diff --git a/group/tf-l2-boot-tests-spm-mm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug b/group/tf-l2-boot-tests-spm-mm/fvp-spm-mm-hob-handoff:fvp-spm.edk2-aemv8a.nocm-debug
similarity index 100%
rename from group/tf-l2-boot-tests-spm-mm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug
rename to group/tf-l2-boot-tests-spm-mm/fvp-spm-mm-hob-handoff:fvp-spm.edk2-aemv8a.nocm-debug
diff --git a/tf_config/fvp-spm-mm b/tf_config/fvp-spm-mm
index 5e11cbd..47df74e 100644
--- a/tf_config/fvp-spm-mm
+++ b/tf_config/fvp-spm-mm
@@ -4,6 +4,4 @@
 EL3_EXCEPTION_HANDLING=1
 ENABLE_SVE_FOR_NS=0
 SPM_MM=1
-HOB_LIST=1
-TRANSFER_LIST=1
 PLAT=fvp