diff --git a/clone.sh b/clone.sh
index 009ba66..be5cba1 100755
--- a/clone.sh
+++ b/clone.sh
@@ -56,6 +56,10 @@
 PSA_ARCH_TESTS_REFSPEC="${PSA_ARCH_TESTS_VERSION:-}"
 PSA_ARCH_TESTS_NAME="psa-arch-tests"
 
+PSA_QCBOR_PROJECT="https://github.com/laurencelundblade/QCBOR.git"
+PSA_QCBOR_REFSPEC="refs/heads/master"
+PSA_QCBOR_NAME="psa_qcbor"
+
 # Array containing "<repo url>;"<repo name>;<refspec>" elements
 repos=(
     "${TFM_PROJECT};${TFM_NAME};${TFM_REFSPEC}"
@@ -64,6 +68,7 @@
     "${MBEDTLS_PROJECT};${MBEDTLS_NAME};${MBEDTLS_REFSPEC}"
     "${MCUBOOT_PROJECT};${MCUBOOT_NAME};${MCUBOOT_REFSPEC}"
     "${PSA_ARCH_TESTS_PROJECT};${PSA_ARCH_TESTS_NAME};${PSA_ARCH_TESTS_REFSPEC}"
+    "${PSA_QCBOR_PROJECT};${PSA_QCBOR_NAME};${PSA_QCBOR_REFSPEC}"
 )
 
 # Take into consideration non-CI runs where SHARE_FOLDER variable
diff --git a/run-build.sh b/run-build.sh
index 5dc83fa..34373d8 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -59,6 +59,11 @@
 	cd -
 fi
 
+psa_qcbor_link="https://github.com/laurencelundblade/QCBOR.git"
+psa_qcbor_path="$(pwd)/psa_qcbor"
+psa_qcbor_cfg_cmake="psa-arch-tests/api-tests/tools/cmake/common/CMakeExternal.cmake"
+sed -i "s#$psa_qcbor_link#$psa_qcbor_path#g" $psa_qcbor_cfg_cmake
+
 rm -rf trusted-firmware-m/build
 mkdir trusted-firmware-m/build
 cd trusted-firmware-m/build