diff --git a/scripts/analyze.sh b/scripts/analyze.sh
index 5b99839c7..c19320082 100755
--- a/scripts/analyze.sh
+++ b/scripts/analyze.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -o errexit pipefail
 
 . $(dirname $0)/env.sh
 
diff --git a/scripts/env.sh b/scripts/env.sh
index cd66f418c..93b150e61 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -1,5 +1,5 @@
 #!/bin/false
-set -e
+set -o errexit pipefail
 
 if [[ -z $ENV_SET ]]; then
   export ENV_SET=1
diff --git a/scripts/run-e2e-test.sh b/scripts/run-e2e-test.sh
index 9c2d1608f..d676b04c5 100755
--- a/scripts/run-e2e-test.sh
+++ b/scripts/run-e2e-test.sh
@@ -2,7 +2,7 @@
 
 # Run E2E / Protractor tests.
 
-set -e
+set -o errexit pipefail
 
 . $(dirname $0)/env.sh
 
diff --git a/scripts/run-test.sh b/scripts/run-test.sh
index 71c1d307a..314ebdd9c 100755
--- a/scripts/run-test.sh
+++ b/scripts/run-test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -o errexit pipefail
 
 . $(dirname $0)/env.sh
 
diff --git a/scripts/sauce/sauce_connect_setup.sh b/scripts/sauce/sauce_connect_setup.sh
index 840b3e7f7..4d1101ee5 100755
--- a/scripts/sauce/sauce_connect_setup.sh
+++ b/scripts/sauce/sauce_connect_setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -o errexit pipefail
 
 # Setup and start Sauce Connect for your TravisCI build
 # This script requires your .travis.yml to include the following two private env variables:
diff --git a/scripts/test-expression-extractor.sh b/scripts/test-expression-extractor.sh
index 9c2ada1fb..42a10dc5c 100755
--- a/scripts/test-expression-extractor.sh
+++ b/scripts/test-expression-extractor.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -o errexit pipefail
 
 . $(dirname $0)/env.sh
 
diff --git a/scripts/travis/after-success.sh b/scripts/travis/after-success.sh
index 21415f3e3..4f86a7abb 100755
--- a/scripts/travis/after-success.sh
+++ b/scripts/travis/after-success.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -o errexit pipefail
 
 echo '*******************'
 echo '** AFTER_SUCCESS **'
diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh
index cf08d989a..c93773419 100755
--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -o errexit pipefail
 . "$(dirname $0)/../env.sh"
 
 echo '==========='
diff --git a/scripts/travis/install.sh b/scripts/travis/install.sh
index 9a12f3e83..e898acd9f 100755
--- a/scripts/travis/install.sh
+++ b/scripts/travis/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -o errexit pipefail
 
 sh -e /etc/init.d/xvfb start
 
diff --git a/scripts/travis/presubmit.sh b/scripts/travis/presubmit.sh
index adab21725..18c80051d 100755
--- a/scripts/travis/presubmit.sh
+++ b/scripts/travis/presubmit.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -o errexit pipefail
 
 #  If we're on the presubmit branch, the dev Dart release, and all unit
 #  tests pass, merge the presubmit branch into master and push it.
diff --git a/scripts/travis/setup.sh b/scripts/travis/setup.sh
index c026f2a36..717d5944f 100755
--- a/scripts/travis/setup.sh
+++ b/scripts/travis/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -o errexit pipefail
 
 
 echo Fetch Dart channel: $CHANNEL