diff --git a/library/Makefile b/library/Makefile
index 21f85b67d9..a0b6d6eb1d 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -356,6 +356,8 @@ $(TF_PSA_CRYPTO_GENERATED_CONFIG_CHECK_FILES):
 	echo "  Gen   $(TF_PSA_CRYPTO_GENERATED_CONFIG_CHECK_FILES)"
 	$(PYTHON) $(TF_PSA_CRYPTO_CORE_PATH)/../scripts/generate_config_checks.py
 
+$(TF_PSA_CRYPTO_CORE_PATH)/tf_psa_crypto_config.o: $(TF_PSA_CRYPTO_GENERATED_CONFIG_CHECK_FILES)
+
 clean:
 ifndef WINDOWS
 	rm -f *.o *.s libmbed*
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index 28fc189d0a..0aeaa673df 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -2436,7 +2436,10 @@ component_test_xts () {
     # supported through the PSA API.
     msg "build: Default + MBEDTLS_CIPHER_MODE_XTS"
 
-    echo "#define MBEDTLS_CIPHER_MODE_XTS" > psa_user_config.h
+    cat <<'EOF' >psa_user_config.h
+#define MBEDTLS_CIPHER_MODE_XTS
+#define TF_PSA_CRYPTO_CONFIG_CHECK_BYPASS
+EOF
     cmake -DTF_PSA_CRYPTO_USER_CONFIG_FILE="psa_user_config.h"
     make