diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch32-roxlattables,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic-debug b/group/tf-l3-boot-tests-misc/fvp-aarch32-roxlattables,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_panic-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-roxlattables,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.roxlattables.spmin_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-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32 b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug
new file mode 100644
index 0000000..1e513d8
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch32-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Cache state modelling is disabled for this test as this particular TBBR config
+# thrashes the I-cache hard, leading to ~60% of CPU time spent in the host kernel
+# switching the pages responsible for the I-cache from writable to executable and
+# back again.
diff --git a/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.bl31_panic-debug b/group/tf-l3-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-l3-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-l3-boot-tests-misc/fvp-aarch64-roxlattables-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic-debug b/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_panic-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-aarch64-roxlattables-tspd,fvp-default:fvp-tftf-fip.tftf-aemv8a.roxlattables.tspd_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-l3-boot-tests-misc/fvp-no-optimize-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-no-optimize-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-no-optimize-default,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-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-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-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-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-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-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-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-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot,fvp-default:fvp-tspd-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-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tspd-tbb-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/juno-no-optimize-default:juno-linux.uboot b/group/tf-l3-boot-tests-misc/juno-no-optimize-default:juno-linux.uboot
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/juno-no-optimize-default:juno-linux.uboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/juno-tbb-mbedtls-ecdsa:juno-linux.uboot b/group/tf-l3-boot-tests-misc/juno-tbb-mbedtls-ecdsa:juno-linux.uboot
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/juno-tbb-mbedtls-ecdsa:juno-linux.uboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#