diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all b/group/tf-l2-boot-tests-misc/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all-tspd
similarity index 100%
rename from group/tf-l2-boot-tests-misc/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all
rename to group/tf-l2-boot-tests-misc/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all-tspd
diff --git a/group/tf-l3-code-coverage/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all.bmcov-debug b/group/tf-l3-code-coverage/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all.bmcov-tspd-debug
similarity index 100%
rename from group/tf-l3-code-coverage/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all.bmcov-debug
rename to group/tf-l3-code-coverage/fvp-aarch64-feats,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all.bmcov-tspd-debug