diff --git a/etcd/embed.go b/etcd/embed.go
index a0ddb8029..dbfd88024 100644
--- a/etcd/embed.go
+++ b/etcd/embed.go
@@ -743,9 +743,10 @@ func (e *Etcd) leaseKeepAlive(ttl int64) (clientv3.LeaseID, func(context.Context
 				if cli, err := e.client(); err != nil {
 					log.Printf("leaseKeepAlive: creates a new client: %v\n", err)
 				} else {
-					if _, err := cli.Revoke(context.Background(), leaseResp.ID); err != nil {
+					if _, err := cli.Revoke(context.TODO(), leaseResp.ID); err != nil {
 						log.Printf("leaseKeepAlive: revokes the lease (ID: %v): %v\n", leaseResp.ID, err)
 					}
+					cli.Close()
 				}
 				return