diff --git a/.travis.yml b/.travis.yml
index a66a67a..7727f3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,5 +14,5 @@ install:
  - make deps
 
 script:
-  - make test
+  - make test-no-race
   - make compatibility
diff --git a/Makefile b/Makefile
index 4442851..f39e677 100644
--- a/Makefile
+++ b/Makefile
@@ -15,5 +15,10 @@ test: build
 	@go test -v  ./check
 	@go test -race ./check
 
+test-no-race: build
+	@go fmt . ./check
+	@go vet . ./check
+	@go test -v  ./check
+
 compatibility: build
 	@go run compatibility/test.go -base-dir "./compatibility" -health-check "./kafka-health-check"