diff --git a/test/test_acl_comparisons.py b/test/admin/test_acl_comparisons.py
similarity index 100%
rename from test/test_acl_comparisons.py
rename to test/admin/test_acl_comparisons.py
diff --git a/test/test_admin.py b/test/admin/test_admin.py
similarity index 100%
rename from test/test_admin.py
rename to test/admin/test_admin.py
diff --git a/test/test_assignors.py b/test/consumer/test_assignors.py
similarity index 100%
rename from test/test_assignors.py
rename to test/consumer/test_assignors.py
diff --git a/test/test_consumer.py b/test/consumer/test_consumer.py
similarity index 100%
rename from test/test_consumer.py
rename to test/consumer/test_consumer.py
diff --git a/test/test_coordinator.py b/test/consumer/test_coordinator.py
similarity index 100%
rename from test/test_coordinator.py
rename to test/consumer/test_coordinator.py
diff --git a/test/test_fetcher.py b/test/consumer/test_fetcher.py
similarity index 100%
rename from test/test_fetcher.py
rename to test/consumer/test_fetcher.py
diff --git a/test/test_partition_movements.py b/test/consumer/test_sticky_partition_movements.py
similarity index 100%
rename from test/test_partition_movements.py
rename to test/consumer/test_sticky_partition_movements.py
diff --git a/test/test_subscription_state.py b/test/consumer/test_subscription_state.py
similarity index 100%
rename from test/test_subscription_state.py
rename to test/consumer/test_subscription_state.py
diff --git a/test/test_partitioner.py b/test/producer/test_partitioner.py
similarity index 100%
rename from test/test_partitioner.py
rename to test/producer/test_partitioner.py
diff --git a/test/test_producer.py b/test/producer/test_producer.py
similarity index 100%
rename from test/test_producer.py
rename to test/producer/test_producer.py
diff --git a/test/test_producer_batch.py b/test/producer/test_producer_batch.py
similarity index 100%
rename from test/test_producer_batch.py
rename to test/producer/test_producer_batch.py
diff --git a/test/test_record_accumulator.py b/test/producer/test_record_accumulator.py
similarity index 100%
rename from test/test_record_accumulator.py
rename to test/producer/test_record_accumulator.py
diff --git a/test/test_sender.py b/test/producer/test_sender.py
similarity index 100%
rename from test/test_sender.py
rename to test/producer/test_sender.py
diff --git a/test/protocol/admin/test_admin.py b/test/protocol/admin/test_protocol_admin.py
similarity index 100%
rename from test/protocol/admin/test_admin.py
rename to test/protocol/admin/test_protocol_admin.py