diff --git a/acceptance/creator_test.go b/acceptance/creator_test.go
index ebd38788d..30580bc77 100644
--- a/acceptance/creator_test.go
+++ b/acceptance/creator_test.go
@@ -1,5 +1,4 @@
 //go:build acceptance
-// +build acceptance
 
 package acceptance
 
diff --git a/acceptance/detector_test.go b/acceptance/detector_test.go
index 5c41b2bbb..b29e84ef5 100644
--- a/acceptance/detector_test.go
+++ b/acceptance/detector_test.go
@@ -1,5 +1,4 @@
 //go:build acceptance
-// +build acceptance
 
 package acceptance
 
diff --git a/acceptance/exporter_test.go b/acceptance/exporter_test.go
index c29a8e30c..90e9ce700 100644
--- a/acceptance/exporter_test.go
+++ b/acceptance/exporter_test.go
@@ -1,5 +1,4 @@
 //go:build acceptance
-// +build acceptance
 
 package acceptance
 
diff --git a/acceptance/extender_test.go b/acceptance/extender_test.go
index b1272e95e..973ef524f 100644
--- a/acceptance/extender_test.go
+++ b/acceptance/extender_test.go
@@ -1,5 +1,4 @@
 //go:build acceptance
-// +build acceptance
 
 package acceptance
 
diff --git a/acceptance/rebaser_test.go b/acceptance/rebaser_test.go
index d0dfa95ae..1b03bf67e 100644
--- a/acceptance/rebaser_test.go
+++ b/acceptance/rebaser_test.go
@@ -1,5 +1,4 @@
 //go:build acceptance
-// +build acceptance
 
 package acceptance
 
diff --git a/acceptance/restorer_test.go b/acceptance/restorer_test.go
index 2e6b14561..2e12f146f 100644
--- a/acceptance/restorer_test.go
+++ b/acceptance/restorer_test.go
@@ -1,5 +1,4 @@
 //go:build acceptance
-// +build acceptance
 
 package acceptance
 
diff --git a/acceptance/testdata/launcher/exec.d/fd_unix.go b/acceptance/testdata/launcher/exec.d/fd_unix.go
index f7e84cdb8..f0ee7602a 100644
--- a/acceptance/testdata/launcher/exec.d/fd_unix.go
+++ b/acceptance/testdata/launcher/exec.d/fd_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package main
 
diff --git a/acceptance/variables_unix.go b/acceptance/variables_unix.go
index d19aae1ef..c1c38e702 100644
--- a/acceptance/variables_unix.go
+++ b/acceptance/variables_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package acceptance
 
diff --git a/archive/tar_unix.go b/archive/tar_unix.go
index a140903f2..d8b624738 100644
--- a/archive/tar_unix.go
+++ b/archive/tar_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package archive
 
diff --git a/internal/fsutil/os_detection_linux_test.go b/internal/fsutil/os_detection_linux_test.go
index 2b78c3d2c..95813b6f2 100644
--- a/internal/fsutil/os_detection_linux_test.go
+++ b/internal/fsutil/os_detection_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package fsutil_test
 
diff --git a/internal/fsutil/os_detection_notlinux_test.go b/internal/fsutil/os_detection_notlinux_test.go
index 6c4584561..6da50f009 100644
--- a/internal/fsutil/os_detection_notlinux_test.go
+++ b/internal/fsutil/os_detection_notlinux_test.go
@@ -1,5 +1,4 @@
 //go:build windows || darwin
-// +build windows darwin
 
 package fsutil_test
 
diff --git a/internal/path/defaults_unix.go b/internal/path/defaults_unix.go
index 50c3815dd..27657b367 100644
--- a/internal/path/defaults_unix.go
+++ b/internal/path/defaults_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package path
 
diff --git a/launch/exec_d_unix.go b/launch/exec_d_unix.go
index a71af4a24..db5bf17ca 100644
--- a/launch/exec_d_unix.go
+++ b/launch/exec_d_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package launch
 
diff --git a/launch/launcher_unix.go b/launch/launcher_unix.go
index b547a9a40..4be9a2adc 100644
--- a/launch/launcher_unix.go
+++ b/launch/launcher_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package launch
 
diff --git a/launch/testdata/cmd/execd/fd_unix.go b/launch/testdata/cmd/execd/fd_unix.go
index f7e84cdb8..f0ee7602a 100644
--- a/launch/testdata/cmd/execd/fd_unix.go
+++ b/launch/testdata/cmd/execd/fd_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package main
 
diff --git a/launch/testhelpers/syscall_unix.go b/launch/testhelpers/syscall_unix.go
index c5b74923f..120f25628 100644
--- a/launch/testhelpers/syscall_unix.go
+++ b/launch/testhelpers/syscall_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package testhelpers
 
diff --git a/launch/testhelpers/syscall_windows.go b/launch/testhelpers/syscall_windows.go
index b5a41f3ed..01ad0e372 100644
--- a/launch/testhelpers/syscall_windows.go
+++ b/launch/testhelpers/syscall_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package testhelpers
 
diff --git a/layers/layers_unix_test.go b/layers/layers_unix_test.go
index f97892127..79296769b 100644
--- a/layers/layers_unix_test.go
+++ b/layers/layers_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package layers_test
 
diff --git a/priv/sock_unix.go b/priv/sock_unix.go
index cee7f3f7b..a686882d1 100644
--- a/priv/sock_unix.go
+++ b/priv/sock_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package priv
 
diff --git a/priv/user_linux.go b/priv/user_linux.go
index a9296e562..7e602f8fe 100644
--- a/priv/user_linux.go
+++ b/priv/user_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package priv
 
diff --git a/testhelpers/vars_darwin.go b/testhelpers/vars_darwin.go
index c3f8af878..a0b4cec82 100644
--- a/testhelpers/vars_darwin.go
+++ b/testhelpers/vars_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package testhelpers
 
diff --git a/testhelpers/vars_linux.go b/testhelpers/vars_linux.go
index a284c4306..2520ede2f 100644
--- a/testhelpers/vars_linux.go
+++ b/testhelpers/vars_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package testhelpers