diff --git a/tests/core/pyspec/eth2spec/test/phase_0/__init__.py b/tests/core/pyspec/eth2spec/test/phase0/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase0/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/__init__.py b/tests/core/pyspec/eth2spec/test/phase0/block_processing/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/block_processing/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase0/block_processing/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py b/tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_attestation.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py
rename to tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_attestation.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attester_slashing.py b/tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_attester_slashing.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attester_slashing.py
rename to tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_attester_slashing.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_block_header.py b/tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_block_header.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_block_header.py
rename to tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_block_header.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_deposit.py b/tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_deposit.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_deposit.py
rename to tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_deposit.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_proposer_slashing.py b/tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_proposer_slashing.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_proposer_slashing.py
rename to tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_proposer_slashing.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py b/tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_voluntary_exit.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py
rename to tests/core/pyspec/eth2spec/test/phase0/block_processing/test_process_voluntary_exit.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/__init__.py b/tests/core/pyspec/eth2spec/test/phase0/epoch_processing/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase0/epoch_processing/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/run_epoch_process_base.py b/tests/core/pyspec/eth2spec/test/phase0/epoch_processing/run_epoch_process_base.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/run_epoch_process_base.py
rename to tests/core/pyspec/eth2spec/test/phase0/epoch_processing/run_epoch_process_base.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_final_updates.py b/tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_final_updates.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_final_updates.py
rename to tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_final_updates.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_justification_and_finalization.py b/tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_justification_and_finalization.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_justification_and_finalization.py
rename to tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_justification_and_finalization.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py b/tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_registry_updates.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py
rename to tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_registry_updates.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py b/tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_rewards_and_penalties.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py
rename to tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_rewards_and_penalties.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_slashings.py b/tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_slashings.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_slashings.py
rename to tests/core/pyspec/eth2spec/test/phase0/epoch_processing/test_process_slashings.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/__init__.py b/tests/core/pyspec/eth2spec/test/phase0/rewards/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/rewards/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase0/rewards/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_basic.py b/tests/core/pyspec/eth2spec/test/phase0/rewards/test_basic.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/rewards/test_basic.py
rename to tests/core/pyspec/eth2spec/test/phase0/rewards/test_basic.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_leak.py b/tests/core/pyspec/eth2spec/test/phase0/rewards/test_leak.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/rewards/test_leak.py
rename to tests/core/pyspec/eth2spec/test/phase0/rewards/test_leak.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_random.py b/tests/core/pyspec/eth2spec/test/phase0/rewards/test_random.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/rewards/test_random.py
rename to tests/core/pyspec/eth2spec/test/phase0/rewards/test_random.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/sanity/__init__.py b/tests/core/pyspec/eth2spec/test/phase0/sanity/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/sanity/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase0/sanity/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/sanity/test_blocks.py b/tests/core/pyspec/eth2spec/test/phase0/sanity/test_blocks.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/sanity/test_blocks.py
rename to tests/core/pyspec/eth2spec/test/phase0/sanity/test_blocks.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/sanity/test_slots.py b/tests/core/pyspec/eth2spec/test/phase0/sanity/test_slots.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_0/sanity/test_slots.py
rename to tests/core/pyspec/eth2spec/test/phase0/sanity/test_slots.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/__init__.py b/tests/core/pyspec/eth2spec/test/phase1/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase1/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/block_processing/__init__.py b/tests/core/pyspec/eth2spec/test/phase1/block_processing/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/block_processing/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase1/block_processing/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_attestation.py b/tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_attestation.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_attestation.py
rename to tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_attestation.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_chunk_challenge.py b/tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_chunk_challenge.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_chunk_challenge.py
rename to tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_chunk_challenge.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_custody_key_reveal.py b/tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_custody_key_reveal.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_custody_key_reveal.py
rename to tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_custody_key_reveal.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_custody_slashing.py b/tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_custody_slashing.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_custody_slashing.py
rename to tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_custody_slashing.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_early_derived_secret_reveal.py b/tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_early_derived_secret_reveal.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_early_derived_secret_reveal.py
rename to tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_early_derived_secret_reveal.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_shard_transition.py b/tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_shard_transition.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/block_processing/test_process_shard_transition.py
rename to tests/core/pyspec/eth2spec/test/phase1/block_processing/test_process_shard_transition.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_challenge_deadlines.py b/tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_challenge_deadlines.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_challenge_deadlines.py
rename to tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_challenge_deadlines.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_custody_final_updates.py b/tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_custody_final_updates.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_custody_final_updates.py
rename to tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_custody_final_updates.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_reveal_deadlines.py b/tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_reveal_deadlines.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/epoch_processing/test_process_reveal_deadlines.py
rename to tests/core/pyspec/eth2spec/test/phase1/epoch_processing/test_process_reveal_deadlines.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/sanity/__init__.py b/tests/core/pyspec/eth2spec/test/phase1/sanity/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/sanity/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase1/sanity/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/sanity/test_blocks.py b/tests/core/pyspec/eth2spec/test/phase1/sanity/test_blocks.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/sanity/test_blocks.py
rename to tests/core/pyspec/eth2spec/test/phase1/sanity/test_blocks.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/unittests/__init__.py b/tests/core/pyspec/eth2spec/test/phase1/unittests/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/unittests/__init__.py
rename to tests/core/pyspec/eth2spec/test/phase1/unittests/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/phase_1/unittests/test_get_start_shard.py b/tests/core/pyspec/eth2spec/test/phase1/unittests/test_get_start_shard.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/phase_1/unittests/test_get_start_shard.py
rename to tests/core/pyspec/eth2spec/test/phase1/unittests/test_get_start_shard.py