diff --git a/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime-mbedtls:juno-linux.uboot+aarch32-rt32 b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime-mbedtls:juno-linux.uboot+aarch32-rt32
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime-mbedtls:juno-linux.uboot+aarch32-rt32
@@ -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-juno/juno-aarch32-el3-runtime:juno-linux.uboot+aarch32-rt32-debug b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime:juno-linux.uboot+aarch32-rt32-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-aarch32-el3-runtime:juno-linux.uboot+aarch32-rt32-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-juno/juno-all-cpu-reset-ops:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-all-cpu-reset-ops:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-all-cpu-reset-ops:juno-linux.uboot
@@ -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-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee
@@ -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-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-debug
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-mbedtls-ecdsa-opteed:juno-linux.optee-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-juno/juno-mbedtls-rsa-opteed:juno-linux.optee b/group/tf-l2-boot-tests-juno/juno-mbedtls-rsa-opteed:juno-linux.optee
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-mbedtls-rsa-opteed:juno-linux.optee
@@ -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-juno/juno-no-cohmem:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-no-cohmem:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-no-cohmem:juno-linux.uboot
@@ -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-juno/juno-stack-protector:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot
new file mode 100644
index 0000000..e5b5fb5
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot
@@ -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-juno/juno-tbb-mbedtls-romlib,juno-default:juno-tftf-romlib b/group/tf-l2-boot-tests-juno/juno-tbb-mbedtls-romlib,juno-default:juno-tftf-romlib
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-tbb-mbedtls-romlib,juno-default:juno-tftf-romlib
@@ -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-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-debug b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls,juno-default:juno-tftf-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-juno/juno-tspd-tbb-mbedtls:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l2-boot-tests-juno/juno-tspd-tbb-mbedtls:juno-linux.uboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+