diff --git a/oslo_messaging/_drivers/impl_kafka.py b/oslo_messaging/_drivers/impl_kafka.py
index 3412bdf89..6b037a55b 100644
--- a/oslo_messaging/_drivers/impl_kafka.py
+++ b/oslo_messaging/_drivers/impl_kafka.py
@@ -32,7 +32,7 @@ import tenacity
 
 from oslo_messaging._drivers import base
 from oslo_messaging._drivers import common as driver_common
-from oslo_messaging._drivers import kafka_options
+from oslo_messaging._drivers.kafka_driver import kafka_options
 from oslo_messaging._drivers import pool as driver_pool
 from oslo_messaging._i18n import _LE
 from oslo_messaging._i18n import _LW
diff --git a/oslo_messaging/_drivers/kafka_driver/__init__.py b/oslo_messaging/_drivers/kafka_driver/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/oslo_messaging/_drivers/kafka_options.py b/oslo_messaging/_drivers/kafka_driver/kafka_options.py
similarity index 100%
rename from oslo_messaging/_drivers/kafka_options.py
rename to oslo_messaging/_drivers/kafka_driver/kafka_options.py
diff --git a/oslo_messaging/opts.py b/oslo_messaging/opts.py
index 61bb692f8..b766bb3f2 100644
--- a/oslo_messaging/opts.py
+++ b/oslo_messaging/opts.py
@@ -26,7 +26,7 @@ from oslo_messaging._drivers import base as drivers_base
 from oslo_messaging._drivers import impl_pika
 from oslo_messaging._drivers import impl_rabbit
 from oslo_messaging._drivers.impl_zmq import zmq_options
-from oslo_messaging._drivers import kafka_options
+from oslo_messaging._drivers.kafka_driver import kafka_options
 from oslo_messaging._drivers.pika_driver import pika_connection_factory
 from oslo_messaging._drivers.zmq_driver.matchmaker import zmq_matchmaker_redis
 from oslo_messaging.notify import notifier
diff --git a/oslo_messaging/tests/functional/utils.py b/oslo_messaging/tests/functional/utils.py
index b83ec65be..5cf3cb03d 100644
--- a/oslo_messaging/tests/functional/utils.py
+++ b/oslo_messaging/tests/functional/utils.py
@@ -20,7 +20,7 @@ from oslo_config import cfg
 from six import moves
 
 import oslo_messaging
-from oslo_messaging._drivers import kafka_options
+from oslo_messaging._drivers.kafka_driver import kafka_options
 from oslo_messaging._drivers.zmq_driver import zmq_options
 from oslo_messaging.notify import notifier
 from oslo_messaging.tests import utils as test_utils