diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index eebcfeb2a2..4ef950a2fd 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -112,11 +112,6 @@ pre_check_environment () {
     fi
 }
 
-if ! [ -f crypto/Makefile ]; then
-    echo "Please initialize the crypto submodule" >&2
-    exit 1
-fi
-
 pre_initialize_variables () {
     CONFIG_H='include/mbedtls/config.h'
     CONFIG_BAK="$CONFIG_H.bak"
@@ -401,6 +396,10 @@ pre_check_git () {
             exit 1
         fi
     fi
+    if ! [ -f crypto/Makefile ]; then
+        echo "Please initialize the crypto submodule" >&2
+        exit 1
+    fi
 }
 
 pre_setup_keep_going () {