diff --git a/tests/core/pyspec/eth2spec/test/phase0/genesis/test_initialization.py b/tests/core/pyspec/eth2spec/test/phase0/genesis/test_initialization.py
index 939152309..1ec40c56f 100644
--- a/tests/core/pyspec/eth2spec/test/phase0/genesis/test_initialization.py
+++ b/tests/core/pyspec/eth2spec/test/phase0/genesis/test_initialization.py
@@ -1,10 +1,10 @@
 from eth2spec.test.context import (
-    PHASE0, ALTAIR, MINIMAL,
+    MINIMAL,
     is_post_altair,
     single_phase,
     spec_test,
     with_configs,
-    with_phases,
+    with_all_phases,
 )
 from eth2spec.test.helpers.deposits import (
     prepare_full_genesis_deposits,
@@ -16,7 +16,7 @@ def get_post_altair_description(spec):
     return f"Although it's not phase 0, we may use {spec.fork} spec to start testnets."
 
 
-@with_phases(([PHASE0, ALTAIR]))
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -53,7 +53,7 @@ def test_initialize_beacon_state_from_eth1(spec):
     yield 'state', state
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -98,7 +98,7 @@ def test_initialize_beacon_state_some_small_balances(spec):
     yield 'state', state
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -148,7 +148,7 @@ def test_initialize_beacon_state_one_topup_activation(spec):
     yield 'state', state
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -176,7 +176,7 @@ def test_initialize_beacon_state_random_invalid_genesis(spec):
     yield 'state', state
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
diff --git a/tests/core/pyspec/eth2spec/test/phase0/genesis/test_validity.py b/tests/core/pyspec/eth2spec/test/phase0/genesis/test_validity.py
index dcddf2d54..a7bcaa6d0 100644
--- a/tests/core/pyspec/eth2spec/test/phase0/genesis/test_validity.py
+++ b/tests/core/pyspec/eth2spec/test/phase0/genesis/test_validity.py
@@ -1,10 +1,10 @@
 from eth2spec.test.context import (
-    PHASE0, ALTAIR, MINIMAL,
+    MINIMAL,
     is_post_altair,
     spec_test,
     single_phase,
     with_configs,
-    with_phases,
+    with_all_phases,
 )
 from eth2spec.test.helpers.deposits import (
     prepare_full_genesis_deposits,
@@ -41,7 +41,7 @@ def run_is_valid_genesis_state(spec, state, valid=True):
     assert is_valid == valid
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -54,7 +54,7 @@ def test_is_valid_genesis_state_true(spec):
     yield from run_is_valid_genesis_state(spec, state, valid=True)
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -68,7 +68,7 @@ def test_is_valid_genesis_state_false_invalid_timestamp(spec):
     yield from run_is_valid_genesis_state(spec, state, valid=False)
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -82,7 +82,7 @@ def test_is_valid_genesis_state_true_more_balance(spec):
     yield from run_is_valid_genesis_state(spec, state, valid=True)
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")
@@ -105,7 +105,7 @@ def test_is_valid_genesis_state_true_one_more_validator(spec):
     yield from run_is_valid_genesis_state(spec, state, valid=True)
 
 
-@with_phases([PHASE0, ALTAIR])
+@with_all_phases
 @spec_test
 @single_phase
 @with_configs([MINIMAL], reason="too slow")