diff --git a/fs.go b/fs.go
index 5bdea1a..ecb1769 100644
--- a/fs.go
+++ b/fs.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.16 && finder
+// +build go1.16,finder
 
 package viper
 
diff --git a/fs_test.go b/fs_test.go
index d811f45..071e346 100644
--- a/fs_test.go
+++ b/fs_test.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.16 && finder
+// +build go1.16,finder
 
 package viper
 
diff --git a/viper_go1_15.go b/viper_go1_15.go
index 487e0c8..a679af5 100644
--- a/viper_go1_15.go
+++ b/viper_go1_15.go
@@ -1,5 +1,5 @@
-//go:build !go1.16
-// +build !go1.16
+//go:build !go1.16 || !finder
+// +build !go1.16 !finder
 
 package viper
 
diff --git a/viper_go1_16.go b/viper_go1_16.go
index eb313fa..e10172f 100644
--- a/viper_go1_16.go
+++ b/viper_go1_16.go
@@ -1,5 +1,5 @@
-//go:build go1.16
-// +build go1.16
+//go:build go1.16 && finder
+// +build go1.16,finder
 
 package viper