diff --git a/script/run_local_ci.sh b/script/run_local_ci.sh
index 857355a..248d338 100755
--- a/script/run_local_ci.sh
+++ b/script/run_local_ci.sh
@@ -250,13 +250,20 @@
     tftf_config="${tftf_config:-nil}"
     scp_config="${scp_config:-nil}"
     scp_tools="${scp_tools:-nil}"
+    spm_config="${spm_config:-nil}"
     run_config="${run_config:-nil}"
 
-    # constuct the 'long form' so it takes into account all possible configurations
-    tg=$(printf "%s/%s,%s,%s,%s:%s" "${test_group}" "${tf_config}" "${tftf_config}" "${scp_config}" "${scp_tools}" "${run_config}")
+    # construct the 'long form' so it takes into account all possible configurations
+    if echo ${test_group} | grep -q 'scp-'; then
+	tg=$(printf "%s/%s,%s,%s,%s:%s" "${test_group}" "${scp_config}" "${tf_config}" "${tftf_config}" "${scp_tools}" "${run_config}")
+    elif echo ${test_group} | grep -q 'spm-'; then
+	tg=$(printf "%s/%s,%s,%s,%s,%s:%s" "${test_group}" "${spm_config}" "${tf_config}" "${tftf_config}" "${scp_config}" "${scp_tools}" "${run_config}")
+    else
+	tg=$(printf "%s/%s,%s,%s,%s,%s:%s" "${test_group}" "${tf_config}" "${tftf_config}" "${scp_config}" "${scp_tools}" "${spm_config}" "${run_config}")
+    fi
 
     # trim any ',nil:' from it
-    tg="${tg/,nil:/:}" tg="${tg/,nil:/:}"; tg="${tg/,nil:/:}"
+    tg="${tg/,nil:/:}" tg="${tg/,nil:/:}"; tg="${tg/,nil:/:}"; tg="${tg/,nil:/:}"
 
     # finally exported
     export test_groups="${tg}"