diff --git a/.changes/unreleased/NOTES-20240906-171054.yaml b/.changes/unreleased/NOTES-20240906-171054.yaml
new file mode 100644
index 000000000..cf1685bd4
--- /dev/null
+++ b/.changes/unreleased/NOTES-20240906-171054.yaml
@@ -0,0 +1,7 @@
+kind: NOTES
+body: 'all: This Go module has been updated to Go 1.22 per the [Go support policy](https://go.dev/doc/devel/release#policy).
+  It is recommended to review the [Go 1.22 release notes](https://go.dev/doc/go1.22)
+  before upgrading. Any consumers building on earlier Go versions may experience errors.'
+time: 2024-09-06T17:10:54.704843-04:00
+custom:
+  Issue: "371"
diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml
index a83ada4b2..e93c9b9a4 100644
--- a/.github/workflows/ci-go.yml
+++ b/.github/workflows/ci-go.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.22', '1.21' ]
+        go-version: [ '1.23', '1.22' ]
         terraform: ${{ fromJSON(vars.TF_VERSIONS_PROTOCOL_V5) }}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
diff --git a/README.md b/README.md
index 8583530d8..4f12b82e9 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ When run from the root of a Terraform Provider codebase, Terraform’s testing f
 
 This project follows the [support policy](https://golang.org/doc/devel/release.html#policy) of Go as its support policy. The two latest major releases of Go are supported by the project.
 
-Currently, that means Go **1.21** or later must be used when including this project as a dependency.
+Currently, that means Go **1.22** or later must be used when including this project as a dependency.
 
 ## Contributing
 
diff --git a/go.mod b/go.mod
index bc53a64af..48b3b47cb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/hashicorp/terraform-plugin-testing
 
-go 1.21
+go 1.22.0
 
-toolchain go1.21.6
+toolchain go1.22.7
 
 require (
 	github.com/google/go-cmp v0.6.0
diff --git a/tools/go.mod b/tools/go.mod
index 4a4affd20..9938d4caa 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,6 +1,6 @@
 module tools
 
-go 1.21
+go 1.22.7
 
 require github.com/hashicorp/copywrite v0.19.0