diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7c58dce1e5adf..1bba086d83be6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -387,7 +387,7 @@ jobs:
 
       - name: Run Tests
         run: |
-          gotestsum --junitfile="gotests.xml" -- -race ./...
+          make test-race
 
       - name: Upload test stats to Datadog
         timeout-minutes: 1
diff --git a/Makefile b/Makefile
index 4aabb3951fcc6..0b0442d973cfa 100644
--- a/Makefile
+++ b/Makefile
@@ -780,7 +780,8 @@ test-postgres: test-postgres-docker
 		--packages="./..." -- \
 		-timeout=20m \
 		-failfast \
-		-count=1
+		-count=1 \
+		-parallel=4
 .PHONY: test-postgres
 
 # NOTE: we set --memory to the same size as a GitHub runner.
@@ -815,7 +816,7 @@ test-postgres-docker:
 
 # Make sure to keep this in sync with test-go-race from .github/workflows/ci.yaml.
 test-race:
-	gotestsum --junitfile="gotests.xml" -- -race -count=1 ./...
+	gotestsum --junitfile="gotests.xml" -- -race -count=1 -parallel=4 ./...
 .PHONY: test-race
 
 # Note: we used to add this to the test target, but it's not necessary and we can