diff --git a/commands/main_test.go b/commands/main_test.go
index d35c64f71..b5e25d4c8 100644
--- a/commands/main_test.go
+++ b/commands/main_test.go
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build e2e
 // +build e2e
 
 package commands
diff --git a/commands/mmctl_e2e_test.go b/commands/mmctl_e2e_test.go
index 7ed3c293b..affb5d6bf 100644
--- a/commands/mmctl_e2e_test.go
+++ b/commands/mmctl_e2e_test.go
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build e2e
 // +build e2e
 
 package commands
diff --git a/commands/mmctl_unit_test.go b/commands/mmctl_unit_test.go
index 9cce8dfaa..949934d4b 100644
--- a/commands/mmctl_unit_test.go
+++ b/commands/mmctl_unit_test.go
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build unit
 // +build unit
 
 package commands
diff --git a/commands/utils_unix.go b/commands/utils_unix.go
index 1659ced8b..6c9700559 100644
--- a/commands/utils_unix.go
+++ b/commands/utils_unix.go
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build linux || darwin
 // +build linux darwin
 
 package commands
diff --git a/magefile.go b/magefile.go
index 1bd68d7c2..d0d161bab 100644
--- a/magefile.go
+++ b/magefile.go
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+//go:build mage
 // +build mage
 
 package main