diff --git a/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/scp-boot-tests/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug b/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/scp-boot-tests/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/scp-boot-tests/fvp-sgm775,fvp-sgm775:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug b/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/scp-boot-tests/juno,juno-default,juno-default:scp_juno-tftf-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/scp-boot-tests/juno,juno-default,nil,juno-scp-tools:juno-scmi b/group/scp-boot-tests/juno,juno-default,nil,juno-scp-tools:juno-scmi
new file mode 100644
index 0000000..c16bb20
--- /dev/null
+++ b/group/scp-boot-tests/juno,juno-default,nil,juno-scp-tools:juno-scmi
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot b/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/scp-boot-tests/juno,juno-default:scp_juno-linux.uboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#