diff --git a/etcdserver/api/v2http/client_auth_test.go b/etcdserver/api/v2http/client_auth_test.go
index ec88c5d01..a4f301118 100644
--- a/etcdserver/api/v2http/client_auth_test.go
+++ b/etcdserver/api/v2http/client_auth_test.go
@@ -53,11 +53,11 @@ func (s *mockAuthStore) GetUser(name string) (auth.User, error) {
 }
 func (s *mockAuthStore) CreateOrUpdateUser(user auth.User) (out auth.User, created bool, err error) {
 	if s.users == nil {
-		u, err := s.CreateUser(user)
-		return u, true, err
+		out, err = s.CreateUser(user)
+		return out, true, err
 	}
-	u, err := s.UpdateUser(user)
-	return u, false, err
+	out, err = s.UpdateUser(user)
+	return out, false, err
 }
 func (s *mockAuthStore) CreateUser(user auth.User) (auth.User, error) { return user, s.err }
 func (s *mockAuthStore) DeleteUser(name string) error                 { return s.err }
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 8b1befff3..cd254eae5 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -296,7 +296,8 @@ func NewServer(cfg *ServerConfig) (srv *EtcdServer, err error) {
 			if err != nil {
 				return nil, &DiscoveryError{Op: "join", Err: err}
 			}
-			urlsmap, err := types.NewURLsMap(str)
+			var urlsmap types.URLsMap
+			urlsmap, err = types.NewURLsMap(str)
 			if err != nil {
 				return nil, err
 			}
@@ -329,7 +330,7 @@ func NewServer(cfg *ServerConfig) (srv *EtcdServer, err error) {
 			return nil, err
 		}
 		if snapshot != nil {
-			if err := st.Recovery(snapshot.Data); err != nil {
+			if err = st.Recovery(snapshot.Data); err != nil {
 				plog.Panicf("recovered store from snapshot error: %v", err)
 			}
 			plog.Infof("recovered store from snapshot at index %d", snapshot.Metadata.Index)
diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go
index 45f6e7b93..513833d0c 100644
--- a/etcdserver/server_test.go
+++ b/etcdserver/server_test.go
@@ -654,11 +654,11 @@ func TestDoProposal(t *testing.T) {
 }
 
 func TestDoProposalCancelled(t *testing.T) {
-	wait := mockwait.NewRecorder()
+	wt := mockwait.NewRecorder()
 	srv := &EtcdServer{
 		cfg:      &ServerConfig{TickMs: 1},
 		r:        raftNode{Node: newNodeNop()},
-		w:        wait,
+		w:        wt,
 		reqIDGen: idutil.NewGenerator(0, time.Time{}),
 	}
 	ctx, cancel := context.WithCancel(context.Background())
@@ -669,8 +669,8 @@ func TestDoProposalCancelled(t *testing.T) {
 		t.Fatalf("err = %v, want %v", err, ErrCanceled)
 	}
 	w := []testutil.Action{{Name: "Register"}, {Name: "Trigger"}}
-	if !reflect.DeepEqual(wait.Action(), w) {
-		t.Errorf("wait.action = %+v, want %+v", wait.Action(), w)
+	if !reflect.DeepEqual(wt.Action(), w) {
+		t.Errorf("wt.action = %+v, want %+v", wt.Action(), w)
 	}
 }
 
diff --git a/rafthttp/stream.go b/rafthttp/stream.go
index 1a76b89cc..1d84311a8 100644
--- a/rafthttp/stream.go
+++ b/rafthttp/stream.go
@@ -382,7 +382,7 @@ func (cr *streamReader) dial(t streamType) (io.ReadCloser, error) {
 	req, err := http.NewRequest("GET", uu.String(), nil)
 	if err != nil {
 		cr.picker.unreachable(u)
-		return nil, fmt.Errorf("failed to make http request to %s (%v)", u, err)
+		return nil, fmt.Errorf("failed to make http request to %v (%v)", u, err)
 	}
 	req.Header.Set("X-Server-From", cr.local.String())
 	req.Header.Set("X-Server-Version", version.Version)
diff --git a/tools/functional-tester/etcd-agent/agent.go b/tools/functional-tester/etcd-agent/agent.go
index 5f19fbb87..d1e9d4787 100644
--- a/tools/functional-tester/etcd-agent/agent.go
+++ b/tools/functional-tester/etcd-agent/agent.go
@@ -95,16 +95,16 @@ func sigtermAndWait(cmd *exec.Cmd) error {
 
 	errc := make(chan error)
 	go func() {
-		_, err := cmd.Process.Wait()
-		errc <- err
+		_, ew := cmd.Process.Wait()
+		errc <- ew
 		close(errc)
 	}()
 
 	select {
 	case <-time.After(5 * time.Second):
 		cmd.Process.Kill()
-	case err := <-errc:
-		return err
+	case e := <-errc:
+		return e
 	}
 	err = <-errc
 	return err
diff --git a/wal/wal_test.go b/wal/wal_test.go
index 026babcf6..9045c557d 100644
--- a/wal/wal_test.go
+++ b/wal/wal_test.go
@@ -184,7 +184,7 @@ func TestCut(t *testing.T) {
 		t.Fatal(err)
 	}
 	snap := walpb.Snapshot{Index: 2, Term: 1}
-	if err := w.SaveSnapshot(snap); err != nil {
+	if err = w.SaveSnapshot(snap); err != nil {
 		t.Fatal(err)
 	}
 	wname = walName(2, 2)
@@ -506,7 +506,8 @@ func TestReleaseLockTo(t *testing.T) {
 		t.Errorf("len(w.locks) = %d, want %d", len(w.locks), 7)
 	}
 	for i, l := range w.locks {
-		_, lockIndex, err := parseWalName(path.Base(l.Name()))
+		var lockIndex uint64
+		_, lockIndex, err = parseWalName(path.Base(l.Name()))
 		if err != nil {
 			t.Fatal(err)
 		}