diff --git a/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.memprotect-debug b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.memprotect-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.memprotect-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-rst-bl31:fvp-linux.rootfs+rst31-dtb.1t-fip.uboot-aemv8a.rst31-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-aarch64-only-with-nstimer:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-aarch64-only-with-nstimer:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-aarch64-only-with-nstimer:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-tbb-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tbb-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tbb-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb-fip.uboot-aemva-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb-fip.uboot-aemva-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb-fip.uboot-aemva-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a-tspd-debug b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-rootfs/fvp-tspd-tsp-dram:fvp-linux.rootfs-dtb.1t-fip.uboot-aemv8a-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+