diff --git a/Gopkg.lock b/Gopkg.lock
index 98eec1e3a13c..a9bf30ddfbd1 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -933,7 +933,7 @@
   version = "v1.0.0"
 
 [[projects]]
-  digest = "1:284874efbaa03f94a209a905d2c493feea7f41ffc23875aa4809e4cdfd83c561"
+  digest = "1:9c0eed728d7c6c3232a7b90505855517daa4a81697529bc509c3c10bea5d3ef1"
   name = "github.com/knz/go-libedit"
   packages = [
     ".",
@@ -943,8 +943,8 @@
     "unix/sigtramp",
   ]
   pruneopts = "T"
-  revision = "f49778aa742b30ce62b430589d78a57247ae7cb1"
-  version = "v1.9"
+  revision = "0af72fd06d6f44cdb9666279d9b9a4d29cfa2da0"
+  version = "v1.9.1"
 
 [[projects]]
   branch = "master"
diff --git a/Makefile b/Makefile
index 3109ff71c002..b651ca81bd32 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ $(info GOPATH set to $(GOPATH))
 
 # We install our vendored tools to a directory within this repository to avoid
 # overwriting any user-installed binaries of the same name in the default GOBIN.
-GO_INSTALL := GOBIN='$(abspath bin)' $(GO) install
+GO_INSTALL := GOBIN='$(abspath bin)' GOFLAGS= $(GO) install
 
 # Prefer tools we've installed with go install and Yarn to those elsewhere on
 # the PATH.
@@ -868,7 +868,7 @@ stress stressrace:
 roachprod-stress roachprod-stressrace: bin/roachprod-stress
 	# The bootstrap target creates, among other things, ./bin/stress.
 	build/builder.sh make bin/.bootstrap
-	build/builder.sh make test GOFLAGS="$(GOFLAGS) -v -c -o $(notdir $(PKG)).test" PKG=$(PKG)
+	build/builder.sh make test GOFLAGS="$(GOFLAGS) -v -c -o $(notdir $(patsubst %/,%,$(PKG))).test" PKG=$(PKG)
 	@if [ -z "$(CLUSTER)" ]; then \
 	  echo "ERROR: missing or empty CLUSTER"; \
 	else \
diff --git a/pkg/testutils/lint/lint_test.go b/pkg/testutils/lint/lint_test.go
index bcda073c4f13..592327237eaf 100644
--- a/pkg/testutils/lint/lint_test.go
+++ b/pkg/testutils/lint/lint_test.go
@@ -1024,7 +1024,6 @@ func TestLint(t *testing.T) {
 	})
 
 	t.Run("TestVet", func(t *testing.T) {
-		t.Skip("#34059")
 		t.Parallel()
 		// `go vet` is a special snowflake that emits all its output on
 		// `stderr.
diff --git a/vendor b/vendor
index 86d92b979505..2d0d5adc9887 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 86d92b9795051f29dd97fa6784868eb5b94eed02
+Subproject commit 2d0d5adc9887a2438859a60c11aea5e0d0283ab2