diff --git a/.gitignore b/.gitignore
index c57f793b..69d2ba91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.swp
 *~
 vendor
-./adapter
+_output
diff --git a/Makefile b/Makefile
index 9fe211b6..b60221a7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ TEMP_DIR:=$(shell mktemp -d)
 ARCH?=amd64
 ALL_ARCH=amd64 arm arm64 ppc64le s390x
 ML_PLATFORMS=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x
+OUT_DIR?=./_output
 
 VERSION?=latest
 
@@ -23,11 +24,13 @@ ifeq ($(ARCH),s390x)
 	BASEIMAGE?=s390x/busybox
 endif
 
-all: docker-build
-build:
-	CGO_ENABLED=0 GOARCH=$(ARCH) go build -a -tags netgo -o /build/adapter github.com/directxman12/k8s-prometheus-adapter/cmd/adapter
+.PHONY: all build docker-build push-% push test
 
-docker-build:
+all: build
+build: vendor
+	CGO_ENABLED=0 GOARCH=$(ARCH) go build -a -tags netgo -o $(OUT_DIR)/$(ARCH)/adapter github.com/directxman12/k8s-prometheus-adapter/cmd/adapter
+
+docker-build: vendor
 	cp deploy/Dockerfile $(TEMP_DIR)
 	cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
 
@@ -47,3 +50,9 @@ push: ./manifest-tool $(addprefix push-,$(ALL_ARCH))
 ./manifest-tool:
 	curl -sSL https://github.com/estesp/manifest-tool/releases/download/v0.5.0/manifest-tool-linux-amd64 > manifest-tool
 	chmod +x manifest-tool
+
+vendor: glide.lock
+	glide install -v
+
+test: vendor
+	CGO_ENABLED=0 go test ./pkg/...