diff --git a/specs/eip4844/fork.md b/specs/eip4844/fork.md
index 6473f3c85..eaabba916 100644
--- a/specs/eip4844/fork.md
+++ b/specs/eip4844/fork.md
@@ -9,6 +9,9 @@
 
 - [Introduction](#introduction)
 - [Configuration](#configuration)
+- [Helper functions](#helper-functions)
+  - [Misc](#misc)
+    - [Modified `compute_fork_version`](#modified-compute_fork_version)
 - [Fork to EIP-4844](#fork-to-eip-4844)
   - [Fork trigger](#fork-trigger)
   - [Upgrading the state](#upgrading-the-state)
@@ -25,9 +28,29 @@ Warning: this configuration is not definitive.
 
 | Name | Value |
 | - | - |
-| `EIP4844_FORK_VERSION` | `Version('0x03000000')` |
+| `EIP4844_FORK_VERSION` | `Version('0x04000000')` |
 | `EIP4844_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** |
 
+## Helper functions
+
+### Misc
+
+#### Modified `compute_fork_version`
+
+```python
+def compute_fork_version(epoch: Epoch) -> Version:
+    """
+    Return the fork version at the given ``epoch``.
+    """
+    if epoch >= EIP4844_FORK_EPOCH:
+        return EIP4844_FORK_VERSION
+    if epoch >= BELLATRIX_FORK_EPOCH:
+        return BELLATRIX_FORK_VERSION
+    if epoch >= ALTAIR_FORK_EPOCH:
+        return ALTAIR_FORK_VERSION
+    return GENESIS_FORK_VERSION
+```
+
 ## Fork to EIP-4844
 
 ### Fork trigger
diff --git a/tests/core/pyspec/eth2spec/test/context.py b/tests/core/pyspec/eth2spec/test/context.py
index ec3032b28..0f62612e7 100644
--- a/tests/core/pyspec/eth2spec/test/context.py
+++ b/tests/core/pyspec/eth2spec/test/context.py
@@ -12,7 +12,7 @@ from eth2spec.utils import bls
 
 from .exceptions import SkippedTest
 from .helpers.constants import (
-    PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844,
+    PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844, SHARDING,
     MINIMAL, MAINNET,
     ALL_PHASES, FORKS_BEFORE_ALTAIR, FORKS_BEFORE_BELLATRIX,
     ALL_FORK_UPGRADES,
@@ -280,20 +280,34 @@ def spec_configured_state_test(conf):
     return decorator
 
 
+def _check_current_version(spec, state, version_name):
+    fork_version_field = version_name.upper() + '_FORK_VERSION'
+    try:
+        fork_version = getattr(spec.config, fork_version_field)
+    except Exception:
+        return False
+    else:
+        return state.fork.current_version == fork_version
+
+
 def config_fork_epoch_overrides(spec, state):
     overrides = {}
     if state.fork.current_version == spec.config.GENESIS_FORK_VERSION:
         pass
-    elif state.fork.current_version == spec.config.ALTAIR_FORK_VERSION:
+    elif _check_current_version(spec, state, ALTAIR):
         overrides['ALTAIR_FORK_EPOCH'] = spec.GENESIS_EPOCH
-    elif state.fork.current_version == spec.config.BELLATRIX_FORK_VERSION:
+    elif _check_current_version(spec, state, BELLATRIX):
         overrides['ALTAIR_FORK_EPOCH'] = spec.GENESIS_EPOCH
         overrides['BELLATRIX_FORK_EPOCH'] = spec.GENESIS_EPOCH
-    elif state.fork.current_version == spec.config.CAPELLA_FORK_VERSION:
+    elif _check_current_version(spec, state, CAPELLA):
         overrides['ALTAIR_FORK_EPOCH'] = spec.GENESIS_EPOCH
         overrides['BELLATRIX_FORK_EPOCH'] = spec.GENESIS_EPOCH
         overrides['CAPELLA_FORK_EPOCH'] = spec.GENESIS_EPOCH
-    elif state.fork.current_version == spec.config.SHARDING_FORK_VERSION:
+    elif _check_current_version(spec, state, EIP4844):
+        overrides['ALTAIR_FORK_EPOCH'] = spec.GENESIS_EPOCH
+        overrides['BELLATRIX_FORK_EPOCH'] = spec.GENESIS_EPOCH
+        overrides['EIP4844_FORK_EPOCH'] = spec.GENESIS_EPOCH
+    elif _check_current_version(spec, state, SHARDING):
         overrides['ALTAIR_FORK_EPOCH'] = spec.GENESIS_EPOCH
         overrides['BELLATRIX_FORK_EPOCH'] = spec.GENESIS_EPOCH
         overrides['CAPELLA_FORK_EPOCH'] = spec.GENESIS_EPOCH
diff --git a/tests/core/pyspec/eth2spec/test/helpers/genesis.py b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
index 67ff2d4a8..4d81de537 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/genesis.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
@@ -1,5 +1,5 @@
 from eth2spec.test.helpers.constants import (
-    ALTAIR, BELLATRIX, CAPELLA,
+    ALTAIR, BELLATRIX, CAPELLA, EIP4844,
     FORKS_BEFORE_ALTAIR, FORKS_BEFORE_BELLATRIX,
 )
 from eth2spec.test.helpers.keys import pubkeys
@@ -57,6 +57,9 @@ def create_genesis_state(spec, validator_balances, activation_threshold):
     elif spec.fork == BELLATRIX:
         previous_version = spec.config.ALTAIR_FORK_VERSION
         current_version = spec.config.BELLATRIX_FORK_VERSION
+    elif spec.fork == EIP4844:
+        previous_version = spec.config.BELLATRIX_FORK_VERSION
+        current_version = spec.config.EIP4844_FORK_VERSION
 
     state = spec.BeaconState(
         genesis_time=0,