diff --git a/test_libs/pyspec/eth2spec/test/helpers/attestations.py b/test_libs/pyspec/eth2spec/test/helpers/attestations.py
index 6ac0b994e..45ee10c3e 100644
--- a/test_libs/pyspec/eth2spec/test/helpers/attestations.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/attestations.py
@@ -16,7 +16,7 @@ from eth2spec.test.helpers.bitfields import set_bitfield_bit
 from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block
 from eth2spec.test.helpers.keys import privkeys
 from eth2spec.utils.bls import bls_sign, bls_aggregate_signatures
-from eth2spec.utils.minimal_ssz import hash_tree_root
+from eth2spec.utils.ssz.ssz_impl import hash_tree_root
 
 
 def build_attestation_data(state, slot, shard):
diff --git a/test_libs/pyspec/eth2spec/test/helpers/block.py b/test_libs/pyspec/eth2spec/test/helpers/block.py
index 715cf82db..28fd1229f 100644
--- a/test_libs/pyspec/eth2spec/test/helpers/block.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/block.py
@@ -8,7 +8,7 @@ from eth2spec.phase0.spec import (
 )
 from eth2spec.test.helpers.keys import privkeys
 from eth2spec.utils.bls import bls_sign, only_with_bls
-from eth2spec.utils.minimal_ssz import signing_root, hash_tree_root
+from eth2spec.utils.ssz.ssz_impl import signing_root, hash_tree_root
 
 
 # Fully ignore the function if BLS is off, beacon-proposer index calculation is slow.
diff --git a/test_libs/pyspec/eth2spec/test/helpers/block_header.py b/test_libs/pyspec/eth2spec/test/helpers/block_header.py
index 9aba62d37..ad3fbc166 100644
--- a/test_libs/pyspec/eth2spec/test/helpers/block_header.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/block_header.py
@@ -3,7 +3,7 @@ import eth2spec.phase0.spec as spec
 
 from eth2spec.phase0.spec import get_domain
 from eth2spec.utils.bls import bls_sign
-from eth2spec.utils.minimal_ssz import signing_root
+from eth2spec.utils.ssz.ssz_impl import signing_root
 
 
 def sign_block_header(state, header, privkey):
diff --git a/test_libs/pyspec/eth2spec/test/helpers/deposits.py b/test_libs/pyspec/eth2spec/test/helpers/deposits.py
index 2db3ae03c..3080eba7f 100644
--- a/test_libs/pyspec/eth2spec/test/helpers/deposits.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/deposits.py
@@ -5,7 +5,7 @@ from eth2spec.phase0.spec import get_domain, DepositData, verify_merkle_branch,
 from eth2spec.test.helpers.keys import pubkeys, privkeys
 from eth2spec.utils.bls import bls_sign
 from eth2spec.utils.merkle_minimal import calc_merkle_tree_from_leaves, get_merkle_root, get_merkle_proof
-from eth2spec.utils.minimal_ssz import signing_root
+from eth2spec.utils.ssz.ssz_impl import signing_root
 
 
 def build_deposit_data(state, pubkey, privkey, amount, withdrawal_credentials, signed=False):
diff --git a/test_libs/pyspec/eth2spec/test/helpers/genesis.py b/test_libs/pyspec/eth2spec/test/helpers/genesis.py
index 01011cacd..489791907 100644
--- a/test_libs/pyspec/eth2spec/test/helpers/genesis.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/genesis.py
@@ -3,7 +3,7 @@ import eth2spec.phase0.spec as spec
 
 from eth2spec.phase0.spec import Eth1Data, ZERO_HASH, get_active_validator_indices
 from eth2spec.test.helpers.keys import pubkeys
-from eth2spec.utils.minimal_ssz import hash_tree_root
+from eth2spec.utils.ssz.ssz_impl import hash_tree_root
 
 
 def build_mock_validator(i: int, balance: int):
diff --git a/test_libs/pyspec/eth2spec/test/helpers/transfers.py b/test_libs/pyspec/eth2spec/test/helpers/transfers.py
index 2045f48ad..9913ef88a 100644
--- a/test_libs/pyspec/eth2spec/test/helpers/transfers.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/transfers.py
@@ -5,7 +5,7 @@ from eth2spec.phase0.spec import get_current_epoch, get_active_validator_indices
 from eth2spec.test.helpers.keys import pubkeys, privkeys
 from eth2spec.test.helpers.state import get_balance
 from eth2spec.utils.bls import bls_sign
-from eth2spec.utils.minimal_ssz import signing_root
+from eth2spec.utils.ssz.ssz_impl import signing_root
 
 
 def get_valid_transfer(state, slot=None, sender_index=None, amount=None, fee=None, signed=False):
diff --git a/test_libs/pyspec/eth2spec/test/helpers/voluntary_exits.py b/test_libs/pyspec/eth2spec/test/helpers/voluntary_exits.py
index 54376d694..e4a815877 100644
--- a/test_libs/pyspec/eth2spec/test/helpers/voluntary_exits.py
+++ b/test_libs/pyspec/eth2spec/test/helpers/voluntary_exits.py
@@ -3,7 +3,7 @@ import eth2spec.phase0.spec as spec
 
 from eth2spec.phase0.spec import VoluntaryExit, get_domain
 from eth2spec.utils.bls import bls_sign
-from eth2spec.utils.minimal_ssz import signing_root
+from eth2spec.utils.ssz.ssz_impl import signing_root
 
 
 def build_voluntary_exit(state, epoch, validator_index, privkey, signed=False):
diff --git a/test_libs/pyspec/eth2spec/test/sanity/test_blocks.py b/test_libs/pyspec/eth2spec/test/sanity/test_blocks.py
index 654a41d62..3d2234795 100644
--- a/test_libs/pyspec/eth2spec/test/sanity/test_blocks.py
+++ b/test_libs/pyspec/eth2spec/test/sanity/test_blocks.py
@@ -3,7 +3,7 @@ from copy import deepcopy
 import eth2spec.phase0.spec as spec
 from eth2spec.utils.bls import bls_sign
 
-from eth2spec.utils.minimal_ssz import signing_root
+from eth2spec.utils.ssz.ssz_impl import signing_root
 from eth2spec.phase0.spec import (
     # SSZ
     VoluntaryExit,