diff --git a/Makefile b/Makefile
index 4146605dce..21b4b6a492 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 DEPS = $(shell go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
 PACKAGES = $(shell go list ./...)
+VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
+         -nilfunc -printf -rangeloops -shift -structtags -unsafeptr
 
 all: deps format
 	@mkdir -p bin/
@@ -17,6 +19,7 @@ deps:
 test: deps
 	./scripts/verify_no_uuid.sh
 	go list ./... | xargs -n1 go test
+	@$(MAKE) vet
 
 integ:
 	go list ./... | INTEG_TESTS=yes xargs -n1 go test
@@ -29,10 +32,21 @@ format: deps
 	@echo "--> Running go fmt"
 	@go fmt $(PACKAGES)
 
+vet:
+	@go tool vet 2>/dev/null ; if [ $$? -eq 3 ]; then \
+		go get golang.org/x/tools/cmd/vet; \
+	fi
+	@echo "--> Running go tool vet $(VETARGS) ."
+	@go tool vet $(VETARGS) . ; if [ $$? -eq 1 ]; then \
+		echo ""; \
+		echo "Vet found suspicious constructs. Please check the reported constructs"; \
+		echo "and fix them if necessary before submitting the code for reviewal."; \
+	fi
+
 web:
 	./scripts/website_run.sh
 
 web-push:
 	./scripts/website_push.sh
 
-.PHONY: all cov deps integ test web web-push
+.PHONY: all cov deps integ test vet web web-push