diff --git a/Makefile b/Makefile
index 3c6e11dec..7a969839d 100644
--- a/Makefile
+++ b/Makefile
@@ -103,6 +103,7 @@ shell: build-dirs build-image
 		-v "$$(pwd):/go/src/$(PKG)" \
 		-v "$$(pwd)/_output/bin:/output" \
 		-v "$$(pwd)/.go/std/$(GOOS)/$(GOARCH):/usr/local/go/pkg/$(GOOS)_$(GOARCH)_static" \
+		-v "$$(pwd)/.go/go-build:/.cache/go-build" \
 		-w /go/src/$(PKG) \
 		$(BUILDER_IMAGE) \
 		/bin/sh $(CMD)
@@ -171,7 +172,7 @@ tar-bin: build
 
 build-dirs:
 	@mkdir -p _output/bin/$(GOOS)/$(GOARCH)
-	@mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(GOOS)/$(GOARCH)
+	@mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(GOOS)/$(GOARCH) .go/go-build
 
 build-image:
 	cd hack/build-image && docker build -t $(BUILDER_IMAGE) .
diff --git a/hack/build.sh b/hack/build.sh
index 1b1f5f58f..fb9ec8b9c 100755
--- a/hack/build.sh
+++ b/hack/build.sh
@@ -61,7 +61,7 @@ if [[ "${GOOS}" = "windows" ]]; then
   OUTPUT="${OUTPUT}.exe"
 fi
 
-go build -i \
+go build \
     -o ${OUTPUT} \
     -installsuffix "static" \
     -ldflags "${LDFLAGS}" \
diff --git a/hack/test.sh b/hack/test.sh
index 7651487cf..1f85de673 100755
--- a/hack/test.sh
+++ b/hack/test.sh
@@ -23,6 +23,5 @@ export CGO_ENABLED=0
 TARGETS=$(for d in "$@"; do echo ./$d/...; done)
 
 echo "Running tests:"
-go test -i -installsuffix "static" ${TARGETS}
 go test -installsuffix "static" -timeout 60s ${TARGETS}
 echo "Success!"