diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms-corstone1000.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms-corstone1000.inc
new file mode 100644
index 00000000000..d2be149d79a
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms-corstone1000.inc
@@ -0,0 +1,16 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/corstone1000:"
+
+COMPATIBLE_MACHINE = "corstone1000"
+
+SRC_URI:append  = " \
+    file://0001-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch \
+    file://0002-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch \
+"
+
+# The patches above introduce errors with GCC 14.1, silence them for now
+CFLAGS:append = " -Wno-int-conversion -Wno-implicit-function-declaration"
+
+EXTRA_OECMAKE:append = " \
+    -DCORSTONE_1000_TYPE=${CORSTONE_1000_TYPE} \
+    -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
+"
diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms-fvp-base.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms-fvp-base.inc
new file mode 100644
index 00000000000..2f712b928b0
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms-fvp-base.inc
@@ -0,0 +1,3 @@
+COMPATIBLE_MACHINE = "fvp-base"
+TS_PLATFORM = "arm/fvp/fvp_base_revc-2xaemv8a"
+
diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc
index 5ba8d5f5f11..1c777d40261 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-arm-platforms.inc
@@ -1,18 +1,5 @@
-FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000:"
+MACHINE_TS_REQUIRE ?= ""
+MACHINE_TS_REQUIRE:corstone1000 = "ts-arm-platforms-corstone1000.inc"
+MACHINE_TS_REQUIRE:fvp-base = "ts-arm-platforms-fvp-base.inc"
 
-COMPATIBLE_MACHINE:corstone1000 = "corstone1000"
-SRC_URI:append:corstone1000  = " \
-    file://0001-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch \
-    file://0002-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch \
-"
-
-# The patches above introduce errors with GCC 14.1, silence them for now
-CFLAGS:append:corstone1000 = " -Wno-int-conversion -Wno-implicit-function-declaration"
-
-COMPATIBLE_MACHINE:fvp-base = "fvp-base"
-TS_PLATFORM:fvp-base = "arm/fvp/fvp_base_revc-2xaemv8a"
-
-EXTRA_OECMAKE:append:corstone1000 = " \
-    -DCORSTONE_1000_TYPE=${CORSTONE_1000_TYPE} \
-    -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
-"
+require ${MACHINE_TS_REQUIRE}
diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test-corstone1000.inc
similarity index 70%
rename from meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc
rename to meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test-corstone1000.inc
index 70bd8621985..24cdb01cf79 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test.inc
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-api-test-corstone1000.inc
@@ -1,10 +1,8 @@
-FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000/psa-apitest:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/corstone1000/psa-apitest:"
 
-include ts-arm-platforms.inc
-
-SRC_URI:append:corstone1000  = " \
+SRC_URI:append  = " \
     file://0001-corstone1000-port-crypto-config.patch;patchdir=../ts/ts-external/psatest \
     file://0002-corstone1000-Disable-obsolete-algorithms.patch;patchdir=../ts/ts-external/psatest \
     file://0003-corstone1000-Disable-SHA512-384.patch;patchdir=../ts/ts-external/psatest \
     file://0004-Remove-RSA-support.patch;patchdir=../ts/ts-external/psatest \
-    "
+"
diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_%.bbappend
index ea49213e899..eeff2ebf4f3 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_%.bbappend
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-crypto-api-test_%.bbappend
@@ -1 +1,6 @@
-require ts-psa-api-test.inc
+PSA_TEST_TS_REQUIRE ?= ""
+PSA_TEST_TS_REQUIRE:corstone1000 = "ts-psa-api-test-corstone1000.inc"
+
+require ${PSA_TEST_TS_REQUIRE}
+
+require ts-arm-platforms.inc
diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-iat-api-test_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-iat-api-test_%.bbappend
index ea49213e899..eeff2ebf4f3 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-iat-api-test_%.bbappend
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-iat-api-test_%.bbappend
@@ -1 +1,6 @@
-require ts-psa-api-test.inc
+PSA_TEST_TS_REQUIRE ?= ""
+PSA_TEST_TS_REQUIRE:corstone1000 = "ts-psa-api-test-corstone1000.inc"
+
+require ${PSA_TEST_TS_REQUIRE}
+
+require ts-arm-platforms.inc
diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-its-api-test_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-its-api-test_%.bbappend
index ea49213e899..a72dab4a9e8 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-its-api-test_%.bbappend
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-its-api-test_%.bbappend
@@ -1 +1,7 @@
-require ts-psa-api-test.inc
+PSA_TEST_TS_REQUIRE ?= ""
+PSA_TEST_TS_REQUIRE:corstone1000 = "ts-psa-api-test-corstone1000.inc"
+
+require ${PSA_TEST_TS_REQUIRE}
+
+require ts-arm-platforms.inc
+
diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-ps-api-test_%.bbappend b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-ps-api-test_%.bbappend
index ea49213e899..eeff2ebf4f3 100644
--- a/meta-arm-bsp/recipes-security/trusted-services/ts-psa-ps-api-test_%.bbappend
+++ b/meta-arm-bsp/recipes-security/trusted-services/ts-psa-ps-api-test_%.bbappend
@@ -1 +1,6 @@
-require ts-psa-api-test.inc
+PSA_TEST_TS_REQUIRE ?= ""
+PSA_TEST_TS_REQUIRE:corstone1000 = "ts-psa-api-test-corstone1000.inc"
+
+require ${PSA_TEST_TS_REQUIRE}
+
+require ts-arm-platforms.inc