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
deleted file mode 100644
index d7e41c5..0000000
--- a/group/scp-boot-tests/juno,juno-default,nil,juno-scp-tools:juno-scmi
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/scp-boot-tests/juno-scmiv2,juno-default,nil,juno-scp-tools:juno-scmi b/group/scp-boot-tests/juno-scmiv2,juno-default,nil,juno-scp-tools:juno-scmi
new file mode 100644
index 0000000..1bbc737
--- /dev/null
+++ b/group/scp-boot-tests/juno-scmiv2,juno-default,nil,juno-scp-tools:juno-scmi
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2021 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/scp_config/juno-scmiv2 b/scp_config/juno-scmiv2
new file mode 100644
index 0000000..2b2932b
--- /dev/null
+++ b/scp_config/juno-scmiv2
@@ -0,0 +1,7 @@
+CC=/arm/pdsw/downloads/scp-models/tools/gcc-arm-none-eabi-9-2020-q2-update/bin/arm-none-eabi-gcc
+PRODUCT=juno
+BS_FIRMWARE_HAS_SCMI_NOTIFICATIONS=yes
+BS_FIRMWARE_HAS_FAST_CHANNELS=yes
+BS_FIRMWARE_HAS_SCMI_RESET=yes
+BS_FIRMWARE_HAS_DEBUG_UNIT=no
+BS_FIRMWARE_HAS_RESOURCE_PERMISSIONS=no
\ No newline at end of file