diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6bb94cf54..503d93459 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,9 +4,6 @@ workflows:
   ci:
     jobs:
       - lint
-      - go-test:
-          name: test go1.15
-          version: "1.15"
       - go-test:
           name: test go1.16
           version: "1.16"
@@ -15,6 +12,14 @@ workflows:
           version: "1.16"
           goarch: "386"
           args: "" # remove -race
+      - go-test:
+          name: test go1.17
+          version: "1.17"
+      - go-test:
+          name: test go1.17 32bit
+          version: "1.17"
+          goarch: "386"
+          args: "" # remove -race
 
 executors:
   golang:
@@ -37,7 +42,7 @@ jobs:
   lint:
     executor:
       name: golang
-      version: "1.16"
+      version: "1.17"
     steps:
       - checkout
       - run: go mod download
diff --git a/README.md b/README.md
index 11239ecb4..97173ad57 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ fault tolerance as well.
 
 ## Building
 
-If you wish to build raft you'll need Go version 1.2+ installed.
+If you wish to build raft you'll need Go version 1.16+ installed.
 
 Please check your installation with:
 
diff --git a/go.mod b/go.mod
index 09803b688..e088fa2ec 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
 module github.com/hashicorp/raft
 
-go 1.12
+go 1.16
+
+retract v1.1.3 // Deleted original tag; module checksum may not be accurate.
 
 require (
 	github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878
diff --git a/testing_batch.go b/testing_batch.go
index afb228561..ed69894de 100644
--- a/testing_batch.go
+++ b/testing_batch.go
@@ -1,3 +1,4 @@
+//go:build batchtest
 // +build batchtest
 
 package raft