diff --git a/hack/docs/fields.go b/hack/docs/fields.go
index 82a216f0acaf..37762d54b7ef 100644
--- a/hack/docs/fields.go
+++ b/hack/docs/fields.go
@@ -1,5 +1,4 @@
 //go:build !fields
-// +build !fields
 
 package main
 
diff --git a/hack/docs/null_fields.go b/hack/docs/null_fields.go
index 233d06a065dc..27868c8c5c93 100644
--- a/hack/docs/null_fields.go
+++ b/hack/docs/null_fields.go
@@ -1,5 +1,4 @@
 //go:build fields
-// +build fields
 
 package main
 
diff --git a/test/e2e/agent_test.go b/test/e2e/agent_test.go
index 0e6338ea418d..501cfd7a2df1 100644
--- a/test/e2e/agent_test.go
+++ b/test/e2e/agent_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/argo_server_test.go b/test/e2e/argo_server_test.go
index f01f77e52b1f..c56836bcfeba 100644
--- a/test/e2e/argo_server_test.go
+++ b/test/e2e/argo_server_test.go
@@ -1,5 +1,4 @@
 //go:build api
-// +build api
 
 package e2e
 
diff --git a/test/e2e/artifacts_test.go b/test/e2e/artifacts_test.go
index 1caa76d4c35c..ae3a11cb5234 100644
--- a/test/e2e/artifacts_test.go
+++ b/test/e2e/artifacts_test.go
@@ -1,5 +1,4 @@
 //go:build executor
-// +build executor
 
 package e2e
 
diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go
index 3ec3a2400d1b..d8dfd355a183 100644
--- a/test/e2e/cli_test.go
+++ b/test/e2e/cli_test.go
@@ -1,5 +1,4 @@
 //go:build cli
-// +build cli
 
 package e2e
 
diff --git a/test/e2e/cluster_workflow_template_test.go b/test/e2e/cluster_workflow_template_test.go
index a4c90d52b418..132700d71461 100644
--- a/test/e2e/cluster_workflow_template_test.go
+++ b/test/e2e/cluster_workflow_template_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/cron_test.go b/test/e2e/cron_test.go
index bc07bba6d71c..d73bb65a6612 100644
--- a/test/e2e/cron_test.go
+++ b/test/e2e/cron_test.go
@@ -1,5 +1,4 @@
 //go:build cron
-// +build cron
 
 package e2e
 
diff --git a/test/e2e/daemon_pod_test.go b/test/e2e/daemon_pod_test.go
index 4ef9d1c10007..749a3a845aec 100644
--- a/test/e2e/daemon_pod_test.go
+++ b/test/e2e/daemon_pod_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/estimated_duration_test.go b/test/e2e/estimated_duration_test.go
index 28191da8957d..a510d83d68f3 100644
--- a/test/e2e/estimated_duration_test.go
+++ b/test/e2e/estimated_duration_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/executor_plugins_test.go b/test/e2e/executor_plugins_test.go
index e553d3809328..8dbf54edcb4a 100644
--- a/test/e2e/executor_plugins_test.go
+++ b/test/e2e/executor_plugins_test.go
@@ -1,5 +1,4 @@
 //go:build plugins
-// +build plugins
 
 package e2e
 
diff --git a/test/e2e/expr_lang.go b/test/e2e/expr_lang.go
index 3c0511d53c8d..f4549758b4dd 100644
--- a/test/e2e/expr_lang.go
+++ b/test/e2e/expr_lang.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/failed_main_test.go b/test/e2e/failed_main_test.go
index 113df57ec408..820d4f42ba38 100644
--- a/test/e2e/failed_main_test.go
+++ b/test/e2e/failed_main_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/functional_test.go b/test/e2e/functional_test.go
index 19bac47b9c73..03233358329b 100644
--- a/test/e2e/functional_test.go
+++ b/test/e2e/functional_test.go
@@ -1,5 +1,4 @@
 //go:build corefunctional
-// +build corefunctional
 
 package e2e
 
