diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 80e51e22..dd2526c4 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -11,7 +11,7 @@ jobs:
     name: Test and lint
     strategy:
       matrix:
-        go-version: [1.x, 1.15.x, 1.14.x]
+        go-version: [1.15.x, 1.16.x, 1.17.x]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: ${{ matrix.go-version }}
 
       # Caching go modules to speed up the run
       - uses: actions/cache@v2
diff --git a/request_context.go b/request_context.go
index fc0052df..9f3e2647 100644
--- a/request_context.go
+++ b/request_context.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // This file provides glue to use Context in `http.Request` with
diff --git a/request_legacy.go b/request_legacy.go
index 5ceee886..93eb65e8 100644
--- a/request_legacy.go
+++ b/request_legacy.go
@@ -1,3 +1,4 @@
+//go:build !go1.13
 // +build !go1.13
 
 // This file provides glue to use Context in `http.Request` with