diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 68163559a..d86a9f773 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -2758,15 +2758,21 @@ component_test_zeroize () {
 
 component_test_psa_compliance () {
     msg "build: make, default config (out-of-box), libmbedcrypto.a only"
-    make library/libmbedcrypto.a
+    make -C library libmbedcrypto.a
 
     msg "unit test: test_psa_compliance.py"
     ./tests/scripts/test_psa_compliance.py
 }
 
 support_test_psa_compliance () {
-    local ver=($(cmake --version | sed 's/cmake version //; y/./ /; q'))
-    [ "${ver[0]}" -eq 3 ] && [ "${ver[1]}" -ge 10 ]
+    ver="$(cmake --version)"
+    ver="${ver#cmake version }"
+    ver_major="${ver%%.*}"
+
+    ver="${ver#*.}"
+    ver_minor="${ver%%.*}"
+
+    [ "$ver_major" -eq 3 ] && [ "$ver_minor" -ge 10 ]
 }
 
 component_check_python_files () {
diff --git a/tests/scripts/test_psa_compliance.py b/tests/scripts/test_psa_compliance.py
index 07fa76e60..d6fe8c440 100755
--- a/tests/scripts/test_psa_compliance.py
+++ b/tests/scripts/test_psa_compliance.py
@@ -16,9 +16,8 @@ PSA_ARCH_TESTS_REF = 'crypto1.0-3.0'
 def main():
     mbedtls_dir = os.getcwd()
 
-    mbedcrypto_lib = 'library/libmbedcrypto.a'
-    if not os.path.exists(mbedcrypto_lib):
-        subprocess.check_call(['make', mbedcrypto_lib])
+    if not os.path.exists('library/libmbedcrypto.a'):
+        subprocess.check_call(['make', '-C', 'library', 'libmbedcrypto.a'])
 
     psa_arch_tests_dir = 'psa-arch-tests'
     try: