diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a-debug b/group/tf-l2-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a-debug
similarity index 100%
rename from group/tf-l2-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a-debug
rename to group/tf-l2-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a-debug
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug b/group/tf-l2-boot-tests-spm-mm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug
similarity index 100%
rename from group/tf-l2-boot-tests-spm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug
rename to group/tf-l2-boot-tests-spm-mm/fvp-spm-mm:fvp-spm.edk2-aemv8a.nocm-debug
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug b/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
similarity index 100%
rename from group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
rename to group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug b/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
similarity index 100%
rename from group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
rename to group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug b/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
similarity index 100%
rename from group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
rename to group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug b/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
similarity index 100%
rename from group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
rename to group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug b/group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
similarity index 100%
rename from group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
rename to group/tf-l3-boot-tests-spm-mm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug