diff --git a/Makefile b/Makefile
index 2783d9ddc5..c7ed34d67b 100644
--- a/Makefile
+++ b/Makefile
@@ -348,6 +348,7 @@ vendor:
 	$(GO) mod tidy
 	$(GO) mod vendor
 	$(GO) mod verify
+	$(GO) mod edit -toolchain none
 
 
 # We define *-in-container targets for the following make targets. This allow the targets to be run in a container.
diff --git a/contrib/cirrus/postbuild.sh b/contrib/cirrus/postbuild.sh
index 18150e9dac..0d5ee9c4fd 100755
--- a/contrib/cirrus/postbuild.sh
+++ b/contrib/cirrus/postbuild.sh
@@ -32,7 +32,8 @@ cd $CIRRUS_WORKING_DIR
 
 # Note, make completions and make vendor will already be run in _run_build()
 # so do not run them again for no reason. This just makes CI slower.
-SUGGESTION="run 'make vendor' or 'make completions' and commit all changes" ./hack/tree_status.sh
+showrun make -C test/tools vendor
+SUGGESTION="run 'make vendor', 'make -C test/tools vendor' and 'make completions' and commit all changes" ./hack/tree_status.sh
 
 showrun make .install.goimports
 showrun make generate-bindings
diff --git a/go.mod b/go.mod
index fb521f0ff8..d8a77d5a86 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,7 @@
 module github.com/containers/podman/v5
 
-// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
+// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
+// time there shouldn't be), its version must be an exact match to the "go" directive.
 
 go 1.22.6
 
diff --git a/test/tools/Makefile b/test/tools/Makefile
index 810f5e6145..ea128cf433 100644
--- a/test/tools/Makefile
+++ b/test/tools/Makefile
@@ -12,6 +12,7 @@ vendor:
 	$(GO) mod tidy
 	$(GO) mod vendor
 	$(GO) mod verify
+	$(GO) mod edit -toolchain none
 
 .PHONY: clean
 clean:
diff --git a/test/tools/go.mod b/test/tools/go.mod
index a4cef5676c..12460503ac 100644
--- a/test/tools/go.mod
+++ b/test/tools/go.mod
@@ -1,8 +1,9 @@
 module github.com/containers/podman/test/tools
 
-go 1.22.0
+// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
+// time there shouldn't be), its version must be an exact match to the "go" directive.
 
-toolchain go1.22.7
+go 1.22.0
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.5