diff --git a/tests/core/pyspec/eth2spec/test/altair/transition/test_activations_and_exits.py b/tests/core/pyspec/eth2spec/test/altair/transition/test_activations_and_exits.py
index 25a76a686..12aa815ad 100644
--- a/tests/core/pyspec/eth2spec/test/altair/transition/test_activations_and_exits.py
+++ b/tests/core/pyspec/eth2spec/test/altair/transition/test_activations_and_exits.py
@@ -12,6 +12,7 @@ from eth2spec.test.helpers.fork_transition import (
 )
 from eth2spec.test.helpers.random import (
     exit_random_validators,
+    set_some_activations,
     set_some_new_deposits,
 )
 
@@ -168,3 +169,38 @@ def test_transition_with_non_empty_activation_queue(state, fork_epoch, spec, pos
 
     yield "blocks", blocks
     yield "post", state
+
+
+@fork_transition_test(PHASE0, ALTAIR, fork_epoch=2)
+def test_transition_with_activation_at_fork_epoch(state, fork_epoch, spec, post_spec, pre_tag, post_tag):
+    """
+    Create some deposits before the transition
+    """
+    transition_until_fork(spec, state, fork_epoch)
+
+    selected_indices = set_some_activations(spec, state, rng=random.Random(5566), activation_epoch=fork_epoch)
+
+    assert spec.get_current_epoch(state) < fork_epoch
+    assert len(selected_indices) > 0
+    for validator_index in selected_indices:
+        validator = state.validators[validator_index]
+        assert not spec.is_active_validator(validator, spec.get_current_epoch(state))
+        assert validator.activation_epoch == fork_epoch
+
+    yield "pre", state
+
+    # irregular state transition to handle fork:
+    blocks = []
+    state, block = do_altair_fork(state, spec, post_spec, fork_epoch)
+    blocks.append(post_tag(block))
+
+    # continue regular state transition with new spec into next epoch
+    transition_to_next_epoch_and_append_blocks(post_spec, state, post_tag, blocks, only_last_block=True)
+
+    # now they are active
+    for validator_index in selected_indices:
+        validator = state.validators[validator_index]
+        assert post_spec.is_active_validator(validator, post_spec.get_current_epoch(state))
+
+    yield "blocks", blocks
+    yield "post", state
diff --git a/tests/core/pyspec/eth2spec/test/helpers/random.py b/tests/core/pyspec/eth2spec/test/helpers/random.py
index 049bb1a0d..bf603b2c8 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/random.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/random.py
@@ -6,6 +6,26 @@ from eth2spec.test.helpers.deposits import mock_deposit
 from eth2spec.test.helpers.state import next_epoch
 
 
+def set_some_activations(spec, state, rng, activation_epoch=None):
+    if activation_epoch is None:
+        activation_epoch = spec.get_current_epoch(state)
+    num_validators = len(state.validators)
+    selected_indices = []
+    for index in range(num_validators):
+        # If is slashed or exiting, skip
+        if state.validators[index].slashed or state.validators[index].exit_epoch != spec.FAR_FUTURE_EPOCH:
+            continue
+        # Set ~1/10 validators' activation_eligibility_epoch and activation_epoch
+        if rng.randrange(num_validators) < num_validators // 10:
+            state.validators[index].activation_eligibility_epoch = max(
+                int(activation_epoch) - int(spec.MAX_SEED_LOOKAHEAD) - 1,
+                spec.GENESIS_EPOCH,
+            )
+            state.validators[index].activation_epoch = activation_epoch
+            selected_indices.append(index)
+    return selected_indices
+
+
 def set_some_new_deposits(spec, state, rng):
     deposited_indices = []
     num_validators = len(state.validators)