diff --git a/etcd/embed.go b/etcd/embed.go
index 0834eeaa0..40e73ef17 100644
--- a/etcd/embed.go
+++ b/etcd/embed.go
@@ -279,6 +279,9 @@ func (e *Etcd) Started(ctx context.Context) error {
 }
 
 func (e *Etcd) ID() string {
+	if e.e == nil || e.e.Server == nil {
+		return ""
+	}
 	return e.e.Server.ID().String()
 }
 
@@ -291,6 +294,9 @@ func (e *Etcd) Peers() []*disco.Peer {
 }
 
 func (e *Etcd) IsLeader() bool {
+	if e.e == nil || e.e.Server == nil {
+		return false
+	}
 	return e.e.Server.Leader() == e.e.Server.ID()
 }
 
diff --git a/server/server_test.go b/server/server_test.go
index 23f429dfe..f21059e9c 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -54,8 +54,7 @@ func TestMain_Set_Quick(t *testing.T) {
 		t.Skip("short")
 	}
 
-	for i := 0; i < 100; i++ {
-		//for i := 0; i < 10; i++ {
+	for i := 0; i < 10; i++ {
 		t.Run(fmt.Sprint(i), func(t *testing.T) {
 			t.Parallel()