diff --git a/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_0-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-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_1-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-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_2-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-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_3-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-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux-dtb.foundation-fip.uboot-foundationv8.8_4-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-foundation/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-default:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-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-foundation/fvp-opteed:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8 b/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux-dtb.foundation-optee-fip.uboot+bl32-foundationv8
@@ -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-foundation/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug b/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-opteed:fvp-linux.rootfs-dtb.foundation-optee-fip.uboot+bl32-foundationv8-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-foundation/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug b/group/tf-l2-boot-tests-foundation/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-foundation/fvp-tspd:fvp-linux.rootfs-dtb.foundation-fip.uboot-foundationv8-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+