diff --git a/framework b/framework
index 7e6a3d255d..b9065f1717 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 7e6a3d255dcf1d8756d1535ac26bba8695afac30
+Subproject commit b9065f1717a3e0a24de7a13e298e906aaf44bd52
diff --git a/tests/scripts/components-sanitizers.sh b/tests/scripts/components-sanitizers.sh
index 2496c3df6e..454d1407f6 100644
--- a/tests/scripts/components-sanitizers.sh
+++ b/tests/scripts/components-sanitizers.sh
@@ -111,6 +111,8 @@ component_test_tsan () {
     scripts/config.py set MBEDTLS_THREADING_PTHREAD
     # Self-tests do not currently use multiple threads.
     scripts/config.py unset MBEDTLS_SELF_TEST
+    # Interruptible ECC tests are not thread safe
+    scripts/config.py unset MBEDTLS_ECP_RESTARTABLE
 
     # The deprecated MBEDTLS_PSA_CRYPTO_SE_C interface is not thread safe.
     scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 26bc88ccd7..9e4ac374e2 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 26bc88ccd708e8f5748b5aa90691980d5bb111c0
+Subproject commit 9e4ac374e2be67892e70b9c653c6872ba8a2031b