diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-sme-only,fvp-default:fvp-spm.smeonly b/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.smeonly
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-spm-sme-only,fvp-default:fvp-spm.smeonly
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.smeonly
diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme2,fvp-default:fvp-spm.sve+sme+fa64 b/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.sve+sme+fa64
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme2,fvp-default:fvp-spm.sve+sme+fa64
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.sve+sme+fa64
diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme2,fvp-default:fvp-spm.sve+sme2 b/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.sve+sme2
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme2,fvp-default:fvp-spm.sve+sme2
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.sve+sme2
diff --git a/tf_config/fvp-spm-sme-only b/tf_config/fvp-spm-sve+sme
similarity index 100%
rename from tf_config/fvp-spm-sme-only
rename to tf_config/fvp-spm-sve+sme
diff --git a/tf_config/fvp-spm-sve+sme2 b/tf_config/fvp-spm-sve+sme2
deleted file mode 100644
index e7b9713..0000000
--- a/tf_config/fvp-spm-sve+sme2
+++ /dev/null
@@ -1,12 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-SPD=spmd
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=5
-BRANCH_PROTECTION=1
-ENABLE_FEAT_MTE2=1
-ENABLE_SVE_FOR_SWD=1
-ENABLE_SME_FOR_SWD=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
-GIC_EXT_INTID=1
-PLAT_TEST_SPM=1