diff --git a/test.sh b/test.sh
index baa781d364..e433dc5f2e 100755
--- a/test.sh
+++ b/test.sh
@@ -14,7 +14,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 c05a8e14b5..f571130580 100755
--- a/test_existing_projects.sh
+++ b/test_existing_projects.sh
@@ -14,9 +14,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