diff --git a/control-plane/api/v1alpha1/zz_generated.deepcopy.go b/control-plane/api/v1alpha1/zz_generated.deepcopy.go
index 2bf2f86b4e..eb7b167895 100644
--- a/control-plane/api/v1alpha1/zz_generated.deepcopy.go
+++ b/control-plane/api/v1alpha1/zz_generated.deepcopy.go
@@ -1,5 +1,4 @@
 //go:build !ignore_autogenerated
-// +build !ignore_autogenerated
 
 // Code generated by controller-gen. DO NOT EDIT.
 
diff --git a/control-plane/catalog/to-consul/consul_node_services_client_ent_test.go b/control-plane/catalog/to-consul/consul_node_services_client_ent_test.go
index e93fae516b..ac570948f5 100644
--- a/control-plane/catalog/to-consul/consul_node_services_client_ent_test.go
+++ b/control-plane/catalog/to-consul/consul_node_services_client_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package catalog
 
diff --git a/control-plane/catalog/to-consul/syncer_ent_test.go b/control-plane/catalog/to-consul/syncer_ent_test.go
index 0d5ce60140..2cc206f908 100644
--- a/control-plane/catalog/to-consul/syncer_ent_test.go
+++ b/control-plane/catalog/to-consul/syncer_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package catalog
 
diff --git a/control-plane/connect-inject/endpoints_controller_ent_test.go b/control-plane/connect-inject/endpoints_controller_ent_test.go
index fe1a5cfd29..7d333783c8 100644
--- a/control-plane/connect-inject/endpoints_controller_ent_test.go
+++ b/control-plane/connect-inject/endpoints_controller_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package connectinject
 
diff --git a/control-plane/connect-inject/handler_ent_test.go b/control-plane/connect-inject/handler_ent_test.go
index 9bc6249df4..e35fd7aaad 100644
--- a/control-plane/connect-inject/handler_ent_test.go
+++ b/control-plane/connect-inject/handler_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package connectinject
 
diff --git a/control-plane/controller/configentry_controller_ent_test.go b/control-plane/controller/configentry_controller_ent_test.go
index eb4ae505fe..11bdaa33bb 100644
--- a/control-plane/controller/configentry_controller_ent_test.go
+++ b/control-plane/controller/configentry_controller_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package controller_test
 
diff --git a/control-plane/controller/partitionexports_controller_ent_test.go b/control-plane/controller/partitionexports_controller_ent_test.go
index 4313a871a4..02ed8bf31a 100644
--- a/control-plane/controller/partitionexports_controller_ent_test.go
+++ b/control-plane/controller/partitionexports_controller_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package controller_test
 
diff --git a/control-plane/namespaces/namespaces_test.go b/control-plane/namespaces/namespaces_test.go
index 5540e8dec5..8cd3d316fd 100644
--- a/control-plane/namespaces/namespaces_test.go
+++ b/control-plane/namespaces/namespaces_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package namespaces
 
diff --git a/control-plane/subcommand/connect-init/command_ent_test.go b/control-plane/subcommand/connect-init/command_ent_test.go
index ea61f755e9..50b52f44e2 100644
--- a/control-plane/subcommand/connect-init/command_ent_test.go
+++ b/control-plane/subcommand/connect-init/command_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package connectinit
 
diff --git a/control-plane/subcommand/consul-sidecar/command_ent_test.go b/control-plane/subcommand/consul-sidecar/command_ent_test.go
index de0de853a1..c41e73842b 100644
--- a/control-plane/subcommand/consul-sidecar/command_ent_test.go
+++ b/control-plane/subcommand/consul-sidecar/command_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package consulsidecar
 
diff --git a/control-plane/subcommand/partition-init/command_ent_test.go b/control-plane/subcommand/partition-init/command_ent_test.go
index 0da70e454c..8ed91cec14 100644
--- a/control-plane/subcommand/partition-init/command_ent_test.go
+++ b/control-plane/subcommand/partition-init/command_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package partition_init
 
diff --git a/control-plane/subcommand/server-acl-init/command_ent_test.go b/control-plane/subcommand/server-acl-init/command_ent_test.go
index 5d7c6e3262..af240e4960 100644
--- a/control-plane/subcommand/server-acl-init/command_ent_test.go
+++ b/control-plane/subcommand/server-acl-init/command_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package serveraclinit
 
diff --git a/control-plane/subcommand/sync-catalog/command_ent_test.go b/control-plane/subcommand/sync-catalog/command_ent_test.go
index 3475a3daeb..4e5ba14e93 100644
--- a/control-plane/subcommand/sync-catalog/command_ent_test.go
+++ b/control-plane/subcommand/sync-catalog/command_ent_test.go
@@ -1,5 +1,4 @@
 //go:build enterprise
-// +build enterprise
 
 package synccatalog