diff --git a/etcd/leasedkv_test.go b/etcd/leasedkv_test.go
index 826d05c70..9c7965c2d 100644
--- a/etcd/leasedkv_test.go
+++ b/etcd/leasedkv_test.go
@@ -44,8 +44,12 @@ func TestLeasedKv(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
 	cli := v3client.New(etcd.Server)
+	defer func() {
+		etcd.Close()
+		<-etcd.Server.StopNotify()
+		cli.Close()
+	}()
 
 	lkv := newLeasedKV(cli, "/test", 1)