diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh
index eb22d38e75..3be5e9554c 100755
--- a/tests/scripts/check-generated-files.sh
+++ b/tests/scripts/check-generated-files.sh
@@ -154,10 +154,10 @@ if [ -d tf-psa-crypto ]; then
     check framework/scripts/generate_config_tests.py tests/suites/test_suite_config.mbedtls_boolean.data
 else
     check framework/scripts/generate_bignum_tests.py $(framework/scripts/generate_bignum_tests.py --list)
-    if in_mbedtls_repo; then
-        check framework/scripts/generate_config_tests.py tests/suites/test_suite_config.mbedtls_boolean.data
-    else
+    if in_tf_psa_crypto_repo; then
         check framework/scripts/generate_config_tests.py tests/suites/test_suite_config.psa_boolean.data
+    else
+        check framework/scripts/generate_config_tests.py tests/suites/test_suite_config.mbedtls_boolean.data
     fi
     check framework/scripts/generate_ecp_tests.py $(framework/scripts/generate_ecp_tests.py --list)
     check framework/scripts/generate_psa_tests.py $(framework/scripts/generate_psa_tests.py --list)
diff --git a/tests/scripts/check_test_cases.py b/tests/scripts/check_test_cases.py
index 4b3aaed51e..6809dd5e77 100755
--- a/tests/scripts/check_test_cases.py
+++ b/tests/scripts/check_test_cases.py
@@ -136,8 +136,7 @@ option"""
         mbedtls_root = build_tree.guess_mbedtls_root()
         directories = [os.path.join(mbedtls_root, 'tests'),
                        os.path.join(mbedtls_root, 'tf-psa-crypto', 'tests')]
-        for index, value in enumerate(directories):
-            directories[index] = os.path.relpath(value)
+        directories = [os.path.relpath(p) for p in directories]
         return directories
 
     def walk_all(self):