diff --git a/test/e2e/hooks_test.go b/test/e2e/hooks_test.go
index db5e49419b00..a9a58b18953f 100644
--- a/test/e2e/hooks_test.go
+++ b/test/e2e/hooks_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/http_artifacts_test.go b/test/e2e/http_artifacts_test.go
index fe5fb829bb23..e391560fc074 100644
--- a/test/e2e/http_artifacts_test.go
+++ b/test/e2e/http_artifacts_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/invalid_command_test.go b/test/e2e/invalid_command_test.go
index 7a11c70baddf..b41c223008a6 100644
--- a/test/e2e/invalid_command_test.go
+++ b/test/e2e/invalid_command_test.go
@@ -1,5 +1,4 @@
 //go:build executor
-// +build executor
 
 package e2e
 
diff --git a/test/e2e/malformed_resources_test.go b/test/e2e/malformed_resources_test.go
index dcefa3b6da08..97f8f26ace73 100644
--- a/test/e2e/malformed_resources_test.go
+++ b/test/e2e/malformed_resources_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/metrics_test.go b/test/e2e/metrics_test.go
index e8140c44fac6..00d53afc3e6d 100644
--- a/test/e2e/metrics_test.go
+++ b/test/e2e/metrics_test.go
@@ -1,5 +1,4 @@
 //go:build api
-// +build api
 
 package e2e
 
diff --git a/test/e2e/pod_cleanup_test.go b/test/e2e/pod_cleanup_test.go
index ac1bcbd02bcc..bf5f91cbac65 100644
--- a/test/e2e/pod_cleanup_test.go
+++ b/test/e2e/pod_cleanup_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/progress_test.go b/test/e2e/progress_test.go
index 8c4d97a8041a..d277042de3d6 100644
--- a/test/e2e/progress_test.go
+++ b/test/e2e/progress_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/resource_template_test.go b/test/e2e/resource_template_test.go
index a6c4df3b3c74..1d47d7e48d66 100644
--- a/test/e2e/resource_template_test.go
+++ b/test/e2e/resource_template_test.go
@@ -1,5 +1,4 @@
 //go:build executor
-// +build executor
 
 package e2e
 
diff --git a/test/e2e/retry_test.go b/test/e2e/retry_test.go
index fe007af2ace1..7b9cb3924f97 100644
--- a/test/e2e/retry_test.go
+++ b/test/e2e/retry_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/run_as_not_root_test.go b/test/e2e/run_as_not_root_test.go
index 10a60d0f3893..4fe25752c1e6 100644
--- a/test/e2e/run_as_not_root_test.go
+++ b/test/e2e/run_as_not_root_test.go
@@ -1,5 +1,4 @@
 //go:build executor
-// +build executor
 
 package e2e
 
diff --git a/test/e2e/semaphore_test.go b/test/e2e/semaphore_test.go
index 670a31936582..7cdb6834d58d 100644
--- a/test/e2e/semaphore_test.go
+++ b/test/e2e/semaphore_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/signals_test.go b/test/e2e/signals_test.go
index 873c16014096..4de48d5c2b9a 100644
--- a/test/e2e/signals_test.go
+++ b/test/e2e/signals_test.go
@@ -1,5 +1,4 @@
 //go:build executor
-// +build executor
 
 package e2e
 
diff --git a/test/e2e/workflow_configmap_substitution_test.go b/test/e2e/workflow_configmap_substitution_test.go
index 2723cf578256..cf0dd6e8a0f9 100644
--- a/test/e2e/workflow_configmap_substitution_test.go
+++ b/test/e2e/workflow_configmap_substitution_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/workflow_inputs_orverridable_test.go b/test/e2e/workflow_inputs_orverridable_test.go
index e92f72a3afb1..3005bc4e4690 100644
--- a/test/e2e/workflow_inputs_orverridable_test.go
+++ b/test/e2e/workflow_inputs_orverridable_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/workflow_template_test.go b/test/e2e/workflow_template_test.go
index 519051150fa8..721a9c786e30 100644
--- a/test/e2e/workflow_template_test.go
+++ b/test/e2e/workflow_template_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e
 
diff --git a/test/e2e/workflow_test.go b/test/e2e/workflow_test.go
index 7f1bc3f59b6c..6d988b02d044 100644
--- a/test/e2e/workflow_test.go
+++ b/test/e2e/workflow_test.go
@@ -1,5 +1,4 @@
 //go:build functional
-// +build functional
 
 package e2e