diff --git a/nomad/leader_test.go b/nomad/leader_test.go
index eb1b6a0c4..ea6c4670e 100644
--- a/nomad/leader_test.go
+++ b/nomad/leader_test.go
@@ -113,16 +113,8 @@ func TestLeader_LeftLeader(t *testing.T) {
 	}
 
 	// Kill the leader!
-	var leader *Server
-	for _, s := range servers {
-		if s.IsLeader() {
-			leader = s
-			break
-		}
-	}
-	if leader == nil {
-		t.Fatalf("Should have a leader")
-	}
+	leader := waitForStableLeadership(t, servers)
+
 	leader.Leave()
 	leader.Shutdown()