diff --git a/test b/test
index 0ac454c55..3258fdd90 100755
--- a/test
+++ b/test
@@ -27,7 +27,7 @@ fi
 COVER=${COVER:-"-cover"}
 
 # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
-IGNORE_PKGS="(cmd|vendor|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
+IGNORE_PKGS="(cmd/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
 INTEGRATION_PKGS="(integration|e2e|contrib|functional-tester)"
 
 # all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools
diff --git a/tools/benchmark/cmd/lease.go b/tools/benchmark/cmd/lease.go
index 4c21f9f7b..8743ed27e 100644
--- a/tools/benchmark/cmd/lease.go
+++ b/tools/benchmark/cmd/lease.go
@@ -59,7 +59,7 @@ func leaseKeepaliveFunc(cmd *cobra.Command, args []string) {
 			if err != nil {
 				panic(err)
 			}
-			for _ = range requests {
+			for range requests {
 				st := time.Now()
 				_, err := c.KeepAliveOnce(context.TODO(), resp.ID)
 				r.Results() <- report.Result{Err: err, Start: st, End: time.Now()}
diff --git a/tools/benchmark/cmd/put.go b/tools/benchmark/cmd/put.go
index 57d8564d0..760c032eb 100644
--- a/tools/benchmark/cmd/put.go
+++ b/tools/benchmark/cmd/put.go
@@ -129,26 +129,18 @@ func putFunc(cmd *cobra.Command, args []string) {
 }
 
 func compactKV(clients []*v3.Client) {
-	var curRev int64
-	for _, c := range clients {
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		resp, err := c.KV.Get(ctx, "foo")
-		cancel()
-		if err != nil {
-			panic(err)
-		}
-		curRev = resp.Header.Revision
-		break
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	resp, err := clients[0].KV.Get(ctx, "foo")
+	cancel()
+	if err != nil {
+		panic(err)
 	}
-	revToCompact := max(0, curRev-compactIndexDelta)
-	for _, c := range clients {
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		_, err := c.KV.Compact(ctx, revToCompact)
-		cancel()
-		if err != nil {
-			panic(err)
-		}
-		break
+	revToCompact := max(0, resp.Header.Revision-compactIndexDelta)
+	ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
+	_, err = clients[0].KV.Compact(ctx, revToCompact)
+	cancel()
+	if err != nil {
+		panic(err)
 	}
 }