diff --git a/hack/Jenkins/W2L/setup.sh b/hack/Jenkins/W2L/setup.sh
index f8d93e8c2c..ffd9f6b36c 100644
--- a/hack/Jenkins/W2L/setup.sh
+++ b/hack/Jenkins/W2L/setup.sh
@@ -196,7 +196,7 @@ fi
 if [ $ec -eq 0 ]; then
 	echo "INFO: Starting local build of Windows binary..."
 	set -x
-	export TIMEOUT="120m"
+	export TIMEOUT="5m"
 	export DOCKER_HOST="tcp://$ip:$port_inner"
 	export DOCKER_TEST_HOST="tcp://$ip:$port_inner"
 	unset DOCKER_CLIENTONLY
diff --git a/hack/make.sh b/hack/make.sh
index bb3ee7204b..5ac0b9bd7f 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -169,15 +169,13 @@ BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" )
 # Test timeout.
 
 if [ "${DOCKER_ENGINE_GOARCH}" == "arm" ]; then
-	: ${TIMEOUT:=210m}
+	: ${TIMEOUT:=10m}
 elif [ "${DOCKER_ENGINE_GOARCH}" == "windows" ]; then
-	: ${TIMEOUT:=180m}
+	: ${TIMEOUT:=8m}
 else
-	: ${TIMEOUT:=120m}
+	: ${TIMEOUT:=5m}
 fi
 
-TESTFLAGS+=" -test.timeout=${TIMEOUT}"
-
 LDFLAGS_STATIC_DOCKER="
 	$LDFLAGS_STATIC
 	-extldflags \"$EXTLDFLAGS_STATIC\"
@@ -250,6 +248,7 @@ test_env() {
 		DOCKER_REMAP_ROOT="$DOCKER_REMAP_ROOT" \
 		DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \
 		GOPATH="$GOPATH" \
+		GOTRACEBACK=all \
 		HOME="$ABS_DEST/fake-HOME" \
 		PATH="$PATH" \
 		TEMP="$TEMP" \
diff --git a/hack/make/test-integration-cli b/hack/make/test-integration-cli
index 3b4488e142..27897aebad 100644
--- a/hack/make/test-integration-cli
+++ b/hack/make/test-integration-cli
@@ -2,7 +2,7 @@
 set -e
 
 bundle_test_integration_cli() {
-	TESTFLAGS="$TESTFLAGS -check.v"
+	TESTFLAGS="$TESTFLAGS -check.v -check.timeout=${TIMEOUT} -timeout=360m"
 	go_test_dir ./integration-cli
 }
 
diff --git a/hack/make/test-unit b/hack/make/test-unit
index 7eb216daf0..eee9789662 100644
--- a/hack/make/test-unit
+++ b/hack/make/test-unit
@@ -8,6 +8,7 @@ set -e
 #   TESTFLAGS='-test.run ^TestBuild$' ./hack/make.sh test-unit
 #
 bundle_test_unit() {
+	TESTFLAGS+=" -test.timeout=${TIMEOUT}"
 	date
 	if [ -z "$TESTDIRS" ]; then
 		TEST_PATH=./...