diff --git a/homeassistant/components/mqtt/device_tracker/schema_discovery.py b/homeassistant/components/mqtt/device_tracker.py
similarity index 87%
rename from homeassistant/components/mqtt/device_tracker/schema_discovery.py
rename to homeassistant/components/mqtt/device_tracker.py
index ba088a59c44..41902349de4 100644
--- a/homeassistant/components/mqtt/device_tracker/schema_discovery.py
+++ b/homeassistant/components/mqtt/device_tracker.py
@@ -1,4 +1,4 @@
-"""Support for tracking MQTT enabled devices identified through discovery."""
+"""Support for tracking MQTT enabled devices identified."""
 from __future__ import annotations
 
 from collections.abc import Callable
@@ -27,13 +27,18 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .. import subscription
-from ..config import MQTT_RO_SCHEMA
-from ..const import CONF_QOS, CONF_STATE_TOPIC
-from ..debug_info import log_messages
-from ..mixins import MQTT_ENTITY_COMMON_SCHEMA, MqttEntity, async_setup_entry_helper
-from ..models import MqttValueTemplate, ReceiveMessage, ReceivePayloadType
-from ..util import get_mqtt_data
+from . import subscription
+from .config import MQTT_RO_SCHEMA
+from .const import CONF_QOS, CONF_STATE_TOPIC
+from .debug_info import log_messages
+from .mixins import (
+    MQTT_ENTITY_COMMON_SCHEMA,
+    MqttEntity,
+    async_setup_entry_helper,
+    warn_for_legacy_schema,
+)
+from .models import MqttValueTemplate, ReceiveMessage, ReceivePayloadType
+from .util import get_mqtt_data
 
 CONF_PAYLOAD_HOME = "payload_home"
 CONF_PAYLOAD_NOT_HOME = "payload_not_home"
@@ -54,13 +59,17 @@ PLATFORM_SCHEMA_MODERN = MQTT_RO_SCHEMA.extend(
 
 DISCOVERY_SCHEMA = PLATFORM_SCHEMA_MODERN.extend({}, extra=vol.REMOVE_EXTRA)
 
+# Configuring MQTT Device Trackers under the device_tracker platform key is deprecated in HA Core 2022.6
+# Setup for the legacy YAML format was removed in HA Core 2022.12
+PLATFORM_SCHEMA = vol.All(warn_for_legacy_schema(device_tracker.DOMAIN))
 
-async def async_setup_entry_from_discovery(
+
+async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up MQTT device tracker configuration.yaml and dynamically through MQTT discovery."""
+    """Set up MQTT device_tracker through configuration.yaml and dynamically through MQTT discovery."""
     setup = functools.partial(
         _async_setup_entity, hass, async_add_entities, config_entry=config_entry
     )
diff --git a/homeassistant/components/mqtt/device_tracker/__init__.py b/homeassistant/components/mqtt/device_tracker/__init__.py
deleted file mode 100644
index 6be4908403b..00000000000
--- a/homeassistant/components/mqtt/device_tracker/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""Support for tracking MQTT enabled devices."""
-import voluptuous as vol
-
-from homeassistant.components import device_tracker
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from ..mixins import warn_for_legacy_schema
-from .schema_discovery import (  # noqa: F401
-    PLATFORM_SCHEMA_MODERN,
-    async_setup_entry_from_discovery,
-)
-
-# Configuring MQTT Device Trackers under the device_tracker platform key is deprecated in HA Core 2022.6
-# Setup for the legacy YAML format was removed in HA Core 2022.12
-PLATFORM_SCHEMA = vol.All(warn_for_legacy_schema(device_tracker.DOMAIN))
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up MQTT device_tracker through configuration.yaml and dynamically through MQTT discovery."""
-    await async_setup_entry_from_discovery(hass, config_entry, async_add_entities)
diff --git a/tests/components/mqtt/test_device_tracker_discovery.py b/tests/components/mqtt/test_device_tracker.py
similarity index 99%
rename from tests/components/mqtt/test_device_tracker_discovery.py
rename to tests/components/mqtt/test_device_tracker.py
index 873ca1ed9a1..6db5811afd4 100644
--- a/tests/components/mqtt/test_device_tracker_discovery.py
+++ b/tests/components/mqtt/test_device_tracker.py
@@ -1,4 +1,4 @@
-"""The tests for the  MQTT device_tracker platform."""
+"""The tests for the MQTT device_tracker platform."""
 
 from unittest.mock import patch