diff --git a/group/spm-l1-build-tests/fvp-default,fvp-default,fvp-default:nil b/group/spm-l1-build-tests/fvp-default,fvp-default,fvp-default:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/spm-l1-build-tests/fvp-default,fvp-default,fvp-default:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/spm-l1-build-tests/fvp-default,fvp-default:nil b/group/spm-l1-build-tests/fvp-default,fvp-default:nil
deleted file mode 100644
index d52947d..0000000
--- a/group/spm-l1-build-tests/fvp-default,fvp-default:nil
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/spm-l1-build-tests/fvp-default,fvp-spm,fvp-default:nil b/group/spm-l1-build-tests/fvp-default,fvp-spm,fvp-default:nil
new file mode 100644
index 0000000..c473896
--- /dev/null
+++ b/group/spm-l1-build-tests/fvp-default,fvp-spm,fvp-default:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/spm-l1-build-tests/fvp-default,fvp-spm:nil b/group/spm-l1-build-tests/fvp-default,fvp-spm:nil
new file mode 100644
index 0000000..c473896
--- /dev/null
+++ b/group/spm-l1-build-tests/fvp-default,fvp-spm:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+