diff --git a/clone.sh b/clone.sh
index 81536fb..32dba6d 100755
--- a/clone.sh
+++ b/clone.sh
@@ -59,6 +59,24 @@
     echo "${VERSION}"
 }
 
+# Parse dependency version specified in TF-M commit message
+function parse_version_from_commit_msg() {
+    DEPENDENCY_NAME=$1
+    TFM_PATH="${SHARE_FOLDER}/${TFM_NAME}"
+
+    cd ${SHARE_FOLDER}/${TFM_NAME}
+
+    VERSION="$(git log HEAD -n 1 | grep "Depend on ${DEPENDENCY_NAME}" | awk '{print $NF}')"
+
+    if [ -z "${VERSION}" ]; then
+        VERSION="refs/heads/feature-build-split-v2"
+    fi
+
+    cd $OLDPWD
+
+    echo "${VERSION}"
+}
+
 # Must projects
 if [ -n "${GERRIT_EVENT_HASH}" ]; then
     # If triggered by Gerrit, use its variables
@@ -102,7 +120,7 @@
 
 # Dependency projects
 TFM_TESTS_PROJECT="${TFM_TESTS_URL:-}"
-TFM_TESTS_REFSPEC="${TFM_TESTS_REFSPEC:-"$(parse_version_from_cmake lib/ext/tf-m-tests/repo_config_default.cmake TFM_TEST_REPO_VERSION)"}"
+TFM_TESTS_REFSPEC="${TFM_TESTS_REFSPEC:-"$(parse_version_from_commit_msg tf-m-tests)"}"
 TFM_TESTS_NAME="tf-m-tests"
 
 MBEDTLS_PROJECT="${MBEDTLS_URL:-}"