diff --git a/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug
deleted file mode 100644
index c16bb20..0000000
--- a/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32-debug
deleted file mode 100644
index d52947d..0000000
--- a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.8_3-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.8_3-debug
deleted file mode 100644
index d52947d..0000000
--- a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.8_3-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.amu.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.amu.aarch32-debug
deleted file mode 100644
index d52947d..0000000
--- a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.amu.aarch32-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemva.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemva.aarch32-debug
deleted file mode 100644
index d52947d..0000000
--- a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemva.aarch32-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-