diff --git a/pkg/cdi/cache_test_darwin.go b/pkg/cdi/cache_darwin_test.go
similarity index 97%
rename from pkg/cdi/cache_test_darwin.go
rename to pkg/cdi/cache_darwin_test.go
index b09ea6ff..33972941 100644
--- a/pkg/cdi/cache_test_darwin.go
+++ b/pkg/cdi/cache_darwin_test.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
    Copyright © 2021 The CDI Authors
diff --git a/pkg/cdi/cache_test_unix.go b/pkg/cdi/cache_unix_test.go
similarity index 96%
rename from pkg/cdi/cache_test_unix.go
rename to pkg/cdi/cache_unix_test.go
index b7c44129..f925199d 100644
--- a/pkg/cdi/cache_test_unix.go
+++ b/pkg/cdi/cache_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright © 2021 The CDI Authors
diff --git a/pkg/cdi/cache_test_windows.go b/pkg/cdi/cache_windows_test.go
similarity index 97%
rename from pkg/cdi/cache_test_windows.go
rename to pkg/cdi/cache_windows_test.go
index c6dabf5f..531398f4 100644
--- a/pkg/cdi/cache_test_windows.go
+++ b/pkg/cdi/cache_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright © 2021 The CDI Authors
diff --git a/pkg/cdi/container-edits_unix.go b/pkg/cdi/container-edits_unix.go
index 59977b21..e0d41a68 100644
--- a/pkg/cdi/container-edits_unix.go
+++ b/pkg/cdi/container-edits_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright © 2021 The CDI Authors
diff --git a/pkg/cdi/container-edits_windows.go b/pkg/cdi/container-edits_windows.go
index fd91afa9..5515f62c 100644
--- a/pkg/cdi/container-edits_windows.go
+++ b/pkg/cdi/container-edits_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright © 2021 The CDI Authors
diff --git a/pkg/cdi/spec_other.go b/pkg/cdi/spec_other.go
index 285e04e2..f102c46b 100644
--- a/pkg/cdi/spec_other.go
+++ b/pkg/cdi/spec_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright © 2022 The CDI Authors