diff --git a/.golangci.yml b/.golangci.yml
index 55401a171..68a8e953b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -13,10 +13,14 @@ linters:
     - unparam
     - nakedret
     - prealloc
+    - revive
     #- gosec
 linters-settings:
   misspell:
     locale: US
+  revive:
+    rules:
+      - name: redundant-build-tag
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0
diff --git a/database/firebird/firebird.go b/database/firebird/firebird.go
index f564cf74f..e15ea96b8 100644
--- a/database/firebird/firebird.go
+++ b/database/firebird/firebird.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package firebird
 
diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
index c7e7ef617..711ba5187 100644
--- a/database/mysql/mysql.go
+++ b/database/mysql/mysql.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package mysql
 
diff --git a/database/pgx/pgx.go b/database/pgx/pgx.go
index 7e42d29c9..efe8bea80 100644
--- a/database/pgx/pgx.go
+++ b/database/pgx/pgx.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package pgx
 
diff --git a/database/pgx/v5/pgx.go b/database/pgx/v5/pgx.go
index 1b5a6ea7a..303174495 100644
--- a/database/pgx/v5/pgx.go
+++ b/database/pgx/v5/pgx.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package pgx
 
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
index 9e6d6277f..5e4519115 100644
--- a/database/postgres/postgres.go
+++ b/database/postgres/postgres.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package postgres
 
diff --git a/database/redshift/redshift.go b/database/redshift/redshift.go
index 9ba7b4311..7687b9d9a 100644
--- a/database/redshift/redshift.go
+++ b/database/redshift/redshift.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package redshift
 
diff --git a/internal/cli/build_aws-s3.go b/internal/cli/build_aws-s3.go
index 6b2a2e9dd..d872ba857 100644
--- a/internal/cli/build_aws-s3.go
+++ b/internal/cli/build_aws-s3.go
@@ -1,5 +1,4 @@
 //go:build aws_s3
-// +build aws_s3
 
 package cli
 
diff --git a/internal/cli/build_bitbucket.go b/internal/cli/build_bitbucket.go
index f939445d6..86f175b45 100644
--- a/internal/cli/build_bitbucket.go
+++ b/internal/cli/build_bitbucket.go
@@ -1,5 +1,4 @@
 //go:build bitbucket
-// +build bitbucket
 
 package cli
 
diff --git a/internal/cli/build_cassandra.go b/internal/cli/build_cassandra.go
index a24c300bb..702a5560f 100644
--- a/internal/cli/build_cassandra.go
+++ b/internal/cli/build_cassandra.go
@@ -1,5 +1,4 @@
 //go:build cassandra
-// +build cassandra
 
 package cli
 
diff --git a/internal/cli/build_clickhouse.go b/internal/cli/build_clickhouse.go
index c10d65c5e..aa8de1860 100644
--- a/internal/cli/build_clickhouse.go
+++ b/internal/cli/build_clickhouse.go
@@ -1,5 +1,4 @@
 //go:build clickhouse
-// +build clickhouse
 
 package cli
 
diff --git a/internal/cli/build_cockroachdb.go b/internal/cli/build_cockroachdb.go
index d132a4b3c..159579fac 100644
--- a/internal/cli/build_cockroachdb.go
+++ b/internal/cli/build_cockroachdb.go
@@ -1,5 +1,4 @@
 //go:build cockroachdb
-// +build cockroachdb
 
 package cli
 
diff --git a/internal/cli/build_firebird.go b/internal/cli/build_firebird.go
index e760e2f23..4508561d5 100644
--- a/internal/cli/build_firebird.go
+++ b/internal/cli/build_firebird.go
@@ -1,5 +1,4 @@
 //go:build firebird
-// +build firebird
 
 package cli
 
diff --git a/internal/cli/build_github.go b/internal/cli/build_github.go
index 89e316e2f..632e56234 100644
--- a/internal/cli/build_github.go
+++ b/internal/cli/build_github.go
@@ -1,5 +1,4 @@
 //go:build github
-// +build github
 
 package cli
 
diff --git a/internal/cli/build_github_ee.go b/internal/cli/build_github_ee.go
index 230931375..5e14588ef 100644
--- a/internal/cli/build_github_ee.go
+++ b/internal/cli/build_github_ee.go
@@ -1,5 +1,4 @@
 //go:build github
-// +build github
 
 package cli
 
diff --git a/internal/cli/build_gitlab.go b/internal/cli/build_gitlab.go
index 9224f1fd3..be92e618b 100644
--- a/internal/cli/build_gitlab.go
+++ b/internal/cli/build_gitlab.go
@@ -1,5 +1,4 @@
 //go:build gitlab
-// +build gitlab
 
 package cli
 
diff --git a/internal/cli/build_go-bindata.go b/internal/cli/build_go-bindata.go
index 65fe121e3..740d4a315 100644
--- a/internal/cli/build_go-bindata.go
+++ b/internal/cli/build_go-bindata.go
@@ -1,5 +1,4 @@
 //go:build go_bindata
-// +build go_bindata
 
 package cli
 
diff --git a/internal/cli/build_godoc-vfs.go b/internal/cli/build_godoc-vfs.go
index a12be05cb..96e31facf 100644
--- a/internal/cli/build_godoc-vfs.go
+++ b/internal/cli/build_godoc-vfs.go
@@ -1,5 +1,4 @@
 //go:build godoc_vfs
-// +build godoc_vfs
 
 package cli
 
diff --git a/internal/cli/build_google-cloud-storage.go b/internal/cli/build_google-cloud-storage.go
index 1aa841843..05fab15ab 100644
--- a/internal/cli/build_google-cloud-storage.go
+++ b/internal/cli/build_google-cloud-storage.go
@@ -1,5 +1,4 @@
 //go:build google_cloud_storage
-// +build google_cloud_storage
 
 package cli
 
diff --git a/internal/cli/build_mongodb.go b/internal/cli/build_mongodb.go
index 6b9f8f231..ec2fffe1f 100644
--- a/internal/cli/build_mongodb.go
+++ b/internal/cli/build_mongodb.go
@@ -1,5 +1,4 @@
 //go:build mongodb
-// +build mongodb
 
 package cli
 
diff --git a/internal/cli/build_mysql.go b/internal/cli/build_mysql.go
index 3dbd53ccb..c3a092d62 100644
--- a/internal/cli/build_mysql.go
+++ b/internal/cli/build_mysql.go
@@ -1,5 +1,4 @@
 //go:build mysql
-// +build mysql
 
 package cli
 
diff --git a/internal/cli/build_neo4j.go b/internal/cli/build_neo4j.go
index cf2d8488d..5b341cb3d 100644
--- a/internal/cli/build_neo4j.go
+++ b/internal/cli/build_neo4j.go
@@ -1,5 +1,4 @@
 //go:build neo4j
-// +build neo4j
 
 package cli
 
diff --git a/internal/cli/build_pgx.go b/internal/cli/build_pgx.go
index 41862e178..e24f6e572 100644
--- a/internal/cli/build_pgx.go
+++ b/internal/cli/build_pgx.go
@@ -1,5 +1,4 @@
 //go:build pgx
-// +build pgx
 
 package cli
 
diff --git a/internal/cli/build_pgxv5.go b/internal/cli/build_pgxv5.go
index f63048702..749de7ca4 100644
--- a/internal/cli/build_pgxv5.go
+++ b/internal/cli/build_pgxv5.go
@@ -1,5 +1,4 @@
 //go:build pgx5
-// +build pgx5
 
 package cli
 
diff --git a/internal/cli/build_postgres.go b/internal/cli/build_postgres.go
index 626cf5292..c462c836b 100644
--- a/internal/cli/build_postgres.go
+++ b/internal/cli/build_postgres.go
@@ -1,5 +1,4 @@
 //go:build postgres
-// +build postgres
 
 package cli
 
diff --git a/internal/cli/build_ql.go b/internal/cli/build_ql.go
index 125c2cd3f..4029af54c 100644
--- a/internal/cli/build_ql.go
+++ b/internal/cli/build_ql.go
@@ -1,5 +1,4 @@
 //go:build ql
-// +build ql
 
 package cli
 
diff --git a/internal/cli/build_redshift.go b/internal/cli/build_redshift.go
index a1617d1dc..a0f4f670f 100644
--- a/internal/cli/build_redshift.go
+++ b/internal/cli/build_redshift.go
@@ -1,5 +1,4 @@
 //go:build redshift
-// +build redshift
 
 package cli
 
diff --git a/internal/cli/build_rqlite.go b/internal/cli/build_rqlite.go
index 1e3e3a932..577fe0c1b 100644
--- a/internal/cli/build_rqlite.go
+++ b/internal/cli/build_rqlite.go
@@ -1,5 +1,4 @@
 //go:build rqlite
-// +build rqlite
 
 package cli
 
diff --git a/internal/cli/build_snowflake.go b/internal/cli/build_snowflake.go
index 8cd891947..55d91d692 100644
--- a/internal/cli/build_snowflake.go
+++ b/internal/cli/build_snowflake.go
@@ -1,5 +1,4 @@
 //go:build snowflake
-// +build snowflake
 
 package cli
 
diff --git a/internal/cli/build_spanner.go b/internal/cli/build_spanner.go
index 70b56fcca..78f81b20b 100644
--- a/internal/cli/build_spanner.go
+++ b/internal/cli/build_spanner.go
@@ -1,5 +1,4 @@
 //go:build spanner
-// +build spanner
 
 package cli
 
diff --git a/internal/cli/build_sqlcipher.go b/internal/cli/build_sqlcipher.go
index 1f6b31fd3..e8dbfd4a7 100644
--- a/internal/cli/build_sqlcipher.go
+++ b/internal/cli/build_sqlcipher.go
@@ -1,5 +1,4 @@
 //go:build sqlcipher
-// +build sqlcipher
 
 package cli
 
diff --git a/internal/cli/build_sqlite.go b/internal/cli/build_sqlite.go
index 8c95657ce..9d077a754 100644
--- a/internal/cli/build_sqlite.go
+++ b/internal/cli/build_sqlite.go
@@ -1,5 +1,4 @@
 //go:build sqlite
-// +build sqlite
 
 package cli
 
diff --git a/internal/cli/build_sqlite3.go b/internal/cli/build_sqlite3.go
index 4d3867a61..b2b9bf7cc 100644
--- a/internal/cli/build_sqlite3.go
+++ b/internal/cli/build_sqlite3.go
@@ -1,5 +1,4 @@
 //go:build sqlite3
-// +build sqlite3
 
 package cli
 
diff --git a/internal/cli/build_sqlserver.go b/internal/cli/build_sqlserver.go
index f53b93bb0..02e8adfc4 100644
--- a/internal/cli/build_sqlserver.go
+++ b/internal/cli/build_sqlserver.go
@@ -1,5 +1,4 @@
 //go:build sqlserver
-// +build sqlserver
 
 package cli
 
diff --git a/internal/cli/build_yugabytedb.go b/internal/cli/build_yugabytedb.go
index 9cda6067f..26f1e18f9 100644
--- a/internal/cli/build_yugabytedb.go
+++ b/internal/cli/build_yugabytedb.go
@@ -1,5 +1,4 @@
 //go:build yugabytedb
-// +build yugabytedb
 
 package cli
 
diff --git a/source/iofs/example_test.go b/source/iofs/example_test.go
index 474fc633c..b0a9cda5b 100644
--- a/source/iofs/example_test.go
+++ b/source/iofs/example_test.go
@@ -1,5 +1,4 @@
 //go:build go1.16
-// +build go1.16
 
 package iofs_test
 
diff --git a/source/iofs/iofs.go b/source/iofs/iofs.go
index dc934a5fe..a9dc7c4b1 100644
--- a/source/iofs/iofs.go
+++ b/source/iofs/iofs.go
@@ -1,5 +1,4 @@
 //go:build go1.16
-// +build go1.16
 
 package iofs
 
diff --git a/source/iofs/iofs_test.go b/source/iofs/iofs_test.go
index d5b0ea019..05f1750ce 100644
--- a/source/iofs/iofs_test.go
+++ b/source/iofs/iofs_test.go
@@ -1,5 +1,4 @@
 //go:build go1.16
-// +build go1.16
 
 package iofs_test