diff --git a/scripts/e2e-tests.sh b/scripts/e2e-tests.sh
index 2218d41e84..c8e2482363 100755
--- a/scripts/e2e-tests.sh
+++ b/scripts/e2e-tests.sh
@@ -109,9 +109,6 @@ function download_k8s() {
     return 1
   fi
   # Download k8s to staging dir
-  if [[ -z "${GOPATH}" ]]; then
-    local GOPATH=$(go env GOPATH)
-  fi
   version=v${version}
   local staging_dir=${GOPATH}/src/k8s.io/kubernetes/_output/gcs-stage
   rm -fr ${staging_dir}
diff --git a/scripts/library.sh b/scripts/library.sh
index f935a2760d..c52b737dce 100755
--- a/scripts/library.sh
+++ b/scripts/library.sh
@@ -28,6 +28,14 @@ readonly KNATIVE_SERVING_RELEASE=https://storage.googleapis.com/knative-releases
 readonly KNATIVE_BUILD_RELEASE=https://storage.googleapis.com/knative-releases/build/latest/release.yaml
 readonly KNATIVE_EVENTING_RELEASE=https://storage.googleapis.com/knative-releases/eventing/latest/release.yaml
 
+# Conveniently set GOPATH if unset
+if [[ -z "${GOPATH:-}" ]]; then
+  export GOPATH="$(go env GOPATH)"
+  if [[ -z "${GOPATH}" ]]; then
+    echo "WARNING: GOPATH not set and go binary unable to provide it"
+  fi
+fi
+
 # Useful environment variables
 [[ -n "${PROW_JOB_ID:-}" ]] && IS_PROW=1 || IS_PROW=0
 readonly IS_PROW