diff --git a/test_libs/pyspec/eth2spec/test/block_processing/__init__.py b/test_libs/pyspec/eth2spec/test/phase_0/__init__.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/__init__.py
rename to test_libs/pyspec/eth2spec/test/phase_0/__init__.py
diff --git a/test_libs/pyspec/eth2spec/test/epoch_processing/__init__.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/__init__.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/epoch_processing/__init__.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/__init__.py
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_attestation.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_attestation.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_attester_slashing.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_attester_slashing.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_attester_slashing.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_attester_slashing.py
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_block_header.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_block_header.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_block_header.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_block_header.py
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_deposit.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_deposit.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_deposit.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_deposit.py
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_proposer_slashing.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_proposer_slashing.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_proposer_slashing.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_proposer_slashing.py
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_transfer.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_transfer.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_transfer.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_transfer.py
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_voluntary_exit.py b/test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_voluntary_exit.py
rename to test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py
diff --git a/test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/__init__.py b/test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py b/test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_crosslinks.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/epoch_processing/test_process_crosslinks.py
rename to test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_crosslinks.py
diff --git a/test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py b/test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/epoch_processing/test_process_registry_updates.py
rename to test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py
diff --git a/test_libs/pyspec/eth2spec/test/phase_1/__init__.py b/test_libs/pyspec/eth2spec/test/phase_1/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test_libs/pyspec/eth2spec/test/phase_1/block_processing/__init__.py b/test_libs/pyspec/eth2spec/test/phase_1/block_processing/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test_libs/pyspec/eth2spec/test/block_processing/test_process_early_derived_secret_reveal.py b/test_libs/pyspec/eth2spec/test/phase_1/block_processing/test_process_early_derived_secret_reveal.py
similarity index 100%
rename from test_libs/pyspec/eth2spec/test/block_processing/test_process_early_derived_secret_reveal.py
rename to test_libs/pyspec/eth2spec/test/phase_1/block_processing/test_process_early_derived_secret_reveal.py