diff --git a/const_bsds.go b/const_bsds.go
index 18b45824..eed0f225 100644
--- a/const_bsds.go
+++ b/const_bsds.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build aix || darwin || openbsd || freebsd || netbsd || dragonfly
 // +build aix darwin openbsd freebsd netbsd dragonfly
 
 package afero
diff --git a/const_win_unix.go b/const_win_unix.go
index 2b850e4d..004d57e2 100644
--- a/const_win_unix.go
+++ b/const_win_unix.go
@@ -10,12 +10,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// +build !darwin
-// +build !openbsd
-// +build !freebsd
-// +build !dragonfly
-// +build !netbsd
-// +build !aix
+//go:build !darwin && !openbsd && !freebsd && !dragonfly && !netbsd && !aix
+// +build !darwin,!openbsd,!freebsd,!dragonfly,!netbsd,!aix
 
 package afero
 
diff --git a/iofs.go b/iofs.go
index c8034553..0135703d 100644
--- a/iofs.go
+++ b/iofs.go
@@ -1,3 +1,4 @@
+//go:build go1.16
 // +build go1.16
 
 package afero
diff --git a/iofs_test.go b/iofs_test.go
index 1d310e54..7ae73c7b 100644
--- a/iofs_test.go
+++ b/iofs_test.go
@@ -1,3 +1,4 @@
+//go:build go1.16
 // +build go1.16
 
 package afero