diff --git a/test/secure_fw/suites/attestation/attest_token_decode_common.c b/test/secure_fw/suites/attestation/attest_token_decode_common.c
index 93f46c3..eacc5d8 100644
--- a/test/secure_fw/suites/attestation/attest_token_decode_common.c
+++ b/test/secure_fw/suites/attestation/attest_token_decode_common.c
@@ -13,7 +13,7 @@
 #include "attest.h"
 #include "q_useful_buf.h"
 #include "qcbor_util.h"
-#include "config_attest.h"
+#include "config_tfm.h"
 
 /**
  * \file attest_token_decode_common.c
diff --git a/test/secure_fw/suites/attestation/attest_token_test_values.h b/test/secure_fw/suites/attestation/attest_token_test_values.h
index ae3c543..433b0c9 100644
--- a/test/secure_fw/suites/attestation/attest_token_test_values.h
+++ b/test/secure_fw/suites/attestation/attest_token_test_values.h
@@ -12,7 +12,7 @@
 #ifndef __ATTEST_TOKEN_TEST_VALUES_H__
 #define __ATTEST_TOKEN_TEST_VALUES_H__
 
-#include "config_attest.h"
+#include "config_tfm.h"
 
 /**
  * \file attest_token_test_values.h
diff --git a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
index be2f5d8..0136c40 100644
--- a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "config_crypto.h"
+#include "config_tfm.h"
 #include "test_framework_helpers.h"
 #include "tfm_api.h"
 #include "../crypto_tests_common.h"
diff --git a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
index bdbd682..7d8ebd6 100644
--- a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "config_crypto.h"
+#include "config_tfm.h"
 #include "test_framework_helpers.h"
 #include "tfm_secure_client_2_api.h"
 #include "tfm_api.h"
diff --git a/test/secure_fw/suites/its/its_tests_common.c b/test/secure_fw/suites/its/its_tests_common.c
index a4d55c2..5ca2fdb 100644
--- a/test/secure_fw/suites/its/its_tests_common.c
+++ b/test/secure_fw/suites/its/its_tests_common.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "config_its.h"
+#include "config_tfm.h"
 #include "its_tests_common.h"
 #include "psa/internal_trusted_storage.h"
 #include <string.h>
diff --git a/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c b/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c
index 6592b88..4e8b9d1 100644
--- a/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/ps/non_secure/psa_ps_ns_interface_testsuite.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "config_ps.h"
+#include "config_tfm.h"
 #include "ns_test_helpers.h"
 #include "psa/protected_storage.h"
 #include "test_framework_helpers.h"
diff --git a/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c b/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
index 0edb18c..db912b4 100644
--- a/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
+++ b/test/secure_fw/suites/ps/secure/psa_ps_s_interface_testsuite.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "config_ps.h"
+#include "config_tfm.h"
 #include "s_test_helpers.h"
 #include "psa/protected_storage.h"
 #include "test_framework_helpers.h"