diff --git a/AGENTS.md b/AGENTS.md
index 650d3c033..4878ffe1d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -34,7 +34,7 @@ and `hack/macos/TROUBLESHOOTING.md` for detailed debugging.
 ### Test Tags
 
 Tests use build tags with different timeouts:
-- `unit` (10s), `integration` (15s), `generative` (30s), `acceptance` (20m)
+- `unit` (30s), `integration` (15s), `generative` (30s), `acceptance` (20m)
 - Run specific: `go test -tags=unit ./internal/evaluator -run TestName`
 
 ## Key Conventions
diff --git a/Makefile b/Makefile
index 96209218d..3ff872765 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ TEST_OUTPUT_FILTER=grep -vE '0.0% of statements|\[no test files\]'
 .PHONY: test
 test: ## Run all unit tests
 	@echo "Unit tests:"
-	@set -o pipefail && go test -race -covermode=atomic -coverprofile=coverage-unit.out -timeout 10s -tags=unit ./... | $(TEST_OUTPUT_FILTER)
+	@set -o pipefail && go test -race -covermode=atomic -coverprofile=coverage-unit.out -timeout 30s -tags=unit ./... | $(TEST_OUTPUT_FILTER)
 	@echo "Integration tests:"
 	@set -o pipefail && go test -race -covermode=atomic -coverprofile=coverage-integration.out -timeout 15s -tags=integration ./... | $(TEST_OUTPUT_FILTER)
 # Given the nature of generative tests the test timeout is increased from 500ms