diff --git a/Makefile b/Makefile
index f4dfe0dad..6dcde3c03 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ docker:
 	docker rm hugo-build
 
 
-check: fmt vet test
+check: fmt vet test test-race
 
 cyclo:
 	@for d in $(DIRS) ; do \
@@ -59,6 +59,9 @@ lint:
 test:
 	go test ./...
 
+test-race:
+	go test -race ./...
+
 vet:
 	@if [ "`go vet ./... | tee /dev/stderr`" ]; then \
 		echo "^ go vet errors!" && echo && exit 1; \