diff --git a/test-build.sh b/test-build.sh
index e76787d38..4957a1fb5 100755
--- a/test-build.sh
+++ b/test-build.sh
@@ -2,7 +2,7 @@
 #
 # Run a test build for all images.
 
-set -uo pipefail
+set -euo pipefail
 
 . functions.sh
 
diff --git a/test-image.sh b/test-image.sh
index 5f257a1f0..e409e3bc3 100755
--- a/test-image.sh
+++ b/test-image.sh
@@ -7,12 +7,12 @@ echo "Test for node succeeded."
 
 if ! npm --version >/dev/null; then
   echo "Test for npm failed!"
-  exit 2
+  exit 1
 fi
 echo "Test for npm succeeded."
 
 if ! yarn --version >/dev/null; then
   echo "Test of yarn failed!"
-  exit 3
+  exit 1
 fi
 echo "Test for yarn succeeded."