diff --git a/esapi/test/go.mod b/esapi/test/go.mod
index 1239edc610..a12b3bc039 100644
--- a/esapi/test/go.mod
+++ b/esapi/test/go.mod
@@ -1,8 +1,8 @@
 module github.com/elastic/go-elasticsearch/v8/esapi/test
 
-go 1.21
+go 1.22
 
-toolchain go1.22.5
+toolchain go1.22.0
 
 replace github.com/elastic/go-elasticsearch/v8 => ../../
 
diff --git a/internal/build/go.mod b/internal/build/go.mod
index 067e5ec37b..26ef97c6fa 100644
--- a/internal/build/go.mod
+++ b/internal/build/go.mod
@@ -1,7 +1,8 @@
 module github.com/elastic/go-elasticsearch/v8/internal/build
 
-go 1.21
-toolchain go1.21.0
+go 1.22
+
+toolchain go1.22.0
 
 replace github.com/elastic/go-elasticsearch/v8 => ../../