diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 296b3c95..bbed11e5 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -15,4 +15,4 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Test
-      run: go test ./...
+      run: make citest
diff --git a/Makefile b/Makefile
index 3b04f434..acf73f69 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,12 @@ test:	$(ZZZGENERATED)
 	XOPLEVEL_xoptestutil=warn go test -tags xoptesting ./xoptest/xoptestutil -run TestAdjustedLevelLogger -count 1
 	XOPLEVEL_xoptestutil=debug go test -tags xoptesting ./xoptest/xoptestutil -run TestAdjustedLevelLogger -count 1
 
+citest:
+	go test ./... -failfast 
+	go test -race ./... -failfast 
+	XOPLEVEL_xoptestutil=warn go test ./xoptest/xoptestutil -run TestAdjustedLevelLogger -count 1
+	XOPLEVEL_xoptestutil=debug go test ./xoptest/xoptestutil -run TestAdjustedLevelLogger -count 1
+
 ${GOBIN}/gofumpt:;
 	go install mvdan.cc/gofumpt@latest