diff --git a/Makefile b/Makefile
index a4022e916..28c2ceb31 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ telegraf:
 
 .PHONY: test
 test:
-	go test -short ./...
+	go test -race -short ./...
 
 .PHONY: fmt
 fmt:
@@ -107,12 +107,12 @@ fmtcheck:
 
 .PHONY: test-windows
 test-windows:
-	go test -short ./plugins/inputs/ping/...
-	go test -short ./plugins/inputs/win_perf_counters/...
-	go test -short ./plugins/inputs/win_services/...
-	go test -short ./plugins/inputs/procstat/...
-	go test -short ./plugins/inputs/ntpq/...
-	go test -short ./plugins/processors/port_name/...
+	go test -race -short ./plugins/inputs/ping/...
+	go test -race -short ./plugins/inputs/win_perf_counters/...
+	go test -race -short ./plugins/inputs/win_services/...
+	go test -race -short ./plugins/inputs/procstat/...
+	go test -race -short ./plugins/inputs/ntpq/...
+	go test -race -short ./plugins/processors/port_name/...
 
 .PHONY: vet
 vet:
@@ -139,7 +139,7 @@ check: fmtcheck vet
 
 .PHONY: test-all
 test-all: fmtcheck vet
-	go test ./...
+	go test -race ./...
 
 .PHONY: check-deps
 check-deps: