diff --git a/main.go b/main.go
index 00eea79..25be35b 100644
--- a/main.go
+++ b/main.go
@@ -292,7 +292,7 @@ func (e errJustExit) Error() string { return fmt.Sprintf("exit: %d", e) }
 func goVersionOK() bool {
 	const (
 		minGoVersion  = "go1.23.5" // the minimum Go version we support; could be a bugfix release if needed
-		unsupportedGo = "go1.24"   // the first major version we don't support
+		unsupportedGo = "go1.25"   // the first major version we don't support
 	)
 
 	// rxVersion looks for a version like "go1.2" or "go1.2.3" in `go env GOVERSION`.
diff --git a/testdata/script/debugdir.txtar b/testdata/script/debugdir.txtar
index fc123ac..0c59811 100644
--- a/testdata/script/debugdir.txtar
+++ b/testdata/script/debugdir.txtar
@@ -1,6 +1,6 @@
 exec garble -debugdir ./debug1 build
 exists 'debug1/test/main/imported/imported.go' 'debug1/test/main/main.go' 'debug1/reflect/type.go'
-exists 'debug1/runtime/map.go' 'debug1/runtime/funcdata.h' 'debug1/runtime/asm.s'
+exists 'debug1/runtime/error.go' 'debug1/runtime/funcdata.h' 'debug1/runtime/asm.s'
 [amd64] exists 'debug1/runtime/cpuflags_amd64.go' 'debug1/runtime/asm_amd64.s'
 [!amd64] ! exists 'debug1/runtime/cpuflags_amd64.go' 'debug1/runtime/asm_amd64.s'
 ! grep ImportedFunc $WORK/debug1/test/main/imported/imported.go
diff --git a/testdata/script/goversion.txtar b/testdata/script/goversion.txtar
index e04de98..83b734f 100644
--- a/testdata/script/goversion.txtar
+++ b/testdata/script/goversion.txtar
@@ -38,7 +38,7 @@ stderr 'Go version "go1\.14" is too old; please upgrade to go1\.23\.5 or newer'
 env GARBLE_TEST_GOVERSION='go1.28.2'
 env TOOLCHAIN_GOVERSION='go1.28.2'
 ! exec garble build
-stderr 'Go version "go1\.28\.2" is too new; Go linker patches aren''t available for go1\.24 or later yet'
+stderr 'Go version "go1\.28\.2" is too new; Go linker patches aren''t available for go1\.25 or later yet'
 
 # We should accept custom devel strings.
 env TOOLCHAIN_GOVERSION='devel go1.23.5-somecustomversion'
diff --git a/testdata/script/modinfo.txtar b/testdata/script/modinfo.txtar
index ebc4273..62852d3 100644
--- a/testdata/script/modinfo.txtar
+++ b/testdata/script/modinfo.txtar
@@ -7,22 +7,25 @@
 [exec:git] setenvfile HEAD_COMMIT_SHA stdout
 
 exec garble build -tags veryuniquebuildtag
-! binsubstr main$exe '(devel)' 'veryuniquebuildtag' ${HEAD_COMMIT_SHA}
 
 go version -m main$exe
 stdout 'main(\.exe)?: unknown'
 stdout -count=1 '^.+$' # expect just one line
 
+! binsubstr main$exe '(devel)' 'v0.0.0-202' 'veryuniquebuildtag' ${HEAD_COMMIT_SHA}
+
 [short] stop # no need to verify this with -short
 
 go build -tags veryuniquebuildtag
-binsubstr main$exe '(devel)' 'veryuniquebuildtag' ${HEAD_COMMIT_SHA}
 
 go version -m main$exe
 stdout 'path\s*test/main'
-stdout 'mod\s*test/main\s*\(devel\)'
+[go1.24] stdout 'mod\s*test/main\s*v0\.0\.0-202\d'
 stdout 'build\s*-tags=veryuniquebuildtag'
 stdout 'build\s*vcs.revision='${HEAD_COMMIT_SHA}
+
+binsubstr main$exe 'veryuniquebuildtag' ${HEAD_COMMIT_SHA}
+[go1.24] binsubstr main$exe 'v0.0.0-202'
 -- go.mod --
 module test/main