diff --git a/scripts/ci.sh b/scripts/ci.sh
index acccf6cdc73..f632782ac7f 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -4,6 +4,9 @@
 # Travis CI matrix job selector
 # -----------------------------
 
+# Exit immediately on error
+set -o errexit
+
 if [ "$TEST" = "unit" ]; then
 
   npm run build
diff --git a/scripts/e2e.geth.automine.sh b/scripts/e2e.geth.automine.sh
index 9bbef64c689..84714dbaebd 100755
--- a/scripts/e2e.geth.automine.sh
+++ b/scripts/e2e.geth.automine.sh
@@ -30,7 +30,7 @@ geth-dev-assistant --period 2 --accounts 1 --tag 'stable'
 istanbul cover _mocha -- \
   --reporter spec \
   --grep 'E2E' \
-  --timeout 10000 \
+  --timeout 15000 \
   --exit
 
 # Copy cov for this run to a temp file we can combine later and send to coveralls
diff --git a/scripts/e2e.geth.instamine.sh b/scripts/e2e.geth.instamine.sh
index 1dbc3c8ec8e..27e15e5c744 100755
--- a/scripts/e2e.geth.instamine.sh
+++ b/scripts/e2e.geth.instamine.sh
@@ -30,7 +30,7 @@ geth-dev-assistant --accounts 1 --tag 'stable'
 GETH_INSTAMINE=true istanbul cover _mocha -- \
   --reporter spec \
   --grep 'E2E' \
-  --timeout 10000 \
+  --timeout 15000 \
   --exit
 
 # Copy cov for this run to a temp file we can combine later and send to coveralls