diff --git a/.circleci/config.yml b/.circleci/config.yml
index f7d3c182..95065ae7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -93,12 +93,12 @@ workflows:
         name: go-<< matrix.go_version >>
         matrix:
           parameters:
-            go_version: ["1.13", "1.14", "1.15", "1.16"]
+            go_version: ["1.13", "1.14", "1.15", "1.16", "1.17"]
     - test-assets:
         name: assets-go-<< matrix.go_version >>
         matrix:
           parameters:
-            go_version: ["1.16"]
+            go_version: ["1.17"]
     - style:
         name: style
-        go_version: "1.16"
+        go_version: "1.17"
diff --git a/config/tls_config_test.go b/config/tls_config_test.go
index 57ad4bb4..bd8add67 100644
--- a/config/tls_config_test.go
+++ b/config/tls_config_test.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build go1.8
 // +build go1.8
 
 package config
diff --git a/expfmt/fuzz.go b/expfmt/fuzz.go
index dc2eedee..f819e4f8 100644
--- a/expfmt/fuzz.go
+++ b/expfmt/fuzz.go
@@ -12,6 +12,7 @@
 // limitations under the License.
 
 // Build only when actually fuzzing
+//go:build gofuzz
 // +build gofuzz
 
 package expfmt