diff --git a/group/spm-l3-boot-tests/tc-default,fvp-tc3-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc3-debug b/group/spm-l2-boot-tests/tc-default,fvp-tc3-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc3-debug
similarity index 100%
rename from group/spm-l3-boot-tests/tc-default,fvp-tc3-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc3-debug
rename to group/spm-l2-boot-tests/tc-default,fvp-tc3-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc3-debug
diff --git a/group/spm-l3-boot-tests/tc-default,fvp-tc4-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc4-debug b/group/spm-l2-boot-tests/tc-default,fvp-tc4-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc4-debug
similarity index 100%
rename from group/spm-l3-boot-tests/tc-default,fvp-tc4-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc4-debug
rename to group/spm-l2-boot-tests/tc-default,fvp-tc4-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc4-debug
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-tc3-mb:fvp-linux.tc-fip.tc-tc.signer-tc3-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-tc3-mb:fvp-linux.tc-fip.tc-tc.signer-tc3-debug
similarity index 100%
rename from group/tf-l3-boot-tests-misc/fvp-tbb-tc3-mb:fvp-linux.tc-fip.tc-tc.signer-tc3-debug
rename to group/tf-l2-boot-tests-misc/fvp-tbb-tc3-mb:fvp-linux.tc-fip.tc-tc.signer-tc3-debug
diff --git a/group/tf-l3-boot-tests-misc/fvp-tc3-tbb-dpe:fvp-linux.tc-fip.tc-tc3-debug b/group/tf-l2-boot-tests-misc/fvp-tc3-tbb-dpe:fvp-linux.tc-fip.tc-tc3-debug
similarity index 100%
rename from group/tf-l3-boot-tests-misc/fvp-tc3-tbb-dpe:fvp-linux.tc-fip.tc-tc3-debug
rename to group/tf-l2-boot-tests-misc/fvp-tc3-tbb-dpe:fvp-linux.tc-fip.tc-tc3-debug
diff --git a/group/tf-l3-boot-tests-misc/fvp-tc4-tbb-dpe:fvp-linux.tc-fip.tc-tc4-debug b/group/tf-l2-boot-tests-misc/fvp-tc4-tbb-dpe:fvp-linux.tc-fip.tc-tc4-debug
similarity index 100%
rename from group/tf-l3-boot-tests-misc/fvp-tc4-tbb-dpe:fvp-linux.tc-fip.tc-tc4-debug
rename to group/tf-l2-boot-tests-misc/fvp-tc4-tbb-dpe:fvp-linux.tc-fip.tc-tc4-debug