diff --git a/store/store_test.go b/store/store_test.go
index 337e297c..9542a96d 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -1808,14 +1808,17 @@ func Test_MultiNodeStepdown(t *testing.T) {
 		t.Fatalf("leader failed to step down: %s", err.Error())
 	}
 
-	// Check for new leader.
-	nl, err := s2.WaitForLeader(10 * time.Second)
-	if err != nil {
-		t.Fatalf("Error waiting for leader: %s", err)
-	}
-	if nl == s0.Addr() {
-		t.Fatalf("leader address not changed, was %s, is %s", s0.Addr(), nl)
+	check := func() bool {
+		leader, err := s1.WaitForLeader(10 * time.Second)
+		if err != nil {
+			return false
+		}
+		if leader == s0.Addr() {
+			return false
+		}
+		return true
 	}
+	testPoll(t, check, 250*time.Millisecond, 10*time.Second)
 }
 
 func Test_MultiNodeStoreNotifyBootstrap(t *testing.T) {