diff --git a/tests/test_abi/__init__.py b/tests/abi/__init__.py
similarity index 100%
rename from tests/test_abi/__init__.py
rename to tests/abi/__init__.py
diff --git a/tests/test_abi/test_decode_abi.py b/tests/abi/test_decode_abi.py
similarity index 100%
rename from tests/test_abi/test_decode_abi.py
rename to tests/abi/test_decode_abi.py
diff --git a/tests/test_abi/test_decode_single.py b/tests/abi/test_decode_single.py
similarity index 100%
rename from tests/test_abi/test_decode_single.py
rename to tests/abi/test_decode_single.py
diff --git a/tests/test_abi/test_encode_abi.py b/tests/abi/test_encode_abi.py
similarity index 100%
rename from tests/test_abi/test_encode_abi.py
rename to tests/abi/test_encode_abi.py
diff --git a/tests/test_abi/test_encode_single.py b/tests/abi/test_encode_single.py
similarity index 100%
rename from tests/test_abi/test_encode_single.py
rename to tests/abi/test_encode_single.py
diff --git a/tests/test_abi/test_is_encodable.py b/tests/abi/test_is_encodable.py
similarity index 100%
rename from tests/test_abi/test_is_encodable.py
rename to tests/abi/test_is_encodable.py
diff --git a/tests/test_abi/test_is_encodable_type.py b/tests/abi/test_is_encodable_type.py
similarity index 100%
rename from tests/test_abi/test_is_encodable_type.py
rename to tests/abi/test_is_encodable_type.py
diff --git a/tests/test_abi/test_reversibility_properties.py b/tests/abi/test_reversibility_properties.py
similarity index 100%
rename from tests/test_abi/test_reversibility_properties.py
rename to tests/abi/test_reversibility_properties.py
diff --git a/tests/test_abi/test_uint_properties.py b/tests/abi/test_uint_properties.py
similarity index 100%
rename from tests/test_abi/test_uint_properties.py
rename to tests/abi/test_uint_properties.py
diff --git a/tests/test_base.py b/tests/base.py
similarity index 100%
rename from tests/test_base.py
rename to tests/base.py
diff --git a/tests/test_decoding/__init__.py b/tests/decoding/__init__.py
similarity index 100%
rename from tests/test_decoding/__init__.py
rename to tests/decoding/__init__.py
diff --git a/tests/test_decoding/test_context_frames_bytes_io.py b/tests/decoding/test_context_frames_bytes_io.py
similarity index 100%
rename from tests/test_decoding/test_context_frames_bytes_io.py
rename to tests/decoding/test_context_frames_bytes_io.py
diff --git a/tests/test_decoding/test_decoder_properties.py b/tests/decoding/test_decoder_properties.py
similarity index 100%
rename from tests/test_decoding/test_decoder_properties.py
rename to tests/decoding/test_decoder_properties.py
diff --git a/tests/test_encoding/__init__.py b/tests/encoding/__init__.py
similarity index 100%
rename from tests/test_encoding/__init__.py
rename to tests/encoding/__init__.py
diff --git a/tests/test_encoding/test_encoder_properties.py b/tests/encoding/test_encoder_properties.py
similarity index 100%
rename from tests/test_encoding/test_encoder_properties.py
rename to tests/encoding/test_encoder_properties.py
diff --git a/tests/test_integration/__init__.py b/tests/end_to_end/__init__.py
similarity index 100%
rename from tests/test_integration/__init__.py
rename to tests/end_to_end/__init__.py
diff --git a/tests/test_integration/test_custom_registrations.py b/tests/end_to_end/test_custom_registrations.py
similarity index 100%
rename from tests/test_integration/test_custom_registrations.py
rename to tests/end_to_end/test_custom_registrations.py
diff --git a/tests/test_grammar.py b/tests/grammar.py
similarity index 100%
rename from tests/test_grammar.py
rename to tests/grammar.py
diff --git a/tests/test_packed/__init__.py b/tests/packed/__init__.py
similarity index 100%
rename from tests/test_packed/__init__.py
rename to tests/packed/__init__.py
diff --git a/tests/test_packed/test_encode_abi_packed.py b/tests/packed/test_encode_abi_packed.py
similarity index 100%
rename from tests/test_packed/test_encode_abi_packed.py
rename to tests/packed/test_encode_abi_packed.py
diff --git a/tests/test_packed/test_encode_single_packed.py b/tests/packed/test_encode_single_packed.py
similarity index 100%
rename from tests/test_packed/test_encode_single_packed.py
rename to tests/packed/test_encode_single_packed.py
diff --git a/tests/test_packed/test_is_encodable_packed.py b/tests/packed/test_is_encodable_packed.py
similarity index 100%
rename from tests/test_packed/test_is_encodable_packed.py
rename to tests/packed/test_is_encodable_packed.py
diff --git a/tests/test_registry/__init__.py b/tests/registry/__init__.py
similarity index 100%
rename from tests/test_registry/__init__.py
rename to tests/registry/__init__.py
diff --git a/tests/test_registry/test_abi_registry.py b/tests/registry/test_abi_registry.py
similarity index 100%
rename from tests/test_registry/test_abi_registry.py
rename to tests/registry/test_abi_registry.py
diff --git a/tests/test_registry/test_predicate_mapping.py b/tests/registry/test_predicate_mapping.py
similarity index 100%
rename from tests/test_registry/test_predicate_mapping.py
rename to tests/registry/test_predicate_mapping.py
diff --git a/tests/test_registry/test_predicates.py b/tests/registry/test_predicates.py
similarity index 100%
rename from tests/test_registry/test_predicates.py
rename to tests/registry/test_predicates.py
diff --git a/tests/test_utils/__init__.py b/tests/utils/__init__.py
similarity index 100%
rename from tests/test_utils/__init__.py
rename to tests/utils/__init__.py
diff --git a/tests/test_utils/test_abbr.py b/tests/utils/test_abbr.py
similarity index 100%
rename from tests/test_utils/test_abbr.py
rename to tests/utils/test_abbr.py
diff --git a/tests/test_utils/test_ceil32.py b/tests/utils/test_ceil32.py
similarity index 100%
rename from tests/test_utils/test_ceil32.py
rename to tests/utils/test_ceil32.py
diff --git a/tests/test_utils/test_scale_places.py b/tests/utils/test_scale_places.py
similarity index 100%
rename from tests/test_utils/test_scale_places.py
rename to tests/utils/test_scale_places.py
diff --git a/tests/test_utils/test_zpad.py b/tests/utils/test_zpad.py
similarity index 100%
rename from tests/test_utils/test_zpad.py
rename to tests/utils/test_zpad.py