diff --git a/.travis.yml b/.travis.yml
index 9d4cca11..b0f54c92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ install:
     fi
 
 script:
-  - make test
+  - make test-with-race
 
 matrix:
   allow_failures:
diff --git a/makefile b/makefile
index 9bc46f20..eb6232fb 100644
--- a/makefile
+++ b/makefile
@@ -14,5 +14,8 @@ lint:
 test::
 	go test -cover `go list ./... | grep -v vendor`
 
+test-with-race: test
+	go test -cover -race `go list ./... | grep -v vendor`
+
 fmt:
 	go fmt `go list ./... | grep -v vendor`