diff --git a/group/ci-l1/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug b/group/ci-l1/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemv8a-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/ci-l1/fvp-default: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-l1-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug b/group/tf-l1-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-aarch32/fvp-aarch32-default:fvp-linux32-dtb.aarch32-fip.uboot32-cortexa32x4-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l1-boot-tests-juno/juno-default:juno-linux.uboot b/group/tf-l1-boot-tests-juno/juno-default:juno-linux.uboot
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-boot-tests-juno/juno-default: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-l1-build-fvp/fvp-default:nil b/group/tf-l1-build-fvp/fvp-default:nil
new file mode 100644
index 0000000..c75b524
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+