diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 3f8b692d..b86f12bb 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -13,13 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.14.x', '1.15.x' ]
+        go: [ '1.16.x', '1.17.x', '1.18.x' ]
     env:
       TEST_KDC_ADDR: 127.0.0.1
       TEST_HTTP_URL: http://cname.test.gokrb5
       TEST_HTTP_ADDR: 127.0.0.1
       DNS_IP: 127.0.88.53
       DNSUTILS_OVERRIDE_NS: 127.0.88.53:53
+      GO111MODULE: auto
     steps:
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v1
diff --git a/.github/workflows/testingv8.yml b/.github/workflows/testingv8.yml
index 84324e55..2feab51d 100644
--- a/.github/workflows/testingv8.yml
+++ b/.github/workflows/testingv8.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.14.x', '1.15.x' ]
+        go: [ '1.16.x', '1.17.x', '1.18.x' ]
     env:
       TEST_KDC_ADDR: 127.0.0.1
       TEST_HTTP_URL: http://cname.test.gokrb5
diff --git a/README.md b/README.md
index a3d175e5..5c568db7 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,9 @@ Development will be focused on the latest major version. New features will only
 
 
 #### Go Version Support
-![Go version](https://img.shields.io/badge/Go-1.15-brightgreen.svg)
-![Go version](https://img.shields.io/badge/Go-1.14-brightgreen.svg)
+![Go version](https://img.shields.io/badge/Go-1.18-brightgreen.svg)
+![Go version](https://img.shields.io/badge/Go-1.17-brightgreen.svg)
+![Go version](https://img.shields.io/badge/Go-1.16-brightgreen.svg)
 
 gokrb5 may work with other versions of Go but they are not formally tested.
 It has been reported that gokrb5 also works with the [gollvm](https://go.googlesource.com/gollvm/) compiler but this is not formally tested.
diff --git a/examples/example-AD.go b/examples/example-AD.go
index 61b05acf..76737981 100644
--- a/examples/example-AD.go
+++ b/examples/example-AD.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 package main
@@ -11,6 +12,7 @@ import (
 	"net/http/httptest"
 	"os"
 
+	goidentity "gopkg.in/jcmturner/goidentity.v3"
 	"gopkg.in/jcmturner/gokrb5.v7/client"
 	"gopkg.in/jcmturner/gokrb5.v7/config"
 	"gopkg.in/jcmturner/gokrb5.v7/credentials"
diff --git a/examples/example.go b/examples/example.go
index 8971c3aa..b163b617 100644
--- a/examples/example.go
+++ b/examples/example.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 // Package examples provides simple examples of gokrb5 use.
@@ -12,7 +13,7 @@ import (
 	"net/http/httptest"
 	"os"
 
-	"gopkg.in/jcmturner/goidentity.v3"
+	goidentity "gopkg.in/jcmturner/goidentity.v3"
 	"gopkg.in/jcmturner/gokrb5.v7/client"
 	"gopkg.in/jcmturner/gokrb5.v7/config"
 	"gopkg.in/jcmturner/gokrb5.v7/keytab"
diff --git a/examples/httpClient.go b/examples/httpClient.go
index a48fe957..ccf8482e 100644
--- a/examples/httpClient.go
+++ b/examples/httpClient.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 package main
diff --git a/examples/httpServer.go b/examples/httpServer.go
index c7cffc1a..df3fdde2 100644
--- a/examples/httpServer.go
+++ b/examples/httpServer.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 package main
diff --git a/v8/README.md b/v8/README.md
index a3d175e5..5c568db7 100644
--- a/v8/README.md
+++ b/v8/README.md
@@ -11,8 +11,9 @@ Development will be focused on the latest major version. New features will only
 
 
 #### Go Version Support
-![Go version](https://img.shields.io/badge/Go-1.15-brightgreen.svg)
-![Go version](https://img.shields.io/badge/Go-1.14-brightgreen.svg)
+![Go version](https://img.shields.io/badge/Go-1.18-brightgreen.svg)
+![Go version](https://img.shields.io/badge/Go-1.17-brightgreen.svg)
+![Go version](https://img.shields.io/badge/Go-1.16-brightgreen.svg)
 
 gokrb5 may work with other versions of Go but they are not formally tested.
 It has been reported that gokrb5 also works with the [gollvm](https://go.googlesource.com/gollvm/) compiler but this is not formally tested.
diff --git a/v8/examples/example-AD.go b/v8/examples/example-AD.go
index 49775dfa..f0d726d9 100644
--- a/v8/examples/example-AD.go
+++ b/v8/examples/example-AD.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 package main
diff --git a/v8/examples/example.go b/v8/examples/example.go
index aa4cd083..6e42419b 100644
--- a/v8/examples/example.go
+++ b/v8/examples/example.go
@@ -1,4 +1,5 @@
 // Package examples provides simple examples of gokrb5 use.
+//go:build examples
 // +build examples
 
 package main
diff --git a/v8/examples/httpClient.go b/v8/examples/httpClient.go
index 63479cfb..541b7314 100644
--- a/v8/examples/httpClient.go
+++ b/v8/examples/httpClient.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 package main
diff --git a/v8/examples/httpServer.go b/v8/examples/httpServer.go
index e334ec9a..c51171a9 100644
--- a/v8/examples/httpServer.go
+++ b/v8/examples/httpServer.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 package main
diff --git a/v8/examples/longRunningClient.go b/v8/examples/longRunningClient.go
index 6bcdda1b..f6c25ca4 100644
--- a/v8/examples/longRunningClient.go
+++ b/v8/examples/longRunningClient.go
@@ -1,3 +1,4 @@
+//go:build examples
 // +build examples
 
 package main