src/cmd/go/testdata/script/get_brace.txt    | 4 ++++
 src/cmd/go/testdata/script/get_dotfiles.txt | 4 ++++
 src/cmd/go/testdata/script/get_unicode.txt  | 9 +++++++++

diff --git a/src/cmd/go/testdata/script/get_brace.txt b/src/cmd/go/testdata/script/get_brace.txt
index 36414d7b556c08ccc5004ff47719d8c36becf921..be81d8f4875cc12d12624fc0939a5581a870f8f8 100644
--- a/src/cmd/go/testdata/script/get_brace.txt
+++ b/src/cmd/go/testdata/script/get_brace.txt
@@ -3,11 +3,15 @@
 # Set up some empty repositories.
 cd $WORK/_origin/foo
 exec git init
+exec git config user.name 'Nameless Gopher'
+exec git config user.email 'nobody@golang.org'
 exec git commit --allow-empty -m 'create master branch'
 
 cd $WORK
 cd '_origin/{confusing}'
 exec git init
+exec git config user.name 'Nameless Gopher'
+exec git config user.email 'nobody@golang.org'
 exec git commit --allow-empty -m 'create master branch'
 
 # Clone the empty repositories into GOPATH.
diff --git a/src/cmd/go/testdata/script/get_dotfiles.txt b/src/cmd/go/testdata/script/get_dotfiles.txt
index c09da8beeb1dd3909f23d89e81463f924778903b..1876114362690c35fded65ff212fc4ff2e005af6 100644
--- a/src/cmd/go/testdata/script/get_dotfiles.txt
+++ b/src/cmd/go/testdata/script/get_dotfiles.txt
@@ -3,10 +3,14 @@
 # Set up a benign repository and a repository with a dotfile name.
 cd $WORK/_origin/foo
 exec git init
+exec git config user.name 'Nameless Gopher'
+exec git config user.email 'nobody@golang.org'
 exec git commit --allow-empty -m 'create master branch'
 
 cd $WORK/_origin/.hidden
 exec git init
+exec git config user.name 'Nameless Gopher'
+exec git config user.email 'nobody@golang.org'
 exec git commit --allow-empty -m 'create master branch'
 
 # Clone the empty repositories into GOPATH.
diff --git a/src/cmd/go/testdata/script/get_unicode.txt b/src/cmd/go/testdata/script/get_unicode.txt
index a30802b999cd2e939b77afb7b2cde56033d40b5b..31edcdb9f66c98710e75afeea3f1fab778216cdc 100644
--- a/src/cmd/go/testdata/script/get_unicode.txt
+++ b/src/cmd/go/testdata/script/get_unicode.txt
@@ -1,23 +1,32 @@
 [!exec:git] skip
 
+# Construct a repository that imports a non-ASCII path.
 cd $WORK/_origin/example.com/unicode
 exec git init
+exec git config user.name 'Nameless Gopher'
+exec git config user.email 'nobody@golang.org'
 exec git add unicode.go
 exec git commit -m 'add unicode.go'
 
+# Clone the repo into GOPATH so that 'go get -u' can find it.
 mkdir $GOPATH/src/example.com/unicode
 cd $GOPATH/src/example.com/unicode
 exec git clone $WORK/_origin/example.com/unicode .
 
+# Construct the imported repository.
 cd $WORK/_origin/example.com/испытание
 exec git init
+exec git config user.name 'Nameless Gopher'
+exec git config user.email 'nobody@golang.org'
 exec git add испытание.go
 exec git commit -m 'add испытание.go'
 
+# Clone that repo into GOPATH too.
 mkdir $GOPATH/src/example.com/испытание
 cd $GOPATH/src/example.com/испытание
 exec git clone $WORK/_origin/example.com/испытание .
 
+# Upgrading the importer should pull from the non-ASCII repo.
 cd $GOPATH
 go get -u example.com/unicode