diff --git a/test.sh b/test.sh
index 8a1c8a0524..28d7290725 100755
--- a/test.sh
+++ b/test.sh
@@ -13,7 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
 
 # Enable tracing in this script off by setting the TRACE variable in your
 # environment to any value:
diff --git a/test_existing_projects.sh b/test_existing_projects.sh
index 1b2934cdd6..0cea518f61 100755
--- a/test_existing_projects.sh
+++ b/test_existing_projects.sh
@@ -13,9 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -o errexit
+set -o nounset
+set -o pipefail
+
 for p in ./test/projects/*
 do
     if [[ -d "$p" ]]; then
         go test -v "$p"
     fi
-done
\ No newline at end of file
+done