diff --git a/.gitignore b/.gitignore
index 9aa7a78aa3..02a2a4b1a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,7 @@ kubernetes.tar.gz
 # TODO(thockin): uncomment this when we stop committing the generated files.
 #zz_generated.*
 zz_generated.openapi.go
+zz_generated_*_test.go
 
 # make-related metadata
 /.make/
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index e5b3b35425..0db5008b1a 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -463,7 +463,7 @@ kube::golang::path_for_coverage_dummy_test() {
   local package="$1"
   local path="${KUBE_GOPATH}/src/${package}"
   local name=$(basename "${package}")
-  echo "$path/zz_autogenerated_${name}_test.go"
+  echo "$path/zz_generated_${name}_test.go"
 }
 
 # Argument: the name of a Kubernetes package (e.g. k8s.io/kubernetes/cmd/kube-scheduler).
@@ -504,8 +504,9 @@ kube::golang::delete_coverage_dummy_test() {
 }
 
 # Arguments: a list of kubernetes packages to build.
-# Expected variables: build_args should be set to an array of Go build arguments.
-# In addition, the standard build globals are assumed.
+# Expected variables: ${build_args} should be set to an array of Go build arguments.
+# In addition, ${package} and ${platform} should have been set earlier, and if
+# ${build_with_coverage} is set, coverage instrumentation will be enabled.
 #
 # Invokes Go to actually build some packages. If coverage is disabled, simply invokes
 # go install. If coverage is enabled, builds covered binaries using go test, temporarily