diff --git a/tests/lean_spec/subspecs/forkchoice/__init__.py b/tests/lean_spec/forks/lstar/__init__.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/__init__.py
rename to tests/lean_spec/forks/lstar/__init__.py
diff --git a/tests/lean_spec/forks/lstar/forkchoice/__init__.py b/tests/lean_spec/forks/lstar/forkchoice/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/lean_spec/subspecs/forkchoice/conftest.py b/tests/lean_spec/forks/lstar/forkchoice/conftest.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/conftest.py
rename to tests/lean_spec/forks/lstar/forkchoice/conftest.py
diff --git a/tests/lean_spec/subspecs/forkchoice/test_attestation_target.py b/tests/lean_spec/forks/lstar/forkchoice/test_attestation_target.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/test_attestation_target.py
rename to tests/lean_spec/forks/lstar/forkchoice/test_attestation_target.py
diff --git a/tests/lean_spec/subspecs/forkchoice/test_compute_block_weights.py b/tests/lean_spec/forks/lstar/forkchoice/test_compute_block_weights.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/test_compute_block_weights.py
rename to tests/lean_spec/forks/lstar/forkchoice/test_compute_block_weights.py
diff --git a/tests/lean_spec/subspecs/forkchoice/test_store_attestations.py b/tests/lean_spec/forks/lstar/forkchoice/test_store_attestations.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/test_store_attestations.py
rename to tests/lean_spec/forks/lstar/forkchoice/test_store_attestations.py
diff --git a/tests/lean_spec/subspecs/forkchoice/test_store_pruning.py b/tests/lean_spec/forks/lstar/forkchoice/test_store_pruning.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/test_store_pruning.py
rename to tests/lean_spec/forks/lstar/forkchoice/test_store_pruning.py
diff --git a/tests/lean_spec/subspecs/forkchoice/test_time_management.py b/tests/lean_spec/forks/lstar/forkchoice/test_time_management.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/test_time_management.py
rename to tests/lean_spec/forks/lstar/forkchoice/test_time_management.py
diff --git a/tests/lean_spec/subspecs/forkchoice/test_validate_attestation.py b/tests/lean_spec/forks/lstar/forkchoice/test_validate_attestation.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/test_validate_attestation.py
rename to tests/lean_spec/forks/lstar/forkchoice/test_validate_attestation.py
diff --git a/tests/lean_spec/subspecs/forkchoice/test_validator.py b/tests/lean_spec/forks/lstar/forkchoice/test_validator.py
similarity index 100%
rename from tests/lean_spec/subspecs/forkchoice/test_validator.py
rename to tests/lean_spec/forks/lstar/forkchoice/test_validator.py
diff --git a/tests/lean_spec/forks/lstar/state/__init__.py b/tests/lean_spec/forks/lstar/state/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/lean_spec/subspecs/containers/conftest.py b/tests/lean_spec/forks/lstar/state/conftest.py
similarity index 100%
rename from tests/lean_spec/subspecs/containers/conftest.py
rename to tests/lean_spec/forks/lstar/state/conftest.py
diff --git a/tests/lean_spec/subspecs/containers/test_state_aggregation.py b/tests/lean_spec/forks/lstar/state/test_state_aggregation.py
similarity index 100%
rename from tests/lean_spec/subspecs/containers/test_state_aggregation.py
rename to tests/lean_spec/forks/lstar/state/test_state_aggregation.py
diff --git a/tests/lean_spec/subspecs/containers/test_state_justified_slots.py b/tests/lean_spec/forks/lstar/state/test_state_justified_slots.py
similarity index 100%
rename from tests/lean_spec/subspecs/containers/test_state_justified_slots.py
rename to tests/lean_spec/forks/lstar/state/test_state_justified_slots.py
diff --git a/tests/lean_spec/subspecs/containers/test_state_process_attestations.py b/tests/lean_spec/forks/lstar/state/test_state_process_attestations.py
similarity index 100%
rename from tests/lean_spec/subspecs/containers/test_state_process_attestations.py
rename to tests/lean_spec/forks/lstar/state/test_state_process_attestations.py