diff --git a/src/blockstream.rs b/src/blockstream.rs
index de1131c712..197bda383a 100644
--- a/src/blockstream.rs
+++ b/src/blockstream.rs
@@ -181,7 +181,7 @@ mod test {
         genesis_block.slots_per_epoch = 2;
 
         let bank = Bank::new(&genesis_block);
-        let leader_scheduler = LeaderScheduler::new_with_window_len(10, &bank);
+        let leader_scheduler = LeaderScheduler::new_with_bank(&bank);
         let leader_scheduler = Arc::new(RwLock::new(leader_scheduler));
 
         // Set up blockstream
diff --git a/src/blockstream_service.rs b/src/blockstream_service.rs
index 938516da9d..582d6c4656 100644
--- a/src/blockstream_service.rs
+++ b/src/blockstream_service.rs
@@ -136,7 +136,7 @@ mod test {
         genesis_block.slots_per_epoch = 2;
 
         let bank = Bank::new(&genesis_block);
-        let leader_scheduler = LeaderScheduler::new_with_window_len(10, &bank);
+        let leader_scheduler = LeaderScheduler::new_with_bank(&bank);
         let leader_scheduler = Arc::new(RwLock::new(leader_scheduler));
 
         // Set up blockstream
diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs
index 9778353ff1..c54927c134 100644
--- a/src/leader_scheduler.rs
+++ b/src/leader_scheduler.rs
@@ -105,7 +105,9 @@ impl LeaderScheduler {
         }
     }
 
-    pub fn new_with_window_len(active_window_slot_len: u64, bank: &Bank) -> Self {
+    // Same as new_with_bank() but allows caller to override `active_window_slot_len`.
+    // Used by unit-tests.
+    fn new_with_window_len(active_window_slot_len: u64, bank: &Bank) -> Self {
         let config = LeaderSchedulerConfig::new(
             bank.ticks_per_slot(),
             bank.slots_per_epoch(),