diff --git a/group/spm-l3-boot-tests/tc-default,fvp-tc2-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc2-debug b/group/spm-l3-boot-tests/tc-default,fvp-tc2-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc2-debug
deleted file mode 100644
index c473896..0000000
--- a/group/spm-l3-boot-tests/tc-default,fvp-tc2-spm,fvp-tc-spm:fvp-tc.spm.tftf-tc2-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tf-l2-boot-tests-arm-plats/fvp-tc2-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc2-debug b/group/tf-l2-boot-tests-arm-plats/fvp-tc2-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc2-debug
deleted file mode 100644
index b8939c8..0000000
--- a/group/tf-l2-boot-tests-arm-plats/fvp-tc2-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc2-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-arm-plats/fvp-tc2-rotpk:fvp-linux.tc-fip.tc-tc.crash-tc2-debug b/group/tf-l2-boot-tests-arm-plats/fvp-tc2-rotpk:fvp-linux.tc-fip.tc-tc.crash-tc2-debug
deleted file mode 100644
index 8c2d647..0000000
--- a/group/tf-l2-boot-tests-arm-plats/fvp-tc2-rotpk:fvp-linux.tc-fip.tc-tc.crash-tc2-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-tc2-mb:fvp-linux.tc-fip.tc-tc.signer-tc2-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-tc2-mb:fvp-linux.tc-fip.tc-tc.signer-tc2-debug
deleted file mode 100644
index e69de29..0000000
--- a/group/tf-l3-boot-tests-misc/fvp-tbb-tc2-mb:fvp-linux.tc-fip.tc-tc.signer-tc2-debug
+++ /dev/null