diff --git a/test/test_contracts.sh b/test/test_contracts.sh
index 41b60eb00..bb5f7c089 100755
--- a/test/test_contracts.sh
+++ b/test/test_contracts.sh
@@ -23,10 +23,13 @@ CONTRACT_PATH=contracts
 printf "\n\n"
 
 # Assert all contracts typecheck
-for contract in `ls $CONTRACT_PATH/*.tz`; do
-    printf "[Typechecking %s]\n" "$contract";
-    ${client} typecheck program "$contract";
-done
+if [ ! $NO_TYPECHECK ] ; then
+    for contract in `ls $CONTRACT_PATH/*.tz`; do
+        printf "[Typechecking %s]\n" "$contract";
+        ${client} typecheck program "$contract";
+    done
+    printf "All contracts are well typed\n\n"
+fi
 
 # FORMAT: assert_output contract_file storage input expected_result