diff --git a/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py b/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
index 20c20b938..68444c472 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
@@ -159,6 +159,8 @@ def do_fork(state, spec, post_spec, fork_epoch, with_block=True, sync_aggregate=
         state = post_spec.upgrade_to_capella(state)
     elif post_spec.fork == DENEB:
         state = post_spec.upgrade_to_deneb(state)
+    elif post_spec.fork == EIP6110:
+        state = post_spec.upgrade_to_eip6110(state)
 
     assert state.fork.epoch == fork_epoch
 
@@ -175,7 +177,7 @@ def do_fork(state, spec, post_spec, fork_epoch, with_block=True, sync_aggregate=
         assert state.fork.previous_version == post_spec.config.CAPELLA_FORK_VERSION
         assert state.fork.current_version == post_spec.config.DENEB_FORK_VERSION
     elif post_spec.fork == EIP6110:
-        assert state.fork.previous_version == post_spec.config.CAPELLA_FORK_VERSION
+        assert state.fork.previous_version == post_spec.config.DENEB_FORK_VERSION
         assert state.fork.current_version == post_spec.config.EIP6110_FORK_VERSION
 
     if with_block:
diff --git a/tests/core/pyspec/eth2spec/test/helpers/genesis.py b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
index 32ce8974d..fea259013 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/genesis.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
@@ -84,7 +84,7 @@ def create_genesis_state(spec, validator_balances, activation_threshold):
         previous_version = spec.config.CAPELLA_FORK_VERSION
         current_version = spec.config.DENEB_FORK_VERSION
     elif spec.fork == EIP6110:
-        previous_version = spec.config.CAPELLA_FORK_VERSION
+        previous_version = spec.config.DENEB_FORK_VERSION
         current_version = spec.config.EIP6110_FORK_VERSION
 
     state = spec.BeaconState(