diff --git a/framework b/framework
index df7024c..fc46420 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit df7024c72357610b3aa4194ae8e10ede989ed0fd
+Subproject commit fc464209a949557108fc6de1bbb49e3bc1a4725e
diff --git a/scripts/abi_check.py b/scripts/abi_check.py
index f91d80e..5421363 100755
--- a/scripts/abi_check.py
+++ b/scripts/abi_check.py
@@ -350,9 +350,15 @@
         """
         # Existing test data files. This may be missing some automatically
         # generated files if they haven't been generated yet.
-        storage_data_files = set(glob.glob(
-            'tests/suites/test_suite_*storage_format*.data'
-        ))
+        if os.path.isdir(os.path.join(git_worktree_path, 'tf-psa-crypto',
+                                      'tests', 'suites')):
+            storage_data_files = set(glob.glob(
+                'tf-psa-crypto/tests/suites/test_suite_*storage_format*.data'
+            ))
+        else:
+            storage_data_files = set(glob.glob(
+                'tests/suites/test_suite_*storage_format*.data'
+            ))
         # Discover and (re)generate automatically generated data files.
         to_be_generated = set()
         for filename in self._list_generated_test_data_files(git_worktree_path):