diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 251b70e2..c570bcd8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,7 +21,10 @@ jobs:
       - run: go build ./...
       - run: go build -tags sqliteonly ./...
       - run: go vet ./...
-      - run: go test -race -coverpkg=./... -coverprofile=coverage.out ./...
+      # -timeout=90s caps each test binary so a deadlocked test fails fast
+      # instead of blocking CI for the 10-minute default. Race-heavy wave C
+      # suites run in <20s, so 90s leaves ample breathing room.
+      - run: go test -race -timeout=90s -coverpkg=./... -coverprofile=coverage.out ./...
       - name: Coverage summary
         run: go tool cover -func=coverage.out | tail -1
       - name: Coverage ratchet gate
diff --git a/Makefile b/Makefile
index f8ef7ac8..a90734dc 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ reset: version-file
 	$(COMPOSE) up -d --build
 
 test:
-	go test -race ./...
+	go test -race -timeout=90s ./...
 
 vet:
 	go vet ./...