diff --git a/scripts/mbedtls_framework/psa_information.py b/scripts/mbedtls_framework/psa_information.py
index 0a498930a..0d4ea9edd 100644
--- a/scripts/mbedtls_framework/psa_information.py
+++ b/scripts/mbedtls_framework/psa_information.py
@@ -37,11 +37,12 @@ class Information:
         if os.path.isdir('tf-psa-crypto'):
             header_file_names = ['tf-psa-crypto/include/psa/crypto_values.h',
                                  'tf-psa-crypto/include/psa/crypto_extra.h']
+            test_suites = ['tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.data']
         else:
             header_file_names = ['include/psa/crypto_values.h',
                                  'include/psa/crypto_extra.h']
+            test_suites = ['tests/suites/test_suite_psa_crypto_metadata.data']
 
-        test_suites = ['tests/suites/test_suite_psa_crypto_metadata.data']
         for header_file_name in header_file_names:
             constructors.parse_header(header_file_name)
         for test_cases in test_suites:
diff --git a/scripts/mbedtls_framework/psa_storage.py b/scripts/mbedtls_framework/psa_storage.py
index 4c1f070c1..64e4fabc1 100644
--- a/scripts/mbedtls_framework/psa_storage.py
+++ b/scripts/mbedtls_framework/psa_storage.py
@@ -53,6 +53,11 @@ class Expr:
 
         if build_tree.looks_like_tf_psa_crypto_root('.'):
             includes.append('drivers/builtin/include')
+            # Temporary, while TF-PSA-Crypto build system in Mbed TLS still
+            # reference some files in Mbed TLS include directory. When it does
+            # not anymore, this can be removed.
+            if build_tree.looks_like_mbedtls_root('..'):
+                includes.append('../include')
         values = c_build_helper.get_c_expression_values(
             'unsigned long', '%lu',
             expressions,