diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 02bdfb1b0..87c092a17 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -49,7 +49,7 @@ extern "C" {
 
 #if defined(PSA_WANT_ALG_ECDSA_DETERMINISTIC)
 #if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC)
-#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA     1
+#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA_DETERMINISTIC     1
 #define MBEDTLS_ECDSA_DETERMINISTIC
 #endif /* MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC */
 #endif /* PSA_WANT_ALG_DETERMINISTIC_ECDSA */
diff --git a/include/psa/crypto_config.h b/include/psa/crypto_config.h
index 808c68a57..28702ebfa 100644
--- a/include/psa/crypto_config.h
+++ b/include/psa/crypto_config.h
@@ -2,7 +2,7 @@
  * \file psa/crypto_config.h
  * \brief PSA crypto configuration options (set of defines)
  *
-*/
+ */
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
 /**
  * When #MBEDTLS_PSA_CRYPTO_CONFIG is enabled in config.h,
diff --git a/tests/scripts/list-macros.sh b/tests/scripts/list-macros.sh
index 15d2590c1..a8617a083 100755
--- a/tests/scripts/list-macros.sh
+++ b/tests/scripts/list-macros.sh
@@ -30,4 +30,10 @@ sed -n -e 's/.*#define \([a-zA-Z0-9_]*\).*/\1/p' $HEADERS \
     | egrep -v '^(asm|inline|EMIT|_CRT_SECURE_NO_DEPRECATE)$|^MULADDC_' \
     | sort -u > macros
 
+# For include/mbedtls/config_psa.h need to ignore the MBEDTLS_xxx define
+# in that file since they may not be defined in include/psa/crypto_config.h
+# This line renames the potentially missing defines to ones that should
+# be present.
+sed -ne 's/^MBEDTLS_PSA_BUILTIN_/MBEDTLS_PSA_ACCEL_/p' <macros >>macros
+
 wc -l macros