diff --git a/etcd/embed.go b/etcd/embed.go
index e574062e1..3f7d53d88 100644
--- a/etcd/embed.go
+++ b/etcd/embed.go
@@ -103,9 +103,9 @@ func (e *Etcd) Close() error {
 		if e.heartbeatCancel != nil {
 			e.heartbeatCancel()
 		}
-		// e.e.Server.Stop()
-		// e.e.Close()
-		// <-e.e.Server.StopNotify()
+		e.e.Server.Stop()
+		e.e.Close()
+		<-e.e.Server.StopNotify()
 	}
 
 	return nil
@@ -122,10 +122,6 @@ func parseOptions(opt Options) *embed.Config {
 	cfg.LPUrls = types.MustNewURLs([]string{opt.LPeerURL})
 	cfg.APUrls = types.MustNewURLs([]string{opt.APeerURL})
 
-	cfg.Logger = "zap"
-	cfg.ZapLoggerBuilder = func(*embed.Config) error {
-		return nil
-	}
 	if opt.InitCluster != "" {
 		cfg.InitialCluster = opt.InitCluster
 		cfg.ClusterState = embed.ClusterStateFlagNew