diff --git a/.circleci/config.yml b/.circleci/config.yml
index a62505e8b..b3f9c51ed 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,6 +63,8 @@ workflows:
           name: go-1-16
           go_version: "1.16"
           run_lint: true
-          # Style and unused/missing packages are only checked against
-          # the latest supported Go version.
+      - test:
+          name: go-1-17
+          go_version: "1.17"
+          run_lint: true
           run_style_and_unused: true
diff --git a/prometheus/collectors/dbstats_collector_go115.go b/prometheus/collectors/dbstats_collector_go115.go
index a6e6268ce..6d152fbf1 100644
--- a/prometheus/collectors/dbstats_collector_go115.go
+++ b/prometheus/collectors/dbstats_collector_go115.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build go1.15
 // +build go1.15
 
 package collectors
diff --git a/prometheus/collectors/dbstats_collector_pre_go115.go b/prometheus/collectors/dbstats_collector_pre_go115.go
index 0568affe2..65235069d 100644
--- a/prometheus/collectors/dbstats_collector_pre_go115.go
+++ b/prometheus/collectors/dbstats_collector_pre_go115.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !go1.15
 // +build !go1.15
 
 package collectors
diff --git a/prometheus/process_collector_other.go b/prometheus/process_collector_other.go
index 3117461cd..2dc3660da 100644
--- a/prometheus/process_collector_other.go
+++ b/prometheus/process_collector_other.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !windows
 // +build !windows
 
 package prometheus
diff --git a/prometheus/process_collector_test.go b/prometheus/process_collector_test.go
index 7b19c5e05..3a604aba9 100644
--- a/prometheus/process_collector_test.go
+++ b/prometheus/process_collector_test.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package prometheus