diff --git a/script/build_package.sh b/script/build_package.sh
index 88663fc..307d793 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -503,7 +503,14 @@
 
 		emit_env "MBEDTLS_DIR" "$mbedtls_dir"
 	fi
-
+	if [ "$(get_tf_opt PLATFORM_TEST)" = "tfm-testsuite" ] &&
+	   not_upon "${TF_M_TESTS_PATH}"; then
+		emit_env "TF_M_TESTS_PATH" "$WORKSPACE/tf-m-tests"
+	fi
+	if [ "$(get_tf_opt PLATFORM_TEST)" = "tfm-testsuite" ] &&
+	   not_upon "${TF_M_EXTRAS_PATH}"; then
+		emit_env "TF_M_EXTRAS_PATH" "$WORKSPACE/tf-m-extras"
+	fi
 	if [ -f "$env_file" ]; then
 		set -a
 		source "$env_file"
diff --git a/script/clone_repos.sh b/script/clone_repos.sh
index cb2b8de..b896cdd 100755
--- a/script/clone_repos.sh
+++ b/script/clone_repos.sh
@@ -467,6 +467,18 @@
 		clone_and_sync
 fi
 
+TF_M_TESTS_REFSPEC="${tf_m_tests_refspec:-$TF_M_TESTS_REFSPEC}"
+if not_upon "$no_tfm_tests"; then
+	url="$tf_m_tests_src_repo_url" name="tf-m-tests" ref="TF_M_TESTS_REFSPEC" \
+		loc="TF_M_TESTS_PATH" clone_and_sync
+fi
+
+TF_M_EXTRAS_REFSPEC="${tf_m_extras_refspec:-$TF_M_EXTRAS_REFSPEC}"
+if not_upon "$no_tfm_extras"; then
+	url="$tf_m_extras_src_repo_url" name="tf-m-extras" ref="TF_M_EXTRAS_REFSPEC" \
+		loc="TF_M_EXTRAS_PATH" clone_and_sync
+fi
+
 if [ "$GERRIT_BRANCH" ]; then
 	# If this CI run was in response to a Gerrit commit, post a comment back
 	# to the patch set calling out everything that we've done so far. This
diff --git a/script/translate_refspec.py b/script/translate_refspec.py
index a45ec60..7c81c90 100755
--- a/script/translate_refspec.py
+++ b/script/translate_refspec.py
@@ -30,6 +30,8 @@
 	"cc_plugin": gerrit.GerritProject("tests/lava/test-definitions.git", gerrit_arm),
         "scp": gerrit.GerritProject("scp/firmware", gerrit_arm),
         "spm": gerrit.GerritProject("trusted-firmware/spm", gerrit_arm),
+        "tf-m-tests": gerrit.GerritProject("iot-sw/tf-m/internal/tf-m-tests", gerrit_arm),
+        "tf-m-extras": gerrit.GerritProject("iot-sw/tf-m/internal/tf-m-extras", gerrit_arm),
     },
 
     # Projects hosted on trustedfirmware.org Gerrit server.
@@ -38,6 +40,8 @@
         "trusted-firmware-tf": gerrit.GerritProject("TF-A/tf-a-tests", gerrit_tforg),
         "trusted-firmware-ci": gerrit.GerritProject("ci/tf-a-ci-scripts", gerrit_tforg),
         "spm": gerrit.GerritProject("hafnium/hafnium", gerrit_tforg),
+        "tf-m-tests": gerrit.GerritProject("TF-M/tf-m-tests", gerrit_tforg),
+        "tf-m-extras": gerrit.GerritProject("TF-M/tf-m-extras", gerrit_tforg),
     },
 }