diff --git a/build b/build
index 9c2f95f6ae5..8e76b4c86ea 100755
--- a/build
+++ b/build
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 ETCD_PACKAGE=github.com/coreos/etcd
 export GOPATH="${PWD}"
diff --git a/test.sh b/test.sh
index 9695e70c2c2..31196f7eccc 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # Get GOPATH, etc from build
 . ./build