diff --git a/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rde1edge-debug b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rde1edge-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rde1edge-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-css/fvp-rde1edge-tbb:fvp-linux.sgi-fip.sgi-rde1edge-debug b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb:fvp-linux.sgi-fip.sgi-rde1edge-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rde1edge-tbb:fvp-linux.sgi-fip.sgi-rde1edge-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-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf-fip.tftf-rdn1edge b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf-fip.tftf-rdn1edge
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb,fvp-rdn1edge-default:fvp-tftf-fip.tftf-rdn1edge
@@ -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-css/fvp-rdn1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rdn1edge-debug b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rdn1edge-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb-dualroot:fvp-linux.sgi-fip.sgi-rdn1edge-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-css/fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug b/group/tf-l3-boot-tests-css/fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/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/tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf-fip.tftf-sgi575 b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf-fip.tftf-sgi575
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb,fvp-sgi575-default:fvp-tftf-fip.tftf-sgi575
@@ -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-css/fvp-sgi575-tbb-dualroot:fvp-linux.sgi-fip.sgi-sgi575-debug b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb-dualroot:fvp-linux.sgi-fip.sgi-sgi575-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb-dualroot:fvp-linux.sgi-fip.sgi-sgi575-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-css/fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug b/group/tf-l3-boot-tests-css/fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/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/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
new file mode 100644
index 0000000..0a342ff
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb-dualroot:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-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-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb:fvp-linux.sgm-dtb.sgm775-fip.sgm-sgm775-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-sgm775-tbb: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/tf-l3-boot-tests-css/fvp-tc0-tbb:fvp-linux.tc0-fip.tc0-tc0-debug b/group/tf-l3-boot-tests-css/fvp-tc0-tbb:fvp-linux.tc0-fip.tc0-tc0-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tf-l3-boot-tests-css/fvp-tc0-tbb:fvp-linux.tc0-fip.tc0-tc0-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+