diff --git a/hack/make/binary b/hack/make/binary
index 041e4d1ee8465812b88892082b791831939dd9f7..b97069a8566988407be3c1ae2a08d400656d4430 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 6dc71d1c7e35ecc1de3f128a85713ac5f806a2ad..ca772d03bc755afda7d9940431b4e05a3b030c62 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 e8f90e29b7a601c4179bd6303e5c7aef76416323..32fbbc38f9bf4297acc5674883d86d833e8af5ee 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 75cffe3dcc5b1e6a3c8743b6e5d6a93875039ee3..426b9cb566dfdcb6ce5536a284c9b993f768d029 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 744db3e9997e134b684215d0f73454c43aedfc68..56f624b1f5f01d858b5acaa2b9d45bc77995e755 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 ef7e6a5a418da3f84e707d9a8c631f5643af093a..03d7cbef95eafabcd676304d2abf92e2f17f0430 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 39ba5cd3a5cae1eef44beb25729de645b697325a..183ce95c247cd1a470771e5a7285fff83f530dd2 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 0af4c23c481895c522d0048130b23978a7005317..4c2bccaead10b7a4ca2b4ae460dc3a406603d202 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 b0506d261a0aaefef61a8bdcd6271ceb796b8d82..6e8b38892e5561ef11005e042d7f0d2fb55af636 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}