diff --git a/go.mod b/go.mod
index a1137c72..7418d18e 100644
--- a/go.mod
+++ b/go.mod
@@ -18,8 +18,8 @@ require (
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
 	k8s.io/code-generator v0.18.0
 	k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
-	knative.dev/pkg v0.0.0-20200429233442-1ebb4d56f726
-	knative.dev/test-infra v0.0.0-20200429211942-f4c4853375cf
+	knative.dev/pkg v0.0.0-20200501005942-d980c0865972
+	knative.dev/test-infra v0.0.0-20200430225942-f7c1fafc1cde
 )
 
 replace (
diff --git a/go.sum b/go.sum
index 61382f65..46867d26 100644
--- a/go.sum
+++ b/go.sum
@@ -914,12 +914,12 @@ k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl
 k8s.io/utils v0.0.0-20190907131718-3d4f5b7dea0b h1:eMM0sTvh3KBVGwJfuNcU86P38TJhlVMAICbFPDG3t0M=
 k8s.io/utils v0.0.0-20190907131718-3d4f5b7dea0b/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
-knative.dev/pkg v0.0.0-20200429233442-1ebb4d56f726 h1:L2EgutIZ+seB9uv7BzNqJ/2T++JvJbv5d4NREa4dVJU=
-knative.dev/pkg v0.0.0-20200429233442-1ebb4d56f726/go.mod h1:WRkhFA44sWhFk+p94IPkW5zaiX3DZUfftw7eqmY/74I=
-knative.dev/test-infra v0.0.0-20200429132042-cb2fc4ae428f h1:bo0XooULJpgNd8sV/kJ2KYypRFTHaLQZjShhTZGiJSA=
-knative.dev/test-infra v0.0.0-20200429132042-cb2fc4ae428f/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
+knative.dev/pkg v0.0.0-20200501005942-d980c0865972 h1:N/umsmNgROaU+fIziEBZ+L32OMpgwZRYW3VeHUPR8ZA=
+knative.dev/pkg v0.0.0-20200501005942-d980c0865972/go.mod h1:X4wmXb4xUR+1eDBoP6AeVfAqsyxl1yATnRdSgFdjhQw=
 knative.dev/test-infra v0.0.0-20200429211942-f4c4853375cf h1:rNWg3NiXNLjZC9C1EJf2qKA+mRnrWMLW1KONsEusLYg=
 knative.dev/test-infra v0.0.0-20200429211942-f4c4853375cf/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
+knative.dev/test-infra v0.0.0-20200430225942-f7c1fafc1cde h1:QSzxFsf21WXNhODvh0jRKbFR+c5UI7WFjiISy/sMOLg=
+knative.dev/test-infra v0.0.0-20200430225942-f7c1fafc1cde/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh
index a8aa72e7..b90f4e1d 100644
--- a/vendor/knative.dev/test-infra/scripts/library.sh
+++ b/vendor/knative.dev/test-infra/scripts/library.sh
@@ -483,16 +483,22 @@ function run_go_tool() {
   [[ $1 =~ ^[\./].* ]] && action=install
   # Avoid running `go get` from root dir of the repository, as it can change go.sum and go.mod files.
   # See discussions in https://github.com/golang/go/issues/27643.
-  if [[ ${action} == "get" && $(pwd) == "${REPO_ROOT_DIR}" ]]; then
-    local temp_dir="$(mktemp -d)"
-    local install_failed=0
-    # Swallow the output as we are returning the stdout in the end.
-    pushd "${temp_dir}" > /dev/null 2>&1
-    GOFLAGS="" go ${action} $1 || install_failed=1
-    popd > /dev/null 2>&1
-    (( install_failed )) && return ${install_failed}
-  else
-    GOFLAGS="" go ${action} $1
+  if [[ -z "$(which ${tool})" ]]; then
+    local action=get
+    [[ $1 =~ ^[\./].* ]] && action=install
+    # Avoid running `go get` from root dir of the repository, as it can change go.sum and go.mod files.
+    # See discussions in https://github.com/golang/go/issues/27643.
+    if [[ ${action} == "get" && $(pwd) == "${REPO_ROOT_DIR}" ]]; then
+      local temp_dir="$(mktemp -d)"
+      local install_failed=0
+      # Swallow the output as we are returning the stdout in the end.
+      pushd "${temp_dir}" > /dev/null 2>&1
+      GOFLAGS="" go ${action} $1 || install_failed=1
+      popd > /dev/null 2>&1
+      (( install_failed )) && return ${install_failed}
+    else
+      GOFLAGS="" go ${action} $1
+    fi
   fi
   shift 2
   ${tool} "$@"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index de7bcfa2..78d50a17 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -651,7 +651,7 @@ k8s.io/kube-openapi/pkg/util/sets
 k8s.io/utils/buffer
 k8s.io/utils/integer
 k8s.io/utils/trace
-# knative.dev/pkg v0.0.0-20200429233442-1ebb4d56f726
+# knative.dev/pkg v0.0.0-20200501005942-d980c0865972
 knative.dev/pkg/apis
 knative.dev/pkg/changeset
 knative.dev/pkg/codegen/cmd/injection-gen
@@ -668,7 +668,7 @@ knative.dev/pkg/logging/logkey
 knative.dev/pkg/metrics
 knative.dev/pkg/metrics/metricskey
 knative.dev/pkg/reconciler
-# knative.dev/test-infra v0.0.0-20200429211942-f4c4853375cf
+# knative.dev/test-infra v0.0.0-20200430225942-f7c1fafc1cde
 knative.dev/test-infra/scripts
 knative.dev/test-infra/tools/dep-collector
 # sigs.k8s.io/yaml v1.1.0