diff --git a/etcd/embed.go b/etcd/embed.go
index 40e73ef17..23b6cc8cb 100644
--- a/etcd/embed.go
+++ b/etcd/embed.go
@@ -115,6 +115,8 @@ func (e *Etcd) Close() error {
 func parseOptions(opt Options) *embed.Config {
 	cfg := embed.NewConfig()
 	cfg.Debug = false // true gives data races on grpc.EnableTracing in etcd
+	cfg.LogLevel = "error"
+	cfg.Logger = "zap"
 	cfg.Name = opt.Name
 	cfg.Dir = opt.Dir
 	cfg.InitialClusterToken = opt.ClusterName
diff --git a/test/cluster.go b/test/cluster.go
index d8eb55071..2875cad44 100644
--- a/test/cluster.go
+++ b/test/cluster.go
@@ -275,7 +275,6 @@ func (c *Cluster) Start() error {
 
 				return cc.Start()
 			})
-			// fixes race on gossip: time.Sleep(time.Second)
 		}
 
 		return eg.Wait()