From 9b626864f00f0f473859251213ea146d49c3cecd Mon Sep 17 00:00:00 2001
From: Preston Van Loon <pvanloon@offchainlabs.com>
Date: Thu, 29 May 2025 09:17:34 -0500
Subject: [PATCH] Spectests: Use a flat structure for faster test ingestion
 (#15313)

* Flatten spectests directory: Move all spectests to a single directory per network.

Commands ran:
```
cd testing/spectest/
```

Then for each network, I ran the following command twice.

```
find . -type f -name '*_test.go' -exec bash -c '
  for file; do
    dir=$(dirname "$file")
    base=$(basename "$file" _test.go)
    new_name="./${dir#./}__${base}_test.go"
    git mv "$file" "$new_name"
  done
' bash {} +
```

Then updated the packages with a command like

```
sed -i 's/package [a-zA-Z0-9_]\+/package mainnet/g' *.go
```

Updated commit from 5edadd7b to address @Kasey's feedback.

* Fix panic when checking types. String is not compatible with DeepEqual.

* Docs: add commentary on the filename convention

* Add a section about nightly tests to the spectest readme. Ref https://github.com/OffchainLabs/prysm/pull/15312

* Set shard_count to optimal value... one!

* Changelog fragment

* use latest unclog release

* Update spectest build instructions after #9122

---------

Co-authored-by: Kasey Kirkham <kasey@users.noreply.github.com>
---
 .github/workflows/changelog.yml               |   2 +-
 changelog/pvl-flat-spectests.md               |   3 +
 testing/spectest/README.md                    |  24 +-
 .../general/{deneb/kzg => }/BUILD.bazel       |   7 +-
 ..._kzg__verify_blob_kzg_proof_batch_test.go} |   2 +-
 testing/spectest/mainnet/BUILD.bazel          | 283 +++++++++++++++++
 .../altair/epoch_processing/BUILD.bazel       |  25 --
 .../mainnet/altair/finality/BUILD.bazel       |  14 -
 .../mainnet/altair/fork_helper/BUILD.bazel    |  13 -
 .../altair/fork_transition/BUILD.bazel        |  12 -
 .../mainnet/altair/forkchoice/BUILD.bazel     |  16 -
 .../mainnet/altair/light_client/BUILD.bazel   |  15 -
 .../mainnet/altair/operations/BUILD.bazel     |  21 --
 .../mainnet/altair/random/BUILD.bazel         |  13 -
 .../mainnet/altair/rewards/BUILD.bazel        |  12 -
 .../mainnet/altair/sanity/BUILD.bazel         |  16 -
 .../mainnet/altair/ssz_static/BUILD.bazel     |  12 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...ocessing__historical_roots_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...tair__epoch_processing__slashings_test.go} |   2 +-
 ....go => altair__finality__finality_test.go} |   2 +-
 ...r__fork_helper__upgrade_to_altair_test.go} |   2 +-
 ...tair__fork_transition__transition_test.go} |   2 +-
 ...=> altair__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...> altair__operations__attestation_test.go} |   2 +-
 ...ir__operations__attester_slashing_test.go} |   2 +-
 ... altair__operations__block_header_test.go} |   2 +-
 ...go => altair__operations__deposit_test.go} |   2 +-
 ...ir__operations__proposer_slashing_test.go} |   2 +-
 ...ltair__operations__sync_committee_test.go} |   2 +-
 ...ltair__operations__voluntary_exit_test.go} |   2 +-
 ...test.go => altair__random__random_test.go} |   2 +-
 ...st.go => altair__rewards__rewards_test.go} |   2 +-
 ...test.go => altair__sanity__blocks_test.go} |   2 +-
 ..._test.go => altair__sanity__slots_test.go} |   2 +-
 ...=> altair__ssz_static__ssz_static_test.go} |   2 +-
 .../bellatrix/epoch_processing/BUILD.bazel    |  25 --
 .../mainnet/bellatrix/finality/BUILD.bazel    |  14 -
 .../mainnet/bellatrix/fork_helper/BUILD.bazel |  13 -
 .../bellatrix/fork_transition/BUILD.bazel     |  12 -
 .../mainnet/bellatrix/forkchoice/BUILD.bazel  |  16 -
 .../bellatrix/light_client/BUILD.bazel        |  15 -
 .../mainnet/bellatrix/operations/BUILD.bazel  |  22 --
 .../mainnet/bellatrix/random/BUILD.bazel      |  13 -
 .../mainnet/bellatrix/rewards/BUILD.bazel     |  12 -
 .../mainnet/bellatrix/sanity/BUILD.bazel      |  16 -
 .../mainnet/bellatrix/ssz_static/BUILD.bazel  |  12 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...ocessing__historical_roots_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...trix__epoch_processing__slashings_test.go} |   2 +-
 ... => bellatrix__finality__finality_test.go} |   2 +-
 ...x__fork_helper__upgrade_to_altair_test.go} |   2 +-
 ...trix__fork_transition__transition_test.go} |   2 +-
 ...bellatrix__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...ellatrix__operations__attestation_test.go} |   2 +-
 ...ix__operations__attester_slashing_test.go} |   2 +-
 ...llatrix__operations__block_header_test.go} |   2 +-
 ...=> bellatrix__operations__deposit_test.go} |   2 +-
 ...ix__operations__execution_payload_test.go} |   2 +-
 ...ix__operations__proposer_slashing_test.go} |   2 +-
 ...atrix__operations__sync_committee_test.go} |   2 +-
 ...atrix__operations__voluntary_exit_test.go} |   2 +-
 ...t.go => bellatrix__random__random_test.go} |   2 +-
 ...go => bellatrix__rewards__rewards_test.go} |   2 +-
 ...t.go => bellatrix__sanity__blocks_test.go} |   2 +-
 ...st.go => bellatrix__sanity__slots_test.go} |   2 +-
 ...bellatrix__ssz_static__ssz_static_test.go} |   2 +-
 .../capella/epoch_processing/BUILD.bazel      |  25 --
 .../mainnet/capella/finality/BUILD.bazel      |  14 -
 .../mainnet/capella/fork_helper/BUILD.bazel   |  13 -
 .../capella/fork_transition/BUILD.bazel       |  12 -
 .../mainnet/capella/forkchoice/BUILD.bazel    |  16 -
 .../mainnet/capella/light_client/BUILD.bazel  |  15 -
 .../mainnet/capella/operations/BUILD.bazel    |  24 --
 .../mainnet/capella/random/BUILD.bazel        |  13 -
 .../mainnet/capella/rewards/BUILD.bazel       |  12 -
 .../mainnet/capella/sanity/BUILD.bazel        |  16 -
 .../mainnet/capella/ssz_static/BUILD.bazel    |  12 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...sing__historical_summaries_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...ella__epoch_processing__slashings_test.go} |   2 +-
 ...go => capella__finality__finality_test.go} |   2 +-
 ...__fork_helper__upgrade_to_capella_test.go} |   2 +-
 ...ella__fork_transition__transition_test.go} |   2 +-
 ...> capella__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ... capella__operations__attestation_test.go} |   2 +-
 ...la__operations__attester_slashing_test.go} |   2 +-
 ...capella__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ...o => capella__operations__deposit_test.go} |   2 +-
 ...la__operations__execution_payload_test.go} |   2 +-
 ...la__operations__proposer_slashing_test.go} |   2 +-
 ...pella__operations__sync_committee_test.go} |   2 +-
 ...pella__operations__voluntary_exit_test.go} |   2 +-
 ... capella__operations__withdrawals_test.go} |   2 +-
 ...est.go => capella__random__random_test.go} |   2 +-
 ...t.go => capella__rewards__rewards_test.go} |   2 +-
 ...est.go => capella__sanity__blocks_test.go} |   2 +-
 ...test.go => capella__sanity__slots_test.go} |   2 +-
 ...> capella__ssz_static__ssz_static_test.go} |   2 +-
 .../deneb/epoch_processing/BUILD.bazel        |  25 --
 .../mainnet/deneb/finality/BUILD.bazel        |  14 -
 .../mainnet/deneb/fork_helper/BUILD.bazel     |  13 -
 .../mainnet/deneb/fork_transition/BUILD.bazel |  12 -
 .../mainnet/deneb/forkchoice/BUILD.bazel      |  16 -
 .../mainnet/deneb/light_client/BUILD.bazel    |  15 -
 .../mainnet/deneb/merkle_proof/BUILD.bazel    |  11 -
 .../mainnet/deneb/operations/BUILD.bazel      |  24 --
 .../spectest/mainnet/deneb/random/BUILD.bazel |  13 -
 .../mainnet/deneb/rewards/BUILD.bazel         |  12 -
 .../spectest/mainnet/deneb/sanity/BUILD.bazel |  16 -
 .../mainnet/deneb/ssz_static/BUILD.bazel      |  12 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...sing__historical_summaries_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...eneb__epoch_processing__slashings_test.go} |   2 +-
 ...t.go => deneb__finality__finality_test.go} |   2 +-
 ...eb__fork_helper__upgrade_to_deneb_test.go} |   2 +-
 ...eneb__fork_transition__transition_test.go} |   2 +-
 ... => deneb__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...deneb__merkle_proof__merkle_proof_test.go} |   2 +-
 ...=> deneb__operations__attestation_test.go} |   2 +-
 ...eb__operations__attester_slashing_test.go} |   2 +-
 ...> deneb__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ....go => deneb__operations__deposit_test.go} |   2 +-
 ...eb__operations__execution_payload_test.go} |   2 +-
 ...eb__operations__proposer_slashing_test.go} |   2 +-
 ...deneb__operations__sync_committee_test.go} |   2 +-
 ...deneb__operations__voluntary_exit_test.go} |   2 +-
 ...=> deneb__operations__withdrawals_test.go} |   2 +-
 ..._test.go => deneb__random__random_test.go} |   2 +-
 ...est.go => deneb__rewards__rewards_test.go} |   2 +-
 ..._test.go => deneb__sanity__blocks_test.go} |   2 +-
 ...s_test.go => deneb__sanity__slots_test.go} |   2 +-
 ... => deneb__ssz_static__ssz_static_test.go} |   2 +-
 .../electra/epoch_processing/BUILD.bazel      |  24 --
 .../mainnet/electra/finality/BUILD.bazel      |  14 -
 .../mainnet/electra/fork_helper/BUILD.bazel   |  13 -
 .../electra/fork_transition/BUILD.bazel       |  12 -
 .../mainnet/electra/forkchoice/BUILD.bazel    |  16 -
 .../mainnet/electra/light_client/BUILD.bazel  |  15 -
 .../mainnet/electra/merkle_proof/BUILD.bazel  |  11 -
 .../mainnet/electra/operations/BUILD.bazel    |  24 --
 .../mainnet/electra/random/BUILD.bazel        |  13 -
 .../mainnet/electra/rewards/BUILD.bazel       |  12 -
 .../mainnet/electra/sanity/BUILD.bazel        |  16 -
 .../mainnet/electra/ssz_static/BUILD.bazel    |  12 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...sing__historical_summaries_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...rocessing__pending_consolidations_test.go} |   2 +-
 ...cessing__pending_deposits_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...ctra__epoch_processing__slashings_test.go} |   2 +-
 ...go => electra__finality__finality_test.go} |   2 +-
 ...__fork_helper__upgrade_to_electra_test.go} |   2 +-
 ...ctra__fork_transition__transition_test.go} |   2 +-
 ...> electra__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...ectra__merkle_proof__merkle_proof_test.go} |   2 +-
 ... electra__operations__attestation_test.go} |   2 +-
 ...ra__operations__attester_slashing_test.go} |   2 +-
 ...electra__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ...lectra__operations__consolidation_test.go} |   2 +-
 ...tra__operations__deposit_requests_test.go} |   2 +-
 ...o => electra__operations__deposit_test.go} |   2 +-
 ...ions__execution_layer_withdrawals_test.go} |   2 +-
 ...ra__operations__execution_payload_test.go} |   2 +-
 ...ra__operations__proposer_slashing_test.go} |   2 +-
 ...ectra__operations__sync_committee_test.go} |   2 +-
 ...ectra__operations__voluntary_exit_test.go} |   2 +-
 ... electra__operations__withdrawals_test.go} |   2 +-
 ...est.go => electra__random__random_test.go} |   2 +-
 ...t.go => electra__rewards__rewards_test.go} |   2 +-
 ...est.go => electra__sanity__blocks_test.go} |   2 +-
 ...test.go => electra__sanity__slots_test.go} |   2 +-
 ...> electra__ssz_static__ssz_static_test.go} |   2 +-
 .../mainnet/fulu/epoch_processing/BUILD.bazel |  24 --
 .../mainnet/fulu/finality/BUILD.bazel         |  14 -
 .../spectest/mainnet/fulu/fork/BUILD.bazel    |  13 -
 .../mainnet/fulu/forkchoice/BUILD.bazel       |  16 -
 .../mainnet/fulu/merkle_proof/BUILD.bazel     |  11 -
 .../mainnet/fulu/networking/BUILD.bazel       |  12 -
 .../mainnet/fulu/operations/BUILD.bazel       |  24 --
 .../spectest/mainnet/fulu/random/BUILD.bazel  |  13 -
 .../spectest/mainnet/fulu/rewards/BUILD.bazel |  12 -
 .../spectest/mainnet/fulu/sanity/BUILD.bazel  |  16 -
 .../mainnet/fulu/ssz_static/BUILD.bazel       |  12 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...sing__historical_summaries_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...rocessing__pending_consolidations_test.go} |   2 +-
 ...cessing__pending_deposits_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...fulu__epoch_processing__slashings_test.go} |   2 +-
 ...st.go => fulu__finality__finality_test.go} |   2 +-
 ...go => fulu__fork__upgrade_to_fulu_test.go} |   2 +-
 ...o => fulu__forkchoice__forkchoice_test.go} |   2 +-
 ... fulu__merkle_proof__merkle_proof_test.go} |   2 +-
 ... fulu__networking__custody_groups_test.go} |   2 +-
 ... => fulu__operations__attestation_test.go} |   2 +-
 ...lu__operations__attester_slashing_test.go} |   2 +-
 ...=> fulu__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ...> fulu__operations__consolidation_test.go} |   2 +-
 ...ulu__operations__deposit_requests_test.go} |   2 +-
 ...t.go => fulu__operations__deposit_test.go} |   2 +-
 ...ions__execution_layer_withdrawals_test.go} |   2 +-
 ...lu__operations__execution_payload_test.go} |   2 +-
 ...lu__operations__proposer_slashing_test.go} |   2 +-
 ... fulu__operations__sync_committee_test.go} |   2 +-
 ... fulu__operations__voluntary_exit_test.go} |   2 +-
 ... => fulu__operations__withdrawals_test.go} |   2 +-
 ...m_test.go => fulu__random__random_test.go} |   2 +-
 ...test.go => fulu__rewards__rewards_test.go} |   2 +-
 ...s_test.go => fulu__sanity__blocks_test.go} |   2 +-
 ...ts_test.go => fulu__sanity__slots_test.go} |   2 +-
 ...o => fulu__ssz_static__ssz_static_test.go} |   2 +-
 .../phase0/epoch_processing/BUILD.bazel       |  28 --
 .../mainnet/phase0/finality/BUILD.bazel       |  14 -
 .../mainnet/phase0/operations/BUILD.bazel     |  20 --
 .../mainnet/phase0/random/BUILD.bazel         |  13 -
 .../mainnet/phase0/rewards/BUILD.bazel        |  12 -
 .../mainnet/phase0/sanity/BUILD.bazel         |  16 -
 .../phase0/shuffling/core/shuffle/BUILD.bazel |  13 -
 .../shuffling/core/shuffle/shuffle_test.go    |  11 -
 .../mainnet/phase0/ssz_static/BUILD.bazel     |  12 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...poch_processing__epoch_processing_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...ocessing__historical_roots_update_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ing__participation_record_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...ase0__epoch_processing__slashings_test.go} |   2 +-
 ....go => phase0__finality__finality_test.go} |   2 +-
 ...> phase0__operations__attestation_test.go} |   2 +-
 ...e0__operations__attester_slashing_test.go} |   2 +-
 ... phase0__operations__block_header_test.go} |   2 +-
 ...go => phase0__operations__deposit_test.go} |   2 +-
 ...e0__operations__proposer_slashing_test.go} |   2 +-
 ...hase0__operations__voluntary_exit_test.go} |   2 +-
 ...test.go => phase0__random__random_test.go} |   2 +-
 ...st.go => phase0__rewards__rewards_test.go} |   2 +-
 ...test.go => phase0__sanity__blocks_test.go} |   2 +-
 ..._test.go => phase0__sanity__slots_test.go} |   2 +-
 ...=> phase0__ssz_static__ssz_static_test.go} |   2 +-
 testing/spectest/minimal/BUILD.bazel          | 294 ++++++++++++++++++
 .../altair/epoch_processing/BUILD.bazel       |  28 --
 .../minimal/altair/finality/BUILD.bazel       |  17 -
 .../spectest/minimal/altair/fork/BUILD.bazel  |  17 -
 .../altair/fork_transition/BUILD.bazel        |  13 -
 .../minimal/altair/forkchoice/BUILD.bazel     |  20 --
 .../minimal/altair/light_client/BUILD.bazel   |  22 --
 .../minimal/altair/operations/BUILD.bazel     |  24 --
 .../minimal/altair/random/BUILD.bazel         |  13 -
 .../minimal/altair/rewards/BUILD.bazel        |  16 -
 .../minimal/altair/sanity/BUILD.bazel         |  19 --
 .../minimal/altair/ssz_static/BUILD.bazel     |  16 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...ocessing__historical_roots_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...tair__epoch_processing__slashings_test.go} |   2 +-
 ....go => altair__finality__finality_test.go} |   2 +-
 ...> altair__fork__upgrade_to_altair_test.go} |   2 +-
 ...tair__fork_transition__transition_test.go} |   2 +-
 ...=> altair__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...air__light_client__update_ranking_test.go} |   2 +-
 ...> altair__operations__attestation_test.go} |   2 +-
 ...ir__operations__attester_slashing_test.go} |   2 +-
 ... altair__operations__block_header_test.go} |   2 +-
 ...go => altair__operations__deposit_test.go} |   2 +-
 ...ir__operations__proposer_slashing_test.go} |   2 +-
 ...ltair__operations__sync_committee_test.go} |   2 +-
 ...ltair__operations__voluntary_exit_test.go} |   2 +-
 ...test.go => altair__random__random_test.go} |   2 +-
 ...st.go => altair__rewards__rewards_test.go} |   2 +-
 ...test.go => altair__sanity__blocks_test.go} |   2 +-
 ..._test.go => altair__sanity__slots_test.go} |   2 +-
 ...=> altair__ssz_static__ssz_static_test.go} |   2 +-
 .../bellatrix/epoch_processing/BUILD.bazel    |  28 --
 .../minimal/bellatrix/finality/BUILD.bazel    |  17 -
 .../minimal/bellatrix/fork/BUILD.bazel        |  17 -
 .../bellatrix/fork_transition/BUILD.bazel     |  13 -
 .../minimal/bellatrix/forkchoice/BUILD.bazel  |  20 --
 .../bellatrix/light_client/BUILD.bazel        |  22 --
 .../minimal/bellatrix/operations/BUILD.bazel  |  25 --
 .../minimal/bellatrix/random/BUILD.bazel      |  13 -
 .../minimal/bellatrix/rewards/BUILD.bazel     |  16 -
 .../minimal/bellatrix/sanity/BUILD.bazel      |  19 --
 .../minimal/bellatrix/ssz_static/BUILD.bazel  |  16 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...ocessing__historical_roots_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...trix__epoch_processing__slashings_test.go} |   2 +-
 ... => bellatrix__finality__finality_test.go} |   2 +-
 ...ellatrix__fork__upgrade_to_altair_test.go} |   2 +-
 ...trix__fork_transition__transition_test.go} |   2 +-
 ...bellatrix__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...rix__light_client__update_ranking_test.go} |   2 +-
 ...ellatrix__operations__attestation_test.go} |   2 +-
 ...ix__operations__attester_slashing_test.go} |   2 +-
 ...llatrix__operations__block_header_test.go} |   2 +-
 ...=> bellatrix__operations__deposit_test.go} |   2 +-
 ...ix__operations__execution_payload_test.go} |   2 +-
 ...ix__operations__proposer_slashing_test.go} |   2 +-
 ...atrix__operations__sync_committee_test.go} |   2 +-
 ...atrix__operations__voluntary_exit_test.go} |   2 +-
 ...t.go => bellatrix__random__random_test.go} |   2 +-
 ...go => bellatrix__rewards__rewards_test.go} |   2 +-
 ...t.go => bellatrix__sanity__blocks_test.go} |   2 +-
 ...st.go => bellatrix__sanity__slots_test.go} |   2 +-
 ...bellatrix__ssz_static__ssz_static_test.go} |   2 +-
 .../capella/epoch_processing/BUILD.bazel      |  28 --
 .../minimal/capella/finality/BUILD.bazel      |  17 -
 .../spectest/minimal/capella/fork/BUILD.bazel |  17 -
 .../capella/fork_transition/BUILD.bazel       |  13 -
 .../minimal/capella/forkchoice/BUILD.bazel    |  20 --
 .../minimal/capella/light_client/BUILD.bazel  |  22 --
 .../minimal/capella/operations/BUILD.bazel    |  27 --
 .../minimal/capella/random/BUILD.bazel        |  13 -
 .../minimal/capella/rewards/BUILD.bazel       |  16 -
 .../minimal/capella/sanity/BUILD.bazel        |  19 --
 .../minimal/capella/ssz_static/BUILD.bazel    |  16 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...ssing__historical_roots_summaries_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...ella__epoch_processing__slashings_test.go} |   2 +-
 ...go => capella__finality__finality_test.go} |   2 +-
 ...capella__fork__upgrade_to_capella_test.go} |   2 +-
 ...ella__fork_transition__transition_test.go} |   2 +-
 ...> capella__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...lla__light_client__update_ranking_test.go} |   2 +-
 ... capella__operations__attestation_test.go} |   2 +-
 ...la__operations__attester_slashing_test.go} |   2 +-
 ...capella__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ...o => capella__operations__deposit_test.go} |   2 +-
 ...la__operations__execution_payload_test.go} |   2 +-
 ...la__operations__proposer_slashing_test.go} |   2 +-
 ...pella__operations__sync_committee_test.go} |   2 +-
 ...pella__operations__voluntary_exit_test.go} |   2 +-
 ... capella__operations__withdrawals_test.go} |   2 +-
 ...est.go => capella__random__random_test.go} |   2 +-
 ...t.go => capella__rewards__rewards_test.go} |   2 +-
 ...est.go => capella__sanity__blocks_test.go} |   2 +-
 ...test.go => capella__sanity__slots_test.go} |   2 +-
 ...> capella__ssz_static__ssz_static_test.go} |   2 +-
 .../deneb/epoch_processing/BUILD.bazel        |  28 --
 .../minimal/deneb/finality/BUILD.bazel        |  17 -
 .../spectest/minimal/deneb/fork/BUILD.bazel   |  17 -
 .../minimal/deneb/fork_transition/BUILD.bazel |  13 -
 .../minimal/deneb/forkchoice/BUILD.bazel      |  20 --
 .../minimal/deneb/light_client/BUILD.bazel    |  22 --
 .../minimal/deneb/merkle_proof/BUILD.bazel    |  16 -
 .../minimal/deneb/operations/BUILD.bazel      |  27 --
 .../spectest/minimal/deneb/random/BUILD.bazel |  13 -
 .../minimal/deneb/rewards/BUILD.bazel         |  16 -
 .../spectest/minimal/deneb/sanity/BUILD.bazel |  19 --
 .../minimal/deneb/ssz_static/BUILD.bazel      |  16 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...sing__historical_summaries_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...eneb__epoch_processing__slashings_test.go} |   2 +-
 ...t.go => deneb__finality__finality_test.go} |   2 +-
 ... => deneb__fork__upgrade_to_deneb_test.go} |   2 +-
 ...eneb__fork_transition__transition_test.go} |   2 +-
 ... => deneb__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...neb__light_client__update_ranking_test.go} |   2 +-
 ...deneb__merkle_proof__merkle_proof_test.go} |   2 +-
 ...=> deneb__operations__attestation_test.go} |   2 +-
 ...eb__operations__attester_slashing_test.go} |   2 +-
 ...> deneb__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ....go => deneb__operations__deposit_test.go} |   2 +-
 ...eb__operations__execution_payload_test.go} |   2 +-
 ...eb__operations__proposer_slashing_test.go} |   2 +-
 ...deneb__operations__sync_committee_test.go} |   2 +-
 ...deneb__operations__voluntary_exit_test.go} |   2 +-
 ...=> deneb__operations__withdrawals_test.go} |   2 +-
 ..._test.go => deneb__random__random_test.go} |   2 +-
 ...est.go => deneb__rewards__rewards_test.go} |   2 +-
 ..._test.go => deneb__sanity__blocks_test.go} |   2 +-
 ...s_test.go => deneb__sanity__slots_test.go} |   2 +-
 ... => deneb__ssz_static__ssz_static_test.go} |   2 +-
 .../electra/epoch_processing/BUILD.bazel      |  26 --
 .../minimal/electra/finality/BUILD.bazel      |  15 -
 .../spectest/minimal/electra/fork/BUILD.bazel |  17 -
 .../electra/fork_transition/BUILD.bazel       |  13 -
 .../minimal/electra/forkchoice/BUILD.bazel    |  17 -
 .../minimal/electra/light_client/BUILD.bazel  |  22 --
 .../minimal/electra/merkle_proof/BUILD.bazel  |  12 -
 .../minimal/electra/operations/BUILD.bazel    |  25 --
 .../minimal/electra/random/BUILD.bazel        |  14 -
 .../minimal/electra/rewards/BUILD.bazel       |  13 -
 .../minimal/electra/sanity/BUILD.bazel        |  17 -
 .../minimal/electra/ssz_static/BUILD.bazel    |  16 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...sing__historical_summaries_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...rocessing__pending_consolidations_test.go} |   2 +-
 ...cessing__pending_deposits_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...ctra__epoch_processing__slashings_test.go} |   2 +-
 ...rocessing__sync_committee_updates_test.go} |   2 +-
 ...go => electra__finality__finality_test.go} |   2 +-
 ...electra__fork__upgrade_to_electra_test.go} |   2 +-
 ...ctra__fork_transition__transition_test.go} |   2 +-
 ...> electra__forkchoice__forkchoice_test.go} |   2 +-
 ...light_client__single_merkle_proof_test.go} |   2 +-
 ...tra__light_client__update_ranking_test.go} |   2 +-
 ...ectra__merkle_proof__merkle_proof_test.go} |   2 +-
 ... electra__operations__attestation_test.go} |   2 +-
 ...ra__operations__attester_slashing_test.go} |   2 +-
 ...electra__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ...lectra__operations__consolidation_test.go} |   2 +-
 ...tra__operations__deposit_requests_test.go} |   2 +-
 ...o => electra__operations__deposit_test.go} |   2 +-
 ...ions__execution_layer_withdrawals_test.go} |   2 +-
 ...ra__operations__execution_payload_test.go} |   2 +-
 ...ra__operations__proposer_slashing_test.go} |   2 +-
 ...ectra__operations__sync_committee_test.go} |   2 +-
 ...ectra__operations__voluntary_exit_test.go} |   2 +-
 ... electra__operations__withdrawals_test.go} |   2 +-
 ...est.go => electra__random__random_test.go} |   2 +-
 ...t.go => electra__rewards__rewards_test.go} |   2 +-
 ...est.go => electra__sanity__blocks_test.go} |   2 +-
 ...test.go => electra__sanity__slots_test.go} |   2 +-
 ...> electra__ssz_static__ssz_static_test.go} |   2 +-
 .../minimal/fulu/epoch_processing/BUILD.bazel |  26 --
 .../minimal/fulu/finality/BUILD.bazel         |  15 -
 .../spectest/minimal/fulu/fork/BUILD.bazel    |  17 -
 .../minimal/fulu/forkchoice/BUILD.bazel       |  17 -
 .../minimal/fulu/merkle_proof/BUILD.bazel     |  12 -
 .../minimal/fulu/networking/BUILD.bazel       |  12 -
 .../minimal/fulu/operations/BUILD.bazel       |  25 --
 .../spectest/minimal/fulu/random/BUILD.bazel  |  14 -
 .../spectest/minimal/fulu/rewards/BUILD.bazel |  13 -
 .../spectest/minimal/fulu/sanity/BUILD.bazel  |  17 -
 .../minimal/fulu/ssz_static/BUILD.bazel       |  16 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...sing__historical_summaries_update_test.go} |   2 +-
 ...ch_processing__inactivity_updates_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ssing__participation_flag_updates_test.go} |   2 +-
 ...rocessing__pending_consolidations_test.go} |   2 +-
 ...cessing__pending_deposits_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...fulu__epoch_processing__slashings_test.go} |   2 +-
 ...rocessing__sync_committee_updates_test.go} |   2 +-
 ...st.go => fulu__finality__finality_test.go} |   2 +-
 ...go => fulu__fork__upgrade_to_fulu_test.go} |   2 +-
 ...o => fulu__forkchoice__forkchoice_test.go} |   2 +-
 ... fulu__merkle_proof__merkle_proof_test.go} |   2 +-
 ...fulu__networking__custody_columns_test.go} |   2 +-
 ... => fulu__operations__attestation_test.go} |   2 +-
 ...lu__operations__attester_slashing_test.go} |   2 +-
 ...=> fulu__operations__block_header_test.go} |   2 +-
 ...erations__bls_to_execution_change_test.go} |   2 +-
 ...> fulu__operations__consolidation_test.go} |   2 +-
 ...ulu__operations__deposit_requests_test.go} |   2 +-
 ...t.go => fulu__operations__deposit_test.go} |   2 +-
 ...ions__execution_layer_withdrawals_test.go} |   2 +-
 ...lu__operations__execution_payload_test.go} |   2 +-
 ...lu__operations__proposer_slashing_test.go} |   2 +-
 ... fulu__operations__sync_committee_test.go} |   2 +-
 ... fulu__operations__voluntary_exit_test.go} |   2 +-
 ... => fulu__operations__withdrawals_test.go} |   2 +-
 ...m_test.go => fulu__random__random_test.go} |   2 +-
 ...test.go => fulu__rewards__rewards_test.go} |   2 +-
 ...s_test.go => fulu__sanity__blocks_test.go} |   2 +-
 ...ts_test.go => fulu__sanity__slots_test.go} |   2 +-
 ...o => fulu__ssz_static__ssz_static_test.go} |   2 +-
 .../phase0/epoch_processing/BUILD.bazel       |  31 --
 .../minimal/phase0/finality/BUILD.bazel       |  17 -
 .../minimal/phase0/operations/BUILD.bazel     |  23 --
 .../minimal/phase0/random/BUILD.bazel         |  16 -
 .../minimal/phase0/rewards/BUILD.bazel        |  16 -
 .../minimal/phase0/sanity/BUILD.bazel         |  19 --
 .../phase0/shuffling/core/shuffle/BUILD.bazel |  16 -
 .../shuffling/core/shuffle/shuffle_test.go    |  11 -
 .../minimal/phase0/ssz_static/BUILD.bazel     |  16 -
 ...essing__effective_balance_updates_test.go} |   2 +-
 ...poch_processing__epoch_processing_test.go} |   2 +-
 ...epoch_processing__eth1_data_reset_test.go} |   2 +-
 ...ocessing__historical_roots_update_test.go} |   2 +-
 ...g__justification_and_finalization_test.go} |   2 +-
 ...ing__participation_record_updates_test.go} |   2 +-
 ...ch_processing__randao_mixes_reset_test.go} |   2 +-
 ...poch_processing__registry_updates_test.go} |   2 +-
 ...processing__rewards_and_penalties_test.go} |   2 +-
 ...epoch_processing__slashings_reset_test.go} |   2 +-
 ...ase0__epoch_processing__slashings_test.go} |   2 +-
 ....go => phase0__finality__finality_test.go} |   2 +-
 ...> phase0__operations__attestation_test.go} |   2 +-
 ...e0__operations__attester_slashing_test.go} |   2 +-
 ... phase0__operations__block_header_test.go} |   2 +-
 ...go => phase0__operations__deposit_test.go} |   2 +-
 ...e0__operations__proposer_slashing_test.go} |   2 +-
 ...hase0__operations__voluntary_exit_test.go} |   2 +-
 ...test.go => phase0__random__random_test.go} |   2 +-
 ...st.go => phase0__rewards__rewards_test.go} |   2 +-
 ...test.go => phase0__sanity__blocks_test.go} |   2 +-
 ..._test.go => phase0__sanity__slots_test.go} |   2 +-
 ...=> phase0__ssz_static__ssz_static_test.go} |   2 +-
 .../shared/common/forkchoice/builder.go       |   4 +-
 601 files changed, 1044 insertions(+), 3034 deletions(-)
 create mode 100644 changelog/pvl-flat-spectests.md
 rename testing/spectest/general/{deneb/kzg => }/BUILD.bazel (78%)
 rename testing/spectest/general/{deneb/kzg/verify_blob_kzg_proof_batch_test.go => deneb__kzg__verify_blob_kzg_proof_batch_test.go} (99%)
 create mode 100644 testing/spectest/mainnet/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/finality/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/fork_helper/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/operations/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/random/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/altair/ssz_static/BUILD.bazel
 rename testing/spectest/mainnet/{altair/epoch_processing/effective_balance_updates_test.go => altair__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/mainnet/{altair/epoch_processing/eth1_data_reset_test.go => altair__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/historical_roots_update_test.go => altair__epoch_processing__historical_roots_update_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/inactivity_updates_test.go => altair__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/justification_and_finalization_test.go => altair__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/mainnet/{altair/epoch_processing/participation_flag_updates_test.go => altair__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/randao_mixes_reset_test.go => altair__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/registry_updates_test.go => altair__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/rewards_and_penalties_test.go => altair__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/slashings_reset_test.go => altair__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/mainnet/{altair/epoch_processing/slashings_test.go => altair__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/mainnet/{altair/finality/finality_test.go => altair__finality__finality_test.go} (91%)
 rename testing/spectest/mainnet/{altair/fork_helper/upgrade_to_altair_test.go => altair__fork_helper__upgrade_to_altair_test.go} (90%)
 rename testing/spectest/mainnet/{altair/fork_transition/transition_test.go => altair__fork_transition__transition_test.go} (88%)
 rename testing/spectest/mainnet/{altair/forkchoice/forkchoice_test.go => altair__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/mainnet/{altair/light_client/single_merkle_proof_test.go => altair__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/mainnet/{altair/operations/attestation_test.go => altair__operations__attestation_test.go} (91%)
 rename testing/spectest/mainnet/{altair/operations/attester_slashing_test.go => altair__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{altair/operations/block_header_test.go => altair__operations__block_header_test.go} (91%)
 rename testing/spectest/mainnet/{altair/operations/deposit_test.go => altair__operations__deposit_test.go} (91%)
 rename testing/spectest/mainnet/{altair/operations/proposer_slashing_test.go => altair__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{altair/operations/sync_committee_test.go => altair__operations__sync_committee_test.go} (91%)
 rename testing/spectest/mainnet/{altair/operations/voluntary_exit_test.go => altair__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/mainnet/{altair/random/random_test.go => altair__random__random_test.go} (93%)
 rename testing/spectest/mainnet/{altair/rewards/rewards_test.go => altair__rewards__rewards_test.go} (92%)
 rename testing/spectest/mainnet/{altair/sanity/blocks_test.go => altair__sanity__blocks_test.go} (93%)
 rename testing/spectest/mainnet/{altair/sanity/slots_test.go => altair__sanity__slots_test.go} (92%)
 rename testing/spectest/mainnet/{altair/ssz_static/ssz_static_test.go => altair__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/mainnet/bellatrix/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/finality/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/fork_helper/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/operations/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/random/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/bellatrix/ssz_static/BUILD.bazel
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/effective_balance_updates_test.go => bellatrix__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/eth1_data_reset_test.go => bellatrix__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/historical_roots_update_test.go => bellatrix__epoch_processing__historical_roots_update_test.go} (91%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/inactivity_updates_test.go => bellatrix__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/justification_and_finalization_test.go => bellatrix__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/participation_flag_updates_test.go => bellatrix__epoch_processing__participation_flag_updates_test.go} (91%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/randao_mixes_reset_test.go => bellatrix__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/registry_updates_test.go => bellatrix__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/rewards_and_penalties_test.go => bellatrix__epoch_processing__rewards_and_penalties_test.go} (91%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/slashings_reset_test.go => bellatrix__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/mainnet/{bellatrix/epoch_processing/slashings_test.go => bellatrix__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/mainnet/{bellatrix/finality/finality_test.go => bellatrix__finality__finality_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/fork_helper/upgrade_to_altair_test.go => bellatrix__fork_helper__upgrade_to_altair_test.go} (91%)
 rename testing/spectest/mainnet/{bellatrix/fork_transition/transition_test.go => bellatrix__fork_transition__transition_test.go} (89%)
 rename testing/spectest/mainnet/{bellatrix/forkchoice/forkchoice_test.go => bellatrix__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/mainnet/{bellatrix/light_client/single_merkle_proof_test.go => bellatrix__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/mainnet/{bellatrix/operations/attestation_test.go => bellatrix__operations__attestation_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/operations/attester_slashing_test.go => bellatrix__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/operations/block_header_test.go => bellatrix__operations__block_header_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/operations/deposit_test.go => bellatrix__operations__deposit_test.go} (91%)
 rename testing/spectest/mainnet/{bellatrix/operations/execution_payload_test.go => bellatrix__operations__execution_payload_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/operations/proposer_slashing_test.go => bellatrix__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/operations/sync_committee_test.go => bellatrix__operations__sync_committee_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/operations/voluntary_exit_test.go => bellatrix__operations__voluntary_exit_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/random/random_test.go => bellatrix__random__random_test.go} (93%)
 rename testing/spectest/mainnet/{bellatrix/rewards/rewards_test.go => bellatrix__rewards__rewards_test.go} (93%)
 rename testing/spectest/mainnet/{bellatrix/sanity/blocks_test.go => bellatrix__sanity__blocks_test.go} (93%)
 rename testing/spectest/mainnet/{bellatrix/sanity/slots_test.go => bellatrix__sanity__slots_test.go} (92%)
 rename testing/spectest/mainnet/{bellatrix/ssz_static/ssz_static_test.go => bellatrix__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/mainnet/capella/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/finality/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/fork_helper/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/operations/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/random/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/capella/ssz_static/BUILD.bazel
 rename testing/spectest/mainnet/{capella/epoch_processing/effective_balance_updates_test.go => capella__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/mainnet/{capella/epoch_processing/eth1_data_reset_test.go => capella__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/mainnet/{capella/epoch_processing/historical_summaries_update_test.go => capella__epoch_processing__historical_summaries_update_test.go} (91%)
 rename testing/spectest/mainnet/{capella/epoch_processing/inactivity_updates_test.go => capella__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/mainnet/{capella/epoch_processing/justification_and_finalization_test.go => capella__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/mainnet/{capella/epoch_processing/participation_flag_updates_test.go => capella__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/mainnet/{capella/epoch_processing/randao_mixes_reset_test.go => capella__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/mainnet/{capella/epoch_processing/registry_updates_test.go => capella__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/mainnet/{capella/epoch_processing/rewards_and_penalties_test.go => capella__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/mainnet/{capella/epoch_processing/slashings_reset_test.go => capella__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/mainnet/{capella/epoch_processing/slashings_test.go => capella__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/mainnet/{capella/finality/finality_test.go => capella__finality__finality_test.go} (91%)
 rename testing/spectest/mainnet/{capella/fork_helper/upgrade_to_capella_test.go => capella__fork_helper__upgrade_to_capella_test.go} (90%)
 rename testing/spectest/mainnet/{capella/fork_transition/transition_test.go => capella__fork_transition__transition_test.go} (88%)
 rename testing/spectest/mainnet/{capella/forkchoice/forkchoice_test.go => capella__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/mainnet/{capella/light_client/single_merkle_proof_test.go => capella__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/mainnet/{capella/operations/attestation_test.go => capella__operations__attestation_test.go} (91%)
 rename testing/spectest/mainnet/{capella/operations/attester_slashing_test.go => capella__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{capella/operations/block_header_test.go => capella__operations__block_header_test.go} (91%)
 rename testing/spectest/mainnet/{capella/operations/bls_to_execution_change_test.go => capella__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/mainnet/{capella/operations/deposit_test.go => capella__operations__deposit_test.go} (91%)
 rename testing/spectest/mainnet/{capella/operations/execution_payload_test.go => capella__operations__execution_payload_test.go} (92%)
 rename testing/spectest/mainnet/{capella/operations/proposer_slashing_test.go => capella__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{capella/operations/sync_committee_test.go => capella__operations__sync_committee_test.go} (92%)
 rename testing/spectest/mainnet/{capella/operations/voluntary_exit_test.go => capella__operations__voluntary_exit_test.go} (92%)
 rename testing/spectest/mainnet/{capella/operations/withdrawals_test.go => capella__operations__withdrawals_test.go} (91%)
 rename testing/spectest/mainnet/{capella/random/random_test.go => capella__random__random_test.go} (93%)
 rename testing/spectest/mainnet/{capella/rewards/rewards_test.go => capella__rewards__rewards_test.go} (93%)
 rename testing/spectest/mainnet/{capella/sanity/blocks_test.go => capella__sanity__blocks_test.go} (93%)
 rename testing/spectest/mainnet/{capella/sanity/slots_test.go => capella__sanity__slots_test.go} (92%)
 rename testing/spectest/mainnet/{capella/ssz_static/ssz_static_test.go => capella__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/mainnet/deneb/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/finality/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/fork_helper/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/merkle_proof/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/operations/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/random/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/deneb/ssz_static/BUILD.bazel
 rename testing/spectest/mainnet/{deneb/epoch_processing/effective_balance_updates_test.go => deneb__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/eth1_data_reset_test.go => deneb__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/historical_summaries_update_test.go => deneb__epoch_processing__historical_summaries_update_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/inactivity_updates_test.go => deneb__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/justification_and_finalization_test.go => deneb__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/participation_flag_updates_test.go => deneb__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/randao_mixes_reset_test.go => deneb__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/registry_updates_test.go => deneb__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/rewards_and_penalties_test.go => deneb__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/slashings_reset_test.go => deneb__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/epoch_processing/slashings_test.go => deneb__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/finality/finality_test.go => deneb__finality__finality_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/fork_helper/upgrade_to_deneb_test.go => deneb__fork_helper__upgrade_to_deneb_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/fork_transition/transition_test.go => deneb__fork_transition__transition_test.go} (88%)
 rename testing/spectest/mainnet/{deneb/forkchoice/forkchoice_test.go => deneb__forkchoice__forkchoice_test.go} (92%)
 rename testing/spectest/mainnet/{deneb/light_client/single_merkle_proof_test.go => deneb__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/mainnet/{deneb/merkle_proof/merkle_proof_test.go => deneb__merkle_proof__merkle_proof_test.go} (90%)
 rename testing/spectest/mainnet/{deneb/operations/attestation_test.go => deneb__operations__attestation_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/operations/attester_slashing_test.go => deneb__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{deneb/operations/block_header_test.go => deneb__operations__block_header_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/operations/bls_to_execution_change_test.go => deneb__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/mainnet/{deneb/operations/deposit_test.go => deneb__operations__deposit_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/operations/execution_payload_test.go => deneb__operations__execution_payload_test.go} (92%)
 rename testing/spectest/mainnet/{deneb/operations/proposer_slashing_test.go => deneb__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{deneb/operations/sync_committee_test.go => deneb__operations__sync_committee_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/operations/voluntary_exit_test.go => deneb__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/operations/withdrawals_test.go => deneb__operations__withdrawals_test.go} (91%)
 rename testing/spectest/mainnet/{deneb/random/random_test.go => deneb__random__random_test.go} (93%)
 rename testing/spectest/mainnet/{deneb/rewards/rewards_test.go => deneb__rewards__rewards_test.go} (92%)
 rename testing/spectest/mainnet/{deneb/sanity/blocks_test.go => deneb__sanity__blocks_test.go} (93%)
 rename testing/spectest/mainnet/{deneb/sanity/slots_test.go => deneb__sanity__slots_test.go} (92%)
 rename testing/spectest/mainnet/{deneb/ssz_static/ssz_static_test.go => deneb__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/mainnet/electra/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/finality/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/fork_helper/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/merkle_proof/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/operations/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/random/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/electra/ssz_static/BUILD.bazel
 rename testing/spectest/mainnet/{electra/epoch_processing/effective_balance_updates_test.go => electra__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/mainnet/{electra/epoch_processing/eth1_data_reset_test.go => electra__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/historical_summaries_update_test.go => electra__epoch_processing__historical_summaries_update_test.go} (91%)
 rename testing/spectest/mainnet/{electra/epoch_processing/inactivity_updates_test.go => electra__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/justification_and_finalization_test.go => electra__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/mainnet/{electra/epoch_processing/participation_flag_updates_test.go => electra__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/pending_consolidations_test.go => electra__epoch_processing__pending_consolidations_test.go} (91%)
 rename testing/spectest/mainnet/{electra/epoch_processing/pending_deposits_updates_test.go => electra__epoch_processing__pending_deposits_updates_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/randao_mixes_reset_test.go => electra__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/registry_updates_test.go => electra__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/rewards_and_penalties_test.go => electra__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/slashings_reset_test.go => electra__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/mainnet/{electra/epoch_processing/slashings_test.go => electra__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/mainnet/{electra/finality/finality_test.go => electra__finality__finality_test.go} (91%)
 rename testing/spectest/mainnet/{electra/fork_helper/upgrade_to_electra_test.go => electra__fork_helper__upgrade_to_electra_test.go} (90%)
 rename testing/spectest/mainnet/{electra/fork_transition/transition_test.go => electra__fork_transition__transition_test.go} (88%)
 rename testing/spectest/mainnet/{electra/forkchoice/forkchoice_test.go => electra__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/mainnet/{electra/light_client/single_merkle_proof_test.go => electra__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/mainnet/{electra/merkle_proof/merkle_proof_test.go => electra__merkle_proof__merkle_proof_test.go} (90%)
 rename testing/spectest/mainnet/{electra/operations/attestation_test.go => electra__operations__attestation_test.go} (91%)
 rename testing/spectest/mainnet/{electra/operations/attester_slashing_test.go => electra__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/block_header_test.go => electra__operations__block_header_test.go} (91%)
 rename testing/spectest/mainnet/{electra/operations/bls_to_execution_change_test.go => electra__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/consolidation_test.go => electra__operations__consolidation_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/deposit_requests_test.go => electra__operations__deposit_requests_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/deposit_test.go => electra__operations__deposit_test.go} (91%)
 rename testing/spectest/mainnet/{electra/operations/execution_layer_withdrawals_test.go => electra__operations__execution_layer_withdrawals_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/execution_payload_test.go => electra__operations__execution_payload_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/proposer_slashing_test.go => electra__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/sync_committee_test.go => electra__operations__sync_committee_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/voluntary_exit_test.go => electra__operations__voluntary_exit_test.go} (92%)
 rename testing/spectest/mainnet/{electra/operations/withdrawals_test.go => electra__operations__withdrawals_test.go} (91%)
 rename testing/spectest/mainnet/{electra/random/random_test.go => electra__random__random_test.go} (93%)
 rename testing/spectest/mainnet/{electra/rewards/rewards_test.go => electra__rewards__rewards_test.go} (93%)
 rename testing/spectest/mainnet/{electra/sanity/blocks_test.go => electra__sanity__blocks_test.go} (93%)
 rename testing/spectest/mainnet/{electra/sanity/slots_test.go => electra__sanity__slots_test.go} (92%)
 rename testing/spectest/mainnet/{electra/ssz_static/ssz_static_test.go => electra__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/mainnet/fulu/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/finality/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/fork/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/merkle_proof/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/networking/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/operations/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/random/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/fulu/ssz_static/BUILD.bazel
 rename testing/spectest/mainnet/{fulu/epoch_processing/effective_balance_updates_test.go => fulu__epoch_processing__effective_balance_updates_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/eth1_data_reset_test.go => fulu__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/historical_summaries_update_test.go => fulu__epoch_processing__historical_summaries_update_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/inactivity_updates_test.go => fulu__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/justification_and_finalization_test.go => fulu__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/participation_flag_updates_test.go => fulu__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/pending_consolidations_test.go => fulu__epoch_processing__pending_consolidations_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/pending_deposits_updates_test.go => fulu__epoch_processing__pending_deposits_updates_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/randao_mixes_reset_test.go => fulu__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/registry_updates_test.go => fulu__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/rewards_and_penalties_test.go => fulu__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/slashings_reset_test.go => fulu__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/epoch_processing/slashings_test.go => fulu__epoch_processing__slashings_test.go} (89%)
 rename testing/spectest/mainnet/{fulu/finality/finality_test.go => fulu__finality__finality_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/fork/upgrade_to_fulu_test.go => fulu__fork__upgrade_to_fulu_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/forkchoice/forkchoice_test.go => fulu__forkchoice__forkchoice_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/merkle_proof/merkle_proof_test.go => fulu__merkle_proof__merkle_proof_test.go} (90%)
 rename testing/spectest/mainnet/{fulu/networking/custody_groups_test.go => fulu__networking__custody_groups_test.go} (95%)
 rename testing/spectest/mainnet/{fulu/operations/attestation_test.go => fulu__operations__attestation_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/operations/attester_slashing_test.go => fulu__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/operations/block_header_test.go => fulu__operations__block_header_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/operations/bls_to_execution_change_test.go => fulu__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/operations/consolidation_test.go => fulu__operations__consolidation_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/operations/deposit_requests_test.go => fulu__operations__deposit_requests_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/operations/deposit_test.go => fulu__operations__deposit_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/operations/execution_layer_withdrawals_test.go => fulu__operations__execution_layer_withdrawals_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/operations/execution_payload_test.go => fulu__operations__execution_payload_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/operations/proposer_slashing_test.go => fulu__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/operations/sync_committee_test.go => fulu__operations__sync_committee_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/operations/voluntary_exit_test.go => fulu__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/operations/withdrawals_test.go => fulu__operations__withdrawals_test.go} (91%)
 rename testing/spectest/mainnet/{fulu/random/random_test.go => fulu__random__random_test.go} (93%)
 rename testing/spectest/mainnet/{fulu/rewards/rewards_test.go => fulu__rewards__rewards_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/sanity/blocks_test.go => fulu__sanity__blocks_test.go} (93%)
 rename testing/spectest/mainnet/{fulu/sanity/slots_test.go => fulu__sanity__slots_test.go} (92%)
 rename testing/spectest/mainnet/{fulu/ssz_static/ssz_static_test.go => fulu__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/mainnet/phase0/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/phase0/finality/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/phase0/operations/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/phase0/random/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/phase0/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/phase0/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/phase0/shuffling/core/shuffle/BUILD.bazel
 delete mode 100644 testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go
 delete mode 100644 testing/spectest/mainnet/phase0/ssz_static/BUILD.bazel
 rename testing/spectest/mainnet/{phase0/epoch_processing/effective_balance_updates_test.go => phase0__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/epoch_processing_test.go => phase0__epoch_processing__epoch_processing_test.go} (92%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/eth1_data_reset_test.go => phase0__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/historical_roots_update_test.go => phase0__epoch_processing__historical_roots_update_test.go} (90%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/justification_and_finalization_test.go => phase0__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/participation_record_updates_test.go => phase0__epoch_processing__participation_record_updates_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/randao_mixes_reset_test.go => phase0__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/registry_updates_test.go => phase0__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/rewards_and_penalties_test.go => phase0__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/slashings_reset_test.go => phase0__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/mainnet/{phase0/epoch_processing/slashings_test.go => phase0__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/mainnet/{phase0/finality/finality_test.go => phase0__finality__finality_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/operations/attestation_test.go => phase0__operations__attestation_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/operations/attester_slashing_test.go => phase0__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{phase0/operations/block_header_test.go => phase0__operations__block_header_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/operations/deposit_test.go => phase0__operations__deposit_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/operations/proposer_slashing_test.go => phase0__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/mainnet/{phase0/operations/voluntary_exit_test.go => phase0__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/mainnet/{phase0/random/random_test.go => phase0__random__random_test.go} (93%)
 rename testing/spectest/mainnet/{phase0/rewards/rewards_test.go => phase0__rewards__rewards_test.go} (92%)
 rename testing/spectest/mainnet/{phase0/sanity/blocks_test.go => phase0__sanity__blocks_test.go} (93%)
 rename testing/spectest/mainnet/{phase0/sanity/slots_test.go => phase0__sanity__slots_test.go} (92%)
 rename testing/spectest/mainnet/{phase0/ssz_static/ssz_static_test.go => phase0__ssz_static__ssz_static_test.go} (91%)
 create mode 100644 testing/spectest/minimal/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/finality/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/fork/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/operations/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/random/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/altair/ssz_static/BUILD.bazel
 rename testing/spectest/minimal/{altair/epoch_processing/effective_balance_updates_test.go => altair__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/minimal/{altair/epoch_processing/eth1_data_reset_test.go => altair__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/historical_roots_update_test.go => altair__epoch_processing__historical_roots_update_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/inactivity_updates_test.go => altair__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/justification_and_finalization_test.go => altair__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/minimal/{altair/epoch_processing/participation_flag_updates_test.go => altair__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/randao_mixes_reset_test.go => altair__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/registry_updates_test.go => altair__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/rewards_and_penalties_test.go => altair__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/slashings_reset_test.go => altair__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/minimal/{altair/epoch_processing/slashings_test.go => altair__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/minimal/{altair/finality/finality_test.go => altair__finality__finality_test.go} (91%)
 rename testing/spectest/minimal/{altair/fork/upgrade_to_altair_test.go => altair__fork__upgrade_to_altair_test.go} (92%)
 rename testing/spectest/minimal/{altair/fork_transition/transition_test.go => altair__fork_transition__transition_test.go} (88%)
 rename testing/spectest/minimal/{altair/forkchoice/forkchoice_test.go => altair__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/minimal/{altair/light_client/single_merkle_proof_test.go => altair__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/minimal/{altair/light_client/update_ranking_test.go => altair__light_client__update_ranking_test.go} (93%)
 rename testing/spectest/minimal/{altair/operations/attestation_test.go => altair__operations__attestation_test.go} (91%)
 rename testing/spectest/minimal/{altair/operations/attester_slashing_test.go => altair__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/minimal/{altair/operations/block_header_test.go => altair__operations__block_header_test.go} (91%)
 rename testing/spectest/minimal/{altair/operations/deposit_test.go => altair__operations__deposit_test.go} (91%)
 rename testing/spectest/minimal/{altair/operations/proposer_slashing_test.go => altair__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/minimal/{altair/operations/sync_committee_test.go => altair__operations__sync_committee_test.go} (91%)
 rename testing/spectest/minimal/{altair/operations/voluntary_exit_test.go => altair__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/minimal/{altair/random/random_test.go => altair__random__random_test.go} (93%)
 rename testing/spectest/minimal/{altair/rewards/rewards_test.go => altair__rewards__rewards_test.go} (92%)
 rename testing/spectest/minimal/{altair/sanity/blocks_test.go => altair__sanity__blocks_test.go} (93%)
 rename testing/spectest/minimal/{altair/sanity/slots_test.go => altair__sanity__slots_test.go} (92%)
 rename testing/spectest/minimal/{altair/ssz_static/ssz_static_test.go => altair__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/minimal/bellatrix/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/finality/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/fork/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/operations/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/random/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/bellatrix/ssz_static/BUILD.bazel
 rename testing/spectest/minimal/{bellatrix/epoch_processing/effective_balance_updates_test.go => bellatrix__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/eth1_data_reset_test.go => bellatrix__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/historical_roots_update_test.go => bellatrix__epoch_processing__historical_roots_update_test.go} (91%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/inactivity_updates_test.go => bellatrix__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/justification_and_finalization_test.go => bellatrix__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/participation_flag_updates_test.go => bellatrix__epoch_processing__participation_flag_updates_test.go} (91%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/randao_mixes_reset_test.go => bellatrix__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/registry_updates_test.go => bellatrix__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/rewards_and_penalties_test.go => bellatrix__epoch_processing__rewards_and_penalties_test.go} (91%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/slashings_reset_test.go => bellatrix__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/minimal/{bellatrix/epoch_processing/slashings_test.go => bellatrix__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/minimal/{bellatrix/finality/finality_test.go => bellatrix__finality__finality_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/fork/upgrade_to_altair_test.go => bellatrix__fork__upgrade_to_altair_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/fork_transition/transition_test.go => bellatrix__fork_transition__transition_test.go} (89%)
 rename testing/spectest/minimal/{bellatrix/forkchoice/forkchoice_test.go => bellatrix__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/minimal/{bellatrix/light_client/single_merkle_proof_test.go => bellatrix__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/minimal/{bellatrix/light_client/update_ranking_test.go => bellatrix__light_client__update_ranking_test.go} (93%)
 rename testing/spectest/minimal/{bellatrix/operations/attestation_test.go => bellatrix__operations__attestation_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/operations/attester_slashing_test.go => bellatrix__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/operations/block_header_test.go => bellatrix__operations__block_header_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/operations/deposit_test.go => bellatrix__operations__deposit_test.go} (91%)
 rename testing/spectest/minimal/{bellatrix/operations/execution_payload_test.go => bellatrix__operations__execution_payload_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/operations/proposer_slashing_test.go => bellatrix__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/operations/sync_committee_test.go => bellatrix__operations__sync_committee_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/operations/voluntary_exit_test.go => bellatrix__operations__voluntary_exit_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/random/random_test.go => bellatrix__random__random_test.go} (93%)
 rename testing/spectest/minimal/{bellatrix/rewards/rewards_test.go => bellatrix__rewards__rewards_test.go} (93%)
 rename testing/spectest/minimal/{bellatrix/sanity/blocks_test.go => bellatrix__sanity__blocks_test.go} (93%)
 rename testing/spectest/minimal/{bellatrix/sanity/slots_test.go => bellatrix__sanity__slots_test.go} (92%)
 rename testing/spectest/minimal/{bellatrix/ssz_static/ssz_static_test.go => bellatrix__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/minimal/capella/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/finality/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/fork/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/operations/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/random/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/capella/ssz_static/BUILD.bazel
 rename testing/spectest/minimal/{capella/epoch_processing/effective_balance_updates_test.go => capella__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/minimal/{capella/epoch_processing/eth1_data_reset_test.go => capella__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/minimal/{capella/epoch_processing/historical_roots_summaries_test.go => capella__epoch_processing__historical_roots_summaries_test.go} (91%)
 rename testing/spectest/minimal/{capella/epoch_processing/inactivity_updates_test.go => capella__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/minimal/{capella/epoch_processing/justification_and_finalization_test.go => capella__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/minimal/{capella/epoch_processing/participation_flag_updates_test.go => capella__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/minimal/{capella/epoch_processing/randao_mixes_reset_test.go => capella__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/minimal/{capella/epoch_processing/registry_updates_test.go => capella__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/minimal/{capella/epoch_processing/rewards_and_penalties_test.go => capella__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/minimal/{capella/epoch_processing/slashings_reset_test.go => capella__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/minimal/{capella/epoch_processing/slashings_test.go => capella__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/minimal/{capella/finality/finality_test.go => capella__finality__finality_test.go} (91%)
 rename testing/spectest/minimal/{capella/fork/upgrade_to_capella_test.go => capella__fork__upgrade_to_capella_test.go} (92%)
 rename testing/spectest/minimal/{capella/fork_transition/transition_test.go => capella__fork_transition__transition_test.go} (88%)
 rename testing/spectest/minimal/{capella/forkchoice/forkchoice_test.go => capella__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/minimal/{capella/light_client/single_merkle_proof_test.go => capella__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/minimal/{capella/light_client/update_ranking_test.go => capella__light_client__update_ranking_test.go} (93%)
 rename testing/spectest/minimal/{capella/operations/attestation_test.go => capella__operations__attestation_test.go} (91%)
 rename testing/spectest/minimal/{capella/operations/attester_slashing_test.go => capella__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/minimal/{capella/operations/block_header_test.go => capella__operations__block_header_test.go} (91%)
 rename testing/spectest/minimal/{capella/operations/bls_to_execution_change_test.go => capella__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/minimal/{capella/operations/deposit_test.go => capella__operations__deposit_test.go} (91%)
 rename testing/spectest/minimal/{capella/operations/execution_payload_test.go => capella__operations__execution_payload_test.go} (92%)
 rename testing/spectest/minimal/{capella/operations/proposer_slashing_test.go => capella__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/minimal/{capella/operations/sync_committee_test.go => capella__operations__sync_committee_test.go} (92%)
 rename testing/spectest/minimal/{capella/operations/voluntary_exit_test.go => capella__operations__voluntary_exit_test.go} (92%)
 rename testing/spectest/minimal/{capella/operations/withdrawals_test.go => capella__operations__withdrawals_test.go} (91%)
 rename testing/spectest/minimal/{capella/random/random_test.go => capella__random__random_test.go} (93%)
 rename testing/spectest/minimal/{capella/rewards/rewards_test.go => capella__rewards__rewards_test.go} (93%)
 rename testing/spectest/minimal/{capella/sanity/blocks_test.go => capella__sanity__blocks_test.go} (93%)
 rename testing/spectest/minimal/{capella/sanity/slots_test.go => capella__sanity__slots_test.go} (92%)
 rename testing/spectest/minimal/{capella/ssz_static/ssz_static_test.go => capella__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/minimal/deneb/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/finality/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/fork/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/merkle_proof/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/operations/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/random/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/deneb/ssz_static/BUILD.bazel
 rename testing/spectest/minimal/{deneb/epoch_processing/effective_balance_updates_test.go => deneb__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/minimal/{deneb/epoch_processing/eth1_data_reset_test.go => deneb__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/minimal/{deneb/epoch_processing/historical_summaries_update_test.go => deneb__epoch_processing__historical_summaries_update_test.go} (91%)
 rename testing/spectest/minimal/{deneb/epoch_processing/inactivity_updates_test.go => deneb__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/minimal/{deneb/epoch_processing/justification_and_finalization_test.go => deneb__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/minimal/{deneb/epoch_processing/participation_flag_updates_test.go => deneb__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/minimal/{deneb/epoch_processing/randao_mixes_reset_test.go => deneb__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/minimal/{deneb/epoch_processing/registry_updates_test.go => deneb__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/minimal/{deneb/epoch_processing/rewards_and_penalties_test.go => deneb__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/minimal/{deneb/epoch_processing/slashings_reset_test.go => deneb__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/minimal/{deneb/epoch_processing/slashings_test.go => deneb__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/minimal/{deneb/finality/finality_test.go => deneb__finality__finality_test.go} (91%)
 rename testing/spectest/minimal/{deneb/fork/upgrade_to_deneb_test.go => deneb__fork__upgrade_to_deneb_test.go} (92%)
 rename testing/spectest/minimal/{deneb/fork_transition/transition_test.go => deneb__fork_transition__transition_test.go} (88%)
 rename testing/spectest/minimal/{deneb/forkchoice/forkchoice_test.go => deneb__forkchoice__forkchoice_test.go} (92%)
 rename testing/spectest/minimal/{deneb/light_client/single_merkle_proof_test.go => deneb__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/minimal/{deneb/light_client/update_ranking_test.go => deneb__light_client__update_ranking_test.go} (93%)
 rename testing/spectest/minimal/{deneb/merkle_proof/merkle_proof_test.go => deneb__merkle_proof__merkle_proof_test.go} (90%)
 rename testing/spectest/minimal/{deneb/operations/attestation_test.go => deneb__operations__attestation_test.go} (91%)
 rename testing/spectest/minimal/{deneb/operations/attester_slashing_test.go => deneb__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/minimal/{deneb/operations/block_header_test.go => deneb__operations__block_header_test.go} (91%)
 rename testing/spectest/minimal/{deneb/operations/bls_to_execution_change_test.go => deneb__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/minimal/{deneb/operations/deposit_test.go => deneb__operations__deposit_test.go} (91%)
 rename testing/spectest/minimal/{deneb/operations/execution_payload_test.go => deneb__operations__execution_payload_test.go} (92%)
 rename testing/spectest/minimal/{deneb/operations/proposer_slashing_test.go => deneb__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/minimal/{deneb/operations/sync_committee_test.go => deneb__operations__sync_committee_test.go} (91%)
 rename testing/spectest/minimal/{deneb/operations/voluntary_exit_test.go => deneb__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/minimal/{deneb/operations/withdrawals_test.go => deneb__operations__withdrawals_test.go} (91%)
 rename testing/spectest/minimal/{deneb/random/random_test.go => deneb__random__random_test.go} (93%)
 rename testing/spectest/minimal/{deneb/rewards/rewards_test.go => deneb__rewards__rewards_test.go} (92%)
 rename testing/spectest/minimal/{deneb/sanity/blocks_test.go => deneb__sanity__blocks_test.go} (93%)
 rename testing/spectest/minimal/{deneb/sanity/slots_test.go => deneb__sanity__slots_test.go} (92%)
 rename testing/spectest/minimal/{deneb/ssz_static/ssz_static_test.go => deneb__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/minimal/electra/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/finality/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/fork/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/fork_transition/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/light_client/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/merkle_proof/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/operations/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/random/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/electra/ssz_static/BUILD.bazel
 rename testing/spectest/minimal/{electra/epoch_processing/effective_balance_updates_test.go => electra__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/minimal/{electra/epoch_processing/eth1_data_reset_test.go => electra__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/historical_summaries_update_test.go => electra__epoch_processing__historical_summaries_update_test.go} (91%)
 rename testing/spectest/minimal/{electra/epoch_processing/inactivity_updates_test.go => electra__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/justification_and_finalization_test.go => electra__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/minimal/{electra/epoch_processing/participation_flag_updates_test.go => electra__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/pending_consolidations_test.go => electra__epoch_processing__pending_consolidations_test.go} (91%)
 rename testing/spectest/minimal/{electra/epoch_processing/pending_deposits_updates_test.go => electra__epoch_processing__pending_deposits_updates_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/randao_mixes_reset_test.go => electra__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/registry_updates_test.go => electra__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/rewards_and_penalties_test.go => electra__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/slashings_reset_test.go => electra__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/slashings_test.go => electra__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/minimal/{electra/epoch_processing/sync_committee_updates_test.go => electra__epoch_processing__sync_committee_updates_test.go} (90%)
 rename testing/spectest/minimal/{electra/finality/finality_test.go => electra__finality__finality_test.go} (91%)
 rename testing/spectest/minimal/{electra/fork/upgrade_to_electra_test.go => electra__fork__upgrade_to_electra_test.go} (92%)
 rename testing/spectest/minimal/{electra/fork_transition/transition_test.go => electra__fork_transition__transition_test.go} (88%)
 rename testing/spectest/minimal/{electra/forkchoice/forkchoice_test.go => electra__forkchoice__forkchoice_test.go} (93%)
 rename testing/spectest/minimal/{electra/light_client/single_merkle_proof_test.go => electra__light_client__single_merkle_proof_test.go} (93%)
 rename testing/spectest/minimal/{electra/light_client/update_ranking_test.go => electra__light_client__update_ranking_test.go} (93%)
 rename testing/spectest/minimal/{electra/merkle_proof/merkle_proof_test.go => electra__merkle_proof__merkle_proof_test.go} (90%)
 rename testing/spectest/minimal/{electra/operations/attestation_test.go => electra__operations__attestation_test.go} (91%)
 rename testing/spectest/minimal/{electra/operations/attester_slashing_test.go => electra__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/block_header_test.go => electra__operations__block_header_test.go} (91%)
 rename testing/spectest/minimal/{electra/operations/bls_to_execution_change_test.go => electra__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/consolidation_test.go => electra__operations__consolidation_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/deposit_requests_test.go => electra__operations__deposit_requests_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/deposit_test.go => electra__operations__deposit_test.go} (91%)
 rename testing/spectest/minimal/{electra/operations/execution_layer_withdrawals_test.go => electra__operations__execution_layer_withdrawals_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/execution_payload_test.go => electra__operations__execution_payload_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/proposer_slashing_test.go => electra__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/sync_committee_test.go => electra__operations__sync_committee_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/voluntary_exit_test.go => electra__operations__voluntary_exit_test.go} (92%)
 rename testing/spectest/minimal/{electra/operations/withdrawals_test.go => electra__operations__withdrawals_test.go} (91%)
 rename testing/spectest/minimal/{electra/random/random_test.go => electra__random__random_test.go} (93%)
 rename testing/spectest/minimal/{electra/rewards/rewards_test.go => electra__rewards__rewards_test.go} (93%)
 rename testing/spectest/minimal/{electra/sanity/blocks_test.go => electra__sanity__blocks_test.go} (93%)
 rename testing/spectest/minimal/{electra/sanity/slots_test.go => electra__sanity__slots_test.go} (92%)
 rename testing/spectest/minimal/{electra/ssz_static/ssz_static_test.go => electra__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/minimal/fulu/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/finality/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/fork/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/forkchoice/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/merkle_proof/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/networking/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/operations/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/random/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/fulu/ssz_static/BUILD.bazel
 rename testing/spectest/minimal/{fulu/epoch_processing/effective_balance_updates_test.go => fulu__epoch_processing__effective_balance_updates_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/eth1_data_reset_test.go => fulu__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/historical_summaries_update_test.go => fulu__epoch_processing__historical_summaries_update_test.go} (91%)
 rename testing/spectest/minimal/{fulu/epoch_processing/inactivity_updates_test.go => fulu__epoch_processing__inactivity_updates_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/justification_and_finalization_test.go => fulu__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/minimal/{fulu/epoch_processing/participation_flag_updates_test.go => fulu__epoch_processing__participation_flag_updates_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/pending_consolidations_test.go => fulu__epoch_processing__pending_consolidations_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/pending_deposits_updates_test.go => fulu__epoch_processing__pending_deposits_updates_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/randao_mixes_reset_test.go => fulu__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/registry_updates_test.go => fulu__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/rewards_and_penalties_test.go => fulu__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/slashings_reset_test.go => fulu__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/minimal/{fulu/epoch_processing/slashings_test.go => fulu__epoch_processing__slashings_test.go} (89%)
 rename testing/spectest/minimal/{fulu/epoch_processing/sync_committee_updates_test.go => fulu__epoch_processing__sync_committee_updates_test.go} (90%)
 rename testing/spectest/minimal/{fulu/finality/finality_test.go => fulu__finality__finality_test.go} (91%)
 rename testing/spectest/minimal/{fulu/fork/upgrade_to_fulu_test.go => fulu__fork__upgrade_to_fulu_test.go} (91%)
 rename testing/spectest/minimal/{fulu/forkchoice/forkchoice_test.go => fulu__forkchoice__forkchoice_test.go} (92%)
 rename testing/spectest/minimal/{fulu/merkle_proof/merkle_proof_test.go => fulu__merkle_proof__merkle_proof_test.go} (90%)
 rename testing/spectest/minimal/{fulu/networking/custody_columns_test.go => fulu__networking__custody_columns_test.go} (95%)
 rename testing/spectest/minimal/{fulu/operations/attestation_test.go => fulu__operations__attestation_test.go} (91%)
 rename testing/spectest/minimal/{fulu/operations/attester_slashing_test.go => fulu__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/minimal/{fulu/operations/block_header_test.go => fulu__operations__block_header_test.go} (91%)
 rename testing/spectest/minimal/{fulu/operations/bls_to_execution_change_test.go => fulu__operations__bls_to_execution_change_test.go} (92%)
 rename testing/spectest/minimal/{fulu/operations/consolidation_test.go => fulu__operations__consolidation_test.go} (91%)
 rename testing/spectest/minimal/{fulu/operations/deposit_requests_test.go => fulu__operations__deposit_requests_test.go} (91%)
 rename testing/spectest/minimal/{fulu/operations/deposit_test.go => fulu__operations__deposit_test.go} (91%)
 rename testing/spectest/minimal/{fulu/operations/execution_layer_withdrawals_test.go => fulu__operations__execution_layer_withdrawals_test.go} (92%)
 rename testing/spectest/minimal/{fulu/operations/execution_payload_test.go => fulu__operations__execution_payload_test.go} (92%)
 rename testing/spectest/minimal/{fulu/operations/proposer_slashing_test.go => fulu__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/minimal/{fulu/operations/sync_committee_test.go => fulu__operations__sync_committee_test.go} (91%)
 rename testing/spectest/minimal/{fulu/operations/voluntary_exit_test.go => fulu__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/minimal/{fulu/operations/withdrawals_test.go => fulu__operations__withdrawals_test.go} (91%)
 rename testing/spectest/minimal/{fulu/random/random_test.go => fulu__random__random_test.go} (93%)
 rename testing/spectest/minimal/{fulu/rewards/rewards_test.go => fulu__rewards__rewards_test.go} (92%)
 rename testing/spectest/minimal/{fulu/sanity/blocks_test.go => fulu__sanity__blocks_test.go} (93%)
 rename testing/spectest/minimal/{fulu/sanity/slots_test.go => fulu__sanity__slots_test.go} (92%)
 rename testing/spectest/minimal/{fulu/ssz_static/ssz_static_test.go => fulu__ssz_static__ssz_static_test.go} (91%)
 delete mode 100644 testing/spectest/minimal/phase0/epoch_processing/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/phase0/finality/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/phase0/operations/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/phase0/random/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/phase0/rewards/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/phase0/sanity/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/phase0/shuffling/core/shuffle/BUILD.bazel
 delete mode 100644 testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go
 delete mode 100644 testing/spectest/minimal/phase0/ssz_static/BUILD.bazel
 rename testing/spectest/minimal/{phase0/epoch_processing/effective_balance_updates_test.go => phase0__epoch_processing__effective_balance_updates_test.go} (91%)
 rename testing/spectest/minimal/{phase0/epoch_processing/epoch_processing_test.go => phase0__epoch_processing__epoch_processing_test.go} (92%)
 rename testing/spectest/minimal/{phase0/epoch_processing/eth1_data_reset_test.go => phase0__epoch_processing__eth1_data_reset_test.go} (90%)
 rename testing/spectest/minimal/{phase0/epoch_processing/historical_roots_update_test.go => phase0__epoch_processing__historical_roots_update_test.go} (90%)
 rename testing/spectest/minimal/{phase0/epoch_processing/justification_and_finalization_test.go => phase0__epoch_processing__justification_and_finalization_test.go} (91%)
 rename testing/spectest/minimal/{phase0/epoch_processing/participation_record_updates_test.go => phase0__epoch_processing__participation_record_updates_test.go} (91%)
 rename testing/spectest/minimal/{phase0/epoch_processing/randao_mixes_reset_test.go => phase0__epoch_processing__randao_mixes_reset_test.go} (90%)
 rename testing/spectest/minimal/{phase0/epoch_processing/registry_updates_test.go => phase0__epoch_processing__registry_updates_test.go} (90%)
 rename testing/spectest/minimal/{phase0/epoch_processing/rewards_and_penalties_test.go => phase0__epoch_processing__rewards_and_penalties_test.go} (90%)
 rename testing/spectest/minimal/{phase0/epoch_processing/slashings_reset_test.go => phase0__epoch_processing__slashings_reset_test.go} (90%)
 rename testing/spectest/minimal/{phase0/epoch_processing/slashings_test.go => phase0__epoch_processing__slashings_test.go} (90%)
 rename testing/spectest/minimal/{phase0/finality/finality_test.go => phase0__finality__finality_test.go} (91%)
 rename testing/spectest/minimal/{phase0/operations/attestation_test.go => phase0__operations__attestation_test.go} (91%)
 rename testing/spectest/minimal/{phase0/operations/attester_slashing_test.go => phase0__operations__attester_slashing_test.go} (92%)
 rename testing/spectest/minimal/{phase0/operations/block_header_test.go => phase0__operations__block_header_test.go} (91%)
 rename testing/spectest/minimal/{phase0/operations/deposit_test.go => phase0__operations__deposit_test.go} (91%)
 rename testing/spectest/minimal/{phase0/operations/proposer_slashing_test.go => phase0__operations__proposer_slashing_test.go} (92%)
 rename testing/spectest/minimal/{phase0/operations/voluntary_exit_test.go => phase0__operations__voluntary_exit_test.go} (91%)
 rename testing/spectest/minimal/{phase0/random/random_test.go => phase0__random__random_test.go} (93%)
 rename testing/spectest/minimal/{phase0/rewards/rewards_test.go => phase0__rewards__rewards_test.go} (92%)
 rename testing/spectest/minimal/{phase0/sanity/blocks_test.go => phase0__sanity__blocks_test.go} (93%)
 rename testing/spectest/minimal/{phase0/sanity/slots_test.go => phase0__sanity__slots_test.go} (92%)
 rename testing/spectest/minimal/{phase0/ssz_static/ssz_static_test.go => phase0__ssz_static__ssz_static_test.go} (91%)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index a38fe1da09..08f6c7a020 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -18,7 +18,7 @@ jobs:
         uses: dsaltares/fetch-gh-release-asset@aa2ab1243d6e0d5b405b973c89fa4d06a2d0fff7 # 1.1.2
         with:
           repo: OffchainLabs/unclog
-          version: "tags/v0.1.3"
+          version: "tags/v0.1.5"
           file: "unclog"
 
       - name: Get new changelog files
diff --git a/changelog/pvl-flat-spectests.md b/changelog/pvl-flat-spectests.md
new file mode 100644
index 0000000000..ab9aa02d27
--- /dev/null
+++ b/changelog/pvl-flat-spectests.md
@@ -0,0 +1,3 @@
+### Ignored
+
+- Changed spectest tests to a single directory per config (mainnet, general, minimal). This has a significant reduction in runtime due to runfile tree generation only happening 3 times rather than dozens of times.
diff --git a/testing/spectest/README.md b/testing/spectest/README.md
index 1e4049cbbc..b7f795a4cb 100644
--- a/testing/spectest/README.md
+++ b/testing/spectest/README.md
@@ -2,15 +2,29 @@
 
 Spec testing vectors: https://github.com/ethereum/consensus-spec-tests
 
-To run all `mainnet` spec tests:
+To run all spectests:
 
 ```bash
 bazel test //... --test_tag_filters=spectest
 ```
 
-Minimal tests require `--define ssz=minimal` setting and are not triggered
-automatically when `//...` is selected. One can run minimal tests manually, though:
+## Adding new tests
+
+New tests must adhere to the following filename convention:
 
-```bash
-bazel query 'tests(attr("tags", "minimal, spectest", //...))' | xargs bazel test --define ssz=minimal
+```
+{mainnet/minimal/general}/$fork__$package__$test_test.go
+```
+
+An example test is the phase0 epoch processing test for effective balance updates. This test has a spectest path of `{mainnet, minimal}/phase0/epoch_processing/effective_balance_updates/pyspec_tests`.
+There are tests for mainnet and minimal config, so for each config we will add a file by the name of `phase0__epoch_processing__effective_balance_updates_test.go` since the fork is `phase0`, the package is `epoch_processing`, and the test is `effective_balance_updates`.
+
+## Running nightly spectests
+
+Since [PR 15312](https://github.com/OffchainLabs/prysm/pull/15312), Prysm has support to download "nightly" spectests from github via a starlark rule configuration by environment variable. 
+Set `--repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly` when running spectest to download the "nightly" spectests. 
+Note: A GITHUB_TOKEN environment variable is required to be set. The github token must be a [fine grained token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token).
+
+```
+bazel test //... --test_tag_filters=spectest --repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly
 ```
diff --git a/testing/spectest/general/deneb/kzg/BUILD.bazel b/testing/spectest/general/BUILD.bazel
similarity index 78%
rename from testing/spectest/general/deneb/kzg/BUILD.bazel
rename to testing/spectest/general/BUILD.bazel
index 158187ad5f..4da30644ce 100644
--- a/testing/spectest/general/deneb/kzg/BUILD.bazel
+++ b/testing/spectest/general/BUILD.bazel
@@ -2,11 +2,8 @@ load("@prysm//tools/go:def.bzl", "go_test")
 
 go_test(
     name = "go_default_test",
-    size = "small",
-    srcs = ["verify_blob_kzg_proof_batch_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
+    srcs = ["deneb__kzg__verify_blob_kzg_proof_batch_test.go"],
+    data = ["@consensus_spec_tests//:test_data"],
     tags = ["spectest"],
     deps = [
         "//beacon-chain/blockchain/kzg:go_default_library",
diff --git a/testing/spectest/general/deneb/kzg/verify_blob_kzg_proof_batch_test.go b/testing/spectest/general/deneb__kzg__verify_blob_kzg_proof_batch_test.go
similarity index 99%
rename from testing/spectest/general/deneb/kzg/verify_blob_kzg_proof_batch_test.go
rename to testing/spectest/general/deneb__kzg__verify_blob_kzg_proof_batch_test.go
index bcfcd4c399..7979e3f562 100644
--- a/testing/spectest/general/deneb/kzg/verify_blob_kzg_proof_batch_test.go
+++ b/testing/spectest/general/deneb__kzg__verify_blob_kzg_proof_batch_test.go
@@ -1,4 +1,4 @@
-package kzg
+package general
 
 import (
 	"encoding/hex"
diff --git a/testing/spectest/mainnet/BUILD.bazel b/testing/spectest/mainnet/BUILD.bazel
new file mode 100644
index 0000000000..3f1a748cf0
--- /dev/null
+++ b/testing/spectest/mainnet/BUILD.bazel
@@ -0,0 +1,283 @@
+load("@prysm//tools/go:def.bzl", "go_test")
+
+go_test(
+    name = "go_default_test",
+    srcs = [
+        "altair__epoch_processing__effective_balance_updates_test.go",
+        "altair__epoch_processing__eth1_data_reset_test.go",
+        "altair__epoch_processing__historical_roots_update_test.go",
+        "altair__epoch_processing__inactivity_updates_test.go",
+        "altair__epoch_processing__justification_and_finalization_test.go",
+        "altair__epoch_processing__participation_flag_updates_test.go",
+        "altair__epoch_processing__randao_mixes_reset_test.go",
+        "altair__epoch_processing__registry_updates_test.go",
+        "altair__epoch_processing__rewards_and_penalties_test.go",
+        "altair__epoch_processing__slashings_reset_test.go",
+        "altair__epoch_processing__slashings_test.go",
+        "altair__finality__finality_test.go",
+        "altair__fork_helper__upgrade_to_altair_test.go",
+        "altair__fork_transition__transition_test.go",
+        "altair__forkchoice__forkchoice_test.go",
+        "altair__light_client__single_merkle_proof_test.go",
+        "altair__operations__attestation_test.go",
+        "altair__operations__attester_slashing_test.go",
+        "altair__operations__block_header_test.go",
+        "altair__operations__deposit_test.go",
+        "altair__operations__proposer_slashing_test.go",
+        "altair__operations__sync_committee_test.go",
+        "altair__operations__voluntary_exit_test.go",
+        "altair__random__random_test.go",
+        "altair__rewards__rewards_test.go",
+        "altair__sanity__blocks_test.go",
+        "altair__sanity__slots_test.go",
+        "altair__ssz_static__ssz_static_test.go",
+        "bellatrix__epoch_processing__effective_balance_updates_test.go",
+        "bellatrix__epoch_processing__eth1_data_reset_test.go",
+        "bellatrix__epoch_processing__historical_roots_update_test.go",
+        "bellatrix__epoch_processing__inactivity_updates_test.go",
+        "bellatrix__epoch_processing__justification_and_finalization_test.go",
+        "bellatrix__epoch_processing__participation_flag_updates_test.go",
+        "bellatrix__epoch_processing__randao_mixes_reset_test.go",
+        "bellatrix__epoch_processing__registry_updates_test.go",
+        "bellatrix__epoch_processing__rewards_and_penalties_test.go",
+        "bellatrix__epoch_processing__slashings_reset_test.go",
+        "bellatrix__epoch_processing__slashings_test.go",
+        "bellatrix__finality__finality_test.go",
+        "bellatrix__fork_helper__upgrade_to_altair_test.go",
+        "bellatrix__fork_transition__transition_test.go",
+        "bellatrix__forkchoice__forkchoice_test.go",
+        "bellatrix__light_client__single_merkle_proof_test.go",
+        "bellatrix__operations__attestation_test.go",
+        "bellatrix__operations__attester_slashing_test.go",
+        "bellatrix__operations__block_header_test.go",
+        "bellatrix__operations__deposit_test.go",
+        "bellatrix__operations__execution_payload_test.go",
+        "bellatrix__operations__proposer_slashing_test.go",
+        "bellatrix__operations__sync_committee_test.go",
+        "bellatrix__operations__voluntary_exit_test.go",
+        "bellatrix__random__random_test.go",
+        "bellatrix__rewards__rewards_test.go",
+        "bellatrix__sanity__blocks_test.go",
+        "bellatrix__sanity__slots_test.go",
+        "bellatrix__ssz_static__ssz_static_test.go",
+        "capella__epoch_processing__effective_balance_updates_test.go",
+        "capella__epoch_processing__eth1_data_reset_test.go",
+        "capella__epoch_processing__historical_summaries_update_test.go",
+        "capella__epoch_processing__inactivity_updates_test.go",
+        "capella__epoch_processing__justification_and_finalization_test.go",
+        "capella__epoch_processing__participation_flag_updates_test.go",
+        "capella__epoch_processing__randao_mixes_reset_test.go",
+        "capella__epoch_processing__registry_updates_test.go",
+        "capella__epoch_processing__rewards_and_penalties_test.go",
+        "capella__epoch_processing__slashings_reset_test.go",
+        "capella__epoch_processing__slashings_test.go",
+        "capella__finality__finality_test.go",
+        "capella__fork_helper__upgrade_to_capella_test.go",
+        "capella__fork_transition__transition_test.go",
+        "capella__forkchoice__forkchoice_test.go",
+        "capella__light_client__single_merkle_proof_test.go",
+        "capella__operations__attestation_test.go",
+        "capella__operations__attester_slashing_test.go",
+        "capella__operations__block_header_test.go",
+        "capella__operations__bls_to_execution_change_test.go",
+        "capella__operations__deposit_test.go",
+        "capella__operations__execution_payload_test.go",
+        "capella__operations__proposer_slashing_test.go",
+        "capella__operations__sync_committee_test.go",
+        "capella__operations__voluntary_exit_test.go",
+        "capella__operations__withdrawals_test.go",
+        "capella__random__random_test.go",
+        "capella__rewards__rewards_test.go",
+        "capella__sanity__blocks_test.go",
+        "capella__sanity__slots_test.go",
+        "capella__ssz_static__ssz_static_test.go",
+        "deneb__epoch_processing__effective_balance_updates_test.go",
+        "deneb__epoch_processing__eth1_data_reset_test.go",
+        "deneb__epoch_processing__historical_summaries_update_test.go",
+        "deneb__epoch_processing__inactivity_updates_test.go",
+        "deneb__epoch_processing__justification_and_finalization_test.go",
+        "deneb__epoch_processing__participation_flag_updates_test.go",
+        "deneb__epoch_processing__randao_mixes_reset_test.go",
+        "deneb__epoch_processing__registry_updates_test.go",
+        "deneb__epoch_processing__rewards_and_penalties_test.go",
+        "deneb__epoch_processing__slashings_reset_test.go",
+        "deneb__epoch_processing__slashings_test.go",
+        "deneb__finality__finality_test.go",
+        "deneb__fork_helper__upgrade_to_deneb_test.go",
+        "deneb__fork_transition__transition_test.go",
+        "deneb__forkchoice__forkchoice_test.go",
+        "deneb__light_client__single_merkle_proof_test.go",
+        "deneb__merkle_proof__merkle_proof_test.go",
+        "deneb__operations__attestation_test.go",
+        "deneb__operations__attester_slashing_test.go",
+        "deneb__operations__block_header_test.go",
+        "deneb__operations__bls_to_execution_change_test.go",
+        "deneb__operations__deposit_test.go",
+        "deneb__operations__execution_payload_test.go",
+        "deneb__operations__proposer_slashing_test.go",
+        "deneb__operations__sync_committee_test.go",
+        "deneb__operations__voluntary_exit_test.go",
+        "deneb__operations__withdrawals_test.go",
+        "deneb__random__random_test.go",
+        "deneb__rewards__rewards_test.go",
+        "deneb__sanity__blocks_test.go",
+        "deneb__sanity__slots_test.go",
+        "deneb__ssz_static__ssz_static_test.go",
+        "electra__epoch_processing__effective_balance_updates_test.go",
+        "electra__epoch_processing__eth1_data_reset_test.go",
+        "electra__epoch_processing__historical_summaries_update_test.go",
+        "electra__epoch_processing__inactivity_updates_test.go",
+        "electra__epoch_processing__justification_and_finalization_test.go",
+        "electra__epoch_processing__participation_flag_updates_test.go",
+        "electra__epoch_processing__pending_consolidations_test.go",
+        "electra__epoch_processing__pending_deposits_updates_test.go",
+        "electra__epoch_processing__randao_mixes_reset_test.go",
+        "electra__epoch_processing__registry_updates_test.go",
+        "electra__epoch_processing__rewards_and_penalties_test.go",
+        "electra__epoch_processing__slashings_reset_test.go",
+        "electra__epoch_processing__slashings_test.go",
+        "electra__finality__finality_test.go",
+        "electra__fork_helper__upgrade_to_electra_test.go",
+        "electra__fork_transition__transition_test.go",
+        "electra__forkchoice__forkchoice_test.go",
+        "electra__light_client__single_merkle_proof_test.go",
+        "electra__merkle_proof__merkle_proof_test.go",
+        "electra__operations__attestation_test.go",
+        "electra__operations__attester_slashing_test.go",
+        "electra__operations__block_header_test.go",
+        "electra__operations__bls_to_execution_change_test.go",
+        "electra__operations__consolidation_test.go",
+        "electra__operations__deposit_requests_test.go",
+        "electra__operations__deposit_test.go",
+        "electra__operations__execution_layer_withdrawals_test.go",
+        "electra__operations__execution_payload_test.go",
+        "electra__operations__proposer_slashing_test.go",
+        "electra__operations__sync_committee_test.go",
+        "electra__operations__voluntary_exit_test.go",
+        "electra__operations__withdrawals_test.go",
+        "electra__random__random_test.go",
+        "electra__rewards__rewards_test.go",
+        "electra__sanity__blocks_test.go",
+        "electra__sanity__slots_test.go",
+        "electra__ssz_static__ssz_static_test.go",
+        "fulu__epoch_processing__effective_balance_updates_test.go",
+        "fulu__epoch_processing__eth1_data_reset_test.go",
+        "fulu__epoch_processing__historical_summaries_update_test.go",
+        "fulu__epoch_processing__inactivity_updates_test.go",
+        "fulu__epoch_processing__justification_and_finalization_test.go",
+        "fulu__epoch_processing__participation_flag_updates_test.go",
+        "fulu__epoch_processing__pending_consolidations_test.go",
+        "fulu__epoch_processing__pending_deposits_updates_test.go",
+        "fulu__epoch_processing__randao_mixes_reset_test.go",
+        "fulu__epoch_processing__registry_updates_test.go",
+        "fulu__epoch_processing__rewards_and_penalties_test.go",
+        "fulu__epoch_processing__slashings_reset_test.go",
+        "fulu__epoch_processing__slashings_test.go",
+        "fulu__finality__finality_test.go",
+        "fulu__fork__upgrade_to_fulu_test.go",
+        "fulu__forkchoice__forkchoice_test.go",
+        "fulu__merkle_proof__merkle_proof_test.go",
+        "fulu__networking__custody_groups_test.go",
+        "fulu__operations__attestation_test.go",
+        "fulu__operations__attester_slashing_test.go",
+        "fulu__operations__block_header_test.go",
+        "fulu__operations__bls_to_execution_change_test.go",
+        "fulu__operations__consolidation_test.go",
+        "fulu__operations__deposit_requests_test.go",
+        "fulu__operations__deposit_test.go",
+        "fulu__operations__execution_layer_withdrawals_test.go",
+        "fulu__operations__execution_payload_test.go",
+        "fulu__operations__proposer_slashing_test.go",
+        "fulu__operations__sync_committee_test.go",
+        "fulu__operations__voluntary_exit_test.go",
+        "fulu__operations__withdrawals_test.go",
+        "fulu__random__random_test.go",
+        "fulu__rewards__rewards_test.go",
+        "fulu__sanity__blocks_test.go",
+        "fulu__sanity__slots_test.go",
+        "fulu__ssz_static__ssz_static_test.go",
+        "phase0__epoch_processing__effective_balance_updates_test.go",
+        "phase0__epoch_processing__epoch_processing_test.go",
+        "phase0__epoch_processing__eth1_data_reset_test.go",
+        "phase0__epoch_processing__historical_roots_update_test.go",
+        "phase0__epoch_processing__justification_and_finalization_test.go",
+        "phase0__epoch_processing__participation_record_updates_test.go",
+        "phase0__epoch_processing__randao_mixes_reset_test.go",
+        "phase0__epoch_processing__registry_updates_test.go",
+        "phase0__epoch_processing__rewards_and_penalties_test.go",
+        "phase0__epoch_processing__slashings_reset_test.go",
+        "phase0__epoch_processing__slashings_test.go",
+        "phase0__finality__finality_test.go",
+        "phase0__operations__attestation_test.go",
+        "phase0__operations__attester_slashing_test.go",
+        "phase0__operations__block_header_test.go",
+        "phase0__operations__deposit_test.go",
+        "phase0__operations__proposer_slashing_test.go",
+        "phase0__operations__voluntary_exit_test.go",
+        "phase0__random__random_test.go",
+        "phase0__rewards__rewards_test.go",
+        "phase0__sanity__blocks_test.go",
+        "phase0__sanity__slots_test.go",
+        "phase0__ssz_static__ssz_static_test.go",
+    ],
+    data = ["@consensus_spec_tests//:test_data"],
+    tags = ["spectest"],
+    deps = [
+        "//config/params:go_default_library",
+        "//runtime/version:go_default_library",
+        "//testing/spectest/shared/altair/epoch_processing:go_default_library",
+        "//testing/spectest/shared/altair/finality:go_default_library",
+        "//testing/spectest/shared/altair/fork:go_default_library",
+        "//testing/spectest/shared/altair/operations:go_default_library",
+        "//testing/spectest/shared/altair/rewards:go_default_library",
+        "//testing/spectest/shared/altair/sanity:go_default_library",
+        "//testing/spectest/shared/altair/ssz_static:go_default_library",
+        "//testing/spectest/shared/bellatrix/epoch_processing:go_default_library",
+        "//testing/spectest/shared/bellatrix/finality:go_default_library",
+        "//testing/spectest/shared/bellatrix/fork:go_default_library",
+        "//testing/spectest/shared/bellatrix/operations:go_default_library",
+        "//testing/spectest/shared/bellatrix/rewards:go_default_library",
+        "//testing/spectest/shared/bellatrix/sanity:go_default_library",
+        "//testing/spectest/shared/bellatrix/ssz_static:go_default_library",
+        "//testing/spectest/shared/capella/epoch_processing:go_default_library",
+        "//testing/spectest/shared/capella/finality:go_default_library",
+        "//testing/spectest/shared/capella/fork:go_default_library",
+        "//testing/spectest/shared/capella/operations:go_default_library",
+        "//testing/spectest/shared/capella/rewards:go_default_library",
+        "//testing/spectest/shared/capella/sanity:go_default_library",
+        "//testing/spectest/shared/capella/ssz_static:go_default_library",
+        "//testing/spectest/shared/common/forkchoice:go_default_library",
+        "//testing/spectest/shared/common/light_client:go_default_library",
+        "//testing/spectest/shared/deneb/epoch_processing:go_default_library",
+        "//testing/spectest/shared/deneb/finality:go_default_library",
+        "//testing/spectest/shared/deneb/fork:go_default_library",
+        "//testing/spectest/shared/deneb/merkle_proof:go_default_library",
+        "//testing/spectest/shared/deneb/operations:go_default_library",
+        "//testing/spectest/shared/deneb/rewards:go_default_library",
+        "//testing/spectest/shared/deneb/sanity:go_default_library",
+        "//testing/spectest/shared/deneb/ssz_static:go_default_library",
+        "//testing/spectest/shared/electra/epoch_processing:go_default_library",
+        "//testing/spectest/shared/electra/finality:go_default_library",
+        "//testing/spectest/shared/electra/fork:go_default_library",
+        "//testing/spectest/shared/electra/merkle_proof:go_default_library",
+        "//testing/spectest/shared/electra/operations:go_default_library",
+        "//testing/spectest/shared/electra/rewards:go_default_library",
+        "//testing/spectest/shared/electra/sanity:go_default_library",
+        "//testing/spectest/shared/electra/ssz_static:go_default_library",
+        "//testing/spectest/shared/fulu/epoch_processing:go_default_library",
+        "//testing/spectest/shared/fulu/finality:go_default_library",
+        "//testing/spectest/shared/fulu/fork:go_default_library",
+        "//testing/spectest/shared/fulu/merkle_proof:go_default_library",
+        "//testing/spectest/shared/fulu/networking:go_default_library",
+        "//testing/spectest/shared/fulu/operations:go_default_library",
+        "//testing/spectest/shared/fulu/rewards:go_default_library",
+        "//testing/spectest/shared/fulu/sanity:go_default_library",
+        "//testing/spectest/shared/fulu/ssz_static:go_default_library",
+        "//testing/spectest/shared/phase0/epoch_processing:go_default_library",
+        "//testing/spectest/shared/phase0/finality:go_default_library",
+        "//testing/spectest/shared/phase0/operations:go_default_library",
+        "//testing/spectest/shared/phase0/rewards:go_default_library",
+        "//testing/spectest/shared/phase0/sanity:go_default_library",
+        "//testing/spectest/shared/phase0/ssz_static:go_default_library",
+    ],
+)
diff --git a/testing/spectest/mainnet/altair/epoch_processing/BUILD.bazel b/testing/spectest/mainnet/altair/epoch_processing/BUILD.bazel
deleted file mode 100644
index 477797b53e..0000000000
--- a/testing/spectest/mainnet/altair/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_roots_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/finality/BUILD.bazel b/testing/spectest/mainnet/altair/finality/BUILD.bazel
deleted file mode 100644
index 9dc604d6a4..0000000000
--- a/testing/spectest/mainnet/altair/finality/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/finality:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/fork_helper/BUILD.bazel b/testing/spectest/mainnet/altair/fork_helper/BUILD.bazel
deleted file mode 100644
index c0c6bd2e04..0000000000
--- a/testing/spectest/mainnet/altair/fork_helper/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_altair_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/fork_transition/BUILD.bazel b/testing/spectest/mainnet/altair/fork_transition/BUILD.bazel
deleted file mode 100644
index 797e87adbb..0000000000
--- a/testing/spectest/mainnet/altair/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    timeout = "short",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/forkchoice/BUILD.bazel b/testing/spectest/mainnet/altair/forkchoice/BUILD.bazel
deleted file mode 100644
index 7590b92ea0..0000000000
--- a/testing/spectest/mainnet/altair/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/altair/light_client/BUILD.bazel b/testing/spectest/mainnet/altair/light_client/BUILD.bazel
deleted file mode 100644
index be8111d458..0000000000
--- a/testing/spectest/mainnet/altair/light_client/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["single_merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/altair/operations/BUILD.bazel b/testing/spectest/mainnet/altair/operations/BUILD.bazel
deleted file mode 100644
index ed314cae9e..0000000000
--- a/testing/spectest/mainnet/altair/operations/BUILD.bazel
+++ /dev/null
@@ -1,21 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "deposit_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/operations:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/random/BUILD.bazel b/testing/spectest/mainnet/altair/random/BUILD.bazel
deleted file mode 100644
index 705c1254c3..0000000000
--- a/testing/spectest/mainnet/altair/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/rewards/BUILD.bazel b/testing/spectest/mainnet/altair/rewards/BUILD.bazel
deleted file mode 100644
index 26209e6761..0000000000
--- a/testing/spectest/mainnet/altair/rewards/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/rewards:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/sanity/BUILD.bazel b/testing/spectest/mainnet/altair/sanity/BUILD.bazel
deleted file mode 100644
index b34f03209b..0000000000
--- a/testing/spectest/mainnet/altair/sanity/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/ssz_static/BUILD.bazel b/testing/spectest/mainnet/altair/ssz_static/BUILD.bazel
deleted file mode 100644
index 610f7f114f..0000000000
--- a/testing/spectest/mainnet/altair/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/altair/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/altair__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__effective_balance_updates_test.go
index 97e89f7e0a..481df02359 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/altair__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__eth1_data_reset_test.go
index 6a551e1226..7bd93780e1 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/historical_roots_update_test.go b/testing/spectest/mainnet/altair__epoch_processing__historical_roots_update_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/historical_roots_update_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__historical_roots_update_test.go
index dfea203ef6..5a2326c709 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/historical_roots_update_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__historical_roots_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/altair__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__inactivity_updates_test.go
index 129516d830..cfb93aaaad 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/altair__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__justification_and_finalization_test.go
index 97ff3232c0..27056ab898 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/altair__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__participation_flag_updates_test.go
index 2898c97aad..34ca48082e 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/altair__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__randao_mixes_reset_test.go
index dde810957e..a8278b3a4c 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/altair__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/registry_updates_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__registry_updates_test.go
index 9fbb7794c7..dc282bcbf3 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/altair__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__rewards_and_penalties_test.go
index 9e908eb82a..6fcad223f5 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/altair__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/slashings_reset_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__slashings_reset_test.go
index ba6bb52f82..e061efefd7 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/epoch_processing/slashings_test.go b/testing/spectest/mainnet/altair__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/epoch_processing/slashings_test.go
rename to testing/spectest/mainnet/altair__epoch_processing__slashings_test.go
index c5615b56a1..522575a123 100644
--- a/testing/spectest/mainnet/altair/epoch_processing/slashings_test.go
+++ b/testing/spectest/mainnet/altair__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/finality/finality_test.go b/testing/spectest/mainnet/altair__finality__finality_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/finality/finality_test.go
rename to testing/spectest/mainnet/altair__finality__finality_test.go
index 478b8d2ea7..2309f6e24f 100644
--- a/testing/spectest/mainnet/altair/finality/finality_test.go
+++ b/testing/spectest/mainnet/altair__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/fork_helper/upgrade_to_altair_test.go b/testing/spectest/mainnet/altair__fork_helper__upgrade_to_altair_test.go
similarity index 90%
rename from testing/spectest/mainnet/altair/fork_helper/upgrade_to_altair_test.go
rename to testing/spectest/mainnet/altair__fork_helper__upgrade_to_altair_test.go
index fc1fd9cf21..227e5f5d67 100644
--- a/testing/spectest/mainnet/altair/fork_helper/upgrade_to_altair_test.go
+++ b/testing/spectest/mainnet/altair__fork_helper__upgrade_to_altair_test.go
@@ -1,4 +1,4 @@
-package fork_helper
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/fork_transition/transition_test.go b/testing/spectest/mainnet/altair__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/mainnet/altair/fork_transition/transition_test.go
rename to testing/spectest/mainnet/altair__fork_transition__transition_test.go
index 760ec617d2..7f112fdaa8 100644
--- a/testing/spectest/mainnet/altair/fork_transition/transition_test.go
+++ b/testing/spectest/mainnet/altair__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/altair__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go
rename to testing/spectest/mainnet/altair__forkchoice__forkchoice_test.go
index c74afd7987..793650315f 100644
--- a/testing/spectest/mainnet/altair/forkchoice/forkchoice_test.go
+++ b/testing/spectest/mainnet/altair__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/light_client/single_merkle_proof_test.go b/testing/spectest/mainnet/altair__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/mainnet/altair/light_client/single_merkle_proof_test.go
rename to testing/spectest/mainnet/altair__light_client__single_merkle_proof_test.go
index 298e102dd9..ae47841048 100644
--- a/testing/spectest/mainnet/altair/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/mainnet/altair__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/operations/attestation_test.go b/testing/spectest/mainnet/altair__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/operations/attestation_test.go
rename to testing/spectest/mainnet/altair__operations__attestation_test.go
index 2dc9a7c2b2..ca0714ff44 100644
--- a/testing/spectest/mainnet/altair/operations/attestation_test.go
+++ b/testing/spectest/mainnet/altair__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/operations/attester_slashing_test.go b/testing/spectest/mainnet/altair__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/altair/operations/attester_slashing_test.go
rename to testing/spectest/mainnet/altair__operations__attester_slashing_test.go
index 07ec65578b..9795331bac 100644
--- a/testing/spectest/mainnet/altair/operations/attester_slashing_test.go
+++ b/testing/spectest/mainnet/altair__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/operations/block_header_test.go b/testing/spectest/mainnet/altair__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/operations/block_header_test.go
rename to testing/spectest/mainnet/altair__operations__block_header_test.go
index 0fea149693..81ffb9dc66 100644
--- a/testing/spectest/mainnet/altair/operations/block_header_test.go
+++ b/testing/spectest/mainnet/altair__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/operations/deposit_test.go b/testing/spectest/mainnet/altair__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/operations/deposit_test.go
rename to testing/spectest/mainnet/altair__operations__deposit_test.go
index 6250f33312..8b511f1650 100644
--- a/testing/spectest/mainnet/altair/operations/deposit_test.go
+++ b/testing/spectest/mainnet/altair__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/operations/proposer_slashing_test.go b/testing/spectest/mainnet/altair__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/altair/operations/proposer_slashing_test.go
rename to testing/spectest/mainnet/altair__operations__proposer_slashing_test.go
index 9b97af033f..877732f84e 100644
--- a/testing/spectest/mainnet/altair/operations/proposer_slashing_test.go
+++ b/testing/spectest/mainnet/altair__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/operations/sync_committee_test.go b/testing/spectest/mainnet/altair__operations__sync_committee_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/operations/sync_committee_test.go
rename to testing/spectest/mainnet/altair__operations__sync_committee_test.go
index 18f0b27a68..05d4612f45 100644
--- a/testing/spectest/mainnet/altair/operations/sync_committee_test.go
+++ b/testing/spectest/mainnet/altair__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/operations/voluntary_exit_test.go b/testing/spectest/mainnet/altair__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/operations/voluntary_exit_test.go
rename to testing/spectest/mainnet/altair__operations__voluntary_exit_test.go
index 8f4e6907bd..3ce9542992 100644
--- a/testing/spectest/mainnet/altair/operations/voluntary_exit_test.go
+++ b/testing/spectest/mainnet/altair__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/random/random_test.go b/testing/spectest/mainnet/altair__random__random_test.go
similarity index 93%
rename from testing/spectest/mainnet/altair/random/random_test.go
rename to testing/spectest/mainnet/altair__random__random_test.go
index 0b088ea154..6d042f3230 100644
--- a/testing/spectest/mainnet/altair/random/random_test.go
+++ b/testing/spectest/mainnet/altair__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/rewards/rewards_test.go b/testing/spectest/mainnet/altair__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/mainnet/altair/rewards/rewards_test.go
rename to testing/spectest/mainnet/altair__rewards__rewards_test.go
index d44e795280..3fd5f67b35 100644
--- a/testing/spectest/mainnet/altair/rewards/rewards_test.go
+++ b/testing/spectest/mainnet/altair__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/sanity/blocks_test.go b/testing/spectest/mainnet/altair__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/mainnet/altair/sanity/blocks_test.go
rename to testing/spectest/mainnet/altair__sanity__blocks_test.go
index 128e4b2642..c026eeb898 100644
--- a/testing/spectest/mainnet/altair/sanity/blocks_test.go
+++ b/testing/spectest/mainnet/altair__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/sanity/slots_test.go b/testing/spectest/mainnet/altair__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/mainnet/altair/sanity/slots_test.go
rename to testing/spectest/mainnet/altair__sanity__slots_test.go
index f6636fae06..ede5ddbe77 100644
--- a/testing/spectest/mainnet/altair/sanity/slots_test.go
+++ b/testing/spectest/mainnet/altair__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/altair/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/altair__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/mainnet/altair/ssz_static/ssz_static_test.go
rename to testing/spectest/mainnet/altair__ssz_static__ssz_static_test.go
index c4ca405b1a..9dbb4c32ff 100644
--- a/testing/spectest/mainnet/altair/ssz_static/ssz_static_test.go
+++ b/testing/spectest/mainnet/altair__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/BUILD.bazel b/testing/spectest/mainnet/bellatrix/epoch_processing/BUILD.bazel
deleted file mode 100644
index badc8de924..0000000000
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_roots_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/finality/BUILD.bazel b/testing/spectest/mainnet/bellatrix/finality/BUILD.bazel
deleted file mode 100644
index 56f11c4df6..0000000000
--- a/testing/spectest/mainnet/bellatrix/finality/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/finality:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/fork_helper/BUILD.bazel b/testing/spectest/mainnet/bellatrix/fork_helper/BUILD.bazel
deleted file mode 100644
index 6fa223a22d..0000000000
--- a/testing/spectest/mainnet/bellatrix/fork_helper/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_altair_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/fork_transition/BUILD.bazel b/testing/spectest/mainnet/bellatrix/fork_transition/BUILD.bazel
deleted file mode 100644
index daf7b2c1a8..0000000000
--- a/testing/spectest/mainnet/bellatrix/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel b/testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel
deleted file mode 100644
index 7590b92ea0..0000000000
--- a/testing/spectest/mainnet/bellatrix/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/bellatrix/light_client/BUILD.bazel b/testing/spectest/mainnet/bellatrix/light_client/BUILD.bazel
deleted file mode 100644
index be8111d458..0000000000
--- a/testing/spectest/mainnet/bellatrix/light_client/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["single_merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/bellatrix/operations/BUILD.bazel b/testing/spectest/mainnet/bellatrix/operations/BUILD.bazel
deleted file mode 100644
index 290bfcb1e3..0000000000
--- a/testing/spectest/mainnet/bellatrix/operations/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "deposit_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/operations:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/random/BUILD.bazel b/testing/spectest/mainnet/bellatrix/random/BUILD.bazel
deleted file mode 100644
index 75511c36be..0000000000
--- a/testing/spectest/mainnet/bellatrix/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/rewards/BUILD.bazel b/testing/spectest/mainnet/bellatrix/rewards/BUILD.bazel
deleted file mode 100644
index 654dc28356..0000000000
--- a/testing/spectest/mainnet/bellatrix/rewards/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/rewards:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/sanity/BUILD.bazel b/testing/spectest/mainnet/bellatrix/sanity/BUILD.bazel
deleted file mode 100644
index 4d2bac1338..0000000000
--- a/testing/spectest/mainnet/bellatrix/sanity/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/ssz_static/BUILD.bazel b/testing/spectest/mainnet/bellatrix/ssz_static/BUILD.bazel
deleted file mode 100644
index 3df45b28b8..0000000000
--- a/testing/spectest/mainnet/bellatrix/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__effective_balance_updates_test.go
index 36d7e37680..bc0c895376 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__eth1_data_reset_test.go
index 5fc0549d49..be62930aa5 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/historical_roots_update_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__historical_roots_update_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/historical_roots_update_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__historical_roots_update_test.go
index be81e78647..fa02a1a217 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/historical_roots_update_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__historical_roots_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__inactivity_updates_test.go
index 08f95f285a..34cc0c7047 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__justification_and_finalization_test.go
index fd787d5fc0..ed7146221d 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__participation_flag_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__participation_flag_updates_test.go
index cd77388615..17c6ae3483 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__randao_mixes_reset_test.go
index 4b2753f51a..51d4641467 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/registry_updates_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__registry_updates_test.go
index 010e5945ab..2f91ea38c3 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__rewards_and_penalties_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__rewards_and_penalties_test.go
index 253141b8b4..a3d11b2903 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/slashings_reset_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__slashings_reset_test.go
index 85559bda8c..0739bbc274 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_test.go b/testing/spectest/mainnet/bellatrix__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/mainnet/bellatrix/epoch_processing/slashings_test.go
rename to testing/spectest/mainnet/bellatrix__epoch_processing__slashings_test.go
index f10cb10c3c..99427f74ed 100644
--- a/testing/spectest/mainnet/bellatrix/epoch_processing/slashings_test.go
+++ b/testing/spectest/mainnet/bellatrix__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/finality/finality_test.go b/testing/spectest/mainnet/bellatrix__finality__finality_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/finality/finality_test.go
rename to testing/spectest/mainnet/bellatrix__finality__finality_test.go
index 58b91d8dc9..838544d5bb 100644
--- a/testing/spectest/mainnet/bellatrix/finality/finality_test.go
+++ b/testing/spectest/mainnet/bellatrix__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/fork_helper/upgrade_to_altair_test.go b/testing/spectest/mainnet/bellatrix__fork_helper__upgrade_to_altair_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/fork_helper/upgrade_to_altair_test.go
rename to testing/spectest/mainnet/bellatrix__fork_helper__upgrade_to_altair_test.go
index 42714431b9..304b152f1f 100644
--- a/testing/spectest/mainnet/bellatrix/fork_helper/upgrade_to_altair_test.go
+++ b/testing/spectest/mainnet/bellatrix__fork_helper__upgrade_to_altair_test.go
@@ -1,4 +1,4 @@
-package fork_helper
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/fork_transition/transition_test.go b/testing/spectest/mainnet/bellatrix__fork_transition__transition_test.go
similarity index 89%
rename from testing/spectest/mainnet/bellatrix/fork_transition/transition_test.go
rename to testing/spectest/mainnet/bellatrix__fork_transition__transition_test.go
index 8a5211b4af..16358c3978 100644
--- a/testing/spectest/mainnet/bellatrix/fork_transition/transition_test.go
+++ b/testing/spectest/mainnet/bellatrix__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/bellatrix__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go
rename to testing/spectest/mainnet/bellatrix__forkchoice__forkchoice_test.go
index 438f5a035b..decff38d7a 100644
--- a/testing/spectest/mainnet/bellatrix/forkchoice/forkchoice_test.go
+++ b/testing/spectest/mainnet/bellatrix__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/light_client/single_merkle_proof_test.go b/testing/spectest/mainnet/bellatrix__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/mainnet/bellatrix/light_client/single_merkle_proof_test.go
rename to testing/spectest/mainnet/bellatrix__light_client__single_merkle_proof_test.go
index 2eabe70ef5..7d6b9f4388 100644
--- a/testing/spectest/mainnet/bellatrix/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/mainnet/bellatrix__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/attestation_test.go b/testing/spectest/mainnet/bellatrix__operations__attestation_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/operations/attestation_test.go
rename to testing/spectest/mainnet/bellatrix__operations__attestation_test.go
index 4edd85f7ba..444e4cc629 100644
--- a/testing/spectest/mainnet/bellatrix/operations/attestation_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/attester_slashing_test.go b/testing/spectest/mainnet/bellatrix__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/operations/attester_slashing_test.go
rename to testing/spectest/mainnet/bellatrix__operations__attester_slashing_test.go
index 9b322b5138..b66b8ea167 100644
--- a/testing/spectest/mainnet/bellatrix/operations/attester_slashing_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/block_header_test.go b/testing/spectest/mainnet/bellatrix__operations__block_header_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/operations/block_header_test.go
rename to testing/spectest/mainnet/bellatrix__operations__block_header_test.go
index 739ce205f9..0664c90526 100644
--- a/testing/spectest/mainnet/bellatrix/operations/block_header_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/deposit_test.go b/testing/spectest/mainnet/bellatrix__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/operations/deposit_test.go
rename to testing/spectest/mainnet/bellatrix__operations__deposit_test.go
index fb97d488d6..c2fda6680c 100644
--- a/testing/spectest/mainnet/bellatrix/operations/deposit_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/execution_payload_test.go b/testing/spectest/mainnet/bellatrix__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/operations/execution_payload_test.go
rename to testing/spectest/mainnet/bellatrix__operations__execution_payload_test.go
index 726e386b63..e414826198 100644
--- a/testing/spectest/mainnet/bellatrix/operations/execution_payload_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/proposer_slashing_test.go b/testing/spectest/mainnet/bellatrix__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/operations/proposer_slashing_test.go
rename to testing/spectest/mainnet/bellatrix__operations__proposer_slashing_test.go
index 67519541b5..61e6fc1062 100644
--- a/testing/spectest/mainnet/bellatrix/operations/proposer_slashing_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/sync_committee_test.go b/testing/spectest/mainnet/bellatrix__operations__sync_committee_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/operations/sync_committee_test.go
rename to testing/spectest/mainnet/bellatrix__operations__sync_committee_test.go
index ac21fbb042..24017da422 100644
--- a/testing/spectest/mainnet/bellatrix/operations/sync_committee_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/operations/voluntary_exit_test.go b/testing/spectest/mainnet/bellatrix__operations__voluntary_exit_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/operations/voluntary_exit_test.go
rename to testing/spectest/mainnet/bellatrix__operations__voluntary_exit_test.go
index 76bde398e1..e8de0480d8 100644
--- a/testing/spectest/mainnet/bellatrix/operations/voluntary_exit_test.go
+++ b/testing/spectest/mainnet/bellatrix__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/random/random_test.go b/testing/spectest/mainnet/bellatrix__random__random_test.go
similarity index 93%
rename from testing/spectest/mainnet/bellatrix/random/random_test.go
rename to testing/spectest/mainnet/bellatrix__random__random_test.go
index d28a6e3ec6..96733e0a7a 100644
--- a/testing/spectest/mainnet/bellatrix/random/random_test.go
+++ b/testing/spectest/mainnet/bellatrix__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/rewards/rewards_test.go b/testing/spectest/mainnet/bellatrix__rewards__rewards_test.go
similarity index 93%
rename from testing/spectest/mainnet/bellatrix/rewards/rewards_test.go
rename to testing/spectest/mainnet/bellatrix__rewards__rewards_test.go
index 5871bf5371..86c6e0f7c1 100644
--- a/testing/spectest/mainnet/bellatrix/rewards/rewards_test.go
+++ b/testing/spectest/mainnet/bellatrix__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/sanity/blocks_test.go b/testing/spectest/mainnet/bellatrix__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/mainnet/bellatrix/sanity/blocks_test.go
rename to testing/spectest/mainnet/bellatrix__sanity__blocks_test.go
index 635ead0cd0..cb88187866 100644
--- a/testing/spectest/mainnet/bellatrix/sanity/blocks_test.go
+++ b/testing/spectest/mainnet/bellatrix__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/sanity/slots_test.go b/testing/spectest/mainnet/bellatrix__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/mainnet/bellatrix/sanity/slots_test.go
rename to testing/spectest/mainnet/bellatrix__sanity__slots_test.go
index 9f5c46e6af..cbc5a2e046 100644
--- a/testing/spectest/mainnet/bellatrix/sanity/slots_test.go
+++ b/testing/spectest/mainnet/bellatrix__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/bellatrix/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/bellatrix__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/mainnet/bellatrix/ssz_static/ssz_static_test.go
rename to testing/spectest/mainnet/bellatrix__ssz_static__ssz_static_test.go
index 688cf2d25d..31d2e01cbc 100644
--- a/testing/spectest/mainnet/bellatrix/ssz_static/ssz_static_test.go
+++ b/testing/spectest/mainnet/bellatrix__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/BUILD.bazel b/testing/spectest/mainnet/capella/epoch_processing/BUILD.bazel
deleted file mode 100644
index a5b5c87cfd..0000000000
--- a/testing/spectest/mainnet/capella/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_summaries_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/finality/BUILD.bazel b/testing/spectest/mainnet/capella/finality/BUILD.bazel
deleted file mode 100644
index 599a69e9d6..0000000000
--- a/testing/spectest/mainnet/capella/finality/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 1,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/finality:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/fork_helper/BUILD.bazel b/testing/spectest/mainnet/capella/fork_helper/BUILD.bazel
deleted file mode 100644
index f6cb89c8c7..0000000000
--- a/testing/spectest/mainnet/capella/fork_helper/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_capella_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 1,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/fork_transition/BUILD.bazel b/testing/spectest/mainnet/capella/fork_transition/BUILD.bazel
deleted file mode 100644
index b446cd8282..0000000000
--- a/testing/spectest/mainnet/capella/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["transition_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/forkchoice/BUILD.bazel b/testing/spectest/mainnet/capella/forkchoice/BUILD.bazel
deleted file mode 100644
index 95d586f158..0000000000
--- a/testing/spectest/mainnet/capella/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/capella/light_client/BUILD.bazel b/testing/spectest/mainnet/capella/light_client/BUILD.bazel
deleted file mode 100644
index be8111d458..0000000000
--- a/testing/spectest/mainnet/capella/light_client/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["single_merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/capella/operations/BUILD.bazel b/testing/spectest/mainnet/capella/operations/BUILD.bazel
deleted file mode 100644
index a6ef2b7709..0000000000
--- a/testing/spectest/mainnet/capella/operations/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "deposit_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/operations:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/random/BUILD.bazel b/testing/spectest/mainnet/capella/random/BUILD.bazel
deleted file mode 100644
index 2fcd72b0d9..0000000000
--- a/testing/spectest/mainnet/capella/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/rewards/BUILD.bazel b/testing/spectest/mainnet/capella/rewards/BUILD.bazel
deleted file mode 100644
index 5b06a7e167..0000000000
--- a/testing/spectest/mainnet/capella/rewards/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/rewards:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/sanity/BUILD.bazel b/testing/spectest/mainnet/capella/sanity/BUILD.bazel
deleted file mode 100644
index ea37751d16..0000000000
--- a/testing/spectest/mainnet/capella/sanity/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/ssz_static/BUILD.bazel b/testing/spectest/mainnet/capella/ssz_static/BUILD.bazel
deleted file mode 100644
index b821997cbb..0000000000
--- a/testing/spectest/mainnet/capella/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/capella/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/capella__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__effective_balance_updates_test.go
index 679e0299d5..2c750c8fa1 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/capella__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__eth1_data_reset_test.go
index 00366a6d75..f7b4acfb57 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/historical_summaries_update_test.go b/testing/spectest/mainnet/capella__epoch_processing__historical_summaries_update_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/epoch_processing/historical_summaries_update_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__historical_summaries_update_test.go
index 903764bfd6..af1831c1ef 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/historical_summaries_update_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__historical_summaries_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/capella__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__inactivity_updates_test.go
index 022083d3a3..d8840cc9d9 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/capella__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__justification_and_finalization_test.go
index 3b7d944784..3a42037417 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/capella__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__participation_flag_updates_test.go
index 53a3e0c70d..6f345ae471 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/capella__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__randao_mixes_reset_test.go
index 479b0205f8..3f80906fc0 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/capella__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/registry_updates_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__registry_updates_test.go
index dd53072586..e71170c73a 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/capella__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__rewards_and_penalties_test.go
index dcbdc7f67b..cf272dafb7 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/capella__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/slashings_reset_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__slashings_reset_test.go
index 4751934fc5..1a31620535 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/epoch_processing/slashings_test.go b/testing/spectest/mainnet/capella__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/epoch_processing/slashings_test.go
rename to testing/spectest/mainnet/capella__epoch_processing__slashings_test.go
index e27b7ce26c..4c6d1cc000 100644
--- a/testing/spectest/mainnet/capella/epoch_processing/slashings_test.go
+++ b/testing/spectest/mainnet/capella__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/finality/finality_test.go b/testing/spectest/mainnet/capella__finality__finality_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/finality/finality_test.go
rename to testing/spectest/mainnet/capella__finality__finality_test.go
index a2eda15a6a..7a7a69eda1 100644
--- a/testing/spectest/mainnet/capella/finality/finality_test.go
+++ b/testing/spectest/mainnet/capella__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/fork_helper/upgrade_to_capella_test.go b/testing/spectest/mainnet/capella__fork_helper__upgrade_to_capella_test.go
similarity index 90%
rename from testing/spectest/mainnet/capella/fork_helper/upgrade_to_capella_test.go
rename to testing/spectest/mainnet/capella__fork_helper__upgrade_to_capella_test.go
index f11ce09967..137d03b411 100644
--- a/testing/spectest/mainnet/capella/fork_helper/upgrade_to_capella_test.go
+++ b/testing/spectest/mainnet/capella__fork_helper__upgrade_to_capella_test.go
@@ -1,4 +1,4 @@
-package fork_helper
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/fork_transition/transition_test.go b/testing/spectest/mainnet/capella__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/mainnet/capella/fork_transition/transition_test.go
rename to testing/spectest/mainnet/capella__fork_transition__transition_test.go
index a74d4ecf64..2f7d8e414b 100644
--- a/testing/spectest/mainnet/capella/fork_transition/transition_test.go
+++ b/testing/spectest/mainnet/capella__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/capella__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go
rename to testing/spectest/mainnet/capella__forkchoice__forkchoice_test.go
index 5b3ca7b176..2660dc96d7 100644
--- a/testing/spectest/mainnet/capella/forkchoice/forkchoice_test.go
+++ b/testing/spectest/mainnet/capella__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/light_client/single_merkle_proof_test.go b/testing/spectest/mainnet/capella__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/mainnet/capella/light_client/single_merkle_proof_test.go
rename to testing/spectest/mainnet/capella__light_client__single_merkle_proof_test.go
index 665d949160..e153467c9b 100644
--- a/testing/spectest/mainnet/capella/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/mainnet/capella__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/attestation_test.go b/testing/spectest/mainnet/capella__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/operations/attestation_test.go
rename to testing/spectest/mainnet/capella__operations__attestation_test.go
index 83df362fb6..89a0621cba 100644
--- a/testing/spectest/mainnet/capella/operations/attestation_test.go
+++ b/testing/spectest/mainnet/capella__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/attester_slashing_test.go b/testing/spectest/mainnet/capella__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/capella/operations/attester_slashing_test.go
rename to testing/spectest/mainnet/capella__operations__attester_slashing_test.go
index a4db0e6e85..a6d0c3a75b 100644
--- a/testing/spectest/mainnet/capella/operations/attester_slashing_test.go
+++ b/testing/spectest/mainnet/capella__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/block_header_test.go b/testing/spectest/mainnet/capella__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/operations/block_header_test.go
rename to testing/spectest/mainnet/capella__operations__block_header_test.go
index 84341ea500..cc0aa52fc5 100644
--- a/testing/spectest/mainnet/capella/operations/block_header_test.go
+++ b/testing/spectest/mainnet/capella__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/bls_to_execution_change_test.go b/testing/spectest/mainnet/capella__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/mainnet/capella/operations/bls_to_execution_change_test.go
rename to testing/spectest/mainnet/capella__operations__bls_to_execution_change_test.go
index d52fc22b5b..158d9ee0f4 100644
--- a/testing/spectest/mainnet/capella/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/mainnet/capella__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/deposit_test.go b/testing/spectest/mainnet/capella__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/operations/deposit_test.go
rename to testing/spectest/mainnet/capella__operations__deposit_test.go
index 557cee07e4..fe0609bc7e 100644
--- a/testing/spectest/mainnet/capella/operations/deposit_test.go
+++ b/testing/spectest/mainnet/capella__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/execution_payload_test.go b/testing/spectest/mainnet/capella__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/mainnet/capella/operations/execution_payload_test.go
rename to testing/spectest/mainnet/capella__operations__execution_payload_test.go
index 64f8e9db26..7d53ce6356 100644
--- a/testing/spectest/mainnet/capella/operations/execution_payload_test.go
+++ b/testing/spectest/mainnet/capella__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/proposer_slashing_test.go b/testing/spectest/mainnet/capella__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/capella/operations/proposer_slashing_test.go
rename to testing/spectest/mainnet/capella__operations__proposer_slashing_test.go
index 34feb810d6..e0571f2dfb 100644
--- a/testing/spectest/mainnet/capella/operations/proposer_slashing_test.go
+++ b/testing/spectest/mainnet/capella__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/sync_committee_test.go b/testing/spectest/mainnet/capella__operations__sync_committee_test.go
similarity index 92%
rename from testing/spectest/mainnet/capella/operations/sync_committee_test.go
rename to testing/spectest/mainnet/capella__operations__sync_committee_test.go
index f523e34207..8f007dd038 100644
--- a/testing/spectest/mainnet/capella/operations/sync_committee_test.go
+++ b/testing/spectest/mainnet/capella__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/voluntary_exit_test.go b/testing/spectest/mainnet/capella__operations__voluntary_exit_test.go
similarity index 92%
rename from testing/spectest/mainnet/capella/operations/voluntary_exit_test.go
rename to testing/spectest/mainnet/capella__operations__voluntary_exit_test.go
index beb51f7bab..7bda262935 100644
--- a/testing/spectest/mainnet/capella/operations/voluntary_exit_test.go
+++ b/testing/spectest/mainnet/capella__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/operations/withdrawals_test.go b/testing/spectest/mainnet/capella__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/operations/withdrawals_test.go
rename to testing/spectest/mainnet/capella__operations__withdrawals_test.go
index 8908d33c1f..373fe8df8a 100644
--- a/testing/spectest/mainnet/capella/operations/withdrawals_test.go
+++ b/testing/spectest/mainnet/capella__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/random/random_test.go b/testing/spectest/mainnet/capella__random__random_test.go
similarity index 93%
rename from testing/spectest/mainnet/capella/random/random_test.go
rename to testing/spectest/mainnet/capella__random__random_test.go
index adffa23645..5bcceba1db 100644
--- a/testing/spectest/mainnet/capella/random/random_test.go
+++ b/testing/spectest/mainnet/capella__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/rewards/rewards_test.go b/testing/spectest/mainnet/capella__rewards__rewards_test.go
similarity index 93%
rename from testing/spectest/mainnet/capella/rewards/rewards_test.go
rename to testing/spectest/mainnet/capella__rewards__rewards_test.go
index aadd85da16..920aef4369 100644
--- a/testing/spectest/mainnet/capella/rewards/rewards_test.go
+++ b/testing/spectest/mainnet/capella__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/sanity/blocks_test.go b/testing/spectest/mainnet/capella__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/mainnet/capella/sanity/blocks_test.go
rename to testing/spectest/mainnet/capella__sanity__blocks_test.go
index 152172867f..9b797f395b 100644
--- a/testing/spectest/mainnet/capella/sanity/blocks_test.go
+++ b/testing/spectest/mainnet/capella__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/sanity/slots_test.go b/testing/spectest/mainnet/capella__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/mainnet/capella/sanity/slots_test.go
rename to testing/spectest/mainnet/capella__sanity__slots_test.go
index f6622dedca..44bff5d8ef 100644
--- a/testing/spectest/mainnet/capella/sanity/slots_test.go
+++ b/testing/spectest/mainnet/capella__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/capella/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/capella__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/mainnet/capella/ssz_static/ssz_static_test.go
rename to testing/spectest/mainnet/capella__ssz_static__ssz_static_test.go
index f5da1e8954..1a44eb1409 100644
--- a/testing/spectest/mainnet/capella/ssz_static/ssz_static_test.go
+++ b/testing/spectest/mainnet/capella__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/BUILD.bazel b/testing/spectest/mainnet/deneb/epoch_processing/BUILD.bazel
deleted file mode 100644
index 7dbe84ad61..0000000000
--- a/testing/spectest/mainnet/deneb/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_summaries_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/finality/BUILD.bazel b/testing/spectest/mainnet/deneb/finality/BUILD.bazel
deleted file mode 100644
index d9584c914a..0000000000
--- a/testing/spectest/mainnet/deneb/finality/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/finality:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/fork_helper/BUILD.bazel b/testing/spectest/mainnet/deneb/fork_helper/BUILD.bazel
deleted file mode 100644
index 0780ca5f88..0000000000
--- a/testing/spectest/mainnet/deneb/fork_helper/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_deneb_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/fork_transition/BUILD.bazel b/testing/spectest/mainnet/deneb/fork_transition/BUILD.bazel
deleted file mode 100644
index cbca1887ba..0000000000
--- a/testing/spectest/mainnet/deneb/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/forkchoice/BUILD.bazel b/testing/spectest/mainnet/deneb/forkchoice/BUILD.bazel
deleted file mode 100644
index 7590b92ea0..0000000000
--- a/testing/spectest/mainnet/deneb/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/deneb/light_client/BUILD.bazel b/testing/spectest/mainnet/deneb/light_client/BUILD.bazel
deleted file mode 100644
index be8111d458..0000000000
--- a/testing/spectest/mainnet/deneb/light_client/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["single_merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/deneb/merkle_proof/BUILD.bazel b/testing/spectest/mainnet/deneb/merkle_proof/BUILD.bazel
deleted file mode 100644
index e07c40d87e..0000000000
--- a/testing/spectest/mainnet/deneb/merkle_proof/BUILD.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = ["merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/merkle_proof:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/operations/BUILD.bazel b/testing/spectest/mainnet/deneb/operations/BUILD.bazel
deleted file mode 100644
index 2d1512b669..0000000000
--- a/testing/spectest/mainnet/deneb/operations/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "deposit_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/operations:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/random/BUILD.bazel b/testing/spectest/mainnet/deneb/random/BUILD.bazel
deleted file mode 100644
index 8bf5c9c09b..0000000000
--- a/testing/spectest/mainnet/deneb/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/rewards/BUILD.bazel b/testing/spectest/mainnet/deneb/rewards/BUILD.bazel
deleted file mode 100644
index 500b240be9..0000000000
--- a/testing/spectest/mainnet/deneb/rewards/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/rewards:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/sanity/BUILD.bazel b/testing/spectest/mainnet/deneb/sanity/BUILD.bazel
deleted file mode 100644
index 45f8aef2e2..0000000000
--- a/testing/spectest/mainnet/deneb/sanity/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/ssz_static/BUILD.bazel b/testing/spectest/mainnet/deneb/ssz_static/BUILD.bazel
deleted file mode 100644
index e519d9fe0a..0000000000
--- a/testing/spectest/mainnet/deneb/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/deneb__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__effective_balance_updates_test.go
index 63cca795ea..004d5ec144 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/deneb__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__eth1_data_reset_test.go
index 7b9246b75c..8674fcd6b0 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/historical_summaries_update_test.go b/testing/spectest/mainnet/deneb__epoch_processing__historical_summaries_update_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/epoch_processing/historical_summaries_update_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__historical_summaries_update_test.go
index 91eed35067..7cda081548 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/historical_summaries_update_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__historical_summaries_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/deneb__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__inactivity_updates_test.go
index 5166fc335e..f8dc106f60 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/deneb__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__justification_and_finalization_test.go
index b5826bdb2e..65f5b3346f 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/deneb__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__participation_flag_updates_test.go
index 6bed90ec7a..c17fa8c887 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/deneb__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__randao_mixes_reset_test.go
index aea9875beb..a253044bc5 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/deneb__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/registry_updates_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__registry_updates_test.go
index ac54dd1103..2d7bfaea79 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/deneb__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__rewards_and_penalties_test.go
index 9903091ef6..87fe8f4022 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/deneb__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/slashings_reset_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__slashings_reset_test.go
index 9cffa6f701..3746428856 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/epoch_processing/slashings_test.go b/testing/spectest/mainnet/deneb__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/epoch_processing/slashings_test.go
rename to testing/spectest/mainnet/deneb__epoch_processing__slashings_test.go
index 105d709919..e58bff9259 100644
--- a/testing/spectest/mainnet/deneb/epoch_processing/slashings_test.go
+++ b/testing/spectest/mainnet/deneb__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/finality/finality_test.go b/testing/spectest/mainnet/deneb__finality__finality_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/finality/finality_test.go
rename to testing/spectest/mainnet/deneb__finality__finality_test.go
index 2e3ec3d883..7350b40f33 100644
--- a/testing/spectest/mainnet/deneb/finality/finality_test.go
+++ b/testing/spectest/mainnet/deneb__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/fork_helper/upgrade_to_deneb_test.go b/testing/spectest/mainnet/deneb__fork_helper__upgrade_to_deneb_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/fork_helper/upgrade_to_deneb_test.go
rename to testing/spectest/mainnet/deneb__fork_helper__upgrade_to_deneb_test.go
index 574b3e7c4c..bfcca00179 100644
--- a/testing/spectest/mainnet/deneb/fork_helper/upgrade_to_deneb_test.go
+++ b/testing/spectest/mainnet/deneb__fork_helper__upgrade_to_deneb_test.go
@@ -1,4 +1,4 @@
-package fork_helper
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/fork_transition/transition_test.go b/testing/spectest/mainnet/deneb__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/mainnet/deneb/fork_transition/transition_test.go
rename to testing/spectest/mainnet/deneb__fork_transition__transition_test.go
index f205f52a71..bf411b88a5 100644
--- a/testing/spectest/mainnet/deneb/fork_transition/transition_test.go
+++ b/testing/spectest/mainnet/deneb__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/deneb__forkchoice__forkchoice_test.go
similarity index 92%
rename from testing/spectest/mainnet/deneb/forkchoice/forkchoice_test.go
rename to testing/spectest/mainnet/deneb__forkchoice__forkchoice_test.go
index b28e18d82a..cb7c634785 100644
--- a/testing/spectest/mainnet/deneb/forkchoice/forkchoice_test.go
+++ b/testing/spectest/mainnet/deneb__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/light_client/single_merkle_proof_test.go b/testing/spectest/mainnet/deneb__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/mainnet/deneb/light_client/single_merkle_proof_test.go
rename to testing/spectest/mainnet/deneb__light_client__single_merkle_proof_test.go
index 10c2c618e2..365ad743b7 100644
--- a/testing/spectest/mainnet/deneb/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/mainnet/deneb__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/merkle_proof/merkle_proof_test.go b/testing/spectest/mainnet/deneb__merkle_proof__merkle_proof_test.go
similarity index 90%
rename from testing/spectest/mainnet/deneb/merkle_proof/merkle_proof_test.go
rename to testing/spectest/mainnet/deneb__merkle_proof__merkle_proof_test.go
index c91977b4c0..9c6a901c57 100644
--- a/testing/spectest/mainnet/deneb/merkle_proof/merkle_proof_test.go
+++ b/testing/spectest/mainnet/deneb__merkle_proof__merkle_proof_test.go
@@ -1,4 +1,4 @@
-package merkle_proof
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/attestation_test.go b/testing/spectest/mainnet/deneb__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/operations/attestation_test.go
rename to testing/spectest/mainnet/deneb__operations__attestation_test.go
index 5c2da88628..25e5f37a6f 100644
--- a/testing/spectest/mainnet/deneb/operations/attestation_test.go
+++ b/testing/spectest/mainnet/deneb__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/attester_slashing_test.go b/testing/spectest/mainnet/deneb__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/deneb/operations/attester_slashing_test.go
rename to testing/spectest/mainnet/deneb__operations__attester_slashing_test.go
index 40875b5df8..17bc78e474 100644
--- a/testing/spectest/mainnet/deneb/operations/attester_slashing_test.go
+++ b/testing/spectest/mainnet/deneb__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/block_header_test.go b/testing/spectest/mainnet/deneb__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/operations/block_header_test.go
rename to testing/spectest/mainnet/deneb__operations__block_header_test.go
index 550c05f03c..ffcfd90769 100644
--- a/testing/spectest/mainnet/deneb/operations/block_header_test.go
+++ b/testing/spectest/mainnet/deneb__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/bls_to_execution_change_test.go b/testing/spectest/mainnet/deneb__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/mainnet/deneb/operations/bls_to_execution_change_test.go
rename to testing/spectest/mainnet/deneb__operations__bls_to_execution_change_test.go
index 37db6e7aca..a35476a1b3 100644
--- a/testing/spectest/mainnet/deneb/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/mainnet/deneb__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/deposit_test.go b/testing/spectest/mainnet/deneb__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/operations/deposit_test.go
rename to testing/spectest/mainnet/deneb__operations__deposit_test.go
index ac0c208d52..563d305e0d 100644
--- a/testing/spectest/mainnet/deneb/operations/deposit_test.go
+++ b/testing/spectest/mainnet/deneb__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/execution_payload_test.go b/testing/spectest/mainnet/deneb__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/mainnet/deneb/operations/execution_payload_test.go
rename to testing/spectest/mainnet/deneb__operations__execution_payload_test.go
index a23483669a..57234a52f4 100644
--- a/testing/spectest/mainnet/deneb/operations/execution_payload_test.go
+++ b/testing/spectest/mainnet/deneb__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/proposer_slashing_test.go b/testing/spectest/mainnet/deneb__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/deneb/operations/proposer_slashing_test.go
rename to testing/spectest/mainnet/deneb__operations__proposer_slashing_test.go
index 1973e751dc..6543d213e7 100644
--- a/testing/spectest/mainnet/deneb/operations/proposer_slashing_test.go
+++ b/testing/spectest/mainnet/deneb__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/sync_committee_test.go b/testing/spectest/mainnet/deneb__operations__sync_committee_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/operations/sync_committee_test.go
rename to testing/spectest/mainnet/deneb__operations__sync_committee_test.go
index 0cf84738c0..d5f5b9c967 100644
--- a/testing/spectest/mainnet/deneb/operations/sync_committee_test.go
+++ b/testing/spectest/mainnet/deneb__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/voluntary_exit_test.go b/testing/spectest/mainnet/deneb__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/operations/voluntary_exit_test.go
rename to testing/spectest/mainnet/deneb__operations__voluntary_exit_test.go
index 8bcf409314..2b1e927a44 100644
--- a/testing/spectest/mainnet/deneb/operations/voluntary_exit_test.go
+++ b/testing/spectest/mainnet/deneb__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/operations/withdrawals_test.go b/testing/spectest/mainnet/deneb__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/operations/withdrawals_test.go
rename to testing/spectest/mainnet/deneb__operations__withdrawals_test.go
index d2f644a743..7f17bd1b0b 100644
--- a/testing/spectest/mainnet/deneb/operations/withdrawals_test.go
+++ b/testing/spectest/mainnet/deneb__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/random/random_test.go b/testing/spectest/mainnet/deneb__random__random_test.go
similarity index 93%
rename from testing/spectest/mainnet/deneb/random/random_test.go
rename to testing/spectest/mainnet/deneb__random__random_test.go
index c493027848..e3bf2d6a41 100644
--- a/testing/spectest/mainnet/deneb/random/random_test.go
+++ b/testing/spectest/mainnet/deneb__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/rewards/rewards_test.go b/testing/spectest/mainnet/deneb__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/mainnet/deneb/rewards/rewards_test.go
rename to testing/spectest/mainnet/deneb__rewards__rewards_test.go
index 1c3bbd5cbe..9cad2025a7 100644
--- a/testing/spectest/mainnet/deneb/rewards/rewards_test.go
+++ b/testing/spectest/mainnet/deneb__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/sanity/blocks_test.go b/testing/spectest/mainnet/deneb__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/mainnet/deneb/sanity/blocks_test.go
rename to testing/spectest/mainnet/deneb__sanity__blocks_test.go
index 7b8cc1b8ec..409a06f419 100644
--- a/testing/spectest/mainnet/deneb/sanity/blocks_test.go
+++ b/testing/spectest/mainnet/deneb__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/sanity/slots_test.go b/testing/spectest/mainnet/deneb__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/mainnet/deneb/sanity/slots_test.go
rename to testing/spectest/mainnet/deneb__sanity__slots_test.go
index a90eb2188f..d8809a60aa 100644
--- a/testing/spectest/mainnet/deneb/sanity/slots_test.go
+++ b/testing/spectest/mainnet/deneb__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/deneb/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/deneb__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/mainnet/deneb/ssz_static/ssz_static_test.go
rename to testing/spectest/mainnet/deneb__ssz_static__ssz_static_test.go
index db5681cd4a..7e753865ff 100644
--- a/testing/spectest/mainnet/deneb/ssz_static/ssz_static_test.go
+++ b/testing/spectest/mainnet/deneb__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/BUILD.bazel b/testing/spectest/mainnet/electra/epoch_processing/BUILD.bazel
deleted file mode 100644
index 461c718bca..0000000000
--- a/testing/spectest/mainnet/electra/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_summaries_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "pending_consolidations_test.go",
-        "pending_deposits_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    deps = ["//testing/spectest/shared/electra/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/finality/BUILD.bazel b/testing/spectest/mainnet/electra/finality/BUILD.bazel
deleted file mode 100644
index c469e095fc..0000000000
--- a/testing/spectest/mainnet/electra/finality/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/finality:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/fork_helper/BUILD.bazel b/testing/spectest/mainnet/electra/fork_helper/BUILD.bazel
deleted file mode 100644
index 109213e27a..0000000000
--- a/testing/spectest/mainnet/electra/fork_helper/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_electra_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/fork_transition/BUILD.bazel b/testing/spectest/mainnet/electra/fork_transition/BUILD.bazel
deleted file mode 100644
index e4e34f108c..0000000000
--- a/testing/spectest/mainnet/electra/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/forkchoice/BUILD.bazel b/testing/spectest/mainnet/electra/forkchoice/BUILD.bazel
deleted file mode 100644
index 7590b92ea0..0000000000
--- a/testing/spectest/mainnet/electra/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/electra/light_client/BUILD.bazel b/testing/spectest/mainnet/electra/light_client/BUILD.bazel
deleted file mode 100644
index be8111d458..0000000000
--- a/testing/spectest/mainnet/electra/light_client/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["single_merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/electra/merkle_proof/BUILD.bazel b/testing/spectest/mainnet/electra/merkle_proof/BUILD.bazel
deleted file mode 100644
index b8899cbb7b..0000000000
--- a/testing/spectest/mainnet/electra/merkle_proof/BUILD.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = ["merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/merkle_proof:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/operations/BUILD.bazel b/testing/spectest/mainnet/electra/operations/BUILD.bazel
deleted file mode 100644
index fdef06bf97..0000000000
--- a/testing/spectest/mainnet/electra/operations/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "consolidation_test.go",
-        "deposit_requests_test.go",
-        "deposit_test.go",
-        "execution_layer_withdrawals_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    deps = ["//testing/spectest/shared/electra/operations:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/random/BUILD.bazel b/testing/spectest/mainnet/electra/random/BUILD.bazel
deleted file mode 100644
index db65377263..0000000000
--- a/testing/spectest/mainnet/electra/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/rewards/BUILD.bazel b/testing/spectest/mainnet/electra/rewards/BUILD.bazel
deleted file mode 100644
index 420995a68c..0000000000
--- a/testing/spectest/mainnet/electra/rewards/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/rewards:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/sanity/BUILD.bazel b/testing/spectest/mainnet/electra/sanity/BUILD.bazel
deleted file mode 100644
index 0880f2d493..0000000000
--- a/testing/spectest/mainnet/electra/sanity/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/ssz_static/BUILD.bazel b/testing/spectest/mainnet/electra/ssz_static/BUILD.bazel
deleted file mode 100644
index f94f1dcb16..0000000000
--- a/testing/spectest/mainnet/electra/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/electra/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/electra__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__effective_balance_updates_test.go
index 1d7ffb289e..c449423e41 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/electra__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__eth1_data_reset_test.go
index 4e6c9cb4b0..76298f1d98 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/historical_summaries_update_test.go b/testing/spectest/mainnet/electra__epoch_processing__historical_summaries_update_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/epoch_processing/historical_summaries_update_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__historical_summaries_update_test.go
index d6fd49d753..7c0c5fa931 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/historical_summaries_update_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__historical_summaries_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/electra__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__inactivity_updates_test.go
index 77a994aebf..d0a5dcb83b 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/electra__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__justification_and_finalization_test.go
index 795cd3735d..b254055e8f 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/electra__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__participation_flag_updates_test.go
index f778b2e9cc..895227d613 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/pending_consolidations_test.go b/testing/spectest/mainnet/electra__epoch_processing__pending_consolidations_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/epoch_processing/pending_consolidations_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__pending_consolidations_test.go
index 099f639d73..9c37903eba 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/pending_consolidations_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__pending_consolidations_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/pending_deposits_updates_test.go b/testing/spectest/mainnet/electra__epoch_processing__pending_deposits_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/pending_deposits_updates_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__pending_deposits_updates_test.go
index 108b86e1f9..907e1c0cde 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/pending_deposits_updates_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__pending_deposits_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/electra__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__randao_mixes_reset_test.go
index 8d43cacdc5..f4e627b80d 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/electra__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/registry_updates_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__registry_updates_test.go
index 6de5d11568..6eecc9f7f5 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/electra__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__rewards_and_penalties_test.go
index c0947bbad0..1bd1368bd2 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/electra__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/slashings_reset_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__slashings_reset_test.go
index 6b48af0b55..a29c86dd1f 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/epoch_processing/slashings_test.go b/testing/spectest/mainnet/electra__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/epoch_processing/slashings_test.go
rename to testing/spectest/mainnet/electra__epoch_processing__slashings_test.go
index df1a822f13..706f4f136a 100644
--- a/testing/spectest/mainnet/electra/epoch_processing/slashings_test.go
+++ b/testing/spectest/mainnet/electra__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/finality/finality_test.go b/testing/spectest/mainnet/electra__finality__finality_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/finality/finality_test.go
rename to testing/spectest/mainnet/electra__finality__finality_test.go
index f69a6ff129..638b7f7933 100644
--- a/testing/spectest/mainnet/electra/finality/finality_test.go
+++ b/testing/spectest/mainnet/electra__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/fork_helper/upgrade_to_electra_test.go b/testing/spectest/mainnet/electra__fork_helper__upgrade_to_electra_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/fork_helper/upgrade_to_electra_test.go
rename to testing/spectest/mainnet/electra__fork_helper__upgrade_to_electra_test.go
index e3f9f39ed7..79fea1a3d5 100644
--- a/testing/spectest/mainnet/electra/fork_helper/upgrade_to_electra_test.go
+++ b/testing/spectest/mainnet/electra__fork_helper__upgrade_to_electra_test.go
@@ -1,4 +1,4 @@
-package fork_helper
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/fork_transition/transition_test.go b/testing/spectest/mainnet/electra__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/mainnet/electra/fork_transition/transition_test.go
rename to testing/spectest/mainnet/electra__fork_transition__transition_test.go
index e2e03596f6..00a0fc86ae 100644
--- a/testing/spectest/mainnet/electra/fork_transition/transition_test.go
+++ b/testing/spectest/mainnet/electra__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/electra__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/mainnet/electra/forkchoice/forkchoice_test.go
rename to testing/spectest/mainnet/electra__forkchoice__forkchoice_test.go
index 985454e880..7ce9594138 100644
--- a/testing/spectest/mainnet/electra/forkchoice/forkchoice_test.go
+++ b/testing/spectest/mainnet/electra__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/light_client/single_merkle_proof_test.go b/testing/spectest/mainnet/electra__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/mainnet/electra/light_client/single_merkle_proof_test.go
rename to testing/spectest/mainnet/electra__light_client__single_merkle_proof_test.go
index 88b6434726..18ca1761e5 100644
--- a/testing/spectest/mainnet/electra/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/mainnet/electra__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/merkle_proof/merkle_proof_test.go b/testing/spectest/mainnet/electra__merkle_proof__merkle_proof_test.go
similarity index 90%
rename from testing/spectest/mainnet/electra/merkle_proof/merkle_proof_test.go
rename to testing/spectest/mainnet/electra__merkle_proof__merkle_proof_test.go
index 083ec02943..08108b6846 100644
--- a/testing/spectest/mainnet/electra/merkle_proof/merkle_proof_test.go
+++ b/testing/spectest/mainnet/electra__merkle_proof__merkle_proof_test.go
@@ -1,4 +1,4 @@
-package merkle_proof
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/attestation_test.go b/testing/spectest/mainnet/electra__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/operations/attestation_test.go
rename to testing/spectest/mainnet/electra__operations__attestation_test.go
index ad623cf634..895a54be7c 100644
--- a/testing/spectest/mainnet/electra/operations/attestation_test.go
+++ b/testing/spectest/mainnet/electra__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/attester_slashing_test.go b/testing/spectest/mainnet/electra__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/attester_slashing_test.go
rename to testing/spectest/mainnet/electra__operations__attester_slashing_test.go
index e809d10381..e00413ec6e 100644
--- a/testing/spectest/mainnet/electra/operations/attester_slashing_test.go
+++ b/testing/spectest/mainnet/electra__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/block_header_test.go b/testing/spectest/mainnet/electra__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/operations/block_header_test.go
rename to testing/spectest/mainnet/electra__operations__block_header_test.go
index e01515f7a6..11d62ad954 100644
--- a/testing/spectest/mainnet/electra/operations/block_header_test.go
+++ b/testing/spectest/mainnet/electra__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/bls_to_execution_change_test.go b/testing/spectest/mainnet/electra__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/bls_to_execution_change_test.go
rename to testing/spectest/mainnet/electra__operations__bls_to_execution_change_test.go
index f0b0fc734f..f3aa0c1cd7 100644
--- a/testing/spectest/mainnet/electra/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/mainnet/electra__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/consolidation_test.go b/testing/spectest/mainnet/electra__operations__consolidation_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/consolidation_test.go
rename to testing/spectest/mainnet/electra__operations__consolidation_test.go
index f8d00cae47..25d47a9825 100644
--- a/testing/spectest/mainnet/electra/operations/consolidation_test.go
+++ b/testing/spectest/mainnet/electra__operations__consolidation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/deposit_requests_test.go b/testing/spectest/mainnet/electra__operations__deposit_requests_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/deposit_requests_test.go
rename to testing/spectest/mainnet/electra__operations__deposit_requests_test.go
index 2f022eb6af..b97524d510 100644
--- a/testing/spectest/mainnet/electra/operations/deposit_requests_test.go
+++ b/testing/spectest/mainnet/electra__operations__deposit_requests_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/deposit_test.go b/testing/spectest/mainnet/electra__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/operations/deposit_test.go
rename to testing/spectest/mainnet/electra__operations__deposit_test.go
index 3a806c9887..dc06c5b685 100644
--- a/testing/spectest/mainnet/electra/operations/deposit_test.go
+++ b/testing/spectest/mainnet/electra__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/execution_layer_withdrawals_test.go b/testing/spectest/mainnet/electra__operations__execution_layer_withdrawals_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/execution_layer_withdrawals_test.go
rename to testing/spectest/mainnet/electra__operations__execution_layer_withdrawals_test.go
index 2657826167..1ec0fb6a7f 100644
--- a/testing/spectest/mainnet/electra/operations/execution_layer_withdrawals_test.go
+++ b/testing/spectest/mainnet/electra__operations__execution_layer_withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/execution_payload_test.go b/testing/spectest/mainnet/electra__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/execution_payload_test.go
rename to testing/spectest/mainnet/electra__operations__execution_payload_test.go
index 99b73985ea..a5df3129c5 100644
--- a/testing/spectest/mainnet/electra/operations/execution_payload_test.go
+++ b/testing/spectest/mainnet/electra__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/proposer_slashing_test.go b/testing/spectest/mainnet/electra__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/proposer_slashing_test.go
rename to testing/spectest/mainnet/electra__operations__proposer_slashing_test.go
index 0b9cb65360..3054c692a3 100644
--- a/testing/spectest/mainnet/electra/operations/proposer_slashing_test.go
+++ b/testing/spectest/mainnet/electra__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/sync_committee_test.go b/testing/spectest/mainnet/electra__operations__sync_committee_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/sync_committee_test.go
rename to testing/spectest/mainnet/electra__operations__sync_committee_test.go
index 492c94c690..d29612f0e2 100644
--- a/testing/spectest/mainnet/electra/operations/sync_committee_test.go
+++ b/testing/spectest/mainnet/electra__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/voluntary_exit_test.go b/testing/spectest/mainnet/electra__operations__voluntary_exit_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/operations/voluntary_exit_test.go
rename to testing/spectest/mainnet/electra__operations__voluntary_exit_test.go
index 47847df830..5c692cbdcf 100644
--- a/testing/spectest/mainnet/electra/operations/voluntary_exit_test.go
+++ b/testing/spectest/mainnet/electra__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/operations/withdrawals_test.go b/testing/spectest/mainnet/electra__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/operations/withdrawals_test.go
rename to testing/spectest/mainnet/electra__operations__withdrawals_test.go
index ce732f085c..59a24e2ab2 100644
--- a/testing/spectest/mainnet/electra/operations/withdrawals_test.go
+++ b/testing/spectest/mainnet/electra__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/random/random_test.go b/testing/spectest/mainnet/electra__random__random_test.go
similarity index 93%
rename from testing/spectest/mainnet/electra/random/random_test.go
rename to testing/spectest/mainnet/electra__random__random_test.go
index adbd1f65a8..cf69d5cc1e 100644
--- a/testing/spectest/mainnet/electra/random/random_test.go
+++ b/testing/spectest/mainnet/electra__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/rewards/rewards_test.go b/testing/spectest/mainnet/electra__rewards__rewards_test.go
similarity index 93%
rename from testing/spectest/mainnet/electra/rewards/rewards_test.go
rename to testing/spectest/mainnet/electra__rewards__rewards_test.go
index 8c67bae8ce..7267ba4563 100644
--- a/testing/spectest/mainnet/electra/rewards/rewards_test.go
+++ b/testing/spectest/mainnet/electra__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/sanity/blocks_test.go b/testing/spectest/mainnet/electra__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/mainnet/electra/sanity/blocks_test.go
rename to testing/spectest/mainnet/electra__sanity__blocks_test.go
index 364806fc0f..abb6f047ff 100644
--- a/testing/spectest/mainnet/electra/sanity/blocks_test.go
+++ b/testing/spectest/mainnet/electra__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/sanity/slots_test.go b/testing/spectest/mainnet/electra__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/mainnet/electra/sanity/slots_test.go
rename to testing/spectest/mainnet/electra__sanity__slots_test.go
index b3088a3196..50e845ee29 100644
--- a/testing/spectest/mainnet/electra/sanity/slots_test.go
+++ b/testing/spectest/mainnet/electra__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/electra/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/electra__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/mainnet/electra/ssz_static/ssz_static_test.go
rename to testing/spectest/mainnet/electra__ssz_static__ssz_static_test.go
index f73b97707b..11b4b904b9 100644
--- a/testing/spectest/mainnet/electra/ssz_static/ssz_static_test.go
+++ b/testing/spectest/mainnet/electra__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/BUILD.bazel b/testing/spectest/mainnet/fulu/epoch_processing/BUILD.bazel
deleted file mode 100644
index 62a42b8e8e..0000000000
--- a/testing/spectest/mainnet/fulu/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_summaries_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "pending_consolidations_test.go",
-        "pending_deposits_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    deps = ["//testing/spectest/shared/fulu/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/finality/BUILD.bazel b/testing/spectest/mainnet/fulu/finality/BUILD.bazel
deleted file mode 100644
index c9a8bd58de..0000000000
--- a/testing/spectest/mainnet/fulu/finality/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/finality:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/fork/BUILD.bazel b/testing/spectest/mainnet/fulu/fork/BUILD.bazel
deleted file mode 100644
index 594438a20a..0000000000
--- a/testing/spectest/mainnet/fulu/fork/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_fulu_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/fork:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/forkchoice/BUILD.bazel b/testing/spectest/mainnet/fulu/forkchoice/BUILD.bazel
deleted file mode 100644
index 7590b92ea0..0000000000
--- a/testing/spectest/mainnet/fulu/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/fulu/merkle_proof/BUILD.bazel b/testing/spectest/mainnet/fulu/merkle_proof/BUILD.bazel
deleted file mode 100644
index 84710a3547..0000000000
--- a/testing/spectest/mainnet/fulu/merkle_proof/BUILD.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = ["merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/merkle_proof:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/networking/BUILD.bazel b/testing/spectest/mainnet/fulu/networking/BUILD.bazel
deleted file mode 100644
index d3b3e7a44c..0000000000
--- a/testing/spectest/mainnet/fulu/networking/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["custody_groups_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/networking:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/operations/BUILD.bazel b/testing/spectest/mainnet/fulu/operations/BUILD.bazel
deleted file mode 100644
index 7941fb9c49..0000000000
--- a/testing/spectest/mainnet/fulu/operations/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "consolidation_test.go",
-        "deposit_requests_test.go",
-        "deposit_test.go",
-        "execution_layer_withdrawals_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    deps = ["//testing/spectest/shared/fulu/operations:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/random/BUILD.bazel b/testing/spectest/mainnet/fulu/random/BUILD.bazel
deleted file mode 100644
index 552aa5024a..0000000000
--- a/testing/spectest/mainnet/fulu/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/rewards/BUILD.bazel b/testing/spectest/mainnet/fulu/rewards/BUILD.bazel
deleted file mode 100644
index 81a8ac0ab3..0000000000
--- a/testing/spectest/mainnet/fulu/rewards/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/rewards:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/sanity/BUILD.bazel b/testing/spectest/mainnet/fulu/sanity/BUILD.bazel
deleted file mode 100644
index 76eaa24934..0000000000
--- a/testing/spectest/mainnet/fulu/sanity/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/ssz_static/BUILD.bazel b/testing/spectest/mainnet/fulu/ssz_static/BUILD.bazel
deleted file mode 100644
index de594f1f39..0000000000
--- a/testing/spectest/mainnet/fulu/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/fulu__epoch_processing__effective_balance_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__effective_balance_updates_test.go
index edc371ff28..0abb667c70 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/fulu__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__eth1_data_reset_test.go
index c6b76d0734..391169f029 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/historical_summaries_update_test.go b/testing/spectest/mainnet/fulu__epoch_processing__historical_summaries_update_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/epoch_processing/historical_summaries_update_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__historical_summaries_update_test.go
index 63b4789455..1b6bf8f081 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/historical_summaries_update_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__historical_summaries_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/inactivity_updates_test.go b/testing/spectest/mainnet/fulu__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__inactivity_updates_test.go
index 5d79e92d03..f2bd5d419b 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/fulu__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__justification_and_finalization_test.go
index 02b6fb2086..a277be899f 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/participation_flag_updates_test.go b/testing/spectest/mainnet/fulu__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__participation_flag_updates_test.go
index dd7b3a7a3c..4d93f23f59 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/pending_consolidations_test.go b/testing/spectest/mainnet/fulu__epoch_processing__pending_consolidations_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/pending_consolidations_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__pending_consolidations_test.go
index 042a6516f1..1e774642ef 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/pending_consolidations_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__pending_consolidations_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/pending_deposits_updates_test.go b/testing/spectest/mainnet/fulu__epoch_processing__pending_deposits_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/pending_deposits_updates_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__pending_deposits_updates_test.go
index ddb91191ec..dfc4123859 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/pending_deposits_updates_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__pending_deposits_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/fulu__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__randao_mixes_reset_test.go
index 2a13180a32..b8c3c53c44 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/fulu__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/registry_updates_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__registry_updates_test.go
index d66ba24bbb..91ae44cabe 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/fulu__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__rewards_and_penalties_test.go
index e5d82df91c..909a9a5247 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/fulu__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/epoch_processing/slashings_reset_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__slashings_reset_test.go
index 5844e0c3d1..20d830ad19 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/epoch_processing/slashings_test.go b/testing/spectest/mainnet/fulu__epoch_processing__slashings_test.go
similarity index 89%
rename from testing/spectest/mainnet/fulu/epoch_processing/slashings_test.go
rename to testing/spectest/mainnet/fulu__epoch_processing__slashings_test.go
index 7d93afa4c5..aff33e3d02 100644
--- a/testing/spectest/mainnet/fulu/epoch_processing/slashings_test.go
+++ b/testing/spectest/mainnet/fulu__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/finality/finality_test.go b/testing/spectest/mainnet/fulu__finality__finality_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/finality/finality_test.go
rename to testing/spectest/mainnet/fulu__finality__finality_test.go
index 91034d243f..27df315db3 100644
--- a/testing/spectest/mainnet/fulu/finality/finality_test.go
+++ b/testing/spectest/mainnet/fulu__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/fork/upgrade_to_fulu_test.go b/testing/spectest/mainnet/fulu__fork__upgrade_to_fulu_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/fork/upgrade_to_fulu_test.go
rename to testing/spectest/mainnet/fulu__fork__upgrade_to_fulu_test.go
index 8697edffc7..1378ba768f 100644
--- a/testing/spectest/mainnet/fulu/fork/upgrade_to_fulu_test.go
+++ b/testing/spectest/mainnet/fulu__fork__upgrade_to_fulu_test.go
@@ -1,4 +1,4 @@
-package fork
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/forkchoice/forkchoice_test.go b/testing/spectest/mainnet/fulu__forkchoice__forkchoice_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/forkchoice/forkchoice_test.go
rename to testing/spectest/mainnet/fulu__forkchoice__forkchoice_test.go
index c906e1dae3..143240e465 100644
--- a/testing/spectest/mainnet/fulu/forkchoice/forkchoice_test.go
+++ b/testing/spectest/mainnet/fulu__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/merkle_proof/merkle_proof_test.go b/testing/spectest/mainnet/fulu__merkle_proof__merkle_proof_test.go
similarity index 90%
rename from testing/spectest/mainnet/fulu/merkle_proof/merkle_proof_test.go
rename to testing/spectest/mainnet/fulu__merkle_proof__merkle_proof_test.go
index 5d133df43a..f6596fa3a4 100644
--- a/testing/spectest/mainnet/fulu/merkle_proof/merkle_proof_test.go
+++ b/testing/spectest/mainnet/fulu__merkle_proof__merkle_proof_test.go
@@ -1,4 +1,4 @@
-package merkle_proof
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/networking/custody_groups_test.go b/testing/spectest/mainnet/fulu__networking__custody_groups_test.go
similarity index 95%
rename from testing/spectest/mainnet/fulu/networking/custody_groups_test.go
rename to testing/spectest/mainnet/fulu__networking__custody_groups_test.go
index 3b36376453..0116edffec 100644
--- a/testing/spectest/mainnet/fulu/networking/custody_groups_test.go
+++ b/testing/spectest/mainnet/fulu__networking__custody_groups_test.go
@@ -1,4 +1,4 @@
-package networking
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/attestation_test.go b/testing/spectest/mainnet/fulu__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/attestation_test.go
rename to testing/spectest/mainnet/fulu__operations__attestation_test.go
index 64342c9b94..ec09eeb7e1 100644
--- a/testing/spectest/mainnet/fulu/operations/attestation_test.go
+++ b/testing/spectest/mainnet/fulu__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/attester_slashing_test.go b/testing/spectest/mainnet/fulu__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/operations/attester_slashing_test.go
rename to testing/spectest/mainnet/fulu__operations__attester_slashing_test.go
index f5e51aca15..c933f3c482 100644
--- a/testing/spectest/mainnet/fulu/operations/attester_slashing_test.go
+++ b/testing/spectest/mainnet/fulu__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/block_header_test.go b/testing/spectest/mainnet/fulu__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/block_header_test.go
rename to testing/spectest/mainnet/fulu__operations__block_header_test.go
index 17af7e74ac..a5e0a08b4f 100644
--- a/testing/spectest/mainnet/fulu/operations/block_header_test.go
+++ b/testing/spectest/mainnet/fulu__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/bls_to_execution_change_test.go b/testing/spectest/mainnet/fulu__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/operations/bls_to_execution_change_test.go
rename to testing/spectest/mainnet/fulu__operations__bls_to_execution_change_test.go
index c5f8819af6..d549c2cbe2 100644
--- a/testing/spectest/mainnet/fulu/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/mainnet/fulu__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/consolidation_test.go b/testing/spectest/mainnet/fulu__operations__consolidation_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/consolidation_test.go
rename to testing/spectest/mainnet/fulu__operations__consolidation_test.go
index 1358ff30c4..b957d5cf90 100644
--- a/testing/spectest/mainnet/fulu/operations/consolidation_test.go
+++ b/testing/spectest/mainnet/fulu__operations__consolidation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/deposit_requests_test.go b/testing/spectest/mainnet/fulu__operations__deposit_requests_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/deposit_requests_test.go
rename to testing/spectest/mainnet/fulu__operations__deposit_requests_test.go
index 631c804b8b..c8c7de74b5 100644
--- a/testing/spectest/mainnet/fulu/operations/deposit_requests_test.go
+++ b/testing/spectest/mainnet/fulu__operations__deposit_requests_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/deposit_test.go b/testing/spectest/mainnet/fulu__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/deposit_test.go
rename to testing/spectest/mainnet/fulu__operations__deposit_test.go
index 982eb2647c..26ec66f2a7 100644
--- a/testing/spectest/mainnet/fulu/operations/deposit_test.go
+++ b/testing/spectest/mainnet/fulu__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/execution_layer_withdrawals_test.go b/testing/spectest/mainnet/fulu__operations__execution_layer_withdrawals_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/operations/execution_layer_withdrawals_test.go
rename to testing/spectest/mainnet/fulu__operations__execution_layer_withdrawals_test.go
index 98277fecb0..712895cd82 100644
--- a/testing/spectest/mainnet/fulu/operations/execution_layer_withdrawals_test.go
+++ b/testing/spectest/mainnet/fulu__operations__execution_layer_withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/execution_payload_test.go b/testing/spectest/mainnet/fulu__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/operations/execution_payload_test.go
rename to testing/spectest/mainnet/fulu__operations__execution_payload_test.go
index 9b6fbe4b42..84776eaffe 100644
--- a/testing/spectest/mainnet/fulu/operations/execution_payload_test.go
+++ b/testing/spectest/mainnet/fulu__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/proposer_slashing_test.go b/testing/spectest/mainnet/fulu__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/operations/proposer_slashing_test.go
rename to testing/spectest/mainnet/fulu__operations__proposer_slashing_test.go
index bdd72968ec..b31d245b7b 100644
--- a/testing/spectest/mainnet/fulu/operations/proposer_slashing_test.go
+++ b/testing/spectest/mainnet/fulu__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/sync_committee_test.go b/testing/spectest/mainnet/fulu__operations__sync_committee_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/sync_committee_test.go
rename to testing/spectest/mainnet/fulu__operations__sync_committee_test.go
index 7df9e3db62..03061e92d2 100644
--- a/testing/spectest/mainnet/fulu/operations/sync_committee_test.go
+++ b/testing/spectest/mainnet/fulu__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/voluntary_exit_test.go b/testing/spectest/mainnet/fulu__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/voluntary_exit_test.go
rename to testing/spectest/mainnet/fulu__operations__voluntary_exit_test.go
index b55032684f..afd0aa282d 100644
--- a/testing/spectest/mainnet/fulu/operations/voluntary_exit_test.go
+++ b/testing/spectest/mainnet/fulu__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/operations/withdrawals_test.go b/testing/spectest/mainnet/fulu__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/operations/withdrawals_test.go
rename to testing/spectest/mainnet/fulu__operations__withdrawals_test.go
index 99ecd75a96..a72cbafa69 100644
--- a/testing/spectest/mainnet/fulu/operations/withdrawals_test.go
+++ b/testing/spectest/mainnet/fulu__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/random/random_test.go b/testing/spectest/mainnet/fulu__random__random_test.go
similarity index 93%
rename from testing/spectest/mainnet/fulu/random/random_test.go
rename to testing/spectest/mainnet/fulu__random__random_test.go
index 0bef2e5d6d..e31ed9a46e 100644
--- a/testing/spectest/mainnet/fulu/random/random_test.go
+++ b/testing/spectest/mainnet/fulu__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/rewards/rewards_test.go b/testing/spectest/mainnet/fulu__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/rewards/rewards_test.go
rename to testing/spectest/mainnet/fulu__rewards__rewards_test.go
index 54d0b0794a..131179191e 100644
--- a/testing/spectest/mainnet/fulu/rewards/rewards_test.go
+++ b/testing/spectest/mainnet/fulu__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/sanity/blocks_test.go b/testing/spectest/mainnet/fulu__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/mainnet/fulu/sanity/blocks_test.go
rename to testing/spectest/mainnet/fulu__sanity__blocks_test.go
index 0be8672c86..191cb37273 100644
--- a/testing/spectest/mainnet/fulu/sanity/blocks_test.go
+++ b/testing/spectest/mainnet/fulu__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/sanity/slots_test.go b/testing/spectest/mainnet/fulu__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/mainnet/fulu/sanity/slots_test.go
rename to testing/spectest/mainnet/fulu__sanity__slots_test.go
index 759121ee1c..4d52c0ed76 100644
--- a/testing/spectest/mainnet/fulu/sanity/slots_test.go
+++ b/testing/spectest/mainnet/fulu__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/fulu/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/fulu__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/mainnet/fulu/ssz_static/ssz_static_test.go
rename to testing/spectest/mainnet/fulu__ssz_static__ssz_static_test.go
index 2c26168dc4..473e60094e 100644
--- a/testing/spectest/mainnet/fulu/ssz_static/ssz_static_test.go
+++ b/testing/spectest/mainnet/fulu__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/BUILD.bazel b/testing/spectest/mainnet/phase0/epoch_processing/BUILD.bazel
deleted file mode 100644
index f890fa97de..0000000000
--- a/testing/spectest/mainnet/phase0/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "epoch_processing_test.go",
-        "eth1_data_reset_test.go",
-        "historical_roots_update_test.go",
-        "justification_and_finalization_test.go",
-        "participation_record_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = [
-        "//config/params:go_default_library",
-        "//testing/spectest/shared/phase0/epoch_processing:go_default_library",
-    ],
-)
diff --git a/testing/spectest/mainnet/phase0/finality/BUILD.bazel b/testing/spectest/mainnet/phase0/finality/BUILD.bazel
deleted file mode 100644
index ab246248f3..0000000000
--- a/testing/spectest/mainnet/phase0/finality/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/phase0/finality:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/phase0/operations/BUILD.bazel b/testing/spectest/mainnet/phase0/operations/BUILD.bazel
deleted file mode 100644
index 89afc1cf37..0000000000
--- a/testing/spectest/mainnet/phase0/operations/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "deposit_test.go",
-        "proposer_slashing_test.go",
-        "voluntary_exit_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/phase0/operations:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/phase0/random/BUILD.bazel b/testing/spectest/mainnet/phase0/random/BUILD.bazel
deleted file mode 100644
index d1be258ec5..0000000000
--- a/testing/spectest/mainnet/phase0/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/phase0/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/phase0/rewards/BUILD.bazel b/testing/spectest/mainnet/phase0/rewards/BUILD.bazel
deleted file mode 100644
index 6be41fc9f4..0000000000
--- a/testing/spectest/mainnet/phase0/rewards/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/phase0/rewards:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/phase0/sanity/BUILD.bazel b/testing/spectest/mainnet/phase0/sanity/BUILD.bazel
deleted file mode 100644
index a9573d5d15..0000000000
--- a/testing/spectest/mainnet/phase0/sanity/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/phase0/sanity:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/phase0/shuffling/core/shuffle/BUILD.bazel b/testing/spectest/mainnet/phase0/shuffling/core/shuffle/BUILD.bazel
deleted file mode 100644
index fb14203085..0000000000
--- a/testing/spectest/mainnet/phase0/shuffling/core/shuffle/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["shuffle_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/phase0/shuffling/core/shuffle:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go b/testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go
deleted file mode 100644
index 7cdd1aa44f..0000000000
--- a/testing/spectest/mainnet/phase0/shuffling/core/shuffle/shuffle_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package shuffle
-
-import (
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/testing/spectest/shared/phase0/shuffling/core/shuffle"
-)
-
-func TestMainnet_Phase0_Shuffling_Core_Shuffle(t *testing.T) {
-	shuffle.RunShuffleTests(t, "mainnet")
-}
diff --git a/testing/spectest/mainnet/phase0/ssz_static/BUILD.bazel b/testing/spectest/mainnet/phase0/ssz_static/BUILD.bazel
deleted file mode 100644
index c9073a8b76..0000000000
--- a/testing/spectest/mainnet/phase0/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/phase0/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/effective_balance_updates_test.go b/testing/spectest/mainnet/phase0__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__effective_balance_updates_test.go
index 02972a7b62..f41a3f8927 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/epoch_processing_test.go b/testing/spectest/mainnet/phase0__epoch_processing__epoch_processing_test.go
similarity index 92%
rename from testing/spectest/mainnet/phase0/epoch_processing/epoch_processing_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__epoch_processing_test.go
index cf31e0d8e8..df0103e8e1 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/epoch_processing_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__epoch_processing_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"os"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/eth1_data_reset_test.go b/testing/spectest/mainnet/phase0__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/phase0/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__eth1_data_reset_test.go
index 088a8ce47c..0dddf4f449 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/historical_roots_update_test.go b/testing/spectest/mainnet/phase0__epoch_processing__historical_roots_update_test.go
similarity index 90%
rename from testing/spectest/mainnet/phase0/epoch_processing/historical_roots_update_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__historical_roots_update_test.go
index 1ca65be257..0f48927225 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/historical_roots_update_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__historical_roots_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/justification_and_finalization_test.go b/testing/spectest/mainnet/phase0__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__justification_and_finalization_test.go
index 804d9f3a9d..f973afb8a6 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/participation_record_updates_test.go b/testing/spectest/mainnet/phase0__epoch_processing__participation_record_updates_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/epoch_processing/participation_record_updates_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__participation_record_updates_test.go
index f18e011c41..1d51e3474f 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/participation_record_updates_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__participation_record_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/mainnet/phase0__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/phase0/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__randao_mixes_reset_test.go
index 8c96225159..010145d932 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/registry_updates_test.go b/testing/spectest/mainnet/phase0__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/mainnet/phase0/epoch_processing/registry_updates_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__registry_updates_test.go
index 0948424f53..3bf29c0bad 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/mainnet/phase0__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/mainnet/phase0/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__rewards_and_penalties_test.go
index 57efb3f293..bd8ad7d45e 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/slashings_reset_test.go b/testing/spectest/mainnet/phase0__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/mainnet/phase0/epoch_processing/slashings_reset_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__slashings_reset_test.go
index 0820336d6e..02786667fd 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/epoch_processing/slashings_test.go b/testing/spectest/mainnet/phase0__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/mainnet/phase0/epoch_processing/slashings_test.go
rename to testing/spectest/mainnet/phase0__epoch_processing__slashings_test.go
index 84313b4025..ce8c2bbc6d 100644
--- a/testing/spectest/mainnet/phase0/epoch_processing/slashings_test.go
+++ b/testing/spectest/mainnet/phase0__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/finality/finality_test.go b/testing/spectest/mainnet/phase0__finality__finality_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/finality/finality_test.go
rename to testing/spectest/mainnet/phase0__finality__finality_test.go
index ad89ce6de6..8d712269ab 100644
--- a/testing/spectest/mainnet/phase0/finality/finality_test.go
+++ b/testing/spectest/mainnet/phase0__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/operations/attestation_test.go b/testing/spectest/mainnet/phase0__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/operations/attestation_test.go
rename to testing/spectest/mainnet/phase0__operations__attestation_test.go
index f379d84822..b1c06bde9f 100644
--- a/testing/spectest/mainnet/phase0/operations/attestation_test.go
+++ b/testing/spectest/mainnet/phase0__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/operations/attester_slashing_test.go b/testing/spectest/mainnet/phase0__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/phase0/operations/attester_slashing_test.go
rename to testing/spectest/mainnet/phase0__operations__attester_slashing_test.go
index b52e4bde94..e60d6af116 100644
--- a/testing/spectest/mainnet/phase0/operations/attester_slashing_test.go
+++ b/testing/spectest/mainnet/phase0__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/operations/block_header_test.go b/testing/spectest/mainnet/phase0__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/operations/block_header_test.go
rename to testing/spectest/mainnet/phase0__operations__block_header_test.go
index 0b2917aa51..ccffa92a9e 100644
--- a/testing/spectest/mainnet/phase0/operations/block_header_test.go
+++ b/testing/spectest/mainnet/phase0__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/operations/deposit_test.go b/testing/spectest/mainnet/phase0__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/operations/deposit_test.go
rename to testing/spectest/mainnet/phase0__operations__deposit_test.go
index 67d7d67c47..70898e3e2d 100644
--- a/testing/spectest/mainnet/phase0/operations/deposit_test.go
+++ b/testing/spectest/mainnet/phase0__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/operations/proposer_slashing_test.go b/testing/spectest/mainnet/phase0__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/mainnet/phase0/operations/proposer_slashing_test.go
rename to testing/spectest/mainnet/phase0__operations__proposer_slashing_test.go
index 1b3158713f..30fc795629 100644
--- a/testing/spectest/mainnet/phase0/operations/proposer_slashing_test.go
+++ b/testing/spectest/mainnet/phase0__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/operations/voluntary_exit_test.go b/testing/spectest/mainnet/phase0__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/operations/voluntary_exit_test.go
rename to testing/spectest/mainnet/phase0__operations__voluntary_exit_test.go
index 51d0fdba39..f37295e81d 100644
--- a/testing/spectest/mainnet/phase0/operations/voluntary_exit_test.go
+++ b/testing/spectest/mainnet/phase0__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/random/random_test.go b/testing/spectest/mainnet/phase0__random__random_test.go
similarity index 93%
rename from testing/spectest/mainnet/phase0/random/random_test.go
rename to testing/spectest/mainnet/phase0__random__random_test.go
index a57cf07e1c..fe631bd03f 100644
--- a/testing/spectest/mainnet/phase0/random/random_test.go
+++ b/testing/spectest/mainnet/phase0__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/rewards/rewards_test.go b/testing/spectest/mainnet/phase0__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/mainnet/phase0/rewards/rewards_test.go
rename to testing/spectest/mainnet/phase0__rewards__rewards_test.go
index df38e52078..21d99009a5 100644
--- a/testing/spectest/mainnet/phase0/rewards/rewards_test.go
+++ b/testing/spectest/mainnet/phase0__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/sanity/blocks_test.go b/testing/spectest/mainnet/phase0__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/mainnet/phase0/sanity/blocks_test.go
rename to testing/spectest/mainnet/phase0__sanity__blocks_test.go
index dc73fb2c0a..c7344cc109 100644
--- a/testing/spectest/mainnet/phase0/sanity/blocks_test.go
+++ b/testing/spectest/mainnet/phase0__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/sanity/slots_test.go b/testing/spectest/mainnet/phase0__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/mainnet/phase0/sanity/slots_test.go
rename to testing/spectest/mainnet/phase0__sanity__slots_test.go
index 918d0a41a7..8ac09e6f97 100644
--- a/testing/spectest/mainnet/phase0/sanity/slots_test.go
+++ b/testing/spectest/mainnet/phase0__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/mainnet/phase0/ssz_static/ssz_static_test.go b/testing/spectest/mainnet/phase0__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/mainnet/phase0/ssz_static/ssz_static_test.go
rename to testing/spectest/mainnet/phase0__ssz_static__ssz_static_test.go
index 5c54380e8e..651bed824d 100644
--- a/testing/spectest/mainnet/phase0/ssz_static/ssz_static_test.go
+++ b/testing/spectest/mainnet/phase0__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package mainnet
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/BUILD.bazel b/testing/spectest/minimal/BUILD.bazel
new file mode 100644
index 0000000000..42faac0d38
--- /dev/null
+++ b/testing/spectest/minimal/BUILD.bazel
@@ -0,0 +1,294 @@
+load("@prysm//tools/go:def.bzl", "go_test")
+
+go_test(
+    name = "go_default_test",
+    srcs = [
+        "altair__epoch_processing__effective_balance_updates_test.go",
+        "altair__epoch_processing__eth1_data_reset_test.go",
+        "altair__epoch_processing__historical_roots_update_test.go",
+        "altair__epoch_processing__inactivity_updates_test.go",
+        "altair__epoch_processing__justification_and_finalization_test.go",
+        "altair__epoch_processing__participation_flag_updates_test.go",
+        "altair__epoch_processing__randao_mixes_reset_test.go",
+        "altair__epoch_processing__registry_updates_test.go",
+        "altair__epoch_processing__rewards_and_penalties_test.go",
+        "altair__epoch_processing__slashings_reset_test.go",
+        "altair__epoch_processing__slashings_test.go",
+        "altair__finality__finality_test.go",
+        "altair__fork__upgrade_to_altair_test.go",
+        "altair__fork_transition__transition_test.go",
+        "altair__forkchoice__forkchoice_test.go",
+        "altair__light_client__single_merkle_proof_test.go",
+        "altair__light_client__update_ranking_test.go",
+        "altair__operations__attestation_test.go",
+        "altair__operations__attester_slashing_test.go",
+        "altair__operations__block_header_test.go",
+        "altair__operations__deposit_test.go",
+        "altair__operations__proposer_slashing_test.go",
+        "altair__operations__sync_committee_test.go",
+        "altair__operations__voluntary_exit_test.go",
+        "altair__random__random_test.go",
+        "altair__rewards__rewards_test.go",
+        "altair__sanity__blocks_test.go",
+        "altair__sanity__slots_test.go",
+        "altair__ssz_static__ssz_static_test.go",
+        "bellatrix__epoch_processing__effective_balance_updates_test.go",
+        "bellatrix__epoch_processing__eth1_data_reset_test.go",
+        "bellatrix__epoch_processing__historical_roots_update_test.go",
+        "bellatrix__epoch_processing__inactivity_updates_test.go",
+        "bellatrix__epoch_processing__justification_and_finalization_test.go",
+        "bellatrix__epoch_processing__participation_flag_updates_test.go",
+        "bellatrix__epoch_processing__randao_mixes_reset_test.go",
+        "bellatrix__epoch_processing__registry_updates_test.go",
+        "bellatrix__epoch_processing__rewards_and_penalties_test.go",
+        "bellatrix__epoch_processing__slashings_reset_test.go",
+        "bellatrix__epoch_processing__slashings_test.go",
+        "bellatrix__finality__finality_test.go",
+        "bellatrix__fork__upgrade_to_altair_test.go",
+        "bellatrix__fork_transition__transition_test.go",
+        "bellatrix__forkchoice__forkchoice_test.go",
+        "bellatrix__light_client__single_merkle_proof_test.go",
+        "bellatrix__light_client__update_ranking_test.go",
+        "bellatrix__operations__attestation_test.go",
+        "bellatrix__operations__attester_slashing_test.go",
+        "bellatrix__operations__block_header_test.go",
+        "bellatrix__operations__deposit_test.go",
+        "bellatrix__operations__execution_payload_test.go",
+        "bellatrix__operations__proposer_slashing_test.go",
+        "bellatrix__operations__sync_committee_test.go",
+        "bellatrix__operations__voluntary_exit_test.go",
+        "bellatrix__random__random_test.go",
+        "bellatrix__rewards__rewards_test.go",
+        "bellatrix__sanity__blocks_test.go",
+        "bellatrix__sanity__slots_test.go",
+        "bellatrix__ssz_static__ssz_static_test.go",
+        "capella__epoch_processing__effective_balance_updates_test.go",
+        "capella__epoch_processing__eth1_data_reset_test.go",
+        "capella__epoch_processing__historical_roots_summaries_test.go",
+        "capella__epoch_processing__inactivity_updates_test.go",
+        "capella__epoch_processing__justification_and_finalization_test.go",
+        "capella__epoch_processing__participation_flag_updates_test.go",
+        "capella__epoch_processing__randao_mixes_reset_test.go",
+        "capella__epoch_processing__registry_updates_test.go",
+        "capella__epoch_processing__rewards_and_penalties_test.go",
+        "capella__epoch_processing__slashings_reset_test.go",
+        "capella__epoch_processing__slashings_test.go",
+        "capella__finality__finality_test.go",
+        "capella__fork__upgrade_to_capella_test.go",
+        "capella__fork_transition__transition_test.go",
+        "capella__forkchoice__forkchoice_test.go",
+        "capella__light_client__single_merkle_proof_test.go",
+        "capella__light_client__update_ranking_test.go",
+        "capella__operations__attestation_test.go",
+        "capella__operations__attester_slashing_test.go",
+        "capella__operations__block_header_test.go",
+        "capella__operations__bls_to_execution_change_test.go",
+        "capella__operations__deposit_test.go",
+        "capella__operations__execution_payload_test.go",
+        "capella__operations__proposer_slashing_test.go",
+        "capella__operations__sync_committee_test.go",
+        "capella__operations__voluntary_exit_test.go",
+        "capella__operations__withdrawals_test.go",
+        "capella__random__random_test.go",
+        "capella__rewards__rewards_test.go",
+        "capella__sanity__blocks_test.go",
+        "capella__sanity__slots_test.go",
+        "capella__ssz_static__ssz_static_test.go",
+        "deneb__epoch_processing__effective_balance_updates_test.go",
+        "deneb__epoch_processing__eth1_data_reset_test.go",
+        "deneb__epoch_processing__historical_summaries_update_test.go",
+        "deneb__epoch_processing__inactivity_updates_test.go",
+        "deneb__epoch_processing__justification_and_finalization_test.go",
+        "deneb__epoch_processing__participation_flag_updates_test.go",
+        "deneb__epoch_processing__randao_mixes_reset_test.go",
+        "deneb__epoch_processing__registry_updates_test.go",
+        "deneb__epoch_processing__rewards_and_penalties_test.go",
+        "deneb__epoch_processing__slashings_reset_test.go",
+        "deneb__epoch_processing__slashings_test.go",
+        "deneb__finality__finality_test.go",
+        "deneb__fork__upgrade_to_deneb_test.go",
+        "deneb__fork_transition__transition_test.go",
+        "deneb__forkchoice__forkchoice_test.go",
+        "deneb__light_client__single_merkle_proof_test.go",
+        "deneb__light_client__update_ranking_test.go",
+        "deneb__merkle_proof__merkle_proof_test.go",
+        "deneb__operations__attestation_test.go",
+        "deneb__operations__attester_slashing_test.go",
+        "deneb__operations__block_header_test.go",
+        "deneb__operations__bls_to_execution_change_test.go",
+        "deneb__operations__deposit_test.go",
+        "deneb__operations__execution_payload_test.go",
+        "deneb__operations__proposer_slashing_test.go",
+        "deneb__operations__sync_committee_test.go",
+        "deneb__operations__voluntary_exit_test.go",
+        "deneb__operations__withdrawals_test.go",
+        "deneb__random__random_test.go",
+        "deneb__rewards__rewards_test.go",
+        "deneb__sanity__blocks_test.go",
+        "deneb__sanity__slots_test.go",
+        "deneb__ssz_static__ssz_static_test.go",
+        "electra__epoch_processing__effective_balance_updates_test.go",
+        "electra__epoch_processing__eth1_data_reset_test.go",
+        "electra__epoch_processing__historical_summaries_update_test.go",
+        "electra__epoch_processing__inactivity_updates_test.go",
+        "electra__epoch_processing__justification_and_finalization_test.go",
+        "electra__epoch_processing__participation_flag_updates_test.go",
+        "electra__epoch_processing__pending_consolidations_test.go",
+        "electra__epoch_processing__pending_deposits_updates_test.go",
+        "electra__epoch_processing__randao_mixes_reset_test.go",
+        "electra__epoch_processing__registry_updates_test.go",
+        "electra__epoch_processing__rewards_and_penalties_test.go",
+        "electra__epoch_processing__slashings_reset_test.go",
+        "electra__epoch_processing__slashings_test.go",
+        "electra__epoch_processing__sync_committee_updates_test.go",
+        "electra__finality__finality_test.go",
+        "electra__fork__upgrade_to_electra_test.go",
+        "electra__fork_transition__transition_test.go",
+        "electra__forkchoice__forkchoice_test.go",
+        "electra__light_client__single_merkle_proof_test.go",
+        "electra__light_client__update_ranking_test.go",
+        "electra__merkle_proof__merkle_proof_test.go",
+        "electra__operations__attestation_test.go",
+        "electra__operations__attester_slashing_test.go",
+        "electra__operations__block_header_test.go",
+        "electra__operations__bls_to_execution_change_test.go",
+        "electra__operations__consolidation_test.go",
+        "electra__operations__deposit_requests_test.go",
+        "electra__operations__deposit_test.go",
+        "electra__operations__execution_layer_withdrawals_test.go",
+        "electra__operations__execution_payload_test.go",
+        "electra__operations__proposer_slashing_test.go",
+        "electra__operations__sync_committee_test.go",
+        "electra__operations__voluntary_exit_test.go",
+        "electra__operations__withdrawals_test.go",
+        "electra__random__random_test.go",
+        "electra__rewards__rewards_test.go",
+        "electra__sanity__blocks_test.go",
+        "electra__sanity__slots_test.go",
+        "electra__ssz_static__ssz_static_test.go",
+        "fulu__epoch_processing__effective_balance_updates_test.go",
+        "fulu__epoch_processing__eth1_data_reset_test.go",
+        "fulu__epoch_processing__historical_summaries_update_test.go",
+        "fulu__epoch_processing__inactivity_updates_test.go",
+        "fulu__epoch_processing__justification_and_finalization_test.go",
+        "fulu__epoch_processing__participation_flag_updates_test.go",
+        "fulu__epoch_processing__pending_consolidations_test.go",
+        "fulu__epoch_processing__pending_deposits_updates_test.go",
+        "fulu__epoch_processing__randao_mixes_reset_test.go",
+        "fulu__epoch_processing__registry_updates_test.go",
+        "fulu__epoch_processing__rewards_and_penalties_test.go",
+        "fulu__epoch_processing__slashings_reset_test.go",
+        "fulu__epoch_processing__slashings_test.go",
+        "fulu__epoch_processing__sync_committee_updates_test.go",
+        "fulu__finality__finality_test.go",
+        "fulu__fork__upgrade_to_fulu_test.go",
+        "fulu__forkchoice__forkchoice_test.go",
+        "fulu__merkle_proof__merkle_proof_test.go",
+        "fulu__networking__custody_columns_test.go",
+        "fulu__operations__attestation_test.go",
+        "fulu__operations__attester_slashing_test.go",
+        "fulu__operations__block_header_test.go",
+        "fulu__operations__bls_to_execution_change_test.go",
+        "fulu__operations__consolidation_test.go",
+        "fulu__operations__deposit_requests_test.go",
+        "fulu__operations__deposit_test.go",
+        "fulu__operations__execution_layer_withdrawals_test.go",
+        "fulu__operations__execution_payload_test.go",
+        "fulu__operations__proposer_slashing_test.go",
+        "fulu__operations__sync_committee_test.go",
+        "fulu__operations__voluntary_exit_test.go",
+        "fulu__operations__withdrawals_test.go",
+        "fulu__random__random_test.go",
+        "fulu__rewards__rewards_test.go",
+        "fulu__sanity__blocks_test.go",
+        "fulu__sanity__slots_test.go",
+        "fulu__ssz_static__ssz_static_test.go",
+        "phase0__epoch_processing__effective_balance_updates_test.go",
+        "phase0__epoch_processing__epoch_processing_test.go",
+        "phase0__epoch_processing__eth1_data_reset_test.go",
+        "phase0__epoch_processing__historical_roots_update_test.go",
+        "phase0__epoch_processing__justification_and_finalization_test.go",
+        "phase0__epoch_processing__participation_record_updates_test.go",
+        "phase0__epoch_processing__randao_mixes_reset_test.go",
+        "phase0__epoch_processing__registry_updates_test.go",
+        "phase0__epoch_processing__rewards_and_penalties_test.go",
+        "phase0__epoch_processing__slashings_reset_test.go",
+        "phase0__epoch_processing__slashings_test.go",
+        "phase0__finality__finality_test.go",
+        "phase0__operations__attestation_test.go",
+        "phase0__operations__attester_slashing_test.go",
+        "phase0__operations__block_header_test.go",
+        "phase0__operations__deposit_test.go",
+        "phase0__operations__proposer_slashing_test.go",
+        "phase0__operations__voluntary_exit_test.go",
+        "phase0__random__random_test.go",
+        "phase0__rewards__rewards_test.go",
+        "phase0__sanity__blocks_test.go",
+        "phase0__sanity__slots_test.go",
+        "phase0__ssz_static__ssz_static_test.go",
+    ],
+    data = ["@consensus_spec_tests//:test_data"],
+    eth_network = "minimal",
+    tags = [
+        "minimal",
+        "spectest",
+    ],
+    deps = [
+        "//config/params:go_default_library",
+        "//runtime/version:go_default_library",
+        "//testing/spectest/shared/altair/epoch_processing:go_default_library",
+        "//testing/spectest/shared/altair/finality:go_default_library",
+        "//testing/spectest/shared/altair/fork:go_default_library",
+        "//testing/spectest/shared/altair/operations:go_default_library",
+        "//testing/spectest/shared/altair/rewards:go_default_library",
+        "//testing/spectest/shared/altair/sanity:go_default_library",
+        "//testing/spectest/shared/altair/ssz_static:go_default_library",
+        "//testing/spectest/shared/bellatrix/epoch_processing:go_default_library",
+        "//testing/spectest/shared/bellatrix/finality:go_default_library",
+        "//testing/spectest/shared/bellatrix/fork:go_default_library",
+        "//testing/spectest/shared/bellatrix/operations:go_default_library",
+        "//testing/spectest/shared/bellatrix/rewards:go_default_library",
+        "//testing/spectest/shared/bellatrix/sanity:go_default_library",
+        "//testing/spectest/shared/bellatrix/ssz_static:go_default_library",
+        "//testing/spectest/shared/capella/epoch_processing:go_default_library",
+        "//testing/spectest/shared/capella/finality:go_default_library",
+        "//testing/spectest/shared/capella/fork:go_default_library",
+        "//testing/spectest/shared/capella/operations:go_default_library",
+        "//testing/spectest/shared/capella/rewards:go_default_library",
+        "//testing/spectest/shared/capella/sanity:go_default_library",
+        "//testing/spectest/shared/capella/ssz_static:go_default_library",
+        "//testing/spectest/shared/common/forkchoice:go_default_library",
+        "//testing/spectest/shared/common/light_client:go_default_library",
+        "//testing/spectest/shared/deneb/epoch_processing:go_default_library",
+        "//testing/spectest/shared/deneb/finality:go_default_library",
+        "//testing/spectest/shared/deneb/fork:go_default_library",
+        "//testing/spectest/shared/deneb/merkle_proof:go_default_library",
+        "//testing/spectest/shared/deneb/operations:go_default_library",
+        "//testing/spectest/shared/deneb/rewards:go_default_library",
+        "//testing/spectest/shared/deneb/sanity:go_default_library",
+        "//testing/spectest/shared/deneb/ssz_static:go_default_library",
+        "//testing/spectest/shared/electra/epoch_processing:go_default_library",
+        "//testing/spectest/shared/electra/finality:go_default_library",
+        "//testing/spectest/shared/electra/fork:go_default_library",
+        "//testing/spectest/shared/electra/merkle_proof:go_default_library",
+        "//testing/spectest/shared/electra/operations:go_default_library",
+        "//testing/spectest/shared/electra/rewards:go_default_library",
+        "//testing/spectest/shared/electra/sanity:go_default_library",
+        "//testing/spectest/shared/electra/ssz_static:go_default_library",
+        "//testing/spectest/shared/fulu/epoch_processing:go_default_library",
+        "//testing/spectest/shared/fulu/finality:go_default_library",
+        "//testing/spectest/shared/fulu/fork:go_default_library",
+        "//testing/spectest/shared/fulu/merkle_proof:go_default_library",
+        "//testing/spectest/shared/fulu/networking:go_default_library",
+        "//testing/spectest/shared/fulu/operations:go_default_library",
+        "//testing/spectest/shared/fulu/rewards:go_default_library",
+        "//testing/spectest/shared/fulu/sanity:go_default_library",
+        "//testing/spectest/shared/fulu/ssz_static:go_default_library",
+        "//testing/spectest/shared/phase0/epoch_processing:go_default_library",
+        "//testing/spectest/shared/phase0/finality:go_default_library",
+        "//testing/spectest/shared/phase0/operations:go_default_library",
+        "//testing/spectest/shared/phase0/rewards:go_default_library",
+        "//testing/spectest/shared/phase0/sanity:go_default_library",
+        "//testing/spectest/shared/phase0/ssz_static:go_default_library",
+    ],
+)
diff --git a/testing/spectest/minimal/altair/epoch_processing/BUILD.bazel b/testing/spectest/minimal/altair/epoch_processing/BUILD.bazel
deleted file mode 100644
index 4d2d0e2d87..0000000000
--- a/testing/spectest/minimal/altair/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_roots_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/altair/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/finality/BUILD.bazel b/testing/spectest/minimal/altair/finality/BUILD.bazel
deleted file mode 100644
index c33692c59b..0000000000
--- a/testing/spectest/minimal/altair/finality/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/altair/finality:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/fork/BUILD.bazel b/testing/spectest/minimal/altair/fork/BUILD.bazel
deleted file mode 100644
index 1d461c825d..0000000000
--- a/testing/spectest/minimal/altair/fork/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_altair_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/altair/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/fork_transition/BUILD.bazel b/testing/spectest/minimal/altair/fork_transition/BUILD.bazel
deleted file mode 100644
index 3784d9246b..0000000000
--- a/testing/spectest/minimal/altair/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    timeout = "short",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/forkchoice/BUILD.bazel b/testing/spectest/minimal/altair/forkchoice/BUILD.bazel
deleted file mode 100644
index 22d33a567e..0000000000
--- a/testing/spectest/minimal/altair/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/altair/light_client/BUILD.bazel b/testing/spectest/minimal/altair/light_client/BUILD.bazel
deleted file mode 100644
index 0158d90cd4..0000000000
--- a/testing/spectest/minimal/altair/light_client/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "single_merkle_proof_test.go",
-        "update_ranking_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/altair/operations/BUILD.bazel b/testing/spectest/minimal/altair/operations/BUILD.bazel
deleted file mode 100644
index 01309153d7..0000000000
--- a/testing/spectest/minimal/altair/operations/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "deposit_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/altair/operations:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/random/BUILD.bazel b/testing/spectest/minimal/altair/random/BUILD.bazel
deleted file mode 100644
index 3f438f8fb0..0000000000
--- a/testing/spectest/minimal/altair/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/altair/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/rewards/BUILD.bazel b/testing/spectest/minimal/altair/rewards/BUILD.bazel
deleted file mode 100644
index 5087f2e12d..0000000000
--- a/testing/spectest/minimal/altair/rewards/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/altair/rewards:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/sanity/BUILD.bazel b/testing/spectest/minimal/altair/sanity/BUILD.bazel
deleted file mode 100644
index 333404ec2a..0000000000
--- a/testing/spectest/minimal/altair/sanity/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/altair/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/ssz_static/BUILD.bazel b/testing/spectest/minimal/altair/ssz_static/BUILD.bazel
deleted file mode 100644
index 174510e3f6..0000000000
--- a/testing/spectest/minimal/altair/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/altair/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/minimal/altair/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/altair__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/minimal/altair__epoch_processing__effective_balance_updates_test.go
index 5b32f1a1ed..ae4fce99be 100644
--- a/testing/spectest/minimal/altair/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/altair__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/minimal/altair__epoch_processing__eth1_data_reset_test.go
index 8d67cee9b1..1202b906bc 100644
--- a/testing/spectest/minimal/altair/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/historical_roots_update_test.go b/testing/spectest/minimal/altair__epoch_processing__historical_roots_update_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/historical_roots_update_test.go
rename to testing/spectest/minimal/altair__epoch_processing__historical_roots_update_test.go
index f0120da937..bf3498da01 100644
--- a/testing/spectest/minimal/altair/epoch_processing/historical_roots_update_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__historical_roots_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/altair__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/minimal/altair__epoch_processing__inactivity_updates_test.go
index 2510c7b787..465cfef719 100644
--- a/testing/spectest/minimal/altair/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/altair__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/minimal/altair__epoch_processing__justification_and_finalization_test.go
index 0f34bde188..b388691fa7 100644
--- a/testing/spectest/minimal/altair/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/altair__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/minimal/altair__epoch_processing__participation_flag_updates_test.go
index 70e2a42c02..59573063ee 100644
--- a/testing/spectest/minimal/altair/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/altair__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/minimal/altair__epoch_processing__randao_mixes_reset_test.go
index 286ed9246f..18c3f9bec3 100644
--- a/testing/spectest/minimal/altair/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/altair__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/registry_updates_test.go
rename to testing/spectest/minimal/altair__epoch_processing__registry_updates_test.go
index 59d1d0f3d9..262deee996 100644
--- a/testing/spectest/minimal/altair/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/altair__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/minimal/altair__epoch_processing__rewards_and_penalties_test.go
index 5e4075e758..6d72fd164b 100644
--- a/testing/spectest/minimal/altair/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/altair__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/slashings_reset_test.go
rename to testing/spectest/minimal/altair__epoch_processing__slashings_reset_test.go
index 0ae1bb784d..74a8b7e7ee 100644
--- a/testing/spectest/minimal/altair/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/epoch_processing/slashings_test.go b/testing/spectest/minimal/altair__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/minimal/altair/epoch_processing/slashings_test.go
rename to testing/spectest/minimal/altair__epoch_processing__slashings_test.go
index 52e786b14a..94d82f8a1a 100644
--- a/testing/spectest/minimal/altair/epoch_processing/slashings_test.go
+++ b/testing/spectest/minimal/altair__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/finality/finality_test.go b/testing/spectest/minimal/altair__finality__finality_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/finality/finality_test.go
rename to testing/spectest/minimal/altair__finality__finality_test.go
index f0db28821a..7be4b3f71c 100644
--- a/testing/spectest/minimal/altair/finality/finality_test.go
+++ b/testing/spectest/minimal/altair__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/fork/upgrade_to_altair_test.go b/testing/spectest/minimal/altair__fork__upgrade_to_altair_test.go
similarity index 92%
rename from testing/spectest/minimal/altair/fork/upgrade_to_altair_test.go
rename to testing/spectest/minimal/altair__fork__upgrade_to_altair_test.go
index def725fd04..998b2fbce2 100644
--- a/testing/spectest/minimal/altair/fork/upgrade_to_altair_test.go
+++ b/testing/spectest/minimal/altair__fork__upgrade_to_altair_test.go
@@ -1,4 +1,4 @@
-package fork
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/fork_transition/transition_test.go b/testing/spectest/minimal/altair__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/minimal/altair/fork_transition/transition_test.go
rename to testing/spectest/minimal/altair__fork_transition__transition_test.go
index 16689417b6..6e9f206979 100644
--- a/testing/spectest/minimal/altair/fork_transition/transition_test.go
+++ b/testing/spectest/minimal/altair__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go b/testing/spectest/minimal/altair__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/minimal/altair/forkchoice/forkchoice_test.go
rename to testing/spectest/minimal/altair__forkchoice__forkchoice_test.go
index f41bbf4816..c3af51fdf2 100644
--- a/testing/spectest/minimal/altair/forkchoice/forkchoice_test.go
+++ b/testing/spectest/minimal/altair__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/light_client/single_merkle_proof_test.go b/testing/spectest/minimal/altair__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/minimal/altair/light_client/single_merkle_proof_test.go
rename to testing/spectest/minimal/altair__light_client__single_merkle_proof_test.go
index 1e11497029..386ae8bb49 100644
--- a/testing/spectest/minimal/altair/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/minimal/altair__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/light_client/update_ranking_test.go b/testing/spectest/minimal/altair__light_client__update_ranking_test.go
similarity index 93%
rename from testing/spectest/minimal/altair/light_client/update_ranking_test.go
rename to testing/spectest/minimal/altair__light_client__update_ranking_test.go
index 6faa095961..c70afd5505 100644
--- a/testing/spectest/minimal/altair/light_client/update_ranking_test.go
+++ b/testing/spectest/minimal/altair__light_client__update_ranking_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/operations/attestation_test.go b/testing/spectest/minimal/altair__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/operations/attestation_test.go
rename to testing/spectest/minimal/altair__operations__attestation_test.go
index ca9dbf087b..113f68b262 100644
--- a/testing/spectest/minimal/altair/operations/attestation_test.go
+++ b/testing/spectest/minimal/altair__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/operations/attester_slashing_test.go b/testing/spectest/minimal/altair__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/altair/operations/attester_slashing_test.go
rename to testing/spectest/minimal/altair__operations__attester_slashing_test.go
index 42aee3e41d..59378a7361 100644
--- a/testing/spectest/minimal/altair/operations/attester_slashing_test.go
+++ b/testing/spectest/minimal/altair__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/operations/block_header_test.go b/testing/spectest/minimal/altair__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/operations/block_header_test.go
rename to testing/spectest/minimal/altair__operations__block_header_test.go
index bc06d712bd..d9b4827d6c 100644
--- a/testing/spectest/minimal/altair/operations/block_header_test.go
+++ b/testing/spectest/minimal/altair__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/operations/deposit_test.go b/testing/spectest/minimal/altair__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/operations/deposit_test.go
rename to testing/spectest/minimal/altair__operations__deposit_test.go
index d7601eb8f0..42525b903c 100644
--- a/testing/spectest/minimal/altair/operations/deposit_test.go
+++ b/testing/spectest/minimal/altair__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/operations/proposer_slashing_test.go b/testing/spectest/minimal/altair__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/altair/operations/proposer_slashing_test.go
rename to testing/spectest/minimal/altair__operations__proposer_slashing_test.go
index 478a75247e..e7808d7d6f 100644
--- a/testing/spectest/minimal/altair/operations/proposer_slashing_test.go
+++ b/testing/spectest/minimal/altair__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/operations/sync_committee_test.go b/testing/spectest/minimal/altair__operations__sync_committee_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/operations/sync_committee_test.go
rename to testing/spectest/minimal/altair__operations__sync_committee_test.go
index 27b5a10e12..7a865b2108 100644
--- a/testing/spectest/minimal/altair/operations/sync_committee_test.go
+++ b/testing/spectest/minimal/altair__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/operations/voluntary_exit_test.go b/testing/spectest/minimal/altair__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/operations/voluntary_exit_test.go
rename to testing/spectest/minimal/altair__operations__voluntary_exit_test.go
index 05d46679a4..99f8837b60 100644
--- a/testing/spectest/minimal/altair/operations/voluntary_exit_test.go
+++ b/testing/spectest/minimal/altair__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/random/random_test.go b/testing/spectest/minimal/altair__random__random_test.go
similarity index 93%
rename from testing/spectest/minimal/altair/random/random_test.go
rename to testing/spectest/minimal/altair__random__random_test.go
index 8c960d98aa..7f6040201f 100644
--- a/testing/spectest/minimal/altair/random/random_test.go
+++ b/testing/spectest/minimal/altair__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/rewards/rewards_test.go b/testing/spectest/minimal/altair__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/minimal/altair/rewards/rewards_test.go
rename to testing/spectest/minimal/altair__rewards__rewards_test.go
index 75d1f0fc5d..57edff1bdc 100644
--- a/testing/spectest/minimal/altair/rewards/rewards_test.go
+++ b/testing/spectest/minimal/altair__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/sanity/blocks_test.go b/testing/spectest/minimal/altair__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/minimal/altair/sanity/blocks_test.go
rename to testing/spectest/minimal/altair__sanity__blocks_test.go
index e27c0649e9..1e02d2e86a 100644
--- a/testing/spectest/minimal/altair/sanity/blocks_test.go
+++ b/testing/spectest/minimal/altair__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/sanity/slots_test.go b/testing/spectest/minimal/altair__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/minimal/altair/sanity/slots_test.go
rename to testing/spectest/minimal/altair__sanity__slots_test.go
index 202b8821a8..b2f666cc12 100644
--- a/testing/spectest/minimal/altair/sanity/slots_test.go
+++ b/testing/spectest/minimal/altair__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/altair/ssz_static/ssz_static_test.go b/testing/spectest/minimal/altair__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/minimal/altair/ssz_static/ssz_static_test.go
rename to testing/spectest/minimal/altair__ssz_static__ssz_static_test.go
index 22f3f0bd43..52e1e5be84 100644
--- a/testing/spectest/minimal/altair/ssz_static/ssz_static_test.go
+++ b/testing/spectest/minimal/altair__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/BUILD.bazel b/testing/spectest/minimal/bellatrix/epoch_processing/BUILD.bazel
deleted file mode 100644
index 73febeabe2..0000000000
--- a/testing/spectest/minimal/bellatrix/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_roots_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/bellatrix/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/finality/BUILD.bazel b/testing/spectest/minimal/bellatrix/finality/BUILD.bazel
deleted file mode 100644
index 1e5b41e706..0000000000
--- a/testing/spectest/minimal/bellatrix/finality/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/bellatrix/finality:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/fork/BUILD.bazel b/testing/spectest/minimal/bellatrix/fork/BUILD.bazel
deleted file mode 100644
index 414173bca5..0000000000
--- a/testing/spectest/minimal/bellatrix/fork/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_altair_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/bellatrix/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/fork_transition/BUILD.bazel b/testing/spectest/minimal/bellatrix/fork_transition/BUILD.bazel
deleted file mode 100644
index cb6cbe4ab2..0000000000
--- a/testing/spectest/minimal/bellatrix/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    timeout = "short",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel b/testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel
deleted file mode 100644
index 22d33a567e..0000000000
--- a/testing/spectest/minimal/bellatrix/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/bellatrix/light_client/BUILD.bazel b/testing/spectest/minimal/bellatrix/light_client/BUILD.bazel
deleted file mode 100644
index 0158d90cd4..0000000000
--- a/testing/spectest/minimal/bellatrix/light_client/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "single_merkle_proof_test.go",
-        "update_ranking_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/bellatrix/operations/BUILD.bazel b/testing/spectest/minimal/bellatrix/operations/BUILD.bazel
deleted file mode 100644
index 3447e25816..0000000000
--- a/testing/spectest/minimal/bellatrix/operations/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "deposit_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/bellatrix/operations:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/random/BUILD.bazel b/testing/spectest/minimal/bellatrix/random/BUILD.bazel
deleted file mode 100644
index 688e933068..0000000000
--- a/testing/spectest/minimal/bellatrix/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/bellatrix/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/rewards/BUILD.bazel b/testing/spectest/minimal/bellatrix/rewards/BUILD.bazel
deleted file mode 100644
index 1611fd2c45..0000000000
--- a/testing/spectest/minimal/bellatrix/rewards/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/bellatrix/rewards:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/sanity/BUILD.bazel b/testing/spectest/minimal/bellatrix/sanity/BUILD.bazel
deleted file mode 100644
index 5b0cf45dd9..0000000000
--- a/testing/spectest/minimal/bellatrix/sanity/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/bellatrix/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/ssz_static/BUILD.bazel b/testing/spectest/minimal/bellatrix/ssz_static/BUILD.bazel
deleted file mode 100644
index 91101f87d4..0000000000
--- a/testing/spectest/minimal/bellatrix/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/bellatrix/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/bellatrix/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__effective_balance_updates_test.go
index 33219127d9..bb5ef76180 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/bellatrix/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__eth1_data_reset_test.go
index a883cfb5b2..6504f01c5a 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/historical_roots_update_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__historical_roots_update_test.go
similarity index 91%
rename from testing/spectest/minimal/bellatrix/epoch_processing/historical_roots_update_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__historical_roots_update_test.go
index eb1b678433..b9c801cab8 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/historical_roots_update_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__historical_roots_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/bellatrix/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__inactivity_updates_test.go
index 442562ca62..fb0c09e29c 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/minimal/bellatrix/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__justification_and_finalization_test.go
index afbc7e1de9..55758f1183 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__participation_flag_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/bellatrix/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__participation_flag_updates_test.go
index dd7511ae38..7adaa526fa 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/bellatrix/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__randao_mixes_reset_test.go
index 2832793d32..5874084a86 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/bellatrix/epoch_processing/registry_updates_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__registry_updates_test.go
index 0266db11d4..00d9e3ba82 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__rewards_and_penalties_test.go
similarity index 91%
rename from testing/spectest/minimal/bellatrix/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__rewards_and_penalties_test.go
index d20415bb87..14b340ffe7 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/bellatrix/epoch_processing/slashings_reset_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__slashings_reset_test.go
index b0f1612e30..eabf8bc25c 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_test.go b/testing/spectest/minimal/bellatrix__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/minimal/bellatrix/epoch_processing/slashings_test.go
rename to testing/spectest/minimal/bellatrix__epoch_processing__slashings_test.go
index 51ca49d4e0..ad1b5a6661 100644
--- a/testing/spectest/minimal/bellatrix/epoch_processing/slashings_test.go
+++ b/testing/spectest/minimal/bellatrix__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/finality/finality_test.go b/testing/spectest/minimal/bellatrix__finality__finality_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/finality/finality_test.go
rename to testing/spectest/minimal/bellatrix__finality__finality_test.go
index 141a043aed..0c87711ec5 100644
--- a/testing/spectest/minimal/bellatrix/finality/finality_test.go
+++ b/testing/spectest/minimal/bellatrix__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/fork/upgrade_to_altair_test.go b/testing/spectest/minimal/bellatrix__fork__upgrade_to_altair_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/fork/upgrade_to_altair_test.go
rename to testing/spectest/minimal/bellatrix__fork__upgrade_to_altair_test.go
index 682945ca68..c2dba75ae3 100644
--- a/testing/spectest/minimal/bellatrix/fork/upgrade_to_altair_test.go
+++ b/testing/spectest/minimal/bellatrix__fork__upgrade_to_altair_test.go
@@ -1,4 +1,4 @@
-package fork
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/fork_transition/transition_test.go b/testing/spectest/minimal/bellatrix__fork_transition__transition_test.go
similarity index 89%
rename from testing/spectest/minimal/bellatrix/fork_transition/transition_test.go
rename to testing/spectest/minimal/bellatrix__fork_transition__transition_test.go
index 0dfbd94921..46670f9cb6 100644
--- a/testing/spectest/minimal/bellatrix/fork_transition/transition_test.go
+++ b/testing/spectest/minimal/bellatrix__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go b/testing/spectest/minimal/bellatrix__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go
rename to testing/spectest/minimal/bellatrix__forkchoice__forkchoice_test.go
index e10818e95f..29ecb3ba34 100644
--- a/testing/spectest/minimal/bellatrix/forkchoice/forkchoice_test.go
+++ b/testing/spectest/minimal/bellatrix__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/light_client/single_merkle_proof_test.go b/testing/spectest/minimal/bellatrix__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/minimal/bellatrix/light_client/single_merkle_proof_test.go
rename to testing/spectest/minimal/bellatrix__light_client__single_merkle_proof_test.go
index ee32d80655..13d709ed03 100644
--- a/testing/spectest/minimal/bellatrix/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/minimal/bellatrix__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/light_client/update_ranking_test.go b/testing/spectest/minimal/bellatrix__light_client__update_ranking_test.go
similarity index 93%
rename from testing/spectest/minimal/bellatrix/light_client/update_ranking_test.go
rename to testing/spectest/minimal/bellatrix__light_client__update_ranking_test.go
index 11e056ef38..9cfd8b8897 100644
--- a/testing/spectest/minimal/bellatrix/light_client/update_ranking_test.go
+++ b/testing/spectest/minimal/bellatrix__light_client__update_ranking_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/attestation_test.go b/testing/spectest/minimal/bellatrix__operations__attestation_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/operations/attestation_test.go
rename to testing/spectest/minimal/bellatrix__operations__attestation_test.go
index 09a23de9ee..bcfca7dbf2 100644
--- a/testing/spectest/minimal/bellatrix/operations/attestation_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/attester_slashing_test.go b/testing/spectest/minimal/bellatrix__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/operations/attester_slashing_test.go
rename to testing/spectest/minimal/bellatrix__operations__attester_slashing_test.go
index bc03ecb5d6..52751df0b1 100644
--- a/testing/spectest/minimal/bellatrix/operations/attester_slashing_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/block_header_test.go b/testing/spectest/minimal/bellatrix__operations__block_header_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/operations/block_header_test.go
rename to testing/spectest/minimal/bellatrix__operations__block_header_test.go
index a8ec2cfe6c..2894532694 100644
--- a/testing/spectest/minimal/bellatrix/operations/block_header_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/deposit_test.go b/testing/spectest/minimal/bellatrix__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/minimal/bellatrix/operations/deposit_test.go
rename to testing/spectest/minimal/bellatrix__operations__deposit_test.go
index eef734fe71..75319c1e45 100644
--- a/testing/spectest/minimal/bellatrix/operations/deposit_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/execution_payload_test.go b/testing/spectest/minimal/bellatrix__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/operations/execution_payload_test.go
rename to testing/spectest/minimal/bellatrix__operations__execution_payload_test.go
index 928c433e9b..2e6a71d699 100644
--- a/testing/spectest/minimal/bellatrix/operations/execution_payload_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/proposer_slashing_test.go b/testing/spectest/minimal/bellatrix__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/operations/proposer_slashing_test.go
rename to testing/spectest/minimal/bellatrix__operations__proposer_slashing_test.go
index 379d5adb05..145efaf0a5 100644
--- a/testing/spectest/minimal/bellatrix/operations/proposer_slashing_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/sync_committee_test.go b/testing/spectest/minimal/bellatrix__operations__sync_committee_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/operations/sync_committee_test.go
rename to testing/spectest/minimal/bellatrix__operations__sync_committee_test.go
index 597b7aff5c..0b583bb392 100644
--- a/testing/spectest/minimal/bellatrix/operations/sync_committee_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/operations/voluntary_exit_test.go b/testing/spectest/minimal/bellatrix__operations__voluntary_exit_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/operations/voluntary_exit_test.go
rename to testing/spectest/minimal/bellatrix__operations__voluntary_exit_test.go
index fa33a4e80b..c8b3c4fd21 100644
--- a/testing/spectest/minimal/bellatrix/operations/voluntary_exit_test.go
+++ b/testing/spectest/minimal/bellatrix__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/random/random_test.go b/testing/spectest/minimal/bellatrix__random__random_test.go
similarity index 93%
rename from testing/spectest/minimal/bellatrix/random/random_test.go
rename to testing/spectest/minimal/bellatrix__random__random_test.go
index 0715f5fb5a..4b668f2495 100644
--- a/testing/spectest/minimal/bellatrix/random/random_test.go
+++ b/testing/spectest/minimal/bellatrix__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/rewards/rewards_test.go b/testing/spectest/minimal/bellatrix__rewards__rewards_test.go
similarity index 93%
rename from testing/spectest/minimal/bellatrix/rewards/rewards_test.go
rename to testing/spectest/minimal/bellatrix__rewards__rewards_test.go
index afb7e9b402..35b680291e 100644
--- a/testing/spectest/minimal/bellatrix/rewards/rewards_test.go
+++ b/testing/spectest/minimal/bellatrix__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/sanity/blocks_test.go b/testing/spectest/minimal/bellatrix__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/minimal/bellatrix/sanity/blocks_test.go
rename to testing/spectest/minimal/bellatrix__sanity__blocks_test.go
index d639c3506d..a602ecbadd 100644
--- a/testing/spectest/minimal/bellatrix/sanity/blocks_test.go
+++ b/testing/spectest/minimal/bellatrix__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/sanity/slots_test.go b/testing/spectest/minimal/bellatrix__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/minimal/bellatrix/sanity/slots_test.go
rename to testing/spectest/minimal/bellatrix__sanity__slots_test.go
index 01e6ff1762..54a8a3e3b5 100644
--- a/testing/spectest/minimal/bellatrix/sanity/slots_test.go
+++ b/testing/spectest/minimal/bellatrix__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/bellatrix/ssz_static/ssz_static_test.go b/testing/spectest/minimal/bellatrix__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/minimal/bellatrix/ssz_static/ssz_static_test.go
rename to testing/spectest/minimal/bellatrix__ssz_static__ssz_static_test.go
index e34840b82d..d8481faf90 100644
--- a/testing/spectest/minimal/bellatrix/ssz_static/ssz_static_test.go
+++ b/testing/spectest/minimal/bellatrix__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/BUILD.bazel b/testing/spectest/minimal/capella/epoch_processing/BUILD.bazel
deleted file mode 100644
index 1e2c17d9c3..0000000000
--- a/testing/spectest/minimal/capella/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_roots_summaries_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/capella/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/finality/BUILD.bazel b/testing/spectest/minimal/capella/finality/BUILD.bazel
deleted file mode 100644
index 145820675b..0000000000
--- a/testing/spectest/minimal/capella/finality/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["finality_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 1,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/capella/finality:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/fork/BUILD.bazel b/testing/spectest/minimal/capella/fork/BUILD.bazel
deleted file mode 100644
index c6e2a4bba3..0000000000
--- a/testing/spectest/minimal/capella/fork/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_capella_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 1,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/capella/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/fork_transition/BUILD.bazel b/testing/spectest/minimal/capella/fork_transition/BUILD.bazel
deleted file mode 100644
index f221faf5e2..0000000000
--- a/testing/spectest/minimal/capella/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    timeout = "short",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/forkchoice/BUILD.bazel b/testing/spectest/minimal/capella/forkchoice/BUILD.bazel
deleted file mode 100644
index ac7b8e90b6..0000000000
--- a/testing/spectest/minimal/capella/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/capella/light_client/BUILD.bazel b/testing/spectest/minimal/capella/light_client/BUILD.bazel
deleted file mode 100644
index 0158d90cd4..0000000000
--- a/testing/spectest/minimal/capella/light_client/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "single_merkle_proof_test.go",
-        "update_ranking_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/capella/operations/BUILD.bazel b/testing/spectest/minimal/capella/operations/BUILD.bazel
deleted file mode 100644
index 99194d3521..0000000000
--- a/testing/spectest/minimal/capella/operations/BUILD.bazel
+++ /dev/null
@@ -1,27 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "deposit_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/capella/operations:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/random/BUILD.bazel b/testing/spectest/minimal/capella/random/BUILD.bazel
deleted file mode 100644
index cd59bf6117..0000000000
--- a/testing/spectest/minimal/capella/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/capella/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/rewards/BUILD.bazel b/testing/spectest/minimal/capella/rewards/BUILD.bazel
deleted file mode 100644
index 5ee460c3d8..0000000000
--- a/testing/spectest/minimal/capella/rewards/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/capella/rewards:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/sanity/BUILD.bazel b/testing/spectest/minimal/capella/sanity/BUILD.bazel
deleted file mode 100644
index f9127dc54a..0000000000
--- a/testing/spectest/minimal/capella/sanity/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/capella/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/ssz_static/BUILD.bazel b/testing/spectest/minimal/capella/ssz_static/BUILD.bazel
deleted file mode 100644
index 61ceadadb0..0000000000
--- a/testing/spectest/minimal/capella/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/capella/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/minimal/capella/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/capella__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/minimal/capella__epoch_processing__effective_balance_updates_test.go
index d0a8cc6051..f8c5b869de 100644
--- a/testing/spectest/minimal/capella/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/capella__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/minimal/capella__epoch_processing__eth1_data_reset_test.go
index 10ce0fd666..042eb49d8c 100644
--- a/testing/spectest/minimal/capella/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/historical_roots_summaries_test.go b/testing/spectest/minimal/capella__epoch_processing__historical_roots_summaries_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/epoch_processing/historical_roots_summaries_test.go
rename to testing/spectest/minimal/capella__epoch_processing__historical_roots_summaries_test.go
index 6e96824b83..5153b737db 100644
--- a/testing/spectest/minimal/capella/epoch_processing/historical_roots_summaries_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__historical_roots_summaries_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/capella__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/minimal/capella__epoch_processing__inactivity_updates_test.go
index 263ee639c9..02b2f48fa7 100644
--- a/testing/spectest/minimal/capella/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/capella__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/minimal/capella__epoch_processing__justification_and_finalization_test.go
index 2c9ed5866a..861af2b79e 100644
--- a/testing/spectest/minimal/capella/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/capella__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/minimal/capella__epoch_processing__participation_flag_updates_test.go
index 2d6c63b97b..d53883c587 100644
--- a/testing/spectest/minimal/capella/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/capella__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/minimal/capella__epoch_processing__randao_mixes_reset_test.go
index 0d5451e70a..48e39ee18b 100644
--- a/testing/spectest/minimal/capella/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/capella__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/registry_updates_test.go
rename to testing/spectest/minimal/capella__epoch_processing__registry_updates_test.go
index 07e3069e72..068924bfd4 100644
--- a/testing/spectest/minimal/capella/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/capella__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/minimal/capella__epoch_processing__rewards_and_penalties_test.go
index 5e483ec517..7de4dd8daa 100644
--- a/testing/spectest/minimal/capella/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/capella__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/slashings_reset_test.go
rename to testing/spectest/minimal/capella__epoch_processing__slashings_reset_test.go
index 0d595f7d70..3230a73752 100644
--- a/testing/spectest/minimal/capella/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/epoch_processing/slashings_test.go b/testing/spectest/minimal/capella__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/minimal/capella/epoch_processing/slashings_test.go
rename to testing/spectest/minimal/capella__epoch_processing__slashings_test.go
index 506b4adc1f..fee7e7d50b 100644
--- a/testing/spectest/minimal/capella/epoch_processing/slashings_test.go
+++ b/testing/spectest/minimal/capella__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/finality/finality_test.go b/testing/spectest/minimal/capella__finality__finality_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/finality/finality_test.go
rename to testing/spectest/minimal/capella__finality__finality_test.go
index 34cfec4c0f..ad0083b3e1 100644
--- a/testing/spectest/minimal/capella/finality/finality_test.go
+++ b/testing/spectest/minimal/capella__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/fork/upgrade_to_capella_test.go b/testing/spectest/minimal/capella__fork__upgrade_to_capella_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/fork/upgrade_to_capella_test.go
rename to testing/spectest/minimal/capella__fork__upgrade_to_capella_test.go
index 6fc733630b..47fdd5570e 100644
--- a/testing/spectest/minimal/capella/fork/upgrade_to_capella_test.go
+++ b/testing/spectest/minimal/capella__fork__upgrade_to_capella_test.go
@@ -1,4 +1,4 @@
-package fork
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/fork_transition/transition_test.go b/testing/spectest/minimal/capella__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/minimal/capella/fork_transition/transition_test.go
rename to testing/spectest/minimal/capella__fork_transition__transition_test.go
index 8d9dde1719..453f3eb319 100644
--- a/testing/spectest/minimal/capella/fork_transition/transition_test.go
+++ b/testing/spectest/minimal/capella__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go b/testing/spectest/minimal/capella__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/minimal/capella/forkchoice/forkchoice_test.go
rename to testing/spectest/minimal/capella__forkchoice__forkchoice_test.go
index 2603b9350d..99a7208b90 100644
--- a/testing/spectest/minimal/capella/forkchoice/forkchoice_test.go
+++ b/testing/spectest/minimal/capella__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/light_client/single_merkle_proof_test.go b/testing/spectest/minimal/capella__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/minimal/capella/light_client/single_merkle_proof_test.go
rename to testing/spectest/minimal/capella__light_client__single_merkle_proof_test.go
index a13c0306e1..4c4505c7cc 100644
--- a/testing/spectest/minimal/capella/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/minimal/capella__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/light_client/update_ranking_test.go b/testing/spectest/minimal/capella__light_client__update_ranking_test.go
similarity index 93%
rename from testing/spectest/minimal/capella/light_client/update_ranking_test.go
rename to testing/spectest/minimal/capella__light_client__update_ranking_test.go
index 83e3373a5e..73857a99d9 100644
--- a/testing/spectest/minimal/capella/light_client/update_ranking_test.go
+++ b/testing/spectest/minimal/capella__light_client__update_ranking_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/attestation_test.go b/testing/spectest/minimal/capella__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/operations/attestation_test.go
rename to testing/spectest/minimal/capella__operations__attestation_test.go
index d9a941288f..bfd30f21bd 100644
--- a/testing/spectest/minimal/capella/operations/attestation_test.go
+++ b/testing/spectest/minimal/capella__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/attester_slashing_test.go b/testing/spectest/minimal/capella__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/operations/attester_slashing_test.go
rename to testing/spectest/minimal/capella__operations__attester_slashing_test.go
index b3be738f5c..61f275586b 100644
--- a/testing/spectest/minimal/capella/operations/attester_slashing_test.go
+++ b/testing/spectest/minimal/capella__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/block_header_test.go b/testing/spectest/minimal/capella__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/operations/block_header_test.go
rename to testing/spectest/minimal/capella__operations__block_header_test.go
index 268b2623f3..2f8dd5bc7a 100644
--- a/testing/spectest/minimal/capella/operations/block_header_test.go
+++ b/testing/spectest/minimal/capella__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/bls_to_execution_change_test.go b/testing/spectest/minimal/capella__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/operations/bls_to_execution_change_test.go
rename to testing/spectest/minimal/capella__operations__bls_to_execution_change_test.go
index 3a7dfa76a6..224a04d8d2 100644
--- a/testing/spectest/minimal/capella/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/minimal/capella__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/deposit_test.go b/testing/spectest/minimal/capella__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/operations/deposit_test.go
rename to testing/spectest/minimal/capella__operations__deposit_test.go
index f4d30ab8c7..de44d5c22f 100644
--- a/testing/spectest/minimal/capella/operations/deposit_test.go
+++ b/testing/spectest/minimal/capella__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/execution_payload_test.go b/testing/spectest/minimal/capella__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/operations/execution_payload_test.go
rename to testing/spectest/minimal/capella__operations__execution_payload_test.go
index 21056f3df0..44b5dde71a 100644
--- a/testing/spectest/minimal/capella/operations/execution_payload_test.go
+++ b/testing/spectest/minimal/capella__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/proposer_slashing_test.go b/testing/spectest/minimal/capella__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/operations/proposer_slashing_test.go
rename to testing/spectest/minimal/capella__operations__proposer_slashing_test.go
index fac7a96811..fe63897c58 100644
--- a/testing/spectest/minimal/capella/operations/proposer_slashing_test.go
+++ b/testing/spectest/minimal/capella__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/sync_committee_test.go b/testing/spectest/minimal/capella__operations__sync_committee_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/operations/sync_committee_test.go
rename to testing/spectest/minimal/capella__operations__sync_committee_test.go
index ff4afee96c..88846db371 100644
--- a/testing/spectest/minimal/capella/operations/sync_committee_test.go
+++ b/testing/spectest/minimal/capella__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/voluntary_exit_test.go b/testing/spectest/minimal/capella__operations__voluntary_exit_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/operations/voluntary_exit_test.go
rename to testing/spectest/minimal/capella__operations__voluntary_exit_test.go
index 75eead66b7..62ef84c8fd 100644
--- a/testing/spectest/minimal/capella/operations/voluntary_exit_test.go
+++ b/testing/spectest/minimal/capella__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/operations/withdrawals_test.go b/testing/spectest/minimal/capella__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/operations/withdrawals_test.go
rename to testing/spectest/minimal/capella__operations__withdrawals_test.go
index 76d4591474..e470bfb29d 100644
--- a/testing/spectest/minimal/capella/operations/withdrawals_test.go
+++ b/testing/spectest/minimal/capella__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/random/random_test.go b/testing/spectest/minimal/capella__random__random_test.go
similarity index 93%
rename from testing/spectest/minimal/capella/random/random_test.go
rename to testing/spectest/minimal/capella__random__random_test.go
index ea4d919d9d..a1e9f9c6b1 100644
--- a/testing/spectest/minimal/capella/random/random_test.go
+++ b/testing/spectest/minimal/capella__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/rewards/rewards_test.go b/testing/spectest/minimal/capella__rewards__rewards_test.go
similarity index 93%
rename from testing/spectest/minimal/capella/rewards/rewards_test.go
rename to testing/spectest/minimal/capella__rewards__rewards_test.go
index bf914f6b74..003ba6c056 100644
--- a/testing/spectest/minimal/capella/rewards/rewards_test.go
+++ b/testing/spectest/minimal/capella__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/sanity/blocks_test.go b/testing/spectest/minimal/capella__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/minimal/capella/sanity/blocks_test.go
rename to testing/spectest/minimal/capella__sanity__blocks_test.go
index 2d9299b4a4..5814b612bf 100644
--- a/testing/spectest/minimal/capella/sanity/blocks_test.go
+++ b/testing/spectest/minimal/capella__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/sanity/slots_test.go b/testing/spectest/minimal/capella__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/minimal/capella/sanity/slots_test.go
rename to testing/spectest/minimal/capella__sanity__slots_test.go
index 805c5d7c6b..3462a7e4cd 100644
--- a/testing/spectest/minimal/capella/sanity/slots_test.go
+++ b/testing/spectest/minimal/capella__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/capella/ssz_static/ssz_static_test.go b/testing/spectest/minimal/capella__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/minimal/capella/ssz_static/ssz_static_test.go
rename to testing/spectest/minimal/capella__ssz_static__ssz_static_test.go
index 5c0a6190cd..3003486da6 100644
--- a/testing/spectest/minimal/capella/ssz_static/ssz_static_test.go
+++ b/testing/spectest/minimal/capella__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/BUILD.bazel b/testing/spectest/minimal/deneb/epoch_processing/BUILD.bazel
deleted file mode 100644
index 3afa9bd167..0000000000
--- a/testing/spectest/minimal/deneb/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_summaries_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/finality/BUILD.bazel b/testing/spectest/minimal/deneb/finality/BUILD.bazel
deleted file mode 100644
index 50bde939c8..0000000000
--- a/testing/spectest/minimal/deneb/finality/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/finality:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/fork/BUILD.bazel b/testing/spectest/minimal/deneb/fork/BUILD.bazel
deleted file mode 100644
index 9021674608..0000000000
--- a/testing/spectest/minimal/deneb/fork/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_deneb_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/fork_transition/BUILD.bazel b/testing/spectest/minimal/deneb/fork_transition/BUILD.bazel
deleted file mode 100644
index 5315f28de1..0000000000
--- a/testing/spectest/minimal/deneb/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    timeout = "short",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/forkchoice/BUILD.bazel b/testing/spectest/minimal/deneb/forkchoice/BUILD.bazel
deleted file mode 100644
index 22d33a567e..0000000000
--- a/testing/spectest/minimal/deneb/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/deneb/light_client/BUILD.bazel b/testing/spectest/minimal/deneb/light_client/BUILD.bazel
deleted file mode 100644
index 0158d90cd4..0000000000
--- a/testing/spectest/minimal/deneb/light_client/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "single_merkle_proof_test.go",
-        "update_ranking_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/deneb/merkle_proof/BUILD.bazel b/testing/spectest/minimal/deneb/merkle_proof/BUILD.bazel
deleted file mode 100644
index 3ca9c3057d..0000000000
--- a/testing/spectest/minimal/deneb/merkle_proof/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/merkle_proof:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/operations/BUILD.bazel b/testing/spectest/minimal/deneb/operations/BUILD.bazel
deleted file mode 100644
index 3822485236..0000000000
--- a/testing/spectest/minimal/deneb/operations/BUILD.bazel
+++ /dev/null
@@ -1,27 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "deposit_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/operations:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/random/BUILD.bazel b/testing/spectest/minimal/deneb/random/BUILD.bazel
deleted file mode 100644
index 53dfd2ff9f..0000000000
--- a/testing/spectest/minimal/deneb/random/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/deneb/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/rewards/BUILD.bazel b/testing/spectest/minimal/deneb/rewards/BUILD.bazel
deleted file mode 100644
index 75913a360b..0000000000
--- a/testing/spectest/minimal/deneb/rewards/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/rewards:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/sanity/BUILD.bazel b/testing/spectest/minimal/deneb/sanity/BUILD.bazel
deleted file mode 100644
index c57a18ddb5..0000000000
--- a/testing/spectest/minimal/deneb/sanity/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/ssz_static/BUILD.bazel b/testing/spectest/minimal/deneb/ssz_static/BUILD.bazel
deleted file mode 100644
index 52a15e637a..0000000000
--- a/testing/spectest/minimal/deneb/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/deneb/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/minimal/deneb/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/deneb__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__effective_balance_updates_test.go
index 76a1464343..f222702143 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/deneb__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__eth1_data_reset_test.go
index 640ec3b02d..ed760f6dc0 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/historical_summaries_update_test.go b/testing/spectest/minimal/deneb__epoch_processing__historical_summaries_update_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/epoch_processing/historical_summaries_update_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__historical_summaries_update_test.go
index 52db88b02d..9ec6945c06 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/historical_summaries_update_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__historical_summaries_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/deneb__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__inactivity_updates_test.go
index 27fd94f7cc..dcda7d23f0 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/deneb__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__justification_and_finalization_test.go
index 8f90915514..968645a426 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/deneb__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__participation_flag_updates_test.go
index 519e447af8..2fbd1e82fa 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/deneb__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__randao_mixes_reset_test.go
index 02ff0607fc..933a5f200f 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/deneb__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/registry_updates_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__registry_updates_test.go
index fd42a8d799..91deaa467a 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/deneb__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__rewards_and_penalties_test.go
index 09bfdef1ad..5d46e97ea2 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/deneb__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/slashings_reset_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__slashings_reset_test.go
index 4dbd3c00bf..a0a65a3f20 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/epoch_processing/slashings_test.go b/testing/spectest/minimal/deneb__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/epoch_processing/slashings_test.go
rename to testing/spectest/minimal/deneb__epoch_processing__slashings_test.go
index 383177c1d7..1528f8d8b7 100644
--- a/testing/spectest/minimal/deneb/epoch_processing/slashings_test.go
+++ b/testing/spectest/minimal/deneb__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/finality/finality_test.go b/testing/spectest/minimal/deneb__finality__finality_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/finality/finality_test.go
rename to testing/spectest/minimal/deneb__finality__finality_test.go
index ae03d7748f..1c3e995c19 100644
--- a/testing/spectest/minimal/deneb/finality/finality_test.go
+++ b/testing/spectest/minimal/deneb__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/fork/upgrade_to_deneb_test.go b/testing/spectest/minimal/deneb__fork__upgrade_to_deneb_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/fork/upgrade_to_deneb_test.go
rename to testing/spectest/minimal/deneb__fork__upgrade_to_deneb_test.go
index 093955b974..28bf20b5ce 100644
--- a/testing/spectest/minimal/deneb/fork/upgrade_to_deneb_test.go
+++ b/testing/spectest/minimal/deneb__fork__upgrade_to_deneb_test.go
@@ -1,4 +1,4 @@
-package fork
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/fork_transition/transition_test.go b/testing/spectest/minimal/deneb__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/minimal/deneb/fork_transition/transition_test.go
rename to testing/spectest/minimal/deneb__fork_transition__transition_test.go
index 898ad84785..afeab4298f 100644
--- a/testing/spectest/minimal/deneb/fork_transition/transition_test.go
+++ b/testing/spectest/minimal/deneb__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/forkchoice/forkchoice_test.go b/testing/spectest/minimal/deneb__forkchoice__forkchoice_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/forkchoice/forkchoice_test.go
rename to testing/spectest/minimal/deneb__forkchoice__forkchoice_test.go
index 9fec8bbf17..e11fd470d4 100644
--- a/testing/spectest/minimal/deneb/forkchoice/forkchoice_test.go
+++ b/testing/spectest/minimal/deneb__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/light_client/single_merkle_proof_test.go b/testing/spectest/minimal/deneb__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/minimal/deneb/light_client/single_merkle_proof_test.go
rename to testing/spectest/minimal/deneb__light_client__single_merkle_proof_test.go
index 1339990244..40f5c119ae 100644
--- a/testing/spectest/minimal/deneb/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/minimal/deneb__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/light_client/update_ranking_test.go b/testing/spectest/minimal/deneb__light_client__update_ranking_test.go
similarity index 93%
rename from testing/spectest/minimal/deneb/light_client/update_ranking_test.go
rename to testing/spectest/minimal/deneb__light_client__update_ranking_test.go
index 606f4da41c..1a800d0e38 100644
--- a/testing/spectest/minimal/deneb/light_client/update_ranking_test.go
+++ b/testing/spectest/minimal/deneb__light_client__update_ranking_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/merkle_proof/merkle_proof_test.go b/testing/spectest/minimal/deneb__merkle_proof__merkle_proof_test.go
similarity index 90%
rename from testing/spectest/minimal/deneb/merkle_proof/merkle_proof_test.go
rename to testing/spectest/minimal/deneb__merkle_proof__merkle_proof_test.go
index 9009966543..36211fa7d2 100644
--- a/testing/spectest/minimal/deneb/merkle_proof/merkle_proof_test.go
+++ b/testing/spectest/minimal/deneb__merkle_proof__merkle_proof_test.go
@@ -1,4 +1,4 @@
-package merkle_proof
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/attestation_test.go b/testing/spectest/minimal/deneb__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/operations/attestation_test.go
rename to testing/spectest/minimal/deneb__operations__attestation_test.go
index f00aec32dd..c210b4fcdc 100644
--- a/testing/spectest/minimal/deneb/operations/attestation_test.go
+++ b/testing/spectest/minimal/deneb__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/attester_slashing_test.go b/testing/spectest/minimal/deneb__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/operations/attester_slashing_test.go
rename to testing/spectest/minimal/deneb__operations__attester_slashing_test.go
index 6e0910891e..73e16835ef 100644
--- a/testing/spectest/minimal/deneb/operations/attester_slashing_test.go
+++ b/testing/spectest/minimal/deneb__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/block_header_test.go b/testing/spectest/minimal/deneb__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/operations/block_header_test.go
rename to testing/spectest/minimal/deneb__operations__block_header_test.go
index ad42e11fbe..ad504ddbb4 100644
--- a/testing/spectest/minimal/deneb/operations/block_header_test.go
+++ b/testing/spectest/minimal/deneb__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/bls_to_execution_change_test.go b/testing/spectest/minimal/deneb__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/operations/bls_to_execution_change_test.go
rename to testing/spectest/minimal/deneb__operations__bls_to_execution_change_test.go
index c799cd2c9c..a66b0e713f 100644
--- a/testing/spectest/minimal/deneb/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/minimal/deneb__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/deposit_test.go b/testing/spectest/minimal/deneb__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/operations/deposit_test.go
rename to testing/spectest/minimal/deneb__operations__deposit_test.go
index c7fb3fe77a..6bd817c389 100644
--- a/testing/spectest/minimal/deneb/operations/deposit_test.go
+++ b/testing/spectest/minimal/deneb__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/execution_payload_test.go b/testing/spectest/minimal/deneb__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/operations/execution_payload_test.go
rename to testing/spectest/minimal/deneb__operations__execution_payload_test.go
index 0963b1eecc..1a6f36af0b 100644
--- a/testing/spectest/minimal/deneb/operations/execution_payload_test.go
+++ b/testing/spectest/minimal/deneb__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/proposer_slashing_test.go b/testing/spectest/minimal/deneb__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/operations/proposer_slashing_test.go
rename to testing/spectest/minimal/deneb__operations__proposer_slashing_test.go
index 2d2a579d5c..6959737558 100644
--- a/testing/spectest/minimal/deneb/operations/proposer_slashing_test.go
+++ b/testing/spectest/minimal/deneb__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/sync_committee_test.go b/testing/spectest/minimal/deneb__operations__sync_committee_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/operations/sync_committee_test.go
rename to testing/spectest/minimal/deneb__operations__sync_committee_test.go
index f973a7d259..43ad00012f 100644
--- a/testing/spectest/minimal/deneb/operations/sync_committee_test.go
+++ b/testing/spectest/minimal/deneb__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/voluntary_exit_test.go b/testing/spectest/minimal/deneb__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/operations/voluntary_exit_test.go
rename to testing/spectest/minimal/deneb__operations__voluntary_exit_test.go
index 10ba896160..b3452f182b 100644
--- a/testing/spectest/minimal/deneb/operations/voluntary_exit_test.go
+++ b/testing/spectest/minimal/deneb__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/operations/withdrawals_test.go b/testing/spectest/minimal/deneb__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/operations/withdrawals_test.go
rename to testing/spectest/minimal/deneb__operations__withdrawals_test.go
index 62c055cbd5..e5a18a26b3 100644
--- a/testing/spectest/minimal/deneb/operations/withdrawals_test.go
+++ b/testing/spectest/minimal/deneb__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/random/random_test.go b/testing/spectest/minimal/deneb__random__random_test.go
similarity index 93%
rename from testing/spectest/minimal/deneb/random/random_test.go
rename to testing/spectest/minimal/deneb__random__random_test.go
index 47d0817d35..ddf51eddf9 100644
--- a/testing/spectest/minimal/deneb/random/random_test.go
+++ b/testing/spectest/minimal/deneb__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/rewards/rewards_test.go b/testing/spectest/minimal/deneb__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/rewards/rewards_test.go
rename to testing/spectest/minimal/deneb__rewards__rewards_test.go
index 97fc3d6f56..6b1bb50d9b 100644
--- a/testing/spectest/minimal/deneb/rewards/rewards_test.go
+++ b/testing/spectest/minimal/deneb__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/sanity/blocks_test.go b/testing/spectest/minimal/deneb__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/minimal/deneb/sanity/blocks_test.go
rename to testing/spectest/minimal/deneb__sanity__blocks_test.go
index acd2ef417b..ba9c85a758 100644
--- a/testing/spectest/minimal/deneb/sanity/blocks_test.go
+++ b/testing/spectest/minimal/deneb__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/sanity/slots_test.go b/testing/spectest/minimal/deneb__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/minimal/deneb/sanity/slots_test.go
rename to testing/spectest/minimal/deneb__sanity__slots_test.go
index da80b008a4..b4376a714e 100644
--- a/testing/spectest/minimal/deneb/sanity/slots_test.go
+++ b/testing/spectest/minimal/deneb__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/deneb/ssz_static/ssz_static_test.go b/testing/spectest/minimal/deneb__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/minimal/deneb/ssz_static/ssz_static_test.go
rename to testing/spectest/minimal/deneb__ssz_static__ssz_static_test.go
index 90099d5cd1..bcfb244f97 100644
--- a/testing/spectest/minimal/deneb/ssz_static/ssz_static_test.go
+++ b/testing/spectest/minimal/deneb__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/BUILD.bazel b/testing/spectest/minimal/electra/epoch_processing/BUILD.bazel
deleted file mode 100644
index f4e040b0df..0000000000
--- a/testing/spectest/minimal/electra/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,26 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_summaries_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "pending_consolidations_test.go",
-        "pending_deposits_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-        "sync_committee_updates_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    deps = ["//testing/spectest/shared/electra/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/finality/BUILD.bazel b/testing/spectest/minimal/electra/finality/BUILD.bazel
deleted file mode 100644
index 71001671c0..0000000000
--- a/testing/spectest/minimal/electra/finality/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/finality:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/fork/BUILD.bazel b/testing/spectest/minimal/electra/fork/BUILD.bazel
deleted file mode 100644
index 3cab89d1ad..0000000000
--- a/testing/spectest/minimal/electra/fork/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_electra_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/electra/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/fork_transition/BUILD.bazel b/testing/spectest/minimal/electra/fork_transition/BUILD.bazel
deleted file mode 100644
index 57948d6140..0000000000
--- a/testing/spectest/minimal/electra/fork_transition/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    timeout = "short",
-    srcs = ["transition_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/forkchoice/BUILD.bazel b/testing/spectest/minimal/electra/forkchoice/BUILD.bazel
deleted file mode 100644
index 90ecb9b2b5..0000000000
--- a/testing/spectest/minimal/electra/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/electra/light_client/BUILD.bazel b/testing/spectest/minimal/electra/light_client/BUILD.bazel
deleted file mode 100644
index 0158d90cd4..0000000000
--- a/testing/spectest/minimal/electra/light_client/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "single_merkle_proof_test.go",
-        "update_ranking_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/light_client:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/electra/merkle_proof/BUILD.bazel b/testing/spectest/minimal/electra/merkle_proof/BUILD.bazel
deleted file mode 100644
index 746e153d0e..0000000000
--- a/testing/spectest/minimal/electra/merkle_proof/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = ["merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/merkle_proof:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/operations/BUILD.bazel b/testing/spectest/minimal/electra/operations/BUILD.bazel
deleted file mode 100644
index 4e7177d15c..0000000000
--- a/testing/spectest/minimal/electra/operations/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "consolidation_test.go",
-        "deposit_requests_test.go",
-        "deposit_test.go",
-        "execution_layer_withdrawals_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    deps = ["//testing/spectest/shared/electra/operations:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/random/BUILD.bazel b/testing/spectest/minimal/electra/random/BUILD.bazel
deleted file mode 100644
index cdaf08b58a..0000000000
--- a/testing/spectest/minimal/electra/random/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/rewards/BUILD.bazel b/testing/spectest/minimal/electra/rewards/BUILD.bazel
deleted file mode 100644
index d1a3f3cb96..0000000000
--- a/testing/spectest/minimal/electra/rewards/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/rewards:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/sanity/BUILD.bazel b/testing/spectest/minimal/electra/sanity/BUILD.bazel
deleted file mode 100644
index 7d63fb7f7b..0000000000
--- a/testing/spectest/minimal/electra/sanity/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/electra/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/ssz_static/BUILD.bazel b/testing/spectest/minimal/electra/ssz_static/BUILD.bazel
deleted file mode 100644
index 8d22476ce2..0000000000
--- a/testing/spectest/minimal/electra/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/electra/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/minimal/electra/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/electra__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/minimal/electra__epoch_processing__effective_balance_updates_test.go
index 9cabee2b83..5187907870 100644
--- a/testing/spectest/minimal/electra/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/electra__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/minimal/electra__epoch_processing__eth1_data_reset_test.go
index 0360b66d25..16357ec3aa 100644
--- a/testing/spectest/minimal/electra/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/historical_summaries_update_test.go b/testing/spectest/minimal/electra__epoch_processing__historical_summaries_update_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/epoch_processing/historical_summaries_update_test.go
rename to testing/spectest/minimal/electra__epoch_processing__historical_summaries_update_test.go
index 02ba81cdae..74a28835bf 100644
--- a/testing/spectest/minimal/electra/epoch_processing/historical_summaries_update_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__historical_summaries_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/electra__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/minimal/electra__epoch_processing__inactivity_updates_test.go
index 4a4cb4242b..ff214bb5ea 100644
--- a/testing/spectest/minimal/electra/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/electra__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/minimal/electra__epoch_processing__justification_and_finalization_test.go
index 2375b22062..3daef31c57 100644
--- a/testing/spectest/minimal/electra/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/electra__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/minimal/electra__epoch_processing__participation_flag_updates_test.go
index 9bc6e89493..1d2dd09fa0 100644
--- a/testing/spectest/minimal/electra/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/pending_consolidations_test.go b/testing/spectest/minimal/electra__epoch_processing__pending_consolidations_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/epoch_processing/pending_consolidations_test.go
rename to testing/spectest/minimal/electra__epoch_processing__pending_consolidations_test.go
index 498ca825c1..c471efd52c 100644
--- a/testing/spectest/minimal/electra/epoch_processing/pending_consolidations_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__pending_consolidations_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/pending_deposits_updates_test.go b/testing/spectest/minimal/electra__epoch_processing__pending_deposits_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/pending_deposits_updates_test.go
rename to testing/spectest/minimal/electra__epoch_processing__pending_deposits_updates_test.go
index 0784065e8a..f5195158e9 100644
--- a/testing/spectest/minimal/electra/epoch_processing/pending_deposits_updates_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__pending_deposits_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/electra__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/minimal/electra__epoch_processing__randao_mixes_reset_test.go
index ff0f6273b4..88bab1f907 100644
--- a/testing/spectest/minimal/electra/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/electra__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/registry_updates_test.go
rename to testing/spectest/minimal/electra__epoch_processing__registry_updates_test.go
index 7d09890e1f..eee834588c 100644
--- a/testing/spectest/minimal/electra/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/electra__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/minimal/electra__epoch_processing__rewards_and_penalties_test.go
index 2742fbd5cc..acbeee8787 100644
--- a/testing/spectest/minimal/electra/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/electra__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/slashings_reset_test.go
rename to testing/spectest/minimal/electra__epoch_processing__slashings_reset_test.go
index 81d4528355..a6dd55414c 100644
--- a/testing/spectest/minimal/electra/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/slashings_test.go b/testing/spectest/minimal/electra__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/slashings_test.go
rename to testing/spectest/minimal/electra__epoch_processing__slashings_test.go
index 9b1e72197a..127ccc8a6a 100644
--- a/testing/spectest/minimal/electra/epoch_processing/slashings_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/epoch_processing/sync_committee_updates_test.go b/testing/spectest/minimal/electra__epoch_processing__sync_committee_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/epoch_processing/sync_committee_updates_test.go
rename to testing/spectest/minimal/electra__epoch_processing__sync_committee_updates_test.go
index 5c959a4177..9c19b4b3db 100644
--- a/testing/spectest/minimal/electra/epoch_processing/sync_committee_updates_test.go
+++ b/testing/spectest/minimal/electra__epoch_processing__sync_committee_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/finality/finality_test.go b/testing/spectest/minimal/electra__finality__finality_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/finality/finality_test.go
rename to testing/spectest/minimal/electra__finality__finality_test.go
index 98f2a39c81..9c6239d795 100644
--- a/testing/spectest/minimal/electra/finality/finality_test.go
+++ b/testing/spectest/minimal/electra__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/fork/upgrade_to_electra_test.go b/testing/spectest/minimal/electra__fork__upgrade_to_electra_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/fork/upgrade_to_electra_test.go
rename to testing/spectest/minimal/electra__fork__upgrade_to_electra_test.go
index 53c1f2694f..2acd3b50d7 100644
--- a/testing/spectest/minimal/electra/fork/upgrade_to_electra_test.go
+++ b/testing/spectest/minimal/electra__fork__upgrade_to_electra_test.go
@@ -1,4 +1,4 @@
-package fork
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/fork_transition/transition_test.go b/testing/spectest/minimal/electra__fork_transition__transition_test.go
similarity index 88%
rename from testing/spectest/minimal/electra/fork_transition/transition_test.go
rename to testing/spectest/minimal/electra__fork_transition__transition_test.go
index 9cf1ff40c7..6a6269ef77 100644
--- a/testing/spectest/minimal/electra/fork_transition/transition_test.go
+++ b/testing/spectest/minimal/electra__fork_transition__transition_test.go
@@ -1,4 +1,4 @@
-package fork_transition
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/forkchoice/forkchoice_test.go b/testing/spectest/minimal/electra__forkchoice__forkchoice_test.go
similarity index 93%
rename from testing/spectest/minimal/electra/forkchoice/forkchoice_test.go
rename to testing/spectest/minimal/electra__forkchoice__forkchoice_test.go
index 08ee94d1ab..91beb2f5b1 100644
--- a/testing/spectest/minimal/electra/forkchoice/forkchoice_test.go
+++ b/testing/spectest/minimal/electra__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/light_client/single_merkle_proof_test.go b/testing/spectest/minimal/electra__light_client__single_merkle_proof_test.go
similarity index 93%
rename from testing/spectest/minimal/electra/light_client/single_merkle_proof_test.go
rename to testing/spectest/minimal/electra__light_client__single_merkle_proof_test.go
index bf8e635944..3a9f775e1f 100644
--- a/testing/spectest/minimal/electra/light_client/single_merkle_proof_test.go
+++ b/testing/spectest/minimal/electra__light_client__single_merkle_proof_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/light_client/update_ranking_test.go b/testing/spectest/minimal/electra__light_client__update_ranking_test.go
similarity index 93%
rename from testing/spectest/minimal/electra/light_client/update_ranking_test.go
rename to testing/spectest/minimal/electra__light_client__update_ranking_test.go
index b646455ff8..6a38411999 100644
--- a/testing/spectest/minimal/electra/light_client/update_ranking_test.go
+++ b/testing/spectest/minimal/electra__light_client__update_ranking_test.go
@@ -1,4 +1,4 @@
-package light_client
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/merkle_proof/merkle_proof_test.go b/testing/spectest/minimal/electra__merkle_proof__merkle_proof_test.go
similarity index 90%
rename from testing/spectest/minimal/electra/merkle_proof/merkle_proof_test.go
rename to testing/spectest/minimal/electra__merkle_proof__merkle_proof_test.go
index a260ba4d2c..3b4c162dff 100644
--- a/testing/spectest/minimal/electra/merkle_proof/merkle_proof_test.go
+++ b/testing/spectest/minimal/electra__merkle_proof__merkle_proof_test.go
@@ -1,4 +1,4 @@
-package merkle_proof
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/attestation_test.go b/testing/spectest/minimal/electra__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/operations/attestation_test.go
rename to testing/spectest/minimal/electra__operations__attestation_test.go
index 3e609d03d9..ebdfbf3321 100644
--- a/testing/spectest/minimal/electra/operations/attestation_test.go
+++ b/testing/spectest/minimal/electra__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/attester_slashing_test.go b/testing/spectest/minimal/electra__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/attester_slashing_test.go
rename to testing/spectest/minimal/electra__operations__attester_slashing_test.go
index 02a87ee318..7814394f44 100644
--- a/testing/spectest/minimal/electra/operations/attester_slashing_test.go
+++ b/testing/spectest/minimal/electra__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/block_header_test.go b/testing/spectest/minimal/electra__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/operations/block_header_test.go
rename to testing/spectest/minimal/electra__operations__block_header_test.go
index 17b02c414e..900c404c82 100644
--- a/testing/spectest/minimal/electra/operations/block_header_test.go
+++ b/testing/spectest/minimal/electra__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/bls_to_execution_change_test.go b/testing/spectest/minimal/electra__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/bls_to_execution_change_test.go
rename to testing/spectest/minimal/electra__operations__bls_to_execution_change_test.go
index 3fed62bb90..98ef63da93 100644
--- a/testing/spectest/minimal/electra/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/minimal/electra__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/consolidation_test.go b/testing/spectest/minimal/electra__operations__consolidation_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/consolidation_test.go
rename to testing/spectest/minimal/electra__operations__consolidation_test.go
index 3aff6c956f..83b70a94d5 100644
--- a/testing/spectest/minimal/electra/operations/consolidation_test.go
+++ b/testing/spectest/minimal/electra__operations__consolidation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/deposit_requests_test.go b/testing/spectest/minimal/electra__operations__deposit_requests_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/deposit_requests_test.go
rename to testing/spectest/minimal/electra__operations__deposit_requests_test.go
index c8ab8f323c..ed33524d8b 100644
--- a/testing/spectest/minimal/electra/operations/deposit_requests_test.go
+++ b/testing/spectest/minimal/electra__operations__deposit_requests_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/deposit_test.go b/testing/spectest/minimal/electra__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/operations/deposit_test.go
rename to testing/spectest/minimal/electra__operations__deposit_test.go
index e5b2e9a40e..8e1ab20482 100644
--- a/testing/spectest/minimal/electra/operations/deposit_test.go
+++ b/testing/spectest/minimal/electra__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/execution_layer_withdrawals_test.go b/testing/spectest/minimal/electra__operations__execution_layer_withdrawals_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/execution_layer_withdrawals_test.go
rename to testing/spectest/minimal/electra__operations__execution_layer_withdrawals_test.go
index 0a525ba9f2..69f2013943 100644
--- a/testing/spectest/minimal/electra/operations/execution_layer_withdrawals_test.go
+++ b/testing/spectest/minimal/electra__operations__execution_layer_withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/execution_payload_test.go b/testing/spectest/minimal/electra__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/execution_payload_test.go
rename to testing/spectest/minimal/electra__operations__execution_payload_test.go
index 2d0ebad91d..242a601f01 100644
--- a/testing/spectest/minimal/electra/operations/execution_payload_test.go
+++ b/testing/spectest/minimal/electra__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/proposer_slashing_test.go b/testing/spectest/minimal/electra__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/proposer_slashing_test.go
rename to testing/spectest/minimal/electra__operations__proposer_slashing_test.go
index c3e6d81e87..67c45446e6 100644
--- a/testing/spectest/minimal/electra/operations/proposer_slashing_test.go
+++ b/testing/spectest/minimal/electra__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/sync_committee_test.go b/testing/spectest/minimal/electra__operations__sync_committee_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/sync_committee_test.go
rename to testing/spectest/minimal/electra__operations__sync_committee_test.go
index 4d4d6d10d9..f716db35cc 100644
--- a/testing/spectest/minimal/electra/operations/sync_committee_test.go
+++ b/testing/spectest/minimal/electra__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/voluntary_exit_test.go b/testing/spectest/minimal/electra__operations__voluntary_exit_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/operations/voluntary_exit_test.go
rename to testing/spectest/minimal/electra__operations__voluntary_exit_test.go
index bf656d46b0..e7bb9c4394 100644
--- a/testing/spectest/minimal/electra/operations/voluntary_exit_test.go
+++ b/testing/spectest/minimal/electra__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/operations/withdrawals_test.go b/testing/spectest/minimal/electra__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/operations/withdrawals_test.go
rename to testing/spectest/minimal/electra__operations__withdrawals_test.go
index 44c37834d7..30d904df9f 100644
--- a/testing/spectest/minimal/electra/operations/withdrawals_test.go
+++ b/testing/spectest/minimal/electra__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/random/random_test.go b/testing/spectest/minimal/electra__random__random_test.go
similarity index 93%
rename from testing/spectest/minimal/electra/random/random_test.go
rename to testing/spectest/minimal/electra__random__random_test.go
index c07944ee13..cb282b8a3b 100644
--- a/testing/spectest/minimal/electra/random/random_test.go
+++ b/testing/spectest/minimal/electra__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/rewards/rewards_test.go b/testing/spectest/minimal/electra__rewards__rewards_test.go
similarity index 93%
rename from testing/spectest/minimal/electra/rewards/rewards_test.go
rename to testing/spectest/minimal/electra__rewards__rewards_test.go
index fc11f30c26..d9f91928c8 100644
--- a/testing/spectest/minimal/electra/rewards/rewards_test.go
+++ b/testing/spectest/minimal/electra__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/sanity/blocks_test.go b/testing/spectest/minimal/electra__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/minimal/electra/sanity/blocks_test.go
rename to testing/spectest/minimal/electra__sanity__blocks_test.go
index 13e696c929..5fad1d6bb6 100644
--- a/testing/spectest/minimal/electra/sanity/blocks_test.go
+++ b/testing/spectest/minimal/electra__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/sanity/slots_test.go b/testing/spectest/minimal/electra__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/minimal/electra/sanity/slots_test.go
rename to testing/spectest/minimal/electra__sanity__slots_test.go
index 53ffdb7de9..d0bf1322c8 100644
--- a/testing/spectest/minimal/electra/sanity/slots_test.go
+++ b/testing/spectest/minimal/electra__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/electra/ssz_static/ssz_static_test.go b/testing/spectest/minimal/electra__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/minimal/electra/ssz_static/ssz_static_test.go
rename to testing/spectest/minimal/electra__ssz_static__ssz_static_test.go
index cf9e4a810e..197641491d 100644
--- a/testing/spectest/minimal/electra/ssz_static/ssz_static_test.go
+++ b/testing/spectest/minimal/electra__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/BUILD.bazel b/testing/spectest/minimal/fulu/epoch_processing/BUILD.bazel
deleted file mode 100644
index d590ab3cf2..0000000000
--- a/testing/spectest/minimal/fulu/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,26 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "eth1_data_reset_test.go",
-        "historical_summaries_update_test.go",
-        "inactivity_updates_test.go",
-        "justification_and_finalization_test.go",
-        "participation_flag_updates_test.go",
-        "pending_consolidations_test.go",
-        "pending_deposits_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-        "sync_committee_updates_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    deps = ["//testing/spectest/shared/fulu/epoch_processing:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/finality/BUILD.bazel b/testing/spectest/minimal/fulu/finality/BUILD.bazel
deleted file mode 100644
index 85d855a268..0000000000
--- a/testing/spectest/minimal/fulu/finality/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/finality:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/fork/BUILD.bazel b/testing/spectest/minimal/fulu/fork/BUILD.bazel
deleted file mode 100644
index df2c0fb89e..0000000000
--- a/testing/spectest/minimal/fulu/fork/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["upgrade_to_fulu_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/fulu/fork:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/forkchoice/BUILD.bazel b/testing/spectest/minimal/fulu/forkchoice/BUILD.bazel
deleted file mode 100644
index 90ecb9b2b5..0000000000
--- a/testing/spectest/minimal/fulu/forkchoice/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "enormous",
-    timeout = "short",
-    srcs = ["forkchoice_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = [
-        "//runtime/version:go_default_library",
-        "//testing/spectest/shared/common/forkchoice:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/fulu/merkle_proof/BUILD.bazel b/testing/spectest/minimal/fulu/merkle_proof/BUILD.bazel
deleted file mode 100644
index 3da326f9a2..0000000000
--- a/testing/spectest/minimal/fulu/merkle_proof/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = ["merkle_proof_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/merkle_proof:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/networking/BUILD.bazel b/testing/spectest/minimal/fulu/networking/BUILD.bazel
deleted file mode 100644
index fdcfb0cfcc..0000000000
--- a/testing/spectest/minimal/fulu/networking/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["custody_columns_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/networking:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/operations/BUILD.bazel b/testing/spectest/minimal/fulu/operations/BUILD.bazel
deleted file mode 100644
index 8b024cc6ae..0000000000
--- a/testing/spectest/minimal/fulu/operations/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "bls_to_execution_change_test.go",
-        "consolidation_test.go",
-        "deposit_requests_test.go",
-        "deposit_test.go",
-        "execution_layer_withdrawals_test.go",
-        "execution_payload_test.go",
-        "proposer_slashing_test.go",
-        "sync_committee_test.go",
-        "voluntary_exit_test.go",
-        "withdrawals_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    deps = ["//testing/spectest/shared/fulu/operations:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/random/BUILD.bazel b/testing/spectest/minimal/fulu/random/BUILD.bazel
deleted file mode 100644
index 4a48db77c2..0000000000
--- a/testing/spectest/minimal/fulu/random/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/rewards/BUILD.bazel b/testing/spectest/minimal/fulu/rewards/BUILD.bazel
deleted file mode 100644
index 2881d6e550..0000000000
--- a/testing/spectest/minimal/fulu/rewards/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/rewards:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/sanity/BUILD.bazel b/testing/spectest/minimal/fulu/sanity/BUILD.bazel
deleted file mode 100644
index b3973b1a20..0000000000
--- a/testing/spectest/minimal/fulu/sanity/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "medium",
-    timeout = "short",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = ["spectest"],
-    deps = ["//testing/spectest/shared/fulu/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/ssz_static/BUILD.bazel b/testing/spectest/minimal/fulu/ssz_static/BUILD.bazel
deleted file mode 100644
index c71d47c17d..0000000000
--- a/testing/spectest/minimal/fulu/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/fulu/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/minimal/fulu/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/fulu__epoch_processing__effective_balance_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__effective_balance_updates_test.go
index 9d4a977f25..cbc83036cb 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/fulu__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__eth1_data_reset_test.go
index fff68382ea..461c243bd2 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/historical_summaries_update_test.go b/testing/spectest/minimal/fulu__epoch_processing__historical_summaries_update_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/epoch_processing/historical_summaries_update_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__historical_summaries_update_test.go
index 5933049552..d2b2c7b156 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/historical_summaries_update_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__historical_summaries_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/inactivity_updates_test.go b/testing/spectest/minimal/fulu__epoch_processing__inactivity_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/inactivity_updates_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__inactivity_updates_test.go
index 51449f0558..de27dc7a30 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/inactivity_updates_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__inactivity_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/fulu__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__justification_and_finalization_test.go
index a7238a98ba..885b39e735 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/participation_flag_updates_test.go b/testing/spectest/minimal/fulu__epoch_processing__participation_flag_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/participation_flag_updates_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__participation_flag_updates_test.go
index 3ad6a84131..1e0b99cefa 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/participation_flag_updates_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__participation_flag_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/pending_consolidations_test.go b/testing/spectest/minimal/fulu__epoch_processing__pending_consolidations_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/pending_consolidations_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__pending_consolidations_test.go
index cad56c0c9c..4ddd52703c 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/pending_consolidations_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__pending_consolidations_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/pending_deposits_updates_test.go b/testing/spectest/minimal/fulu__epoch_processing__pending_deposits_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/pending_deposits_updates_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__pending_deposits_updates_test.go
index 465609587e..5723a68611 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/pending_deposits_updates_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__pending_deposits_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/fulu__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__randao_mixes_reset_test.go
index 3e827acb82..34f7faffe9 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/fulu__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/registry_updates_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__registry_updates_test.go
index 73ccd0b95f..d7025e7bd6 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/fulu__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__rewards_and_penalties_test.go
index 72ea922a3c..2a0f7e27df 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/fulu__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/slashings_reset_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__slashings_reset_test.go
index 9ae2cd575c..4d06d23ffc 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/slashings_test.go b/testing/spectest/minimal/fulu__epoch_processing__slashings_test.go
similarity index 89%
rename from testing/spectest/minimal/fulu/epoch_processing/slashings_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__slashings_test.go
index 67c24b6377..8d0fcccc1a 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/slashings_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/epoch_processing/sync_committee_updates_test.go b/testing/spectest/minimal/fulu__epoch_processing__sync_committee_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/epoch_processing/sync_committee_updates_test.go
rename to testing/spectest/minimal/fulu__epoch_processing__sync_committee_updates_test.go
index e4f0e14885..5e3d85dae3 100644
--- a/testing/spectest/minimal/fulu/epoch_processing/sync_committee_updates_test.go
+++ b/testing/spectest/minimal/fulu__epoch_processing__sync_committee_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/finality/finality_test.go b/testing/spectest/minimal/fulu__finality__finality_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/finality/finality_test.go
rename to testing/spectest/minimal/fulu__finality__finality_test.go
index 0ab8cae82c..716718ae05 100644
--- a/testing/spectest/minimal/fulu/finality/finality_test.go
+++ b/testing/spectest/minimal/fulu__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/fork/upgrade_to_fulu_test.go b/testing/spectest/minimal/fulu__fork__upgrade_to_fulu_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/fork/upgrade_to_fulu_test.go
rename to testing/spectest/minimal/fulu__fork__upgrade_to_fulu_test.go
index 8c4bd0bd48..540ad38ec8 100644
--- a/testing/spectest/minimal/fulu/fork/upgrade_to_fulu_test.go
+++ b/testing/spectest/minimal/fulu__fork__upgrade_to_fulu_test.go
@@ -1,4 +1,4 @@
-package fork
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/forkchoice/forkchoice_test.go b/testing/spectest/minimal/fulu__forkchoice__forkchoice_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/forkchoice/forkchoice_test.go
rename to testing/spectest/minimal/fulu__forkchoice__forkchoice_test.go
index 74fe88003a..7b657c6367 100644
--- a/testing/spectest/minimal/fulu/forkchoice/forkchoice_test.go
+++ b/testing/spectest/minimal/fulu__forkchoice__forkchoice_test.go
@@ -1,4 +1,4 @@
-package forkchoice
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/merkle_proof/merkle_proof_test.go b/testing/spectest/minimal/fulu__merkle_proof__merkle_proof_test.go
similarity index 90%
rename from testing/spectest/minimal/fulu/merkle_proof/merkle_proof_test.go
rename to testing/spectest/minimal/fulu__merkle_proof__merkle_proof_test.go
index 18ce6f98c8..36e861721b 100644
--- a/testing/spectest/minimal/fulu/merkle_proof/merkle_proof_test.go
+++ b/testing/spectest/minimal/fulu__merkle_proof__merkle_proof_test.go
@@ -1,4 +1,4 @@
-package merkle_proof
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/networking/custody_columns_test.go b/testing/spectest/minimal/fulu__networking__custody_columns_test.go
similarity index 95%
rename from testing/spectest/minimal/fulu/networking/custody_columns_test.go
rename to testing/spectest/minimal/fulu__networking__custody_columns_test.go
index 43419b86c2..040c1ff31f 100644
--- a/testing/spectest/minimal/fulu/networking/custody_columns_test.go
+++ b/testing/spectest/minimal/fulu__networking__custody_columns_test.go
@@ -1,4 +1,4 @@
-package networking
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/attestation_test.go b/testing/spectest/minimal/fulu__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/attestation_test.go
rename to testing/spectest/minimal/fulu__operations__attestation_test.go
index a5b9c3e069..ebad524a16 100644
--- a/testing/spectest/minimal/fulu/operations/attestation_test.go
+++ b/testing/spectest/minimal/fulu__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/attester_slashing_test.go b/testing/spectest/minimal/fulu__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/operations/attester_slashing_test.go
rename to testing/spectest/minimal/fulu__operations__attester_slashing_test.go
index 502588f2a4..573ef8e05f 100644
--- a/testing/spectest/minimal/fulu/operations/attester_slashing_test.go
+++ b/testing/spectest/minimal/fulu__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/block_header_test.go b/testing/spectest/minimal/fulu__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/block_header_test.go
rename to testing/spectest/minimal/fulu__operations__block_header_test.go
index 75dd342053..ffb1bd0fa6 100644
--- a/testing/spectest/minimal/fulu/operations/block_header_test.go
+++ b/testing/spectest/minimal/fulu__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/bls_to_execution_change_test.go b/testing/spectest/minimal/fulu__operations__bls_to_execution_change_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/operations/bls_to_execution_change_test.go
rename to testing/spectest/minimal/fulu__operations__bls_to_execution_change_test.go
index b1f39a7c61..1356683739 100644
--- a/testing/spectest/minimal/fulu/operations/bls_to_execution_change_test.go
+++ b/testing/spectest/minimal/fulu__operations__bls_to_execution_change_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/consolidation_test.go b/testing/spectest/minimal/fulu__operations__consolidation_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/consolidation_test.go
rename to testing/spectest/minimal/fulu__operations__consolidation_test.go
index 4b63179594..2f6a761d8c 100644
--- a/testing/spectest/minimal/fulu/operations/consolidation_test.go
+++ b/testing/spectest/minimal/fulu__operations__consolidation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/deposit_requests_test.go b/testing/spectest/minimal/fulu__operations__deposit_requests_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/deposit_requests_test.go
rename to testing/spectest/minimal/fulu__operations__deposit_requests_test.go
index 247cfae346..fb2779fc31 100644
--- a/testing/spectest/minimal/fulu/operations/deposit_requests_test.go
+++ b/testing/spectest/minimal/fulu__operations__deposit_requests_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/deposit_test.go b/testing/spectest/minimal/fulu__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/deposit_test.go
rename to testing/spectest/minimal/fulu__operations__deposit_test.go
index eab240758a..b4974f943d 100644
--- a/testing/spectest/minimal/fulu/operations/deposit_test.go
+++ b/testing/spectest/minimal/fulu__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/execution_layer_withdrawals_test.go b/testing/spectest/minimal/fulu__operations__execution_layer_withdrawals_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/operations/execution_layer_withdrawals_test.go
rename to testing/spectest/minimal/fulu__operations__execution_layer_withdrawals_test.go
index 8bf65f3577..34aa1e5c9b 100644
--- a/testing/spectest/minimal/fulu/operations/execution_layer_withdrawals_test.go
+++ b/testing/spectest/minimal/fulu__operations__execution_layer_withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/execution_payload_test.go b/testing/spectest/minimal/fulu__operations__execution_payload_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/operations/execution_payload_test.go
rename to testing/spectest/minimal/fulu__operations__execution_payload_test.go
index dad45b500a..cd84ef9a99 100644
--- a/testing/spectest/minimal/fulu/operations/execution_payload_test.go
+++ b/testing/spectest/minimal/fulu__operations__execution_payload_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/proposer_slashing_test.go b/testing/spectest/minimal/fulu__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/operations/proposer_slashing_test.go
rename to testing/spectest/minimal/fulu__operations__proposer_slashing_test.go
index 2ebd0114c5..3bd599c497 100644
--- a/testing/spectest/minimal/fulu/operations/proposer_slashing_test.go
+++ b/testing/spectest/minimal/fulu__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/sync_committee_test.go b/testing/spectest/minimal/fulu__operations__sync_committee_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/sync_committee_test.go
rename to testing/spectest/minimal/fulu__operations__sync_committee_test.go
index 20c416e100..2ec5e9495c 100644
--- a/testing/spectest/minimal/fulu/operations/sync_committee_test.go
+++ b/testing/spectest/minimal/fulu__operations__sync_committee_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/voluntary_exit_test.go b/testing/spectest/minimal/fulu__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/voluntary_exit_test.go
rename to testing/spectest/minimal/fulu__operations__voluntary_exit_test.go
index 71946e46f9..55dfdac984 100644
--- a/testing/spectest/minimal/fulu/operations/voluntary_exit_test.go
+++ b/testing/spectest/minimal/fulu__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/operations/withdrawals_test.go b/testing/spectest/minimal/fulu__operations__withdrawals_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/operations/withdrawals_test.go
rename to testing/spectest/minimal/fulu__operations__withdrawals_test.go
index e3362d6eb1..333fe00f5f 100644
--- a/testing/spectest/minimal/fulu/operations/withdrawals_test.go
+++ b/testing/spectest/minimal/fulu__operations__withdrawals_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/random/random_test.go b/testing/spectest/minimal/fulu__random__random_test.go
similarity index 93%
rename from testing/spectest/minimal/fulu/random/random_test.go
rename to testing/spectest/minimal/fulu__random__random_test.go
index 42a673d494..0a8de1b216 100644
--- a/testing/spectest/minimal/fulu/random/random_test.go
+++ b/testing/spectest/minimal/fulu__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/rewards/rewards_test.go b/testing/spectest/minimal/fulu__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/rewards/rewards_test.go
rename to testing/spectest/minimal/fulu__rewards__rewards_test.go
index 4243723583..d99d862dc5 100644
--- a/testing/spectest/minimal/fulu/rewards/rewards_test.go
+++ b/testing/spectest/minimal/fulu__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/sanity/blocks_test.go b/testing/spectest/minimal/fulu__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/minimal/fulu/sanity/blocks_test.go
rename to testing/spectest/minimal/fulu__sanity__blocks_test.go
index 92991c5f96..941c0edd91 100644
--- a/testing/spectest/minimal/fulu/sanity/blocks_test.go
+++ b/testing/spectest/minimal/fulu__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/sanity/slots_test.go b/testing/spectest/minimal/fulu__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/minimal/fulu/sanity/slots_test.go
rename to testing/spectest/minimal/fulu__sanity__slots_test.go
index a01b277f73..bac3894e4f 100644
--- a/testing/spectest/minimal/fulu/sanity/slots_test.go
+++ b/testing/spectest/minimal/fulu__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/fulu/ssz_static/ssz_static_test.go b/testing/spectest/minimal/fulu__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/minimal/fulu/ssz_static/ssz_static_test.go
rename to testing/spectest/minimal/fulu__ssz_static__ssz_static_test.go
index 5d678a5126..de11535379 100644
--- a/testing/spectest/minimal/fulu/ssz_static/ssz_static_test.go
+++ b/testing/spectest/minimal/fulu__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/BUILD.bazel b/testing/spectest/minimal/phase0/epoch_processing/BUILD.bazel
deleted file mode 100644
index 3e0eb5176d..0000000000
--- a/testing/spectest/minimal/phase0/epoch_processing/BUILD.bazel
+++ /dev/null
@@ -1,31 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "effective_balance_updates_test.go",
-        "epoch_processing_test.go",
-        "eth1_data_reset_test.go",
-        "historical_roots_update_test.go",
-        "justification_and_finalization_test.go",
-        "participation_record_updates_test.go",
-        "randao_mixes_reset_test.go",
-        "registry_updates_test.go",
-        "rewards_and_penalties_test.go",
-        "slashings_reset_test.go",
-        "slashings_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = [
-        "//config/params:go_default_library",
-        "//testing/spectest/shared/phase0/epoch_processing:go_default_library",
-    ],
-)
diff --git a/testing/spectest/minimal/phase0/finality/BUILD.bazel b/testing/spectest/minimal/phase0/finality/BUILD.bazel
deleted file mode 100644
index cc072bdf94..0000000000
--- a/testing/spectest/minimal/phase0/finality/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["finality_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    shard_count = 4,
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/phase0/finality:go_default_library"],
-)
diff --git a/testing/spectest/minimal/phase0/operations/BUILD.bazel b/testing/spectest/minimal/phase0/operations/BUILD.bazel
deleted file mode 100644
index 6efda60932..0000000000
--- a/testing/spectest/minimal/phase0/operations/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "attestation_test.go",
-        "attester_slashing_test.go",
-        "block_header_test.go",
-        "deposit_test.go",
-        "proposer_slashing_test.go",
-        "voluntary_exit_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/phase0/operations:go_default_library"],
-)
diff --git a/testing/spectest/minimal/phase0/random/BUILD.bazel b/testing/spectest/minimal/phase0/random/BUILD.bazel
deleted file mode 100644
index 9971adb33d..0000000000
--- a/testing/spectest/minimal/phase0/random/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["random_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/phase0/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/phase0/rewards/BUILD.bazel b/testing/spectest/minimal/phase0/rewards/BUILD.bazel
deleted file mode 100644
index fdb240899a..0000000000
--- a/testing/spectest/minimal/phase0/rewards/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["rewards_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/phase0/rewards:go_default_library"],
-)
diff --git a/testing/spectest/minimal/phase0/sanity/BUILD.bazel b/testing/spectest/minimal/phase0/sanity/BUILD.bazel
deleted file mode 100644
index 855fb2229a..0000000000
--- a/testing/spectest/minimal/phase0/sanity/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = [
-        "blocks_test.go",
-        "slots_test.go",
-    ],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/phase0/sanity:go_default_library"],
-)
diff --git a/testing/spectest/minimal/phase0/shuffling/core/shuffle/BUILD.bazel b/testing/spectest/minimal/phase0/shuffling/core/shuffle/BUILD.bazel
deleted file mode 100644
index 61b36fa28d..0000000000
--- a/testing/spectest/minimal/phase0/shuffling/core/shuffle/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["shuffle_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/phase0/shuffling/core/shuffle:go_default_library"],
-)
diff --git a/testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go b/testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go
deleted file mode 100644
index dbcfe09933..0000000000
--- a/testing/spectest/minimal/phase0/shuffling/core/shuffle/shuffle_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package shuffle
-
-import (
-	"testing"
-
-	"github.com/OffchainLabs/prysm/v6/testing/spectest/shared/phase0/shuffling/core/shuffle"
-)
-
-func TestMinimal_Phase0_Shuffling_Core_Shuffle(t *testing.T) {
-	shuffle.RunShuffleTests(t, "minimal")
-}
diff --git a/testing/spectest/minimal/phase0/ssz_static/BUILD.bazel b/testing/spectest/minimal/phase0/ssz_static/BUILD.bazel
deleted file mode 100644
index e54df01966..0000000000
--- a/testing/spectest/minimal/phase0/ssz_static/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-load("@prysm//tools/go:def.bzl", "go_test")
-
-go_test(
-    name = "go_default_test",
-    size = "small",
-    srcs = ["ssz_static_test.go"],
-    data = glob(["*.yaml"]) + [
-        "@consensus_spec_tests//:test_data",
-    ],
-    eth_network = "minimal",
-    tags = [
-        "minimal",
-        "spectest",
-    ],
-    deps = ["//testing/spectest/shared/phase0/ssz_static:go_default_library"],
-)
diff --git a/testing/spectest/minimal/phase0/epoch_processing/effective_balance_updates_test.go b/testing/spectest/minimal/phase0__epoch_processing__effective_balance_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/epoch_processing/effective_balance_updates_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__effective_balance_updates_test.go
index d1d8f9e5bd..b328a3c985 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/effective_balance_updates_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__effective_balance_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/epoch_processing_test.go b/testing/spectest/minimal/phase0__epoch_processing__epoch_processing_test.go
similarity index 92%
rename from testing/spectest/minimal/phase0/epoch_processing/epoch_processing_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__epoch_processing_test.go
index cf31e0d8e8..0190025328 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/epoch_processing_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__epoch_processing_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"os"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/eth1_data_reset_test.go b/testing/spectest/minimal/phase0__epoch_processing__eth1_data_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/phase0/epoch_processing/eth1_data_reset_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__eth1_data_reset_test.go
index 1e50178c36..95e754d06a 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/eth1_data_reset_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__eth1_data_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/historical_roots_update_test.go b/testing/spectest/minimal/phase0__epoch_processing__historical_roots_update_test.go
similarity index 90%
rename from testing/spectest/minimal/phase0/epoch_processing/historical_roots_update_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__historical_roots_update_test.go
index 28d671357a..7fc16e16d8 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/historical_roots_update_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__historical_roots_update_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/justification_and_finalization_test.go b/testing/spectest/minimal/phase0__epoch_processing__justification_and_finalization_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/epoch_processing/justification_and_finalization_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__justification_and_finalization_test.go
index 30291acfd0..6428a5346b 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/justification_and_finalization_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__justification_and_finalization_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/participation_record_updates_test.go b/testing/spectest/minimal/phase0__epoch_processing__participation_record_updates_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/epoch_processing/participation_record_updates_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__participation_record_updates_test.go
index 6778ef61af..2aceb3822e 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/participation_record_updates_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__participation_record_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/randao_mixes_reset_test.go b/testing/spectest/minimal/phase0__epoch_processing__randao_mixes_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/phase0/epoch_processing/randao_mixes_reset_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__randao_mixes_reset_test.go
index 7e36a38e11..789fb612e1 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/randao_mixes_reset_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__randao_mixes_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/registry_updates_test.go b/testing/spectest/minimal/phase0__epoch_processing__registry_updates_test.go
similarity index 90%
rename from testing/spectest/minimal/phase0/epoch_processing/registry_updates_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__registry_updates_test.go
index 17fb9564ba..d3a3738ea8 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/registry_updates_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__registry_updates_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/rewards_and_penalties_test.go b/testing/spectest/minimal/phase0__epoch_processing__rewards_and_penalties_test.go
similarity index 90%
rename from testing/spectest/minimal/phase0/epoch_processing/rewards_and_penalties_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__rewards_and_penalties_test.go
index 37649b2154..181a527a86 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/rewards_and_penalties_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__rewards_and_penalties_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/slashings_reset_test.go b/testing/spectest/minimal/phase0__epoch_processing__slashings_reset_test.go
similarity index 90%
rename from testing/spectest/minimal/phase0/epoch_processing/slashings_reset_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__slashings_reset_test.go
index f8dc6a4ed0..2668354fb2 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/slashings_reset_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__slashings_reset_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/epoch_processing/slashings_test.go b/testing/spectest/minimal/phase0__epoch_processing__slashings_test.go
similarity index 90%
rename from testing/spectest/minimal/phase0/epoch_processing/slashings_test.go
rename to testing/spectest/minimal/phase0__epoch_processing__slashings_test.go
index 821fa5f0b0..1ab33fe1d4 100644
--- a/testing/spectest/minimal/phase0/epoch_processing/slashings_test.go
+++ b/testing/spectest/minimal/phase0__epoch_processing__slashings_test.go
@@ -1,4 +1,4 @@
-package epoch_processing
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/finality/finality_test.go b/testing/spectest/minimal/phase0__finality__finality_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/finality/finality_test.go
rename to testing/spectest/minimal/phase0__finality__finality_test.go
index b260d87cb7..47d0df94a7 100644
--- a/testing/spectest/minimal/phase0/finality/finality_test.go
+++ b/testing/spectest/minimal/phase0__finality__finality_test.go
@@ -1,4 +1,4 @@
-package finality
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/operations/attestation_test.go b/testing/spectest/minimal/phase0__operations__attestation_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/operations/attestation_test.go
rename to testing/spectest/minimal/phase0__operations__attestation_test.go
index 7cc3723469..638bbeb401 100644
--- a/testing/spectest/minimal/phase0/operations/attestation_test.go
+++ b/testing/spectest/minimal/phase0__operations__attestation_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/operations/attester_slashing_test.go b/testing/spectest/minimal/phase0__operations__attester_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/phase0/operations/attester_slashing_test.go
rename to testing/spectest/minimal/phase0__operations__attester_slashing_test.go
index d90903667f..13e64bb9f7 100644
--- a/testing/spectest/minimal/phase0/operations/attester_slashing_test.go
+++ b/testing/spectest/minimal/phase0__operations__attester_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/operations/block_header_test.go b/testing/spectest/minimal/phase0__operations__block_header_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/operations/block_header_test.go
rename to testing/spectest/minimal/phase0__operations__block_header_test.go
index 82701ed617..4efb1b2faa 100644
--- a/testing/spectest/minimal/phase0/operations/block_header_test.go
+++ b/testing/spectest/minimal/phase0__operations__block_header_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/operations/deposit_test.go b/testing/spectest/minimal/phase0__operations__deposit_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/operations/deposit_test.go
rename to testing/spectest/minimal/phase0__operations__deposit_test.go
index 0225da2334..0b025d70a5 100644
--- a/testing/spectest/minimal/phase0/operations/deposit_test.go
+++ b/testing/spectest/minimal/phase0__operations__deposit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/operations/proposer_slashing_test.go b/testing/spectest/minimal/phase0__operations__proposer_slashing_test.go
similarity index 92%
rename from testing/spectest/minimal/phase0/operations/proposer_slashing_test.go
rename to testing/spectest/minimal/phase0__operations__proposer_slashing_test.go
index 639c585d62..d460119c86 100644
--- a/testing/spectest/minimal/phase0/operations/proposer_slashing_test.go
+++ b/testing/spectest/minimal/phase0__operations__proposer_slashing_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/operations/voluntary_exit_test.go b/testing/spectest/minimal/phase0__operations__voluntary_exit_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/operations/voluntary_exit_test.go
rename to testing/spectest/minimal/phase0__operations__voluntary_exit_test.go
index 8c83767091..5e301194bd 100644
--- a/testing/spectest/minimal/phase0/operations/voluntary_exit_test.go
+++ b/testing/spectest/minimal/phase0__operations__voluntary_exit_test.go
@@ -1,4 +1,4 @@
-package operations
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/random/random_test.go b/testing/spectest/minimal/phase0__random__random_test.go
similarity index 93%
rename from testing/spectest/minimal/phase0/random/random_test.go
rename to testing/spectest/minimal/phase0__random__random_test.go
index ea787c6eb2..89140b6850 100644
--- a/testing/spectest/minimal/phase0/random/random_test.go
+++ b/testing/spectest/minimal/phase0__random__random_test.go
@@ -1,4 +1,4 @@
-package random
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/rewards/rewards_test.go b/testing/spectest/minimal/phase0__rewards__rewards_test.go
similarity index 92%
rename from testing/spectest/minimal/phase0/rewards/rewards_test.go
rename to testing/spectest/minimal/phase0__rewards__rewards_test.go
index dad33f5e89..31d656680e 100644
--- a/testing/spectest/minimal/phase0/rewards/rewards_test.go
+++ b/testing/spectest/minimal/phase0__rewards__rewards_test.go
@@ -1,4 +1,4 @@
-package rewards
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/sanity/blocks_test.go b/testing/spectest/minimal/phase0__sanity__blocks_test.go
similarity index 93%
rename from testing/spectest/minimal/phase0/sanity/blocks_test.go
rename to testing/spectest/minimal/phase0__sanity__blocks_test.go
index d0fb4b8dc5..1cadb77f40 100644
--- a/testing/spectest/minimal/phase0/sanity/blocks_test.go
+++ b/testing/spectest/minimal/phase0__sanity__blocks_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/sanity/slots_test.go b/testing/spectest/minimal/phase0__sanity__slots_test.go
similarity index 92%
rename from testing/spectest/minimal/phase0/sanity/slots_test.go
rename to testing/spectest/minimal/phase0__sanity__slots_test.go
index 893a981533..bf2fb6e46d 100644
--- a/testing/spectest/minimal/phase0/sanity/slots_test.go
+++ b/testing/spectest/minimal/phase0__sanity__slots_test.go
@@ -1,4 +1,4 @@
-package sanity
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/minimal/phase0/ssz_static/ssz_static_test.go b/testing/spectest/minimal/phase0__ssz_static__ssz_static_test.go
similarity index 91%
rename from testing/spectest/minimal/phase0/ssz_static/ssz_static_test.go
rename to testing/spectest/minimal/phase0__ssz_static__ssz_static_test.go
index ac03e8821e..8e7eaece32 100644
--- a/testing/spectest/minimal/phase0/ssz_static/ssz_static_test.go
+++ b/testing/spectest/minimal/phase0__ssz_static__ssz_static_test.go
@@ -1,4 +1,4 @@
-package ssz_static
+package minimal
 
 import (
 	"testing"
diff --git a/testing/spectest/shared/common/forkchoice/builder.go b/testing/spectest/shared/common/forkchoice/builder.go
index 29453b6078..826db51e3d 100644
--- a/testing/spectest/shared/common/forkchoice/builder.go
+++ b/testing/spectest/shared/common/forkchoice/builder.go
@@ -162,12 +162,12 @@ func (bb *Builder) Check(t testing.TB, c *Check) {
 	if c.ProposerBoostRoot != nil {
 		want := fmt.Sprintf("%#x", common.FromHex(*c.ProposerBoostRoot))
 		got := fmt.Sprintf("%#x", bb.service.ProposerBoost())
-		require.DeepEqual(t, want, got)
+		require.Equal(t, want, got)
 	}
 	if c.GetProposerHead != nil {
 		want := fmt.Sprintf("%#x", common.FromHex(*c.GetProposerHead))
 		got := fmt.Sprintf("%#x", bb.service.GetProposerHead())
-		require.DeepEqual(t, want, got)
+		require.Equal(t, want, got)
 	}
 	/* TODO: We need to mock the entire proposer system to be able to test this.
 	if c.ShouldOverrideFCU != nil {