diff --git a/testnet/stacks-node/src/tests/integrations.rs b/testnet/stacks-node/src/tests/integrations.rs
index b55909c6d..c33e0720d 100644
--- a/testnet/stacks-node/src/tests/integrations.rs
+++ b/testnet/stacks-node/src/tests/integrations.rs
@@ -225,7 +225,7 @@ fn integration_test_get_info() {
                         &header_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
                 let publish_tx =
@@ -238,7 +238,7 @@ fn integration_test_get_info() {
                         &header_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
                 let publish_tx =
@@ -251,7 +251,7 @@ fn integration_test_get_info() {
                         &header_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
 
@@ -285,7 +285,7 @@ fn integration_test_get_info() {
                         &header_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round >= 3 {
@@ -308,7 +308,7 @@ fn integration_test_get_info() {
                         &header_hash,
                         tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             }
@@ -329,7 +329,7 @@ fn integration_test_get_info() {
                         &header_hash,
                         tx_xfer,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             }
@@ -620,7 +620,7 @@ fn integration_test_get_info() {
                 eprintln!("Test: GET {}", path);
                 let res = client.get(&path).send().unwrap().json::<ContractInterface>().unwrap();
 
-                let contract_analysis = mem_type_check(GET_INFO_CONTRACT, ClarityVersion::Clarity1, StacksEpochId::Epoch20).unwrap().1;
+                let contract_analysis = mem_type_check(GET_INFO_CONTRACT, ClarityVersion::Clarity2, StacksEpochId::Epoch21).unwrap().1;
                 let expected_interface = build_contract_interface(&contract_analysis);
 
                 eprintln!("{}", serde_json::to_string(&expected_interface).unwrap());
@@ -1120,7 +1120,7 @@ fn contract_stx_transfer() {
                         &header_hash,
                         xfer_to_contract,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round == 2 {
@@ -1135,7 +1135,7 @@ fn contract_stx_transfer() {
                         &header_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round == 3 {
@@ -1155,7 +1155,7 @@ fn contract_stx_transfer() {
                         block_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
 
@@ -1176,7 +1176,7 @@ fn contract_stx_transfer() {
                         &header_hash,
                         tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round == 4 {
@@ -1201,7 +1201,7 @@ fn contract_stx_transfer() {
                             &xfer_to_contract,
                             None,
                             &ExecutionCost::max_value(),
-                            &StacksEpochId::Epoch20,
+                            &StacksEpochId::Epoch21,
                         )
                         .unwrap();
                 }
@@ -1219,7 +1219,7 @@ fn contract_stx_transfer() {
                         &xfer_to_contract,
                         None,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap_err()
                 {
@@ -1436,7 +1436,7 @@ fn mine_transactions_out_of_order() {
                         &header_hash,
                         xfer_to_contract,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round == 2 {
@@ -1450,7 +1450,7 @@ fn mine_transactions_out_of_order() {
                         &header_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round == 3 {
@@ -1464,7 +1464,7 @@ fn mine_transactions_out_of_order() {
                         &header_hash,
                         xfer_to_contract,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round == 4 {
@@ -1478,7 +1478,7 @@ fn mine_transactions_out_of_order() {
                         &header_hash,
                         xfer_to_contract,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             }
@@ -1581,7 +1581,7 @@ fn mine_contract_twice() {
                         block_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
 
@@ -1677,7 +1677,7 @@ fn bad_contract_tx_rollback() {
                         block_hash,
                         xfer_to_contract,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round == 2 {
@@ -1695,7 +1695,7 @@ fn bad_contract_tx_rollback() {
                         block_hash,
                         xfer_to_contract,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
 
@@ -1709,7 +1709,7 @@ fn bad_contract_tx_rollback() {
                         block_hash,
                         xfer_to_contract,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
 
@@ -1723,7 +1723,7 @@ fn bad_contract_tx_rollback() {
                         block_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
 
@@ -1737,7 +1737,7 @@ fn bad_contract_tx_rollback() {
                         block_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             }
@@ -1988,7 +1988,7 @@ fn block_limit_runtime_test() {
                         block_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             } else if round > 1 {
@@ -2017,7 +2017,7 @@ fn block_limit_runtime_test() {
                             block_hash,
                             tx,
                             &ExecutionCost::max_value(),
-                            &StacksEpochId::Epoch20,
+                            &StacksEpochId::Epoch21,
                         )
                         .unwrap();
                 }
@@ -2103,7 +2103,7 @@ fn mempool_errors() {
                         &header_hash,
                         publish_tx,
                         &ExecutionCost::max_value(),
-                        &StacksEpochId::Epoch20,
+                        &StacksEpochId::Epoch21,
                     )
                     .unwrap();
             }
diff --git a/testnet/stacks-node/src/tests/neon_integrations.rs b/testnet/stacks-node/src/tests/neon_integrations.rs
index 4b8d6402b..8145a77bd 100644
--- a/testnet/stacks-node/src/tests/neon_integrations.rs
+++ b/testnet/stacks-node/src/tests/neon_integrations.rs
@@ -102,8 +102,13 @@ use std::convert::TryFrom;
 
 use crate::stacks_common::types::PrivateKey;
 
+use crate::stacks::core::StacksEpochExtension;
+
 fn inner_neon_integration_test_conf(seed: Option<Vec<u8>>) -> (Config, StacksAddress) {
     let mut conf = super::new_test_conf();
+
+    // tests can override this, but these tests run with epoch 2.05 by default
+    conf.burnchain.epochs = Some(StacksEpoch::all(0, 1, 10_000));
     let seed = seed.unwrap_or(conf.node.seed.clone());
     conf.node.seed = seed;