diff --git a/hack/make/binary b/hack/make/binary
index 041e4d1ee..b97069a85 100755
--- a/hack/make/binary
+++ b/hack/make/binary
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
diff --git a/hack/make/cover b/hack/make/cover
index 6dc71d1c7..ca772d03b 100644
--- a/hack/make/cover
+++ b/hack/make/cover
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST="$1"
 
diff --git a/hack/make/cross b/hack/make/cross
index e8f90e29b..32fbbc38f 100644
--- a/hack/make/cross
+++ b/hack/make/cross
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
diff --git a/hack/make/dynbinary b/hack/make/dynbinary
index 75cffe3dc..426b9cb56 100644
--- a/hack/make/dynbinary
+++ b/hack/make/dynbinary
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
diff --git a/hack/make/dyntest b/hack/make/dyntest
index 744db3e99..56f624b1f 100644
--- a/hack/make/dyntest
+++ b/hack/make/dyntest
@@ -1,10 +1,9 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 INIT=$DEST/../dynbinary/dockerinit-$VERSION
 
-set -e
-
 if [ ! -x "$INIT" ]; then
 	echo >&2 'error: dynbinary must be run before dyntest'
 	false
diff --git a/hack/make/dyntest-integration b/hack/make/dyntest-integration
index ef7e6a5a4..03d7cbef9 100644
--- a/hack/make/dyntest-integration
+++ b/hack/make/dyntest-integration
@@ -1,10 +1,9 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 INIT=$DEST/../dynbinary/dockerinit-$VERSION
 
-set -e
-
 if [ ! -x "$INIT" ]; then
 	echo >&2 'error: dynbinary must be run before dyntest-integration'
 	false
diff --git a/hack/make/test b/hack/make/test
index 39ba5cd3a..183ce95c2 100644
--- a/hack/make/test
+++ b/hack/make/test
@@ -1,9 +1,8 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
-set -e
-
 RED=$'\033[31m'
 GREEN=$'\033[32m'
 TEXTRESET=$'\033[0m' # reset the foreground colour
diff --git a/hack/make/test-integration b/hack/make/test-integration
index 0af4c23c4..4c2bccaea 100644
--- a/hack/make/test-integration
+++ b/hack/make/test-integration
@@ -1,9 +1,8 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
-set -e
-
 bundle_test_integration() {
 	LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir ./integration \
 		"-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/dotcloud/docker,g' | paste -d, -s)"
diff --git a/hack/make/test-integration-cli b/hack/make/test-integration-cli
index b0506d261..6e8b38892 100644
--- a/hack/make/test-integration-cli
+++ b/hack/make/test-integration-cli
@@ -1,9 +1,8 @@
 #!/bin/bash
+set -e
 
 DEST=$1
 
-set -e
-
 DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
 DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}