diff --git a/framework b/framework
index 2eb60b8da3..9c2eb756ca 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 2eb60b8da3745f8882741f6fa4c2b316abf5478a
+Subproject commit 9c2eb756ca8c8edbbc100ac2530c3066833952a7
diff --git a/tests/scripts/components-compliance.sh b/tests/scripts/components-compliance.sh
deleted file mode 100644
index cce0890460..0000000000
--- a/tests/scripts/components-compliance.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-# components-compliance.sh
-#
-# Copyright The Mbed TLS Contributors
-# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
-
-# This file contains test components that are executed by all.sh
-
-################################################################
-#### Compliance Testing
-################################################################
-
-component_test_psa_compliance () {
-    # The arch tests build with gcc, so require use of gcc here to link properly
-    msg "build: make, default config (out-of-box), libmbedcrypto.a only"
-    CC=gcc make -C library libmbedcrypto.a
-
-    msg "unit test: test_psa_compliance.py"
-    CC=gcc $FRAMEWORK/scripts/test_psa_compliance.py --build-dir="."
-}
-
-support_test_psa_compliance () {
-    # psa-compliance-tests only supports CMake >= 3.10.0
-    ver="$(cmake --version)"
-    ver="${ver#cmake version }"
-    ver_major="${ver%%.*}"
-
-    ver="${ver#*.}"
-    ver_minor="${ver%%.*}"
-
-    [ "$ver_major" -eq 3 ] && [ "$ver_minor" -ge 10 ]
-}
-
diff --git a/tf-psa-crypto b/tf-psa-crypto
index dcbe6fc1da..67995d5def 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit dcbe6fc1da160e17ffa6ad8d2f503e13d7f505ff
+Subproject commit 67995d5def986d60fc81d85f5b3965e8f660e2e9