diff --git a/test/framework/secure_suites.c b/test/framework/secure_suites.c
index dc574c0..2e2eb17 100644
--- a/test/framework/secure_suites.c
+++ b/test/framework/secure_suites.c
@@ -10,19 +10,32 @@
 #include "test_framework.h"
 
 /* Service specific includes */
-#include "test/suites/ps/secure/ps_tests.h"
-#include "test/suites/its/secure/its_s_tests.h"
-#include "test/suites/audit/secure/audit_s_tests.h"
-#include "test/suites/attestation/secure/attest_s_tests.h"
-#include "test/suites/crypto/secure/crypto_s_tests.h"
-#include "test/suites/ipc/secure/ipc_s_tests.h"
-#include "test/suites/platform/secure/platform_s_tests.h"
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+#include "ps_tests.h"
+#endif
+#ifdef TFM_PARTITION_INTERNAL_TRUSTED_STORAGE
+#include "its_s_tests.h"
+#endif
+#ifdef TFM_PARTITION_INITIAL_ATTESTATION
+#include "attest_s_tests.h"
+#endif
+#ifdef TFM_PARTITION_CRYPTO
+#include "crypto_s_tests.h"
+#endif
+#ifdef TFM_PARTITION_PLATFORM
+#include "platform_s_tests.h"
+#endif
+#ifdef TFM_PSA_API
+#include "ipc_s_tests.h"
+#else
+#ifdef TFM_PARTITION_AUDIT_LOG
+#include "audit_s_tests.h"
+#endif
+#endif /* TFM_PSA_API */
 
 static struct test_suite_t test_suites[] = {
-#ifdef SERVICES_TEST_S
-    /* List test cases which are compliant with level 1 isolation */
 
-#ifdef ENABLE_PROTECTED_STORAGE_SERVICE_TESTS
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
     {&register_testsuite_s_psa_ps_interface, 0, 0, 0},
     {&register_testsuite_s_psa_ps_reliability, 0, 0, 0},
 
@@ -31,28 +44,28 @@
 #endif
 #endif
 
-#ifdef ENABLE_INTERNAL_TRUSTED_STORAGE_SERVICE_TESTS
+#ifdef TFM_PARTITION_INTERNAL_TRUSTED_STORAGE
     /* Secure ITS test cases */
     {&register_testsuite_s_psa_its_interface, 0, 0, 0},
     {&register_testsuite_s_psa_its_reliability, 0, 0, 0},
 #endif
 
-#ifdef ENABLE_CRYPTO_SERVICE_TESTS
+#ifdef TFM_PARTITION_CRYPTO
     /* Crypto test cases */
     {&register_testsuite_s_crypto_interface, 0, 0, 0},
 #endif
 
-#ifdef ENABLE_ATTESTATION_SERVICE_TESTS
+#ifdef TFM_PARTITION_INITIAL_ATTESTATION
     /* Secure initial attestation service test cases */
     {&register_testsuite_s_attestation_interface, 0, 0, 0},
 #endif
 
-#ifdef ENABLE_PLATFORM_SERVICE_TESTS
+#ifdef TFM_PARTITION_PLATFORM
     /* Secure platform service test cases */
     {&register_testsuite_s_platform_interface, 0, 0, 0},
 #endif
 
-#ifdef ENABLE_AUDIT_LOGGING_SERVICE_TESTS
+#ifdef TFM_PARTITION_AUDIT_LOG
     /* Secure Audit Logging test cases */
     {&register_testsuite_s_audit_interface, 0, 0, 0},
 #endif
@@ -61,7 +74,6 @@
     /* Secure IPC test cases */
     {&register_testsuite_s_ipc_interface, 0, 0, 0},
 #endif
-#endif /* SERVICES_TEST_S */
     /* End of test suites */
     {0, 0, 0, 0}
 };