diff --git a/isatty_bsd.go b/isatty_bsd.go
index 711f288..39bbcf0 100644
--- a/isatty_bsd.go
+++ b/isatty_bsd.go
@@ -1,3 +1,4 @@
+//go:build (darwin || freebsd || openbsd || netbsd || dragonfly) && !appengine
 // +build darwin freebsd openbsd netbsd dragonfly
 // +build !appengine
 
diff --git a/isatty_others.go b/isatty_others.go
index 3eba4cb..3150322 100644
--- a/isatty_others.go
+++ b/isatty_others.go
@@ -1,3 +1,4 @@
+//go:build appengine || js || nacl || wasm
 // +build appengine js nacl wasm
 
 package isatty
diff --git a/isatty_others_test.go b/isatty_others_test.go
index a2091cf..4c056bd 100644
--- a/isatty_others_test.go
+++ b/isatty_others_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package isatty
diff --git a/isatty_plan9.go b/isatty_plan9.go
index c5b6e0c..bae7f9b 100644
--- a/isatty_plan9.go
+++ b/isatty_plan9.go
@@ -1,3 +1,4 @@
+//go:build plan9
 // +build plan9
 
 package isatty
diff --git a/isatty_solaris.go b/isatty_solaris.go
index 3010670..0c3acf2 100644
--- a/isatty_solaris.go
+++ b/isatty_solaris.go
@@ -1,5 +1,5 @@
-// +build solaris
-// +build !appengine
+//go:build solaris && !appengine
+// +build solaris,!appengine
 
 package isatty
 
diff --git a/isatty_tcgets.go b/isatty_tcgets.go
index 4e7b850..6778765 100644
--- a/isatty_tcgets.go
+++ b/isatty_tcgets.go
@@ -1,3 +1,4 @@
+//go:build (linux || aix || zos) && !appengine
 // +build linux aix zos
 // +build !appengine
 
diff --git a/isatty_windows.go b/isatty_windows.go
index 1f0a4a5..8e3c991 100644
--- a/isatty_windows.go
+++ b/isatty_windows.go
@@ -1,5 +1,5 @@
-// +build windows
-// +build !appengine
+//go:build windows && !appengine
+// +build windows,!appengine
 
 package isatty
 
diff --git a/isatty_windows_test.go b/isatty_windows_test.go
index 5a68c1f..1afc869 100644
--- a/isatty_windows_test.go
+++ b/isatty_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package isatty