diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 94346e8e90..561b271d1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
 
       - name: Run unit tests with coverage
         run: |
-          go test -v -parallel=8 -timeout=3m -tags '!integration' -run='^Test' -coverprofile=coverage.out -json ./... | tee test-result-unit.json
+          go test -v -parallel=8 -timeout=3m -run='^Test' -coverprofile=coverage.out -json ./... | tee test-result-unit.json
           go tool cover -html=coverage.out -o coverage.html
 
       # Coverage reports for recent builds only - 7 days is sufficient for debugging recent changes
diff --git a/Makefile b/Makefile
index a35dadbc15..866dca705e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,15 +40,15 @@ build-darwin:
 build-windows:
 	GOOS=windows GOARCH=amd64 go build $(LDFLAGS) -o $(BINARY_NAME)-windows-amd64.exe ./cmd/gh-aw
 
-# Test the code (runs both unit and integration tests)
+# Test the code (runs both unlabelled unit tests and integration tests)
 .PHONY: test
 test:
 	go test -v -timeout=3m -tags 'integration' -run='^Test' ./...
 
-# Test unit tests only (excludes integration tests)
+# Test unit tests only (excludes labelled integration tests)
 .PHONY: test-unit
 test-unit:
-	go test -v -timeout=3m -tags '!integration' -run='^Test' ./...
+	go test -v -timeout=3m -run='^Test' ./...
 
 # Update golden test files
 .PHONY: update-golden
diff --git a/pkg/cli/copilot_setup_test.go b/pkg/cli/copilot_setup_test.go
index fe0ddbb62a..0e08f1bd55 100644
--- a/pkg/cli/copilot_setup_test.go
+++ b/pkg/cli/copilot_setup_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package cli
 
 import (
diff --git a/pkg/cli/flags_test.go b/pkg/cli/flags_test.go
index 366e4b5a76..7c81e44552 100644
--- a/pkg/cli/flags_test.go
+++ b/pkg/cli/flags_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package cli
 
 import (
diff --git a/pkg/cli/init_command_test.go b/pkg/cli/init_command_test.go
index 1653a2184c..e468975ba5 100644
--- a/pkg/cli/init_command_test.go
+++ b/pkg/cli/init_command_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package cli
 
 import (
diff --git a/pkg/cli/mcp_config_file_test.go b/pkg/cli/mcp_config_file_test.go
index d256579bdc..c7a078c1e4 100644
--- a/pkg/cli/mcp_config_file_test.go
+++ b/pkg/cli/mcp_config_file_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package cli
 
 import (
diff --git a/pkg/cli/mcp_secrets_test.go b/pkg/cli/mcp_secrets_test.go
index a39ad1235a..27bc0b31dc 100644
--- a/pkg/cli/mcp_secrets_test.go
+++ b/pkg/cli/mcp_secrets_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package cli
 
 import (
diff --git a/pkg/cli/test_main_test.go b/pkg/cli/test_main_test.go
index c93b0fbb85..e80a478603 100644
--- a/pkg/cli/test_main_test.go
+++ b/pkg/cli/test_main_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package cli
 
 import (
diff --git a/pkg/workflow/firewall_disable_integration_test.go b/pkg/workflow/firewall_disable_integration_test.go
index 66fb3e95dd..16ecbba39c 100644
--- a/pkg/workflow/firewall_disable_integration_test.go
+++ b/pkg/workflow/firewall_disable_integration_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package workflow
 
 import (
diff --git a/pkg/workflow/github_token_test.go b/pkg/workflow/github_token_test.go
index 24f89fe965..a2707c69b3 100644
--- a/pkg/workflow/github_token_test.go
+++ b/pkg/workflow/github_token_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package workflow
 
 import (
diff --git a/pkg/workflow/github_token_validation_test.go b/pkg/workflow/github_token_validation_test.go
index 6168a688cd..9c04b05fb7 100644
--- a/pkg/workflow/github_token_validation_test.go
+++ b/pkg/workflow/github_token_validation_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package workflow
 
 import (
diff --git a/pkg/workflow/jobs_secrets_validation_test.go b/pkg/workflow/jobs_secrets_validation_test.go
index bd826d80e9..ddcac8c816 100644
--- a/pkg/workflow/jobs_secrets_validation_test.go
+++ b/pkg/workflow/jobs_secrets_validation_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package workflow
 
 import (
diff --git a/pkg/workflow/secrets_validation_test.go b/pkg/workflow/secrets_validation_test.go
index efacd6cea5..305c625a26 100644
--- a/pkg/workflow/secrets_validation_test.go
+++ b/pkg/workflow/secrets_validation_test.go
@@ -1,5 +1,3 @@
-//go:build !integration
-
 package workflow
 
 import (