diff --git a/cluster.go b/cluster.go
index 20ecbe9..d09298e 100644
--- a/cluster.go
+++ b/cluster.go
@@ -97,7 +97,7 @@ func (c *ClusterClient) slotAddrs(slot int) []string {
 	return addrs
 }
 
-// randomClient returns a Client for the first pingable node.
+// randomClient returns a Client for the first live node.
 func (c *ClusterClient) randomClient() (client *Client, err error) {
 	for i := 0; i < 10; i++ {
 		n := rand.Intn(len(c.addrs))
@@ -105,7 +105,7 @@ func (c *ClusterClient) randomClient() (client *Client, err error) {
 		if err != nil {
 			continue
 		}
-		err = client.Ping().Err()
+		err = client.ClusterInfo().Err()
 		if err == nil {
 			return client, nil
 		}
diff --git a/cluster_test.go b/cluster_test.go
index 2ba8812..6ec8552 100644
--- a/cluster_test.go
+++ b/cluster_test.go
@@ -271,7 +271,7 @@ var _ = Describe("Cluster", func() {
 
 			Eventually(func() []string {
 				return client.SlotAddrs(slot)
-			}).Should(Equal([]string{"127.0.0.1:8221", "127.0.0.1:8224"}))
+			}, "5s").Should(Equal([]string{"127.0.0.1:8221", "127.0.0.1:8224"}))
 		})
 
 		It("should perform multi-pipelines", func() {