diff --git a/kafka/cli/admin/cluster/__init__.py b/kafka/cli/admin/cluster/__init__.py
index 25b7877f6..c7b21891b 100644
--- a/kafka/cli/admin/cluster/__init__.py
+++ b/kafka/cli/admin/cluster/__init__.py
@@ -1,8 +1,7 @@
-from .api_versions import GetApiVersions
-from .broker_version import GetBrokerVersion
 from .describe import DescribeCluster
-from .log_dirs import DescribeLogDirs, AlterLogDirs
 from .features import DescribeFeatures, UpdateFeatures
+from .log_dirs import DescribeLogDirs, AlterLogDirs
+from .versions import GetApiVersions, GetBrokerVersion
 
 
 class ClusterCommandGroup:
diff --git a/kafka/cli/admin/cluster/broker_version.py b/kafka/cli/admin/cluster/broker_version.py
deleted file mode 100644
index 2ad24c78d..000000000
--- a/kafka/cli/admin/cluster/broker_version.py
+++ /dev/null
@@ -1,13 +0,0 @@
-class GetBrokerVersion:
-    COMMAND = 'broker-version'
-    HELP = 'Get Version for Broker'
-
-    @classmethod
-    def add_arguments(cls, parser):
-        parser.add_argument('--broker', required=True)
-
-    @classmethod
-    def command(cls, client, args):
-        broker_id = int(args.broker)
-        bvd = client.get_broker_version_data(broker_id)
-        return {broker_id: '.'.join(map(str, bvd.broker_version))}
diff --git a/kafka/cli/admin/cluster/api_versions.py b/kafka/cli/admin/cluster/versions.py
similarity index 61%
rename from kafka/cli/admin/cluster/api_versions.py
rename to kafka/cli/admin/cluster/versions.py
index 31572623e..c6e4ebf67 100644
--- a/kafka/cli/admin/cluster/api_versions.py
+++ b/kafka/cli/admin/cluster/versions.py
@@ -16,3 +16,18 @@ def command(cls, client, args):
         api_versions = client.api_versions()
         return {(k.value if args.raw else k.name): v for k, v in api_versions.items()
                 if k in api_keys}
+
+
+class GetBrokerVersion:
+    COMMAND = 'broker-version'
+    HELP = 'Get Version for Broker'
+
+    @classmethod
+    def add_arguments(cls, parser):
+        parser.add_argument('--broker', required=True)
+
+    @classmethod
+    def command(cls, client, args):
+        broker_id = int(args.broker)
+        bvd = client.get_broker_version_data(broker_id)
+        return {broker_id: '.'.join(map(str, bvd.broker_version))}