diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs
index 1894117dcb..8e3986c542 100644
--- a/program-test/src/lib.rs
+++ b/program-test/src/lib.rs
@@ -818,6 +818,7 @@ impl ProgramTest {
             rent.clone(),
             ClusterType::Development,
             std::mem::take(&mut self.genesis_accounts),
+            false,
         );
 
         // Remove features tagged to deactivate
diff --git a/programs/sbf/tests/programs.rs b/programs/sbf/tests/programs.rs
index 98716da50c..29d9993c31 100644
--- a/programs/sbf/tests/programs.rs
+++ b/programs/sbf/tests/programs.rs
@@ -1437,6 +1437,7 @@ fn get_stable_genesis_config() -> GenesisConfigInfo {
         Rent::free(),               // most tests don't expect rent
         ClusterType::Development,
         vec![],
+        false,
     );
     genesis_config.creation_time = Duration::ZERO.as_secs() as UnixTimestamp;
 
diff --git a/runtime/src/genesis_utils.rs b/runtime/src/genesis_utils.rs
index 8e76291d2c..769b312f31 100644
--- a/runtime/src/genesis_utils.rs
+++ b/runtime/src/genesis_utils.rs
@@ -144,6 +144,7 @@ pub fn create_genesis_config_with_vote_accounts_and_cluster_type(
         Rent::free(),               // most tests don't expect rent
         cluster_type,
         vec![],
+        is_alpenglow,
     );
 
     let mut genesis_config_info = GenesisConfigInfo {
@@ -237,6 +238,7 @@ pub fn create_genesis_config_with_leader_with_mint_keypair(
         Rent::free(),               // most tests don't expect rent
         ClusterType::Development,
         vec![],
+        false,
     );
 
     GenesisConfigInfo {
@@ -299,13 +301,24 @@ pub fn create_genesis_config_with_leader_ex_no_features(
     rent: Rent,
     cluster_type: ClusterType,
     mut initial_accounts: Vec<(Pubkey, AccountSharedData)>,
+    is_alpenglow: bool,
 ) -> GenesisConfig {
-    let validator_vote_account = vote_state::create_account(
-        validator_vote_account_pubkey,
-        validator_pubkey,
-        0,
-        validator_stake_lamports,
-    );
+    let validator_vote_account = if is_alpenglow {
+        AlpenglowVoteState::create_account_with_authorized(
+            validator_pubkey,
+            validator_vote_account_pubkey,
+            validator_vote_account_pubkey,
+            0,
+            validator_stake_lamports,
+        )
+    } else {
+        vote_state::create_account(
+            validator_vote_account_pubkey,
+            validator_pubkey,
+            0,
+            validator_stake_lamports,
+        )
+    };
 
     let validator_stake_account = stake_state::create_account(
         validator_stake_account_pubkey,
@@ -368,6 +381,7 @@ pub fn create_genesis_config_with_leader_ex(
     rent: Rent,
     cluster_type: ClusterType,
     initial_accounts: Vec<(Pubkey, AccountSharedData)>,
+    is_alpenglow: bool,
 ) -> GenesisConfig {
     let mut genesis_config = create_genesis_config_with_leader_ex_no_features(
         mint_lamports,
@@ -381,6 +395,7 @@ pub fn create_genesis_config_with_leader_ex(
         rent,
         cluster_type,
         initial_accounts,
+        is_alpenglow,
     );
 
     if genesis_config.cluster_type == ClusterType::Development {
diff --git a/test-validator/src/lib.rs b/test-validator/src/lib.rs
index dfb21cef19..11d55f4f31 100644
--- a/test-validator/src/lib.rs
+++ b/test-validator/src/lib.rs
@@ -862,6 +862,7 @@ impl TestValidator {
             config.rent.clone(),
             solana_sdk::genesis_config::ClusterType::Development,
             accounts.into_iter().collect(),
+            false,
         );
         genesis_config.epoch_schedule = config
             .epoch_schedule