diff --git a/tests/core/pyspec/eth2spec/test/test_finality.py b/tests/core/pyspec/eth2spec/test/phase0/finality/test_finality.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/test_finality.py
rename to tests/core/pyspec/eth2spec/test/phase0/finality/test_finality.py
diff --git a/tests/core/pyspec/eth2spec/test/genesis/__init__.py b/tests/core/pyspec/eth2spec/test/phase0/genesis/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/genesis/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase0/genesis/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/genesis/test_initialization.py b/tests/core/pyspec/eth2spec/test/phase0/genesis/test_initialization.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/genesis/test_initialization.py
rename to tests/core/pyspec/eth2spec/test/phase0/genesis/test_initialization.py
diff --git a/tests/core/pyspec/eth2spec/test/genesis/test_validity.py b/tests/core/pyspec/eth2spec/test/phase0/genesis/test_validity.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/genesis/test_validity.py
rename to tests/core/pyspec/eth2spec/test/phase0/genesis/test_validity.py
diff --git a/tests/core/pyspec/eth2spec/test/fork_choice/test_get_head.py b/tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_get_head.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/fork_choice/test_get_head.py
rename to tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_get_head.py
diff --git a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_attestation.py b/tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_on_attestation.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/fork_choice/test_on_attestation.py
rename to tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_on_attestation.py
diff --git a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_block.py b/tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_on_block.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/fork_choice/test_on_block.py
rename to tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_on_block.py
diff --git a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_tick.py b/tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_on_tick.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/fork_choice/test_on_tick.py
rename to tests/core/pyspec/eth2spec/test/phase0/unittests/fork_choice/test_on_tick.py
diff --git a/tests/core/pyspec/eth2spec/test/validator/test_validator_unittest.py b/tests/core/pyspec/eth2spec/test/phase0/unittests/validator/test_validator_unittest.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/validator/test_validator_unittest.py
rename to tests/core/pyspec/eth2spec/test/phase0/unittests/validator/test_validator_unittest.py
diff --git a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_shard_head.py b/tests/core/pyspec/eth2spec/test/phase1/unittests/fork_choice/test_on_shard_head.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/fork_choice/test_on_shard_head.py
rename to tests/core/pyspec/eth2spec/test/phase1/unittests/fork_choice/test_on_shard_head.py
diff --git a/tests/generators/genesis/main.py b/tests/generators/genesis/main.py
index 8548b12c1..a978ab684 100644
--- a/tests/generators/genesis/main.py
+++ b/tests/generators/genesis/main.py
@@ -1,7 +1,7 @@
 from typing import Iterable
 
 from eth2spec.test.context import PHASE0
-from eth2spec.test.genesis import test_initialization, test_validity
+from eth2spec.test.phase0.genesis import test_initialization, test_validity
 
 from gen_base import gen_runner, gen_typing
 from gen_from_tests.gen import generate_from_tests