diff --git a/tools/build.sh b/tools/build.sh
index 541f0536..96bced00 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
 
-# run cmake tests
-tools/check_cmakelists.sh
-if [ $? -ne 0 ]; then exit 1; fi
-
-# run sketch tests
-tools/build-tests.sh
-if [ $? -ne 0 ]; then exit 1; fi
-
-# zip the package if tagged build, otherwise finish here
 if [ ! -z "$TRAVIS_TAG" ]; then
+    # zip the package if tagged build
     tools/build-release.sh -a$ESP32_GITHUB_TOKEN
+else
+    # run cmake and sketch tests
+    tools/check_cmakelists.sh && tools/build-tests.sh
 fi