diff --git a/core/src/test_validator.rs b/core/src/test_validator.rs
index 2562acbf94..89a1221141 100644
--- a/core/src/test_validator.rs
+++ b/core/src/test_validator.rs
@@ -83,6 +83,7 @@ pub struct TestValidatorGenesis {
     pub start_progress: Arc<RwLock<ValidatorStartProgress>>,
     pub authorized_voter_keypairs: Arc<RwLock<Vec<Arc<Keypair>>>>,
     pub max_ledger_shreds: Option<u64>,
+    pub max_genesis_archive_unpacked_size: Option<u64>,
 }
 
 impl TestValidatorGenesis {
@@ -413,7 +414,9 @@ impl TestValidator {
                 let _ = create_new_ledger(
                     ledger_path,
                     &genesis_config,
-                    MAX_GENESIS_ARCHIVE_UNPACKED_SIZE,
+                    config
+                        .max_genesis_archive_unpacked_size
+                        .unwrap_or(MAX_GENESIS_ARCHIVE_UNPACKED_SIZE),
                     solana_ledger::blockstore_db::AccessType::PrimaryOnly,
                 )
                 .map_err(|err| {
diff --git a/validator/src/bin/solana-test-validator.rs b/validator/src/bin/solana-test-validator.rs
index 4b00c0102a..9ee305dea5 100644
--- a/validator/src/bin/solana-test-validator.rs
+++ b/validator/src/bin/solana-test-validator.rs
@@ -506,6 +506,7 @@ fn main() {
 
     let mut genesis = TestValidatorGenesis::default();
     genesis.max_ledger_shreds = value_of(&matches, "limit_ledger_size");
+    genesis.max_genesis_archive_unpacked_size = Some(u64::MAX);
 
     admin_rpc_service::run(
         &ledger_path,