diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6fb369..15dd909 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,10 @@ executors:
       - image: circleci/golang:1.15.5
   exec_go_1_16:
     docker:
-      - image: cimg/go:1.16.5
+      - image: cimg/go:1.16.7
+  exec_go_1_17:
+    docker:
+      - image: cimg/go:1.17
 
 commands:
   fmt:
@@ -81,6 +84,11 @@ jobs:
     executor: exec_go_1_16
     steps:
       - all
+  go1_17:
+    working_directory: /home/circleci/go/src/github.com/cucumber/godog
+    executor: exec_go_1_17
+    steps:
+      - all
 
 workflows:
   version: 2
@@ -90,3 +98,4 @@ workflows:
       - go1_14
       - go1_15
       - go1_16
+      - go1_17
diff --git a/colors/ansi_others.go b/colors/ansi_others.go
index 4ce4e77..6a16607 100644
--- a/colors/ansi_others.go
+++ b/colors/ansi_others.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
+//go:build !windows
 // +build !windows
 
 package colors
diff --git a/colors/ansi_windows.go b/colors/ansi_windows.go
index d80f846..8a92c82 100644
--- a/colors/ansi_windows.go
+++ b/colors/ansi_windows.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package colors
diff --git a/internal/builder/builder_go112_test.go b/internal/builder/builder_go112_test.go
index 15ca6cb..d90809b 100644
--- a/internal/builder/builder_go112_test.go
+++ b/internal/builder/builder_go112_test.go
@@ -1,5 +1,5 @@
-// +build go1.12
-// +build !go1.13
+//go:build go1.12 && !go1.13
+// +build go1.12,!go1.13
 
 package builder_test
 
diff --git a/internal/builder/builder_go113_test.go b/internal/builder/builder_go113_test.go
index bd2dd24..9a77272 100644
--- a/internal/builder/builder_go113_test.go
+++ b/internal/builder/builder_go113_test.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 package builder_test
diff --git a/release-notes/v0.12.0.md b/release-notes/v0.12.0.md
index 3e52693..2fafdbf 100644
--- a/release-notes/v0.12.0.md
+++ b/release-notes/v0.12.0.md
@@ -108,9 +108,9 @@ You can now use `string` instead of `*godog.DocString` in declaration.
 
 `godog.TestSuite` now can `RetrieveFeatures() ([]*models.Feature, error)` to expose parsed features to the user.
 
-### Added official support for go1.16
+### Added official support for go1.16 and go1.17
 
-With the introduction of go1.16, go1.16 is now officially supported.
+With the introduction of go1.17, go1.17 and go1.16 are now officially supported.
 
 ### Running scenarios as subtests of *testing.T