diff --git a/Makefile b/Makefile
index 8c2e25d7..34d424a6 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ all: format build test
 
 test:
 	@echo ">> running tests"
-	@$(GO) test -short -race $(pkgs)
+	@$(GO) test -tags test -short -race $(pkgs)
 
 test-integration: build test
 	@./build/integration.sh
diff --git a/build/presubmit.sh b/build/presubmit.sh
index d3b5eb25..73c6f0a3 100755
--- a/build/presubmit.sh
+++ b/build/presubmit.sh
@@ -20,5 +20,5 @@ set -x
 ./build/check_gofmt.sh .
 ./build/check_boilerplate.sh
 go vet github.com/google/cadvisor/...
-godep go test -v -race -test.short github.com/google/cadvisor/...
+godep go test -tags test -v -race -test.short github.com/google/cadvisor/...
 godep go build github.com/google/cadvisor