diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug b/group/tf-l2-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-stack-protector:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-aarch64-stack-protector:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-aarch64-stack-protector:fvp-linux-dtb.1t-fip.uboot-aemv8a-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-misc/fvp-arm-bl31-in-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-arm-bl31-in-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-arm-bl31-in-dram:fvp-linux-dtb.1t-fip.uboot-aemv8a-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-misc/fvp-cas-spinlock,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_3-debug b/group/tf-l2-boot-tests-misc/fvp-cas-spinlock,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_3-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-cas-spinlock,fvp-default:fvp-tftf-fip.tftf-aemv8a.8_3-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug b/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-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-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi b/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.gicv3_spi
@@ -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-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-default-clang,fvp-default:fvp-tftf-fip.tftf-aemv8a b/group/tf-l2-boot-tests-misc/fvp-default-clang,fvp-default:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default-clang,fvp-default:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-default-clang-bfd,fvp-default:fvp-tftf-fip.tftf-aemv8a b/group/tf-l2-boot-tests-misc/fvp-default-clang-bfd,fvp-default:fvp-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-default-clang-bfd,fvp-default:fvp-tftf-fip.tftf-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-early-d-cache,fvp-default:fvp-tftf-fip.tftf-aem8a.singlecluster-debug b/group/tf-l2-boot-tests-misc/fvp-early-d-cache,fvp-default:fvp-tftf-fip.tftf-aem8a.singlecluster-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-early-d-cache,fvp-default:fvp-tftf-fip.tftf-aem8a.singlecluster-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-gcc-lto,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-gcc-lto,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-gcc-lto,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-gicv4:fvp-linux-dtb.1t-fip.uboot-aemv8a.gicv4 b/group/tf-l2-boot-tests-misc/fvp-gicv4:fvp-linux-dtb.1t-fip.uboot-aemv8a.gicv4
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-gicv4:fvp-linux-dtb.1t-fip.uboot-aemv8a.gicv4
@@ -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-misc/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug b/group/tf-l2-boot-tests-misc/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-misc-features:fvp-linux-dtb.1t-fip.uboot-aemv8a.assymetric-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-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug b/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
new file mode 100644
index 0000000..215448a
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+fetch_tf_resource() {
+	set_run_env "num_uarts" "3"
+	uart="0" file="tftf.exp" track_expect
+	uart="1" file="hold_uart.exp" track_expect
+	uart="2" file="hold_uart.exp" track_expect
+}
diff --git a/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-fip.uboot-aemv8a-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-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-romlib:fvp-linux-dtb.1t-romlib-fip.uboot-aemv8a-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-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug b/group/tf-l2-boot-tests-misc/fvp-tspd-aarch64-only:fvp-linux-dtb.1t-fip.uboot-aemv8a.64only-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tspd-aarch64-only:fvp-linux-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-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug b/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-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-misc/fvp-tspd-tsp-async-ehf,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug b/group/tf-l2-boot-tests-misc/fvp-tspd-tsp-async-ehf,fvp-default:fvp-tftf-fip.tftf-aemv8a-tspd-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-tspd-tsp-async-ehf,fvp-default:fvp-tftf-fip.tftf-aemv8a-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-misc/fvp-ubsan,fvp-default:fvp-fip.tftf-aemv8a.ubsan_test-debug b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-fip.tftf-aemv8a.ubsan_test-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-fip.tftf-aemv8a.ubsan_test-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-misc/fvp-ubsan,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#