diff --git a/test/secure_fw/tfm_test_manifest_list.yaml b/test/secure_fw/tfm_test_manifest_list.yaml
index e79a863..88fe5b4 100644
--- a/test/secure_fw/tfm_test_manifest_list.yaml
+++ b/test/secure_fw/tfm_test_manifest_list.yaml
@@ -16,7 +16,7 @@
       "short_name": "TFM_SP_CORE_TEST",
       "manifest": "suites/core/service/tfm_core_test/tfm_ss_core_test.yaml",
       "output_path": "secure_fw/test_services/tfm_core_test",
-      "conditional": "TEST_NS_CORE",
+      "conditional": "@TEST_NS_CORE@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3000,
@@ -31,7 +31,7 @@
       "short_name": "TFM_SP_CORE_TEST_2",
       "manifest": "suites/core/service/tfm_core_test_2/tfm_ss_core_test_2.yaml",
       "output_path": "secure_fw/test_services/tfm_core_test_2",
-      "conditional": "TEST_NS_CORE",
+      "conditional": "@TEST_NS_CORE@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3001,
@@ -46,7 +46,7 @@
       "short_name": "TFM_SP_SECURE_TEST_PARTITION",
       "manifest": "common_test_services/tfm_secure_client_service/tfm_secure_client_service.yaml",
       "output_path": "secure_fw/test_services/tfm_secure_client_service",
-      "conditional": "TEST_FRAMEWORK_S",
+      "conditional": "@TEST_FRAMEWORK_S@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3002,
@@ -61,7 +61,7 @@
       "short_name": "TFM_SP_IPC_SERVICE_TEST",
       "manifest": "suites/spm/ipc/service/tfm_ipc_service/tfm_ipc_service_test.yaml",
       "output_path": "secure_fw/test_services/tfm_ipc_service",
-      "conditional": "TFM_PARTITION_IPC_TEST",
+      "conditional": "@TFM_PARTITION_IPC_TEST@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3003,
@@ -76,7 +76,7 @@
       "short_name": "TFM_SP_IPC_CLIENT_TEST",
       "manifest": "suites/spm/ipc/service/tfm_ipc_client/tfm_ipc_client_test.yaml",
       "output_path": "secure_fw/test_services/tfm_ipc_client",
-      "conditional": "TFM_PARTITION_IPC_TEST",
+      "conditional": "@TFM_PARTITION_IPC_TEST@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3004,
@@ -91,7 +91,7 @@
       "short_name": "TFM_SP_PS_TEST",
       "manifest": "suites/ps/service/tfm_ps_test_service.yaml",
       "output_path": "secure_fw/test_services/tfm_ps_test_service",
-      "conditional": "TEST_S_PS",
+      "conditional": "@TEST_S_PS@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3005,
@@ -106,7 +106,7 @@
       "short_name": "TFM_SP_SECURE_CLIENT_2",
       "manifest": "common_test_services/tfm_secure_client_2/tfm_secure_client_2.yaml",
       "output_path": "secure_fw/test_services/tfm_secure_client_2",
-      "conditional": "TEST_FRAMEWORK_S",
+      "conditional": "@TEST_FRAMEWORK_S@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3006,
@@ -121,7 +121,7 @@
       "short_name": "TFM_SP_SLIH_TEST",
       "manifest": "suites/spm/irq/service/tfm_slih_test_service/tfm_slih_test_service.yaml",
       "output_path": "secure_fw/test_services/tfm_slih_test_service",
-      "conditional": "TEST_NS_SLIH_IRQ",
+      "conditional": "@TEST_NS_SLIH_IRQ@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3008,
@@ -136,7 +136,7 @@
       "short_name": "TFM_SP_FLIH_TEST",
       "manifest": "suites/spm/irq/service/tfm_flih_test_service/tfm_flih_test_service.yaml",
       "output_path": "secure_fw/test_services/tfm_flih_test_service",
-      "conditional": "TEST_NS_FLIH_IRQ",
+      "conditional": "@TEST_NS_FLIH_IRQ@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3009,
@@ -151,7 +151,7 @@
       "short_name": "TFM_SP_FPU_SERVICE_TEST",
       "manifest": "suites/fpu/service/tfm_fpu_service_test.yaml",
       "output_path": "secure_fw/test_services/tfm_fpu_service",
-      "conditional": "TEST_PARTITION_FPU_TEST",
+      "conditional": "@TEST_PARTITION_FPU_TEST@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3010,
@@ -166,7 +166,7 @@
       "short_name": "SFN_BACKEND_TEST",
       "manifest": "suites/spm/sfn/service/sfn_backend_test_partition/sfn_backend_test_partition.yaml",
       "output_path": "secure_fw/test_services/sfn_backend_test_partition",
-      "conditional": "TFM_PARTITION_SFN_BACKEND_TEST",
+      "conditional": "@TFM_PARTITION_SFN_BACKEND_TEST@",
       "version_major": 0,
       "version_minor": 1,
       "pid": 3011,