diff --git a/server/etcdserver/bootstrap_test.go b/server/etcdserver/bootstrap_test.go
index 66dc52439..724a1df6a 100644
--- a/server/etcdserver/bootstrap_test.go
+++ b/server/etcdserver/bootstrap_test.go
@@ -198,6 +198,9 @@ func TestBootstrapBackend(t *testing.T) {
 			st := v2store.New(StoreClusterPrefix, StoreKeysPrefix)
 			ss := snap.New(cfg.Logger, cfg.SnapDir())
 			backend, err := bootstrapBackend(cfg, haveWAL, st, ss)
+			defer t.Cleanup(func() {
+				backend.Close()
+			})
 
 			hasError := err != nil
 			expectedHasError := tt.expectedError != nil
diff --git a/server/etcdserver/corrupt_test.go b/server/etcdserver/corrupt_test.go
index 3ddf22c83..d5a579618 100644
--- a/server/etcdserver/corrupt_test.go
+++ b/server/etcdserver/corrupt_test.go
@@ -517,6 +517,9 @@ func TestHashKVHandler(t *testing.T) {
 	be, _ := betesting.NewDefaultTmpBackend(t)
 	defer betesting.Close(t, be)
 	etcdSrv.kv = mvcc.New(zap.NewNop(), be, &lease.FakeLessor{}, mvcc.StoreConfig{})
+	defer func() {
+		assert.NoError(t, etcdSrv.kv.Close())
+	}()
 	ph := &hashKVHandler{
 		lg:     zap.NewNop(),
 		server: etcdSrv,
diff --git a/server/etcdserver/raft_test.go b/server/etcdserver/raft_test.go
index 079aa13e2..7845d24ba 100644
--- a/server/etcdserver/raft_test.go
+++ b/server/etcdserver/raft_test.go
@@ -207,7 +207,7 @@ func TestConfigChangeBlocksApply(t *testing.T) {
 		updateLead:       func(uint64) {},
 		updateLeadership: func(bool) {},
 	})
-	defer srv.r.Stop()
+	defer srv.r.stop()
 
 	n.readyc <- raft.Ready{
 		SoftState:        &raft.SoftState{RaftState: raft.StateFollower},
diff --git a/server/etcdserver/server_test.go b/server/etcdserver/server_test.go
index 4b8a12f01..a7a7d9f3c 100644
--- a/server/etcdserver/server_test.go
+++ b/server/etcdserver/server_test.go
@@ -77,6 +77,7 @@ func TestApplyRepeat(t *testing.T) {
 	st := v2store.New()
 	cl.SetStore(v2store.New())
 	be, _ := betesting.NewDefaultTmpBackend(t)
+	defer betesting.Close(t, be)
 	cl.SetBackend(schema.NewMembershipBackend(lg, be))
 
 	cl.AddMember(&membership.Member{ID: 1234}, true)
@@ -201,6 +202,7 @@ func TestV2SetClusterVersion(t *testing.T) {
 func TestApplyConfStateWithRestart(t *testing.T) {
 	n := newNodeRecorder()
 	srv := newServer(t, n)
+	defer srv.Cleanup()
 
 	assert.Equal(t, srv.consistIndex.ConsistentIndex(), uint64(0))
 
@@ -476,6 +478,7 @@ func TestApplyConfigChangeUpdatesConsistIndex(t *testing.T) {
 		consistIndex: ci,
 		beHooks:      serverstorage.NewBackendHooks(lg, ci),
 	}
+	defer srv.r.raftNodeConfig.Stop()
 
 	// create EntryConfChange entry
 	now := time.Now()
@@ -547,6 +550,7 @@ func TestApplyMultiConfChangeShouldStop(t *testing.T) {
 	cl := membership.NewCluster(lg)
 	cl.SetStore(v2store.New())
 	be, _ := betesting.NewDefaultTmpBackend(t)
+	defer betesting.Close(t, be)
 	cl.SetBackend(schema.NewMembershipBackend(lg, be))
 
 	for i := 1; i <= 5; i++ {
@@ -596,6 +600,7 @@ func TestSnapshot(t *testing.T) {
 	defer revertFunc()
 
 	be, _ := betesting.NewDefaultTmpBackend(t)
+	defer betesting.Close(t, be)
 
 	s := raft.NewMemoryStorage()
 	s.Append([]raftpb.Entry{{Index: 1}})
@@ -615,6 +620,9 @@ func TestSnapshot(t *testing.T) {
 		consistIndex: cindex.NewConsistentIndex(be),
 	}
 	srv.kv = mvcc.New(zaptest.NewLogger(t), be, &lease.FakeLessor{}, mvcc.StoreConfig{})
+	defer func() {
+		assert.NoError(t, srv.kv.Close())
+	}()
 	srv.be = be
 
 	cl := membership.NewCluster(zaptest.NewLogger(t))
@@ -921,6 +929,7 @@ func TestProcessIgnoreMismatchMessage(t *testing.T) {
 			},
 		},
 	})
+	defer r.raftNodeConfig.Stop()
 	s := &EtcdServer{
 		lgMu:         new(sync.RWMutex),
 		lg:           lg,
@@ -961,6 +970,7 @@ func TestRemoveMember(t *testing.T) {
 	st := v2store.New()
 	cl.SetStore(v2store.New())
 	be, _ := betesting.NewDefaultTmpBackend(t)
+	defer betesting.Close(t, be)
 	cl.SetBackend(schema.NewMembershipBackend(lg, be))
 
 	cl.AddMember(&membership.Member{ID: 1234}, true)
@@ -1060,6 +1070,7 @@ func TestPublishV3(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	lg := zaptest.NewLogger(t)
 	be, _ := betesting.NewDefaultTmpBackend(t)
+	defer betesting.Close(t, be)
 	srv := &EtcdServer{
 		lgMu:       new(sync.RWMutex),
 		lg:         lg,
@@ -1130,6 +1141,7 @@ func TestPublishV3Retry(t *testing.T) {
 
 	lg := zaptest.NewLogger(t)
 	be, _ := betesting.NewDefaultTmpBackend(t)
+	defer betesting.Close(t, be)
 	srv := &EtcdServer{
 		lgMu:       new(sync.RWMutex),
 		lg:         lg,
@@ -1181,6 +1193,7 @@ func TestUpdateVersionV3(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.TODO())
 	lg := zaptest.NewLogger(t)
 	be, _ := betesting.NewDefaultTmpBackend(t)
+	defer betesting.Close(t, be)
 	srv := &EtcdServer{
 		lgMu:       new(sync.RWMutex),
 		lg:         zaptest.NewLogger(t),