diff --git a/tests/configs/user-config-zeroize-memset.h b/tests/configs/user-config-zeroize-memset.h
deleted file mode 100644
index 270d12584b..0000000000
--- a/tests/configs/user-config-zeroize-memset.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* crypto_config.h modifier that defines mbedtls_platform_zeroize() to be
- * memset(), so that the compile can check arguments for us.
- * Used for testing.
- */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- */
-
-#include <string.h>
-
-/* Define _ALT so we don't get the built-in implementation. The test code will
- * also need to define MBEDTLS_TEST_DEFINES_ZEROIZE so we don't get the
- * declaration. */
-#define MBEDTLS_PLATFORM_ZEROIZE_ALT
-
-#define mbedtls_platform_zeroize(buf, len) memset(buf, 0, len)
diff --git a/tests/scripts/components-compiler.sh b/tests/scripts/components-compiler.sh
index cb6dd9253e..469c62cb09 100644
--- a/tests/scripts/components-compiler.sh
+++ b/tests/scripts/components-compiler.sh
@@ -114,7 +114,7 @@ component_build_zeroize_checks () {
     scripts/config.py full
 
     # Only compile - we're looking for sizeof-pointer-memaccess warnings
-    make CFLAGS="'-DTF_PSA_CRYPTO_USER_CONFIG_FILE=\"../tests/configs/user-config-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess"
+    make CFLAGS="'-DTF_PSA_CRYPTO_USER_CONFIG_FILE=\"$TF_PSA_CRYPTO_ROOT_DIR/tests/configs/user-config-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess"
 }
 
 component_test_zeroize () {
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 67995d5def..da76c6b191 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 67995d5def986d60fc81d85f5b3965e8f660e2e9
+Subproject commit da76c6b1915c75e9dd9efc32f7d206a05b5d36c8