diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go
index a2c1087bd8..d0099888d9 100644
--- a/src/cmd/go/script_test.go
+++ b/src/cmd/go/script_test.go
@@ -246,6 +246,7 @@ func scriptEnv(srv *vcstest.Server, srvCertFile string) ([]string, error) {
 		"goversion=" + version,
 		"CMDGO_TEST_RUN_MAIN=true",
 		"HGRCPATH=",
+		"GOTOOLCHAIN=auto",
 		"newline=\n",
 	}
 
diff --git a/src/cmd/go/testdata/script/gotoolchain_local.txt b/src/cmd/go/testdata/script/gotoolchain_local.txt
index 313c541501..0e08207f45 100644
--- a/src/cmd/go/testdata/script/gotoolchain_local.txt
+++ b/src/cmd/go/testdata/script/gotoolchain_local.txt
@@ -5,14 +5,8 @@
 env TESTGO_VERSION=go1.500
 env TESTGO_VERSION_SWITCH=switch
 
-# Default setting should be auto
-env GOTOOLCHAIN=
-go env GOTOOLCHAIN
-stdout auto
-go env
-stdout GOTOOLCHAIN=.?auto.?  # maybe quoted
-
 # GOTOOLCHAIN=auto runs default toolchain without a go.mod or go.work
+env GOTOOLCHAIN=auto
 go version
 stdout go1.500