diff --git a/client_int_test.go b/client_int_test.go
index be3b89e0..619500a5 100644
--- a/client_int_test.go
+++ b/client_int_test.go
@@ -1,3 +1,4 @@
+//go:build integration
 // +build integration
 
 package function_test
diff --git a/client_test.go b/client_test.go
index 160b5ecb..c685c453 100644
--- a/client_test.go
+++ b/client_test.go
@@ -1,3 +1,4 @@
+//go:build !integration
 // +build !integration
 
 package function_test
diff --git a/cmd/config_labels_test.go b/cmd/config_labels_test.go
index 7680526b..69ad47a6 100644
--- a/cmd/config_labels_test.go
+++ b/cmd/config_labels_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cmd
diff --git a/docker/runner_test.go b/docker/runner_test.go
index a654faa6..9d0f777f 100644
--- a/docker/runner_test.go
+++ b/docker/runner_test.go
@@ -1,3 +1,4 @@
+//go:build !integration
 // +build !integration
 
 package docker_test
diff --git a/function_test.go b/function_test.go
index 2a71c6e0..63a7eb19 100644
--- a/function_test.go
+++ b/function_test.go
@@ -1,3 +1,4 @@
+//go:build !integration
 // +build !integration
 
 package function_test
diff --git a/hack/tools.go b/hack/tools.go
index 5cc544b8..3320bce5 100644
--- a/hack/tools.go
+++ b/hack/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 /*
diff --git a/pkged.go b/pkged.go
index 8b8a669b..12d58bf7 100644
--- a/pkged.go
+++ b/pkged.go
@@ -1,5 +1,6 @@
 // Code generated by pkger; DO NOT EDIT.
 
+//go:build !skippkger
 // +build !skippkger
 
 package function
diff --git a/repositories_test.go b/repositories_test.go
index 984717e7..d01d7991 100644
--- a/repositories_test.go
+++ b/repositories_test.go
@@ -1,3 +1,4 @@
+//go:build !integration
 // +build !integration
 
 package function_test
diff --git a/templates_test.go b/templates_test.go
index 318922dd..ec8c8b5d 100644
--- a/templates_test.go
+++ b/templates_test.go
@@ -1,3 +1,4 @@
+//go:build !integration
 // +build !integration
 
 package function_test
diff --git a/test/_e2e/cmd_emit_test.go b/test/_e2e/cmd_emit_test.go
index 0ce06078..aa2b492f 100644
--- a/test/_e2e/cmd_emit_test.go
+++ b/test/_e2e/cmd_emit_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 package e2e
diff --git a/test/_e2e/e2e_functions_test.go b/test/_e2e/e2e_functions_test.go
index ffba10f6..43f5499e 100644
--- a/test/_e2e/e2e_functions_test.go
+++ b/test/_e2e/e2e_functions_test.go
@@ -1,3 +1,4 @@
+//go:build e2elc
 // +build e2elc
 
 package e2e
diff --git a/test/_e2e/e2e_remote_repository_test.go b/test/_e2e/e2e_remote_repository_test.go
index 18f2951c..fbd1e9ee 100644
--- a/test/_e2e/e2e_remote_repository_test.go
+++ b/test/_e2e/e2e_remote_repository_test.go
@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 package e2e
diff --git a/test/_e2e/main_test.go b/test/_e2e/main_test.go
index 97381161..477bf0ab 100644
--- a/test/_e2e/main_test.go
+++ b/test/_e2e/main_test.go
@@ -1,3 +1,4 @@
+//go:build e2e || e2elc
 // +build e2e e2elc
 
 package e2e