bencode/fuzz.go                  | 1 +
 metainfo/fuzz.go                 | 1 +
 storage/bolt-piece-completion.go | 2 +-
 storage/bolt-piece.go            | 2 +-
 storage/bolt.go                  | 2 +-
 utp_go.go                        | 1 +
 utp_libutp.go                    | 1 +

diff --git a/bencode/fuzz.go b/bencode/fuzz.go
index d075b13e200cc6bb20619b6c05aedd73e1330ef0..7606a8ccbe5e8e0d421d83a9a952582efc8d7126 100644
--- a/bencode/fuzz.go
+++ b/bencode/fuzz.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package bencode
diff --git a/metainfo/fuzz.go b/metainfo/fuzz.go
index 60ece520d0ecbae4245f2214d1650f5c62c5d7b7..f0f0dd41bf7bf182a9205244d9e050424ed7c9e0 100644
--- a/metainfo/fuzz.go
+++ b/metainfo/fuzz.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 package metainfo
diff --git a/storage/bolt-piece-completion.go b/storage/bolt-piece-completion.go
index 52c52977a974f2bc368d3bb65b4001430f24bae1..43417f20c476b1f116f01542b0ce8906752952af 100644
--- a/storage/bolt-piece-completion.go
+++ b/storage/bolt-piece-completion.go
@@ -1,4 +1,4 @@
-//go:build !noboltdb,!wasm
+//go:build !noboltdb && !wasm
 // +build !noboltdb,!wasm
 
 package storage
diff --git a/storage/bolt-piece.go b/storage/bolt-piece.go
index 0be820b19dcda053e96d4b0ab7058890f3e7e400..12916ee5714e5f062c3eea0d78556151dd11b384 100644
--- a/storage/bolt-piece.go
+++ b/storage/bolt-piece.go
@@ -1,4 +1,4 @@
-//go:build !noboltdb,!wasm
+//go:build !noboltdb && !wasm
 // +build !noboltdb,!wasm
 
 package storage
diff --git a/storage/bolt.go b/storage/bolt.go
index d2eabf8f1b8a709d3a646f0153dc200d99dbe5f1..4473b8415f79a6c92376b97a82c1c603f5266464 100644
--- a/storage/bolt.go
+++ b/storage/bolt.go
@@ -1,4 +1,4 @@
-//go:build !noboltdb,!wasm
+//go:build !noboltdb && !wasm
 // +build !noboltdb,!wasm
 
 package storage
diff --git a/utp_go.go b/utp_go.go
index 073c34ab997c21fad24bd7881bc15145ac4a1ee7..a7c225de434582869bd4436a99a1d7126b6faf0d 100644
--- a/utp_go.go
+++ b/utp_go.go
@@ -1,3 +1,4 @@
+//go:build !cgo || disable_libutp
 // +build !cgo disable_libutp
 
 package torrent
diff --git a/utp_libutp.go b/utp_libutp.go
index 46ba3afb92fd55217f0a9c31e570f3a23e23c2c0..1e8fa6738fc8165067ab4aa7007038417dbadb0b 100644
--- a/utp_libutp.go
+++ b/utp_libutp.go
@@ -1,3 +1,4 @@
+//go:build cgo && !disable_libutp
 // +build cgo,!disable_libutp
 
 package torrent