diff --git a/hack/make.sh b/hack/make.sh
index 4c7dea4542..ca3c775bfd 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -175,6 +175,7 @@ go_compile_test_dir() {
 		cd "$dir"
 		go test "${testcover[@]}" -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS -c
 	)
+	[ $? -ne 0 ] && return 1
 	mkdir -p "$(dirname "$out_file")"
 	mv "$dir/$(basename "$dir").test" "$out_file"
 	echo "Precompiled: github.com/dotcloud/docker${dir#.}"
diff --git a/hack/make/test-unit b/hack/make/test-unit
index 91a853309b..1ac3f4aa5b 100644
--- a/hack/make/test-unit
+++ b/hack/make/test-unit
@@ -38,7 +38,7 @@ bundle_test_unit() {
 			export BUILDFLAGS_FILE="$HOME/buildflags_file"
 			( IFS=$'\n'; echo "${BUILDFLAGS[*]}" ) > "$BUILDFLAGS_FILE"
 
-			echo "$TESTDIRS" | parallel --jobs "$PARALLEL_JOBS" --env _ go_compile_test_dir
+			echo "$TESTDIRS" | parallel --jobs "$PARALLEL_JOBS" --halt 2 --env _ go_compile_test_dir
 			rm -rf "$HOME"
 		) else
 			# aww, no "parallel" available - fall back to boring