diff --git a/configs/config-suite-b.h b/configs/config-suite-b.h
index 20bd7f9e14..b408a9e59e 100644
--- a/configs/config-suite-b.h
+++ b/configs/config-suite-b.h
@@ -21,6 +21,10 @@
  * See README.txt for usage instructions.
  */
 
+#define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "../configs/crypto-config-suite-b.h"
+
+#define MBEDTLS_PSA_CRYPTO_CONFIG
+
 /* System support */
 #define MBEDTLS_HAVE_ASM
 #define MBEDTLS_HAVE_TIME
diff --git a/configs/crypto-config-suite-b.h b/configs/crypto-config-suite-b.h
index 8ad38754ed..0d8f46530a 100644
--- a/configs/crypto-config-suite-b.h
+++ b/configs/crypto-config-suite-b.h
@@ -22,10 +22,6 @@
  *
  * To be used in conjunction with configs/config-suite-b.h. */
 
-#define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "../configs/crypto-config-suite-b.h"
-
-#define MBEDTLS_PSA_CRYPTO_CONFIG
-
 #ifndef PSA_CRYPTO_CONFIG_H
 #define PSA_CRYPTO_CONFIG_H