diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c7fdd641e..f727c34069 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,9 +51,7 @@ jobs:
         with:
           go-version-file: go.mod
           cache: true
-      - env:
-          CGO_ENABLED: "0"
-        run: go test -v ./...
+      - run: go test -v -race ./...
 
   system-test:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 30e5d691ff..5361e65096 100644
--- a/Makefile
+++ b/Makefile
@@ -78,11 +78,11 @@ apm-server-oss:
 
 .PHONY: test
 test:
-	@go test $(GOMODFLAG) $(GOTESTFLAGS) ./...
+	@go test $(GOMODFLAG) $(GOTESTFLAGS) -race ./...
 
 .PHONY: system-test
 system-test:
-	@(cd systemtest; go test $(GOMODFLAG) $(GOTESTFLAGS) -timeout=20m ./...)
+	@(cd systemtest; go test $(GOMODFLAG) $(GOTESTFLAGS) -race -timeout=20m ./...)
 
 .PHONY:
 clean: