diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 47ededd9..b0ab44ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        goVer: [1.11, 1.12, 1.13]
+        goVer: [1.16, 1.17, 1.18]
 
     steps:
     - name: Set up Go ${{ matrix.goVer }}
diff --git a/context/context-legacy.go b/context/context-legacy.go
index 625387bd..421f3626 100644
--- a/context/context-legacy.go
+++ b/context/context-legacy.go
@@ -1,3 +1,4 @@
+//go:build !go1.7
 // +build !go1.7
 
 package context
diff --git a/context/context.go b/context/context.go
index b882406a..42558b84 100644
--- a/context/context.go
+++ b/context/context.go
@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package context