diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-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-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa53x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa53x4-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-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa57x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa57x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa57x4-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-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4-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-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-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-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4-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-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4a53x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4a53x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa73x4a53x4-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-cortex/fvp-dynamiq-aarch64-only-2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65x4-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-1x2t:fvp-linux-fip.uboot-neoverse_e1x1-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-1x2t:fvp-linux-fip.uboot-neoverse_e1x1-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-1x2t:fvp-linux-fip.uboot-neoverse_e1x1-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-2x2t:fvp-linux-fip.uboot-neoverse_e1x2-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-2x2t:fvp-linux-fip.uboot-neoverse_e1x2-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-2x2t:fvp-linux-fip.uboot-neoverse_e1x2-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-4x2t:fvp-linux-fip.uboot-neoverse_e1x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-4x2t:fvp-linux-fip.uboot-neoverse_e1x4-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8_2-4x2t:fvp-linux-fip.uboot-neoverse_e1x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8x2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65aex8-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8x2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65aex8-debug
new file mode 100644
index 0000000..9636021
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only-8x2t:fvp-linux-dtb.dyn.2t-fip.uboot-cortexa65aex8-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a76x2-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a76x2-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a76x2-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-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76aex4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76aex4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76aex4-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-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa76x4-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-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa77x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa77x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa77x4-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-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
\ No newline at end of file
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-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-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-zeus-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-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4-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-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a75x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a75x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa55x4a75x4-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-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa75x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa75x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq:fvp-linux-dtb.dyn-fip.uboot-cortexa75x4-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-cortex/fvp-rst-bl31:fvp-linux.rst31-dtb-fip.uboot-cortexa57x4a53x4.rst31-debug b/group/tf-l2-boot-tests-cortex/fvp-rst-bl31:fvp-linux.rst31-dtb-fip.uboot-cortexa57x4a53x4.rst31-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-cortex/fvp-rst-bl31:fvp-linux.rst31-dtb-fip.uboot-cortexa57x4a53x4.rst31-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+