diff --git a/conn_generic.go b/conn_generic.go
index 451a70ae3..a2a125c08 100644
--- a/conn_generic.go
+++ b/conn_generic.go
@@ -1,3 +1,4 @@
+//go:build !darwin && !linux && !freebsd && !windows
 // +build !darwin,!linux,!freebsd,!windows
 
 package quic
diff --git a/conn_helper_darwin.go b/conn_helper_darwin.go
index 591e09fd1..eabf489f1 100644
--- a/conn_helper_darwin.go
+++ b/conn_helper_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package quic
diff --git a/conn_helper_freebsd.go b/conn_helper_freebsd.go
index 96f28b533..f30f8a270 100644
--- a/conn_helper_freebsd.go
+++ b/conn_helper_freebsd.go
@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 package quic
diff --git a/conn_helper_linux.go b/conn_helper_linux.go
index 9ef92f136..51bec9002 100644
--- a/conn_helper_linux.go
+++ b/conn_helper_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package quic
diff --git a/conn_oob.go b/conn_oob.go
index 8f888a62c..0d55d57b1 100644
--- a/conn_oob.go
+++ b/conn_oob.go
@@ -1,3 +1,4 @@
+//go:build darwin || linux || freebsd
 // +build darwin linux freebsd
 
 package quic
diff --git a/conn_oob_test.go b/conn_oob_test.go
index e57f565cc..2cc217ea2 100644
--- a/conn_oob_test.go
+++ b/conn_oob_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package quic
diff --git a/conn_windows.go b/conn_windows.go
index 2540d8516..77eac3667 100644
--- a/conn_windows.go
+++ b/conn_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package quic
diff --git a/conn_windows_test.go b/conn_windows_test.go
index de6758366..0dae55a9c 100644
--- a/conn_windows_test.go
+++ b/conn_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package quic
diff --git a/integrationtests/tools/israce/norace.go b/integrationtests/tools/israce/norace.go
index c32df8f12..2a029282f 100644
--- a/integrationtests/tools/israce/norace.go
+++ b/integrationtests/tools/israce/norace.go
@@ -1,3 +1,4 @@
+//go:build !race
 // +build !race
 
 package israce
diff --git a/integrationtests/tools/israce/race.go b/integrationtests/tools/israce/race.go
index dc2c02d2b..78bf4e832 100644
--- a/integrationtests/tools/israce/race.go
+++ b/integrationtests/tools/israce/race.go
@@ -1,3 +1,4 @@
+//go:build race
 // +build race
 
 package israce
diff --git a/internal/qtls/go116.go b/internal/qtls/go116.go
index 35826df4a..e3024624c 100644
--- a/internal/qtls/go116.go
+++ b/internal/qtls/go116.go
@@ -1,5 +1,5 @@
-// +build go1.16
-// +build !go1.17
+//go:build go1.16 && !go1.17
+// +build go1.16,!go1.17
 
 package qtls
 
diff --git a/internal/qtls/go117.go b/internal/qtls/go117.go
index 8e0761018..64ff3b627 100644
--- a/internal/qtls/go117.go
+++ b/internal/qtls/go117.go
@@ -1,3 +1,4 @@
+//go:build go1.17
 // +build go1.17
 
 package qtls
diff --git a/internal/qtls/go118.go b/internal/qtls/go118.go
index fa2df5fde..b443f0898 100644
--- a/internal/qtls/go118.go
+++ b/internal/qtls/go118.go
@@ -1,3 +1,4 @@
+//go:build go1.18
 // +build go1.18
 
 package qtls
diff --git a/tools.go b/tools.go
index 12807f904..ee68fafbe 100644
--- a/tools.go
+++ b/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 package quic