diff --git a/.github/workflows/execution.yml b/.github/workflows/execution.yml
index 82ff833327..95a211ecbc 100644
--- a/.github/workflows/execution.yml
+++ b/.github/workflows/execution.yml
@@ -34,9 +34,9 @@ jobs:
         with:
           go-version: ^${{ matrix.go }}
         id: go
-      - name: CI
+      - name: Quick tests & benchmarks
         working-directory: execution
-        run: make ci
+        run: make test-quick
       - name: Run tests under race detector
         working-directory: execution
         if: runner.os != 'Windows' # These are very slow on Windows, skip them
diff --git a/.github/workflows/v2.yml b/.github/workflows/v2.yml
index 4adcaa47f1..ab1ab2e41c 100644
--- a/.github/workflows/v2.yml
+++ b/.github/workflows/v2.yml
@@ -38,9 +38,9 @@ jobs:
         with:
           go-version: ^${{ matrix.go }}
         id: go
-      - name: CI
+      - name: Quick tests & benchmarks
         working-directory: v2
-        run: make ci
+        run: make test-quick
       - name: Run tests under race detector
         working-directory: v2
         if: runner.os != 'Windows' # These are very slow on Windows, skip them
diff --git a/execution/Makefile b/execution/Makefile
index 4d3f769e41..9f500dfb7e 100644
--- a/execution/Makefile
+++ b/execution/Makefile
@@ -7,10 +7,6 @@ test:
 test-quick:
 	go test -count=1 ./...
 
-.PHONY: test-no-race
-test-no-race:
-	go test -count=1 ./...
-
 # updateTestFixtures will update all! golden fixtures
 .PHONY: updateTestFixtures
 updateTestFixtures:
@@ -23,12 +19,6 @@ format:
 .PHONY: prepare-merge
 prepare-merge: format test
 
-.PHONY: ci
-ci: test
-
-.PHONY: ci-quick
-ci-full: test-quick
-
 .PHONY: update-deps
 update-deps:
 	go get github.com/wundergraph/graphql-go-tools/v2@upgrade
diff --git a/v2/Makefile b/v2/Makefile
index 4ccb5483c9..99bba14c1a 100644
--- a/v2/Makefile
+++ b/v2/Makefile
@@ -7,13 +7,11 @@ test-fresh: clean-testcache test
 test-stability:
 	@while $(MAKE) test-fresh; do :; done
 
+# First we test, then we benchmark. Otherwise we would get noisy output from testing logs.
 .PHONY: test-quick
 test-quick:
-	go test -count=1 ./...
-
-.PHONY: test
-test-no-race:
-	go test -race ./...
+	go test ./...
+	go test -run=xxxx -bench=. -benchtime=1x ./...
 
 clean-testcache:
 	go clean -testcache
@@ -30,12 +28,6 @@ format:
 .PHONY: prepare-merge
 prepare-merge: format test
 
-.PHONY: ci
-ci: test
-
-.PHONY: ci-quick
-ci-full: test-quick
-
 .PHONY: generate
 generate: $(GOPATH)/bin/go-enum $(GOPATH)/bin/mockgen $(GOPATH)/bin/stringer
 	go generate ./...
diff --git a/v2/pkg/engine/datasource/graphql_datasource/graphql_datasource_federation_test.go b/v2/pkg/engine/datasource/graphql_datasource/graphql_datasource_federation_test.go
index b97bb5c808..7fa1a7f3e1 100644
--- a/v2/pkg/engine/datasource/graphql_datasource/graphql_datasource_federation_test.go
+++ b/v2/pkg/engine/datasource/graphql_datasource/graphql_datasource_federation_test.go
@@ -14684,7 +14684,7 @@ func TestGraphQLDataSourceFederation(t *testing.T) {
 				},
 				DisableResolveFieldPositions: true,
 				Debug: plan.DebugConfiguration{
-					PrintQueryPlans: true,
+					PrintQueryPlans: false,
 				},
 			}
 
diff --git a/v2/pkg/netpoll/fd_test.go b/v2/pkg/netpoll/fd_test.go
index beb0a94176..b74f72fb4c 100644
--- a/v2/pkg/netpoll/fd_test.go
+++ b/v2/pkg/netpoll/fd_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package netpoll
 
 import (