diff --git a/group/spm-l3-boot-tests/fvp-default,fvp-spm-hyp,fvp-default:fvp-spm.linux b/group/spm-l3-boot-tests/fvp-spm-hyp,fvp-spm-hyp,fvp-default:fvp-spm.linux
similarity index 100%
rename from group/spm-l3-boot-tests/fvp-default,fvp-spm-hyp,fvp-default:fvp-spm.linux
rename to group/spm-l3-boot-tests/fvp-spm-hyp,fvp-spm-hyp,fvp-default:fvp-spm.linux
diff --git a/group/spm-l3-boot-tests/fvp-default,fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31 b/group/spm-l3-boot-tests/fvp-spm-hyp,fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31
similarity index 100%
rename from group/spm-l3-boot-tests/fvp-default,fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31
rename to group/spm-l3-boot-tests/fvp-spm-hyp,fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31
diff --git a/spm_config/fvp-default b/spm_config/fvp-default
index 7d8d20b..f161020 100644
--- a/spm_config/fvp-default
+++ b/spm_config/fvp-default
@@ -1 +1,2 @@
 PROJECT=reference
+PLATFORM=secure_aem_v8a_fvp_vhe
diff --git a/spm_config/fvp-disable_assertions b/spm_config/fvp-disable_assertions
index 206df94..8934961 100644
--- a/spm_config/fvp-disable_assertions
+++ b/spm_config/fvp-disable_assertions
@@ -1,2 +1,3 @@
 PROJECT=reference
+PLATFORM=secure_aem_v8a_fvp_vhe
 ENABLE_ASSERTIONS=0
diff --git a/spm_config/fvp-spm-hyp b/spm_config/fvp-spm-hyp
new file mode 100644
index 0000000..7d8d20b
--- /dev/null
+++ b/spm_config/fvp-spm-hyp
@@ -0,0 +1 @@
+PROJECT=reference
diff --git a/spm_config/tc-default b/spm_config/tc-default
index 7d8d20b..2386606 100644
--- a/spm_config/tc-default
+++ b/spm_config/tc-default
@@ -1 +1,2 @@
 PROJECT=reference
+PLATFORM=secure_tc