diff --git a/Makefile b/Makefile
index 1701fab1f..880983dcc 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ gen:
 .PHONY: fmt
 fmt:
 	## run go fmt
-	@test -z "$$(gofmt -s -l . | grep -v vendor/ | tee /dev/stderr)" || \
+	@test -z "$$(find . -type d | grep -vE '(/vendor|^\.$$|/.git|/.travis)' | xargs gofmt -s -l  | tee /dev/stderr)" || \
 		(echo "please format Go code with 'gofmt -s -w'" && false)
 
 .PHONY: lint