diff --git a/runtime/src/system_instruction_processor.rs b/runtime/src/system_instruction_processor.rs
index 4ae4d75879..ce45779c29 100644
--- a/runtime/src/system_instruction_processor.rs
+++ b/runtime/src/system_instruction_processor.rs
@@ -358,7 +358,11 @@ mod tests {
     fn create_default_recent_blockhashes_account() -> RefCell<Account> {
         RefCell::new(sysvar::recent_blockhashes::create_account_with_data(
             1,
-            vec![IterItem(0u64, &Hash::default(), &FeeCalculator::default()); 32].into_iter(),
+            vec![
+                IterItem(0u64, &Hash::default(), &FeeCalculator::default());
+                sysvar::recent_blockhashes::MAX_ENTRIES
+            ]
+            .into_iter(),
         ))
     }
     fn create_default_rent_account() -> RefCell<Account> {
@@ -1088,11 +1092,7 @@ mod tests {
             .iter()
             .map(|meta| {
                 RefCell::new(if sysvar::recent_blockhashes::check_id(&meta.pubkey) {
-                    sysvar::recent_blockhashes::create_account_with_data(
-                        1,
-                        vec![IterItem(0u64, &Hash::default(), &FeeCalculator::default()); 32]
-                            .into_iter(),
-                    )
+                    create_default_recent_blockhashes_account().into_inner()
                 } else if sysvar::rent::check_id(&meta.pubkey) {
                     sysvar::rent::create_account(1, &Rent::free())
                 } else {
@@ -1196,7 +1196,7 @@ mod tests {
                         &hash(&serialize(&0).unwrap()),
                         &FeeCalculator::default()
                     );
-                    32
+                    sysvar::recent_blockhashes::MAX_ENTRIES
                 ]
                 .into_iter(),
             ));
diff --git a/sdk/src/sysvar/recent_blockhashes.rs b/sdk/src/sysvar/recent_blockhashes.rs
index c2a8b26d04..3d44c577da 100644
--- a/sdk/src/sysvar/recent_blockhashes.rs
+++ b/sdk/src/sysvar/recent_blockhashes.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 use std::{cmp::Ordering, collections::BinaryHeap, iter::FromIterator, ops::Deref};
 
-const MAX_ENTRIES: usize = 32;
+pub const MAX_ENTRIES: usize = 150;
 
 declare_sysvar_id!(
     "SysvarRecentB1ockHashes11111111111111111111",
@@ -107,7 +107,7 @@ impl<T: Ord> Iterator for IntoIterSorted<T> {
 impl Sysvar for RecentBlockhashes {
     fn size_of() -> usize {
         // hard-coded so that we don't have to construct an empty
-        1288 // golden, update if MAX_ENTRIES changes
+        6008 // golden, update if MAX_ENTRIES changes
     }
 }
 
@@ -162,10 +162,16 @@ pub fn create_test_recent_blockhashes(start: usize) -> RecentBlockhashes {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::hash::HASH_BYTES;
+    use crate::{clock::MAX_PROCESSING_AGE, hash::HASH_BYTES};
     use rand::seq::SliceRandom;
     use rand::thread_rng;
 
+    #[test]
+    fn test_sysvar_can_hold_all_active_blockhashes() {
+        // Ensure we can still hold all of the active entries in `BlockhashQueue`
+        assert!(MAX_PROCESSING_AGE <= MAX_ENTRIES);
+    }
+
     #[test]
     fn test_size_of() {
         let entry = Entry::new(&Hash::default(), &FeeCalculator::default());