diff --git a/test/e2e-tests-local.sh b/test/e2e-tests-local.sh
index e4e4d05fb5..5eb08fe523 100755
--- a/test/e2e-tests-local.sh
+++ b/test/e2e-tests-local.sh
@@ -26,4 +26,4 @@ echo "📋 Formatting"
 go fmt ${base}/test/e2e/...
 
 echo "🧪  Testing"
-go test ${base}/test/e2e/ -test.v --tags 'e2e' "$@"
+go test ${base}/test/e2e/ -test.v -tags "e2e ${E2E_TAGS}" "$@"
diff --git a/test/e2e/basic_workflow_test.go b/test/e2e/basic_workflow_test.go
index 727dbbed10..a225550baa 100644
--- a/test/e2e/basic_workflow_test.go
+++ b/test/e2e/basic_workflow_test.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build e2e
+// +build !eventing
 
 package e2e
 
diff --git a/test/e2e/revision_test.go b/test/e2e/revision_test.go
index dcaba5ad03..534636a753 100644
--- a/test/e2e/revision_test.go
+++ b/test/e2e/revision_test.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build e2e
+// +build !eventing
 
 package e2e
 
diff --git a/test/e2e/route_test.go b/test/e2e/route_test.go
index ded4ac30fb..24c30a0580 100644
--- a/test/e2e/route_test.go
+++ b/test/e2e/route_test.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build e2e
+// +build !eventing
 
 package e2e
 
diff --git a/test/e2e/service_options_test.go b/test/e2e/service_options_test.go
index 64881b4d40..f793e9b650 100644
--- a/test/e2e/service_options_test.go
+++ b/test/e2e/service_options_test.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build e2e
+// +build !eventing
 
 package e2e
 
diff --git a/test/e2e/service_test.go b/test/e2e/service_test.go
index 19d229aee9..1ce32e1cce 100644
--- a/test/e2e/service_test.go
+++ b/test/e2e/service_test.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build e2e
+// +build !eventing
 
 package e2e
 
diff --git a/test/e2e/source_list_types_test.go b/test/e2e/source_list_types_test.go
index 9aaca75aa4..dd014b05fb 100644
--- a/test/e2e/source_list_types_test.go
+++ b/test/e2e/source_list_types_test.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build e2e
+// +build !serving
 
 package e2e
 
diff --git a/test/e2e/traffic_split_test.go b/test/e2e/traffic_split_test.go
index 6844b56ce3..1606c08960 100644
--- a/test/e2e/traffic_split_test.go
+++ b/test/e2e/traffic_split_test.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build e2e
+// +build !eventing
 
 package e2e