diff --git a/analysis/app/appengine.go b/analysis/app/appengine.go
index c5700a1..5dd35fe 100644
--- a/analysis/app/appengine.go
+++ b/analysis/app/appengine.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build appengine
 // +build appengine
 
 package app
diff --git a/analysis/app/local.go b/analysis/app/local.go
index a4b45fd..f34d9f6 100644
--- a/analysis/app/local.go
+++ b/analysis/app/local.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !appengine
 // +build !appengine
 
 package app
diff --git a/storage/app/appengine.go b/storage/app/appengine.go
index 9e4018c..a6689e5 100644
--- a/storage/app/appengine.go
+++ b/storage/app/appengine.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build appengine
 // +build appengine
 
 package app
diff --git a/storage/app/local.go b/storage/app/local.go
index e283567..52450c3 100644
--- a/storage/app/local.go
+++ b/storage/app/local.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !appengine
 // +build !appengine
 
 package app
diff --git a/storage/app/query_test.go b/storage/app/query_test.go
index 56ef050..f72219a 100644
--- a/storage/app/query_test.go
+++ b/storage/app/query_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cgo
 // +build cgo
 
 package app
diff --git a/storage/app/upload_test.go b/storage/app/upload_test.go
index 441cbc6..237bb61 100644
--- a/storage/app/upload_test.go
+++ b/storage/app/upload_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cgo
 // +build cgo
 
 package app
diff --git a/storage/db/db_test.go b/storage/db/db_test.go
index fbc5807..f107a27 100644
--- a/storage/db/db_test.go
+++ b/storage/db/db_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cgo
 // +build cgo
 
 package db_test
diff --git a/storage/db/dbtest/cloud.go b/storage/db/dbtest/cloud.go
index 3ddfd93..2f344aa 100644
--- a/storage/db/dbtest/cloud.go
+++ b/storage/db/dbtest/cloud.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cloud && !plan9
 // +build cloud,!plan9
 
 package dbtest
diff --git a/storage/db/dbtest/dbtest.go b/storage/db/dbtest/dbtest.go
index ce966ca..4ebef55 100644
--- a/storage/db/dbtest/dbtest.go
+++ b/storage/db/dbtest/dbtest.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cgo
 // +build cgo
 
 package dbtest
diff --git a/storage/db/dbtest/nocloud.go b/storage/db/dbtest/nocloud.go
index ba43c13..3e14efd 100644
--- a/storage/db/dbtest/nocloud.go
+++ b/storage/db/dbtest/nocloud.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !cloud && !plan9
 // +build !cloud,!plan9
 
 package dbtest
diff --git a/storage/db/sqlite3/sqlite3.go b/storage/db/sqlite3/sqlite3.go
index 204053b..2b28f9f 100644
--- a/storage/db/sqlite3/sqlite3.go
+++ b/storage/db/sqlite3/sqlite3.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cgo
 // +build cgo
 
 // Package sqlite3 provides the sqlite3 driver for
diff --git a/storage/localperfdata/app.go b/storage/localperfdata/app.go
index fc8eaea..bcd590d 100644
--- a/storage/localperfdata/app.go
+++ b/storage/localperfdata/app.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cgo
 // +build cgo
 
 // Localperfdata runs an HTTP server for benchmark storage.