From d0a188b86d192bd4ba09c5fece94517dfae98c5a Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Wed, 29 Jan 2025 08:57:57 +0100
Subject: [PATCH] Standardize homeassistant imports in component tests (m-z)
 (#136807)

---
 tests/components/manual/test_alarm_control_panel.py       | 2 +-
 tests/components/manual_mqtt/test_alarm_control_panel.py  | 2 +-
 tests/components/media_player/test_async_helpers.py       | 2 +-
 tests/components/media_player/test_device_trigger.py      | 2 +-
 tests/components/melnor/test_sensor.py                    | 2 +-
 tests/components/melnor/test_time.py                      | 2 +-
 tests/components/mfi/test_sensor.py                       | 4 ++--
 tests/components/mfi/test_switch.py                       | 4 ++--
 tests/components/modbus/conftest.py                       | 2 +-
 tests/components/modbus/test_init.py                      | 2 +-
 tests/components/modbus/test_switch.py                    | 2 +-
 tests/components/motioneye/test_camera.py                 | 2 +-
 tests/components/motioneye/test_web_hooks.py              | 2 +-
 tests/components/mqtt/test_binary_sensor.py               | 2 +-
 tests/components/mqtt/test_init.py                        | 2 +-
 tests/components/mqtt/test_sensor.py                      | 2 +-
 tests/components/mqtt_eventstream/test_init.py            | 4 ++--
 tests/components/mqtt_statestream/test_init.py            | 2 +-
 tests/components/nest/test_media_source.py                | 2 +-
 tests/components/netgear_lte/test_init.py                 | 2 +-
 .../nsw_rural_fire_service_feed/test_geo_location.py      | 2 +-
 tests/components/nuheat/test_climate.py                   | 2 +-
 tests/components/persistent_notification/conftest.py      | 2 +-
 tests/components/persistent_notification/test_init.py     | 2 +-
 tests/components/persistent_notification/test_trigger.py  | 2 +-
 tests/components/plex/helpers.py                          | 2 +-
 tests/components/plex/test_init.py                        | 2 +-
 tests/components/powerwall/test_config_flow.py            | 2 +-
 tests/components/powerwall/test_sensor.py                 | 2 +-
 tests/components/profiler/test_init.py                    | 2 +-
 tests/components/qld_bushfire/test_geo_location.py        | 2 +-
 tests/components/radarr/test_sensor.py                    | 2 +-
 tests/components/remember_the_milk/test_init.py           | 2 +-
 tests/components/remote/test_device_condition.py          | 2 +-
 tests/components/remote/test_device_trigger.py            | 2 +-
 tests/components/rflink/test_binary_sensor.py             | 2 +-
 tests/components/roku/test_select.py                      | 2 +-
 tests/components/samsungtv/conftest.py                    | 2 +-
 tests/components/samsungtv/test_media_player.py           | 2 +-
 tests/components/script/test_init.py                      | 3 +--
 tests/components/sighthound/test_image_processing.py      | 2 +-
 tests/components/sonos/test_init.py                       | 2 +-
 tests/components/speedtestdotnet/test_init.py             | 2 +-
 tests/components/srp_energy/conftest.py                   | 2 +-
 tests/components/ssdp/test_init.py                        | 2 +-
 tests/components/steamist/test_switch.py                  | 2 +-
 tests/components/stream/test_hls.py                       | 2 +-
 tests/components/stream/test_recorder.py                  | 2 +-
 tests/components/subaru/conftest.py                       | 2 +-
 tests/components/sun/test_init.py                         | 2 +-
 tests/components/sun/test_sensor.py                       | 2 +-
 tests/components/sun/test_trigger.py                      | 2 +-
 tests/components/switch/test_device_condition.py          | 2 +-
 tests/components/switch/test_device_trigger.py            | 2 +-
 tests/components/tankerkoenig/test_coordinator.py         | 2 +-
 tests/components/tasmota/test_binary_sensor.py            | 4 ++--
 tests/components/tcp/test_sensor.py                       | 2 +-
 tests/components/temper/test_sensor.py                    | 2 +-
 tests/components/template/test_binary_sensor.py           | 2 +-
 tests/components/template/test_sensor.py                  | 2 +-
 tests/components/template/test_trigger.py                 | 2 +-
 tests/components/tesla_wall_connector/conftest.py         | 2 +-
 tests/components/time_date/test_sensor.py                 | 2 +-
 tests/components/tod/test_binary_sensor.py                | 2 +-
 tests/components/tomato/test_device_tracker.py            | 2 +-
 tests/components/tplink/test_light.py                     | 2 +-
 tests/components/tts/test_init.py                         | 2 +-
 tests/components/unifi/conftest.py                        | 2 +-
 tests/components/unifi/test_button.py                     | 2 +-
 tests/components/unifi/test_device_tracker.py             | 2 +-
 tests/components/unifi/test_hub.py                        | 2 +-
 tests/components/unifi/test_sensor.py                     | 2 +-
 tests/components/unifiprotect/conftest.py                 | 2 +-
 tests/components/unifiprotect/utils.py                    | 2 +-
 tests/components/universal/test_media_player.py           | 2 +-
 tests/components/update/test_device_trigger.py            | 2 +-
 tests/components/upnp/test_binary_sensor.py               | 2 +-
 tests/components/upnp/test_sensor.py                      | 2 +-
 .../components/usgs_earthquakes_feed/test_geo_location.py | 2 +-
 tests/components/utility_meter/test_init.py               | 8 +++++---
 tests/components/utility_meter/test_sensor.py             | 2 +-
 tests/components/vacuum/test_device_trigger.py            | 2 +-
 tests/components/vizio/test_init.py                       | 2 +-
 tests/components/vultr/test_sensor.py                     | 3 +--
 tests/components/whois/test_sensor.py                     | 2 +-
 tests/components/wled/test_coordinator.py                 | 2 +-
 tests/components/worldclock/test_sensor.py                | 2 +-
 tests/components/wsdot/test_sensor.py                     | 2 +-
 tests/components/xiaomi/test_device_tracker.py            | 2 +-
 tests/components/yale/test_binary_sensor.py               | 2 +-
 tests/components/yale/test_event.py                       | 2 +-
 tests/components/yale/test_lock.py                        | 2 +-
 tests/components/yandex_transport/test_sensor.py          | 2 +-
 tests/components/zerproc/test_light.py                    | 2 +-
 tests/components/zha/common.py                            | 2 +-
 tests/components/zha/conftest.py                          | 2 +-
 tests/components/zha/test_device_tracker.py               | 2 +-
 tests/components/zha/test_helpers.py                      | 4 ++--
 tests/components/zha/test_siren.py                        | 2 +-
 tests/components/zodiac/test_sensor.py                    | 2 +-
 100 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/tests/components/manual/test_alarm_control_panel.py b/tests/components/manual/test_alarm_control_panel.py
index 9fc92cd5458..941d7523220 100644
--- a/tests/components/manual/test_alarm_control_panel.py
+++ b/tests/components/manual/test_alarm_control_panel.py
@@ -28,7 +28,7 @@ from homeassistant.const import (
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_component, mock_restore_cache
 from tests.components.alarm_control_panel import common
diff --git a/tests/components/manual_mqtt/test_alarm_control_panel.py b/tests/components/manual_mqtt/test_alarm_control_panel.py
index 2b401cb10a0..9bb506b935a 100644
--- a/tests/components/manual_mqtt/test_alarm_control_panel.py
+++ b/tests/components/manual_mqtt/test_alarm_control_panel.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     assert_setup_component,
diff --git a/tests/components/media_player/test_async_helpers.py b/tests/components/media_player/test_async_helpers.py
index 750d2861f21..680603c097d 100644
--- a/tests/components/media_player/test_async_helpers.py
+++ b/tests/components/media_player/test_async_helpers.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import homeassistant.components.media_player as mp
+from homeassistant.components import media_player as mp
 from homeassistant.const import (
     STATE_IDLE,
     STATE_OFF,
diff --git a/tests/components/media_player/test_device_trigger.py b/tests/components/media_player/test_device_trigger.py
index 4bb27b73f24..ae3a84e66a0 100644
--- a/tests/components/media_player/test_device_trigger.py
+++ b/tests/components/media_player/test_device_trigger.py
@@ -21,7 +21,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/melnor/test_sensor.py b/tests/components/melnor/test_sensor.py
index a2ba23d9e61..23902a4b780 100644
--- a/tests/components/melnor/test_sensor.py
+++ b/tests/components/melnor/test_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     mock_config_entry,
diff --git a/tests/components/melnor/test_time.py b/tests/components/melnor/test_time.py
index 50b51d31ff8..f8a3adcf3d0 100644
--- a/tests/components/melnor/test_time.py
+++ b/tests/components/melnor/test_time.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from datetime import time, timedelta
 
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     mock_config_entry,
diff --git a/tests/components/mfi/test_sensor.py b/tests/components/mfi/test_sensor.py
index 37512ca78f8..8c21fa9cb36 100644
--- a/tests/components/mfi/test_sensor.py
+++ b/tests/components/mfi/test_sensor.py
@@ -7,8 +7,8 @@ from mficlient.client import FailedToLogin
 import pytest
 import requests
 
-import homeassistant.components.mfi.sensor as mfi
-import homeassistant.components.sensor as sensor_component
+from homeassistant.components import sensor as sensor_component
+from homeassistant.components.mfi import sensor as mfi
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
diff --git a/tests/components/mfi/test_switch.py b/tests/components/mfi/test_switch.py
index 03b5d5f2c0a..fb586073a3d 100644
--- a/tests/components/mfi/test_switch.py
+++ b/tests/components/mfi/test_switch.py
@@ -4,8 +4,8 @@ from unittest import mock
 
 import pytest
 
-import homeassistant.components.mfi.switch as mfi
-import homeassistant.components.switch as switch_component
+from homeassistant.components import switch as switch_component
+from homeassistant.components.mfi import switch as mfi
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/modbus/conftest.py b/tests/components/modbus/conftest.py
index cdea046ceea..0a2cbf44b9e 100644
--- a/tests/components/modbus/conftest.py
+++ b/tests/components/modbus/conftest.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_restore_cache
 
diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
index e105818d193..7b76dbc3528 100644
--- a/tests/components/modbus/test_init.py
+++ b/tests/components/modbus/test_init.py
@@ -107,7 +107,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     TEST_ENTITY_NAME,
diff --git a/tests/components/modbus/test_switch.py b/tests/components/modbus/test_switch.py
index 4e0ad0841ea..4b2c123ba75 100644
--- a/tests/components/modbus/test_switch.py
+++ b/tests/components/modbus/test_switch.py
@@ -41,7 +41,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, State
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import TEST_ENTITY_NAME, ReadResult
 
diff --git a/tests/components/motioneye/test_camera.py b/tests/components/motioneye/test_camera.py
index 8ef58cc968d..d9a9a847b63 100644
--- a/tests/components/motioneye/test_camera.py
+++ b/tests/components/motioneye/test_camera.py
@@ -45,8 +45,8 @@ from homeassistant.const import ATTR_DEVICE_ID, ATTR_ENTITY_ID, CONF_URL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.util import dt as dt_util
 from homeassistant.util.aiohttp import MockRequest
-import homeassistant.util.dt as dt_util
 
 from . import (
     TEST_CAMERA,
diff --git a/tests/components/motioneye/test_web_hooks.py b/tests/components/motioneye/test_web_hooks.py
index fae7fccbb6d..bc345c0b66f 100644
--- a/tests/components/motioneye/test_web_hooks.py
+++ b/tests/components/motioneye/test_web_hooks.py
@@ -31,7 +31,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.network import NoURLAvailableError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     TEST_CAMERA,
diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py
index d27163c3423..34be237fb72 100644
--- a/tests/components/mqtt/test_binary_sensor.py
+++ b/tests/components/mqtt/test_binary_sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .test_common import (
     help_custom_config,
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index 4e0873c6e1b..d05c340dac2 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -13,6 +13,7 @@ from freezegun.api import FrozenDateTimeFactory
 import pytest
 import voluptuous as vol
 
+from homeassistant import core as ha
 from homeassistant.components import mqtt
 from homeassistant.components.mqtt import debug_info
 from homeassistant.components.mqtt.models import (
@@ -30,7 +31,6 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import device_registry as dr, entity_registry as er, template
diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py
index 7f418864872..6b3bbd6334c 100644
--- a/tests/components/mqtt/test_sensor.py
+++ b/tests/components/mqtt/test_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
 from homeassistant.core import Event, HomeAssistant, State, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.typing import ConfigType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .test_common import (
     help_custom_config,
diff --git a/tests/components/mqtt_eventstream/test_init.py b/tests/components/mqtt_eventstream/test_init.py
index b6c1940b149..cbf02299b09 100644
--- a/tests/components/mqtt_eventstream/test_init.py
+++ b/tests/components/mqtt_eventstream/test_init.py
@@ -5,12 +5,12 @@ from unittest.mock import ANY, patch
 
 import pytest
 
-import homeassistant.components.mqtt_eventstream as eventstream
+from homeassistant.components import mqtt_eventstream as eventstream
 from homeassistant.const import EVENT_STATE_CHANGED, MATCH_ALL
 from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.helpers.json import JSONEncoder
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     async_fire_mqtt_message,
diff --git a/tests/components/mqtt_statestream/test_init.py b/tests/components/mqtt_statestream/test_init.py
index 9798477945c..63c3ea14e44 100644
--- a/tests/components/mqtt_statestream/test_init.py
+++ b/tests/components/mqtt_statestream/test_init.py
@@ -4,7 +4,7 @@ from unittest.mock import ANY, call
 
 import pytest
 
-import homeassistant.components.mqtt_statestream as statestream
+from homeassistant.components import mqtt_statestream as statestream
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/nest/test_media_source.py b/tests/components/nest/test_media_source.py
index 051f7bb87e4..d009e1185da 100644
--- a/tests/components/nest/test_media_source.py
+++ b/tests/components/nest/test_media_source.py
@@ -28,7 +28,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.template import DATE_STR_FORMAT
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     DEVICE_ID,
diff --git a/tests/components/netgear_lte/test_init.py b/tests/components/netgear_lte/test_init.py
index 1bd3dff1eff..e853109e33e 100644
--- a/tests/components/netgear_lte/test_init.py
+++ b/tests/components/netgear_lte/test_init.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import CONF_DATA
 
diff --git a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py
index ad987325b97..96d5e815ff0 100644
--- a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py
+++ b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py
@@ -37,7 +37,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/nuheat/test_climate.py b/tests/components/nuheat/test_climate.py
index bc00df126e5..5e3ba384b2d 100644
--- a/tests/components/nuheat/test_climate.py
+++ b/tests/components/nuheat/test_climate.py
@@ -6,7 +6,7 @@ from unittest.mock import patch
 from homeassistant.components.nuheat.const import DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     MOCK_CONFIG_ENTRY,
diff --git a/tests/components/persistent_notification/conftest.py b/tests/components/persistent_notification/conftest.py
index 29ba5a6008a..76fdc70ea7b 100644
--- a/tests/components/persistent_notification/conftest.py
+++ b/tests/components/persistent_notification/conftest.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-import homeassistant.components.persistent_notification as pn
+from homeassistant.components import persistent_notification as pn
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/persistent_notification/test_init.py b/tests/components/persistent_notification/test_init.py
index 956183d8420..89559d45dc4 100644
--- a/tests/components/persistent_notification/test_init.py
+++ b/tests/components/persistent_notification/test_init.py
@@ -1,6 +1,6 @@
 """The tests for the persistent notification component."""
 
-import homeassistant.components.persistent_notification as pn
+from homeassistant.components import persistent_notification as pn
 from homeassistant.components.websocket_api import TYPE_RESULT
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
diff --git a/tests/components/persistent_notification/test_trigger.py b/tests/components/persistent_notification/test_trigger.py
index 16208143447..5e03fbf5f19 100644
--- a/tests/components/persistent_notification/test_trigger.py
+++ b/tests/components/persistent_notification/test_trigger.py
@@ -2,7 +2,7 @@
 
 from typing import Any
 
-import homeassistant.components.persistent_notification as pn
+from homeassistant.components import persistent_notification as pn
 from homeassistant.components.persistent_notification import trigger
 from homeassistant.core import Context, HomeAssistant, callback
 
diff --git a/tests/components/plex/helpers.py b/tests/components/plex/helpers.py
index 434c31996e4..4dc80d3e7aa 100644
--- a/tests/components/plex/helpers.py
+++ b/tests/components/plex/helpers.py
@@ -7,7 +7,7 @@ from plexwebsocket import SIGNAL_CONNECTION_STATE, STATE_CONNECTED
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/plex/test_init.py b/tests/components/plex/test_init.py
index 490091998ff..036b2d87f3f 100644
--- a/tests/components/plex/test_init.py
+++ b/tests/components/plex/test_init.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
     STATE_PLAYING,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import DEFAULT_DATA, DEFAULT_OPTIONS, PLEX_DIRECT_URL
 from .helpers import trigger_plex_update, wait_for_debouncer
diff --git a/tests/components/powerwall/test_config_flow.py b/tests/components/powerwall/test_config_flow.py
index cd4f1250aa4..ab5034de637 100644
--- a/tests/components/powerwall/test_config_flow.py
+++ b/tests/components/powerwall/test_config_flow.py
@@ -17,7 +17,7 @@ from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     MOCK_GATEWAY_DIN,
diff --git a/tests/components/powerwall/test_sensor.py b/tests/components/powerwall/test_sensor.py
index fa2d986d12a..9b533304fbc 100644
--- a/tests/components/powerwall/test_sensor.py
+++ b/tests/components/powerwall/test_sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import MOCK_GATEWAY_DIN, _mock_powerwall_with_fixtures
 
diff --git a/tests/components/profiler/test_init.py b/tests/components/profiler/test_init.py
index 540e644aca4..e724a9e5cab 100644
--- a/tests/components/profiler/test_init.py
+++ b/tests/components/profiler/test_init.py
@@ -34,7 +34,7 @@ from homeassistant.components.profiler.const import DOMAIN
 from homeassistant.const import CONF_SCAN_INTERVAL, CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/qld_bushfire/test_geo_location.py b/tests/components/qld_bushfire/test_geo_location.py
index 20659182726..aefee4113cc 100644
--- a/tests/components/qld_bushfire/test_geo_location.py
+++ b/tests/components/qld_bushfire/test_geo_location.py
@@ -31,7 +31,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/radarr/test_sensor.py b/tests/components/radarr/test_sensor.py
index 563ac504057..9139e13a957 100644
--- a/tests/components/radarr/test_sensor.py
+++ b/tests/components/radarr/test_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import setup_integration
 
diff --git a/tests/components/remember_the_milk/test_init.py b/tests/components/remember_the_milk/test_init.py
index c68fe14430a..3ada2d343fe 100644
--- a/tests/components/remember_the_milk/test_init.py
+++ b/tests/components/remember_the_milk/test_init.py
@@ -2,7 +2,7 @@
 
 from unittest.mock import Mock, mock_open, patch
 
-import homeassistant.components.remember_the_milk as rtm
+from homeassistant.components import remember_the_milk as rtm
 from homeassistant.core import HomeAssistant
 
 from .const import JSON_STRING, PROFILE, TOKEN
diff --git a/tests/components/remote/test_device_condition.py b/tests/components/remote/test_device_condition.py
index 6c9334aeac4..b4dd513c317 100644
--- a/tests/components/remote/test_device_condition.py
+++ b/tests/components/remote/test_device_condition.py
@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/remote/test_device_trigger.py b/tests/components/remote/test_device_trigger.py
index c647faba2c1..800d090fd7b 100644
--- a/tests/components/remote/test_device_trigger.py
+++ b/tests/components/remote/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/rflink/test_binary_sensor.py b/tests/components/rflink/test_binary_sensor.py
index 9329edb3a00..fd113bceaa0 100644
--- a/tests/components/rflink/test_binary_sensor.py
+++ b/tests/components/rflink/test_binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import CoreState, HomeAssistant, State, callback
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .test_init import mock_rflink
 
diff --git a/tests/components/roku/test_select.py b/tests/components/roku/test_select.py
index 78cd65250f8..a79a23782ce 100644
--- a/tests/components/roku/test_select.py
+++ b/tests/components/roku/test_select.py
@@ -22,7 +22,7 @@ from homeassistant.const import ATTR_ENTITY_ID, SERVICE_SELECT_OPTION
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/samsungtv/conftest.py b/tests/components/samsungtv/conftest.py
index ec12031ef96..105ef0f25ad 100644
--- a/tests/components/samsungtv/conftest.py
+++ b/tests/components/samsungtv/conftest.py
@@ -21,7 +21,7 @@ from samsungtvws.exceptions import ResponseError
 from samsungtvws.remote import ChannelEmitCommand
 
 from homeassistant.components.samsungtv.const import WEBSOCKET_SSL_PORT
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import SAMPLE_DEVICE_INFO_UE48JU6400, SAMPLE_DEVICE_INFO_WIFI
 
diff --git a/tests/components/samsungtv/test_media_player.py b/tests/components/samsungtv/test_media_player.py
index 1a7c8713b17..3d9633bbf96 100644
--- a/tests/components/samsungtv/test_media_player.py
+++ b/tests/components/samsungtv/test_media_player.py
@@ -78,7 +78,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceNotSupported
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import async_wait_config_entry_reload, setup_samsungtv_entry
 from .const import (
diff --git a/tests/components/script/test_init.py b/tests/components/script/test_init.py
index 248ada605cc..3b0bff7e82e 100644
--- a/tests/components/script/test_init.py
+++ b/tests/components/script/test_init.py
@@ -42,8 +42,7 @@ from homeassistant.helpers.script import (
 )
 from homeassistant.helpers.service import async_get_all_descriptions
 from homeassistant.setup import async_setup_component
-from homeassistant.util import yaml as yaml_util
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util, yaml as yaml_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/sighthound/test_image_processing.py b/tests/components/sighthound/test_image_processing.py
index 5db6347a832..ba03f6fc804 100644
--- a/tests/components/sighthound/test_image_processing.py
+++ b/tests/components/sighthound/test_image_processing.py
@@ -11,7 +11,7 @@ import pytest
 import simplehound.core as hound
 
 from homeassistant.components.image_processing import DOMAIN as IP_DOMAIN, SERVICE_SCAN
-import homeassistant.components.sighthound.image_processing as sh
+from homeassistant.components.sighthound import image_processing as sh
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_API_KEY,
diff --git a/tests/components/sonos/test_init.py b/tests/components/sonos/test_init.py
index 3fc8da6a952..a7ad2f4cb82 100644
--- a/tests/components/sonos/test_init.py
+++ b/tests/components/sonos/test_init.py
@@ -21,7 +21,7 @@ from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import MockSoCo, SoCoMockFactory
 
diff --git a/tests/components/speedtestdotnet/test_init.py b/tests/components/speedtestdotnet/test_init.py
index 2e20aaa259c..1dd30c425b3 100644
--- a/tests/components/speedtestdotnet/test_init.py
+++ b/tests/components/speedtestdotnet/test_init.py
@@ -16,7 +16,7 @@ from homeassistant.components.speedtestdotnet.coordinator import (
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/srp_energy/conftest.py b/tests/components/srp_energy/conftest.py
index b612bc9f3f3..b1d5b958d47 100644
--- a/tests/components/srp_energy/conftest.py
+++ b/tests/components/srp_energy/conftest.py
@@ -12,7 +12,7 @@ import pytest
 from homeassistant.components.srp_energy.const import DOMAIN, PHOENIX_TIME_ZONE
 from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import MOCK_USAGE, TEST_CONFIG_HOME
 
diff --git a/tests/components/ssdp/test_init.py b/tests/components/ssdp/test_init.py
index 839509e756b..56623b51bb5 100644
--- a/tests/components/ssdp/test_init.py
+++ b/tests/components/ssdp/test_init.py
@@ -39,7 +39,7 @@ from homeassistant.helpers.service_info.ssdp import (
     SsdpServiceInfo,
 )
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/steamist/test_switch.py b/tests/components/steamist/test_switch.py
index a20bebc4052..cd62c18590a 100644
--- a/tests/components/steamist/test_switch.py
+++ b/tests/components/steamist/test_switch.py
@@ -8,7 +8,7 @@ from unittest.mock import AsyncMock
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     MOCK_ASYNC_GET_STATUS_ACTIVE,
diff --git a/tests/components/stream/test_hls.py b/tests/components/stream/test_hls.py
index cd48fd94c24..c96b7d9427f 100644
--- a/tests/components/stream/test_hls.py
+++ b/tests/components/stream/test_hls.py
@@ -19,7 +19,7 @@ from homeassistant.components.stream.const import (
 from homeassistant.components.stream.core import Orientation, Part
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     FAKE_TIME,
diff --git a/tests/components/stream/test_recorder.py b/tests/components/stream/test_recorder.py
index 8e079cded45..7c856180f77 100644
--- a/tests/components/stream/test_recorder.py
+++ b/tests/components/stream/test_recorder.py
@@ -21,7 +21,7 @@ from homeassistant.components.stream.fmp4utils import find_box
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     DefaultSegment as Segment,
diff --git a/tests/components/subaru/conftest.py b/tests/components/subaru/conftest.py
index e18ea8fd398..84d2fde97f7 100644
--- a/tests/components/subaru/conftest.py
+++ b/tests/components/subaru/conftest.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .api_responses import TEST_VIN_2_EV, VEHICLE_DATA, VEHICLE_STATUS_EV
 
diff --git a/tests/components/sun/test_init.py b/tests/components/sun/test_init.py
index a30076d6d3c..3896498bbb0 100644
--- a/tests/components/sun/test_init.py
+++ b/tests/components/sun/test_init.py
@@ -13,7 +13,7 @@ from homeassistant.components.sun import entity
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/sun/test_sensor.py b/tests/components/sun/test_sensor.py
index 495a97b88fe..59e4e4c700b 100644
--- a/tests/components/sun/test_sensor.py
+++ b/tests/components/sun/test_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
diff --git a/tests/components/sun/test_trigger.py b/tests/components/sun/test_trigger.py
index 303ca3b80cd..a7aeae25ac7 100644
--- a/tests/components/sun/test_trigger.py
+++ b/tests/components/sun/test_trigger.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_component
 
diff --git a/tests/components/switch/test_device_condition.py b/tests/components/switch/test_device_condition.py
index 7c4f434b0a4..5c5737804e1 100644
--- a/tests/components/switch/test_device_condition.py
+++ b/tests/components/switch/test_device_condition.py
@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/switch/test_device_trigger.py b/tests/components/switch/test_device_trigger.py
index 08e6ab6d0f6..81f8a93611d 100644
--- a/tests/components/switch/test_device_trigger.py
+++ b/tests/components/switch/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/tankerkoenig/test_coordinator.py b/tests/components/tankerkoenig/test_coordinator.py
index 3ba0dc31c5f..ff2ceca7442 100644
--- a/tests/components/tankerkoenig/test_coordinator.py
+++ b/tests/components/tankerkoenig/test_coordinator.py
@@ -25,7 +25,7 @@ from homeassistant.const import ATTR_ID, CONF_SHOW_ON_MAP, STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import CONFIG_DATA
 
diff --git a/tests/components/tasmota/test_binary_sensor.py b/tests/components/tasmota/test_binary_sensor.py
index 5abb9ab9bf2..ff951e058cb 100644
--- a/tests/components/tasmota/test_binary_sensor.py
+++ b/tests/components/tasmota/test_binary_sensor.py
@@ -13,6 +13,7 @@ from hatasmota.utils import (
 )
 import pytest
 
+from homeassistant import core as ha
 from homeassistant.components.tasmota.const import DEFAULT_PREFIX
 from homeassistant.const import (
     ATTR_ASSUMED_STATE,
@@ -22,9 +23,8 @@ from homeassistant.const import (
     STATE_UNKNOWN,
     Platform,
 )
-import homeassistant.core as ha
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .test_common import (
     DEFAULT_CONFIG,
diff --git a/tests/components/tcp/test_sensor.py b/tests/components/tcp/test_sensor.py
index 27003df46cd..ade4b9f93d4 100644
--- a/tests/components/tcp/test_sensor.py
+++ b/tests/components/tcp/test_sensor.py
@@ -5,7 +5,7 @@ from unittest.mock import call, patch
 
 import pytest
 
-import homeassistant.components.tcp.common as tcp
+from homeassistant.components.tcp import common as tcp
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/temper/test_sensor.py b/tests/components/temper/test_sensor.py
index d1e74f1ab0f..445adc0b5bd 100644
--- a/tests/components/temper/test_sensor.py
+++ b/tests/components/temper/test_sensor.py
@@ -5,7 +5,7 @@ from unittest.mock import Mock, patch
 
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/template/test_binary_sensor.py b/tests/components/template/test_binary_sensor.py
index 3e3a629b4be..a7ee953bb09 100644
--- a/tests/components/template/test_binary_sensor.py
+++ b/tests/components/template/test_binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.core import Context, CoreState, HomeAssistant, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_component import async_update_entity
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/template/test_sensor.py b/tests/components/template/test_sensor.py
index 929a890ab38..3bf91549114 100644
--- a/tests/components/template/test_sensor.py
+++ b/tests/components/template/test_sensor.py
@@ -28,7 +28,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.setup import ATTR_COMPONENT, async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/template/test_trigger.py b/tests/components/template/test_trigger.py
index a131f5f606b..49b89b61d34 100644
--- a/tests/components/template/test_trigger.py
+++ b/tests/components/template/test_trigger.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Context, HomeAssistant, ServiceCall, callback
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed, mock_component
 
diff --git a/tests/components/tesla_wall_connector/conftest.py b/tests/components/tesla_wall_connector/conftest.py
index 9533b7e691e..e4499d6e308 100644
--- a/tests/components/tesla_wall_connector/conftest.py
+++ b/tests/components/tesla_wall_connector/conftest.py
@@ -14,7 +14,7 @@ from homeassistant.components.tesla_wall_connector.const import (
 )
 from homeassistant.const import CONF_HOST, CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/time_date/test_sensor.py b/tests/components/time_date/test_sensor.py
index ddeec48b3d2..3daa0314cbd 100644
--- a/tests/components/time_date/test_sensor.py
+++ b/tests/components/time_date/test_sensor.py
@@ -8,7 +8,7 @@ import pytest
 from homeassistant.components.time_date.const import OPTION_TYPES
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import event
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import load_int
 
diff --git a/tests/components/tod/test_binary_sensor.py b/tests/components/tod/test_binary_sensor.py
index 47e64353004..8b9a81d7542 100644
--- a/tests/components/tod/test_binary_sensor.py
+++ b/tests/components/tod/test_binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.sun import get_astral_event_date, get_astral_event_next
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/tomato/test_device_tracker.py b/tests/components/tomato/test_device_tracker.py
index f50d999548f..e4f08f55dba 100644
--- a/tests/components/tomato/test_device_tracker.py
+++ b/tests/components/tomato/test_device_tracker.py
@@ -8,7 +8,7 @@ import requests_mock
 import voluptuous as vol
 
 from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
-import homeassistant.components.tomato.device_tracker as tomato
+from homeassistant.components.tomato import device_tracker as tomato
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
diff --git a/tests/components/tplink/test_light.py b/tests/components/tplink/test_light.py
index 565d4f1221a..7ae21fb4a26 100644
--- a/tests/components/tplink/test_light.py
+++ b/tests/components/tplink/test_light.py
@@ -61,7 +61,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import (
     _mocked_device,
diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py
index 2159d92ae4b..d115546c9bc 100644
--- a/tests/components/tts/test_init.py
+++ b/tests/components/tts/test_init.py
@@ -23,7 +23,7 @@ from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import (
     DEFAULT_LANG,
diff --git a/tests/components/unifi/conftest.py b/tests/components/unifi/conftest.py
index 702f8629219..ec7a0595731 100644
--- a/tests/components/unifi/conftest.py
+++ b/tests/components/unifi/conftest.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 from tests.test_util.aiohttp import AiohttpClientMocker
diff --git a/tests/components/unifi/test_button.py b/tests/components/unifi/test_button.py
index 6a493e32b02..94343d12ba2 100644
--- a/tests/components/unifi/test_button.py
+++ b/tests/components/unifi/test_button.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryDisabler
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     ConfigEntryFactoryType,
diff --git a/tests/components/unifi/test_device_tracker.py b/tests/components/unifi/test_device_tracker.py
index b37e4f47137..39b70344db7 100644
--- a/tests/components/unifi/test_device_tracker.py
+++ b/tests/components/unifi/test_device_tracker.py
@@ -26,7 +26,7 @@ from homeassistant.components.unifi.const import (
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME, STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     ConfigEntryFactoryType,
diff --git a/tests/components/unifi/test_hub.py b/tests/components/unifi/test_hub.py
index af134c7449b..5492f6fe0df 100644
--- a/tests/components/unifi/test_hub.py
+++ b/tests/components/unifi/test_hub.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import ConfigEntryFactoryType, WebsocketStateManager
 
diff --git a/tests/components/unifi/test_sensor.py b/tests/components/unifi/test_sensor.py
index 5e47d263079..ee8b102edaa 100644
--- a/tests/components/unifi/test_sensor.py
+++ b/tests/components/unifi/test_sensor.py
@@ -37,7 +37,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryDisabler
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     ConfigEntryFactoryType,
diff --git a/tests/components/unifiprotect/conftest.py b/tests/components/unifiprotect/conftest.py
index 352c33297ba..c49ade514bc 100644
--- a/tests/components/unifiprotect/conftest.py
+++ b/tests/components/unifiprotect/conftest.py
@@ -33,7 +33,7 @@ from uiprotect.websocket import WebsocketState
 
 from homeassistant.components.unifiprotect.const import DOMAIN
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from . import _patch_discovery
 from .utils import MockUFPFixture
diff --git a/tests/components/unifiprotect/utils.py b/tests/components/unifiprotect/utils.py
index 5a1ffa8258e..7dd0362f17c 100644
--- a/tests/components/unifiprotect/utils.py
+++ b/tests/components/unifiprotect/utils.py
@@ -26,7 +26,7 @@ from homeassistant.core import HomeAssistant, split_entity_id
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/universal/test_media_player.py b/tests/components/universal/test_media_player.py
index 5be9cb3fe02..351e11db512 100644
--- a/tests/components/universal/test_media_player.py
+++ b/tests/components/universal/test_media_player.py
@@ -13,7 +13,7 @@ from homeassistant.components.media_player import (
     MediaClass,
     MediaPlayerEntityFeature,
 )
-import homeassistant.components.universal.media_player as universal
+from homeassistant.components.universal import media_player as universal
 from homeassistant.const import (
     SERVICE_RELOAD,
     STATE_OFF,
diff --git a/tests/components/update/test_device_trigger.py b/tests/components/update/test_device_trigger.py
index 202b3d32509..55138430ca0 100644
--- a/tests/components/update/test_device_trigger.py
+++ b/tests/components/update/test_device_trigger.py
@@ -12,7 +12,7 @@ from homeassistant.const import CONF_PLATFORM, STATE_OFF, STATE_ON, EntityCatego
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import MockUpdateEntity
 
diff --git a/tests/components/upnp/test_binary_sensor.py b/tests/components/upnp/test_binary_sensor.py
index 087cd9e9fb4..d9b5b442b00 100644
--- a/tests/components/upnp/test_binary_sensor.py
+++ b/tests/components/upnp/test_binary_sensor.py
@@ -6,7 +6,7 @@ from async_upnp_client.profiles.igd import IgdDevice, IgdState
 
 from homeassistant.components.upnp.const import DEFAULT_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/upnp/test_sensor.py b/tests/components/upnp/test_sensor.py
index e9d8a9cce8f..e7461c91da4 100644
--- a/tests/components/upnp/test_sensor.py
+++ b/tests/components/upnp/test_sensor.py
@@ -7,7 +7,7 @@ import pytest
 
 from homeassistant.components.upnp.const import DEFAULT_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/usgs_earthquakes_feed/test_geo_location.py b/tests/components/usgs_earthquakes_feed/test_geo_location.py
index 40d19422ced..e412d53a0d0 100644
--- a/tests/components/usgs_earthquakes_feed/test_geo_location.py
+++ b/tests/components/usgs_earthquakes_feed/test_geo_location.py
@@ -35,7 +35,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, async_fire_time_changed
 
diff --git a/tests/components/utility_meter/test_init.py b/tests/components/utility_meter/test_init.py
index cd549c77913..eba7cf913db 100644
--- a/tests/components/utility_meter/test_init.py
+++ b/tests/components/utility_meter/test_init.py
@@ -12,9 +12,11 @@ from homeassistant.components.select import (
     DOMAIN as SELECT_DOMAIN,
     SERVICE_SELECT_OPTION,
 )
+from homeassistant.components.utility_meter import (
+    select as um_select,
+    sensor as um_sensor,
+)
 from homeassistant.components.utility_meter.const import DOMAIN, SERVICE_RESET
-import homeassistant.components.utility_meter.select as um_select
-import homeassistant.components.utility_meter.sensor as um_sensor
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_UNIT_OF_MEASUREMENT,
@@ -26,7 +28,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, mock_restore_cache
 
diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py
index 348afac57f7..c671969c5ac 100644
--- a/tests/components/utility_meter/test_sensor.py
+++ b/tests/components/utility_meter/test_sensor.py
@@ -44,7 +44,7 @@ from homeassistant.const import (
 from homeassistant.core import CoreState, HomeAssistant, State
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/vacuum/test_device_trigger.py b/tests/components/vacuum/test_device_trigger.py
index 3a0cbafb4a1..381cc1caa47 100644
--- a/tests/components/vacuum/test_device_trigger.py
+++ b/tests/components/vacuum/test_device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.entity_registry import RegistryEntryHider
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import (
     MockConfigEntry,
diff --git a/tests/components/vizio/test_init.py b/tests/components/vizio/test_init.py
index e004255ec6d..9d776ba6a59 100644
--- a/tests/components/vizio/test_init.py
+++ b/tests/components/vizio/test_init.py
@@ -7,7 +7,7 @@ import pytest
 from homeassistant.components.vizio.const import DOMAIN
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .const import MOCK_SPEAKER_CONFIG, MOCK_USER_VALID_TV_CONFIG, UNIQUE_ID
 
diff --git a/tests/components/vultr/test_sensor.py b/tests/components/vultr/test_sensor.py
index f9f922b35d4..65be23fc168 100644
--- a/tests/components/vultr/test_sensor.py
+++ b/tests/components/vultr/test_sensor.py
@@ -4,8 +4,7 @@ import pytest
 import voluptuous as vol
 
 from homeassistant.components import vultr as base_vultr
-from homeassistant.components.vultr import CONF_SUBSCRIPTION
-import homeassistant.components.vultr.sensor as vultr
+from homeassistant.components.vultr import CONF_SUBSCRIPTION, sensor as vultr
 from homeassistant.const import (
     CONF_MONITORED_CONDITIONS,
     CONF_NAME,
diff --git a/tests/components/whois/test_sensor.py b/tests/components/whois/test_sensor.py
index d58cc342745..d290bc347a9 100644
--- a/tests/components/whois/test_sensor.py
+++ b/tests/components/whois/test_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.whois.const import SCAN_INTERVAL
 from homeassistant.const import STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/wled/test_coordinator.py b/tests/components/wled/test_coordinator.py
index 14e8b620983..e2935290f03 100644
--- a/tests/components/wled/test_coordinator.py
+++ b/tests/components/wled/test_coordinator.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/worldclock/test_sensor.py b/tests/components/worldclock/test_sensor.py
index f901f605730..4941462cb14 100644
--- a/tests/components/worldclock/test_sensor.py
+++ b/tests/components/worldclock/test_sensor.py
@@ -7,7 +7,7 @@ import pytest
 from homeassistant.components.worldclock.const import CONF_TIME_FORMAT, DEFAULT_NAME
 from homeassistant.const import CONF_NAME, CONF_TIME_ZONE
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry
 
diff --git a/tests/components/wsdot/test_sensor.py b/tests/components/wsdot/test_sensor.py
index 9f5ec92a5b6..ff3d4960735 100644
--- a/tests/components/wsdot/test_sensor.py
+++ b/tests/components/wsdot/test_sensor.py
@@ -5,7 +5,7 @@ import re
 
 import requests_mock
 
-import homeassistant.components.wsdot.sensor as wsdot
+from homeassistant.components.wsdot import sensor as wsdot
 from homeassistant.components.wsdot.sensor import (
     ATTR_DESCRIPTION,
     ATTR_TIME_UPDATED,
diff --git a/tests/components/xiaomi/test_device_tracker.py b/tests/components/xiaomi/test_device_tracker.py
index 625e6f404ad..e3cc1898ce9 100644
--- a/tests/components/xiaomi/test_device_tracker.py
+++ b/tests/components/xiaomi/test_device_tracker.py
@@ -7,7 +7,7 @@ from unittest.mock import MagicMock, call, patch
 import requests
 
 from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
-import homeassistant.components.xiaomi.device_tracker as xiaomi
+from homeassistant.components.xiaomi import device_tracker as xiaomi
 from homeassistant.components.xiaomi.device_tracker import get_scanner
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PLATFORM, CONF_USERNAME
 from homeassistant.core import HomeAssistant
diff --git a/tests/components/yale/test_binary_sensor.py b/tests/components/yale/test_binary_sensor.py
index 811c845e359..16ec0ffbeb4 100644
--- a/tests/components/yale/test_binary_sensor.py
+++ b/tests/components/yale/test_binary_sensor.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_yale_with_devices,
diff --git a/tests/components/yale/test_event.py b/tests/components/yale/test_event.py
index 7aeb9d8f12b..ce7f2635eea 100644
--- a/tests/components/yale/test_event.py
+++ b/tests/components/yale/test_event.py
@@ -4,7 +4,7 @@ from freezegun.api import FrozenDateTimeFactory
 
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_yale_with_devices,
diff --git a/tests/components/yale/test_lock.py b/tests/components/yale/test_lock.py
index f6b96120d0d..1a99cf967ba 100644
--- a/tests/components/yale/test_lock.py
+++ b/tests/components/yale/test_lock.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceNotSupported
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .mocks import (
     _create_yale_with_devices,
diff --git a/tests/components/yandex_transport/test_sensor.py b/tests/components/yandex_transport/test_sensor.py
index 13432850b2b..dd8e82278f3 100644
--- a/tests/components/yandex_transport/test_sensor.py
+++ b/tests/components/yandex_transport/test_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components import sensor
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import assert_setup_component, load_fixture
 
diff --git a/tests/components/zerproc/test_light.py b/tests/components/zerproc/test_light.py
index 724414b5965..6cadc025385 100644
--- a/tests/components/zerproc/test_light.py
+++ b/tests/components/zerproc/test_light.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
 
diff --git a/tests/components/zha/common.py b/tests/components/zha/common.py
index 1dd1e5f81aa..89526f6431e 100644
--- a/tests/components/zha/common.py
+++ b/tests/components/zha/common.py
@@ -9,7 +9,7 @@ import zigpy.zcl.foundation as zcl_f
 from homeassistant.components.zha.helpers import ZHADeviceProxy
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import async_fire_time_changed
 
diff --git a/tests/components/zha/conftest.py b/tests/components/zha/conftest.py
index 1b280ea499a..78d335469b8 100644
--- a/tests/components/zha/conftest.py
+++ b/tests/components/zha/conftest.py
@@ -25,7 +25,7 @@ from zigpy.zcl.clusters.general import Basic, Groups
 from zigpy.zcl.foundation import Status
 import zigpy.zdo.types as zdo_t
 
-import homeassistant.components.zha.const as zha_const
+from homeassistant.components.zha import const as zha_const
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
diff --git a/tests/components/zha/test_device_tracker.py b/tests/components/zha/test_device_tracker.py
index ae96de44f17..8a587966f81 100644
--- a/tests/components/zha/test_device_tracker.py
+++ b/tests/components/zha/test_device_tracker.py
@@ -18,7 +18,7 @@ from homeassistant.components.zha.helpers import (
 )
 from homeassistant.const import STATE_HOME, STATE_NOT_HOME, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import find_entity_id, send_attributes_report
 from .conftest import SIG_EP_INPUT, SIG_EP_OUTPUT, SIG_EP_PROFILE, SIG_EP_TYPE
diff --git a/tests/components/zha/test_helpers.py b/tests/components/zha/test_helpers.py
index f8a809df51e..f52b403869e 100644
--- a/tests/components/zha/test_helpers.py
+++ b/tests/components/zha/test_helpers.py
@@ -9,7 +9,7 @@ from zigpy.application import ControllerApplication
 from zigpy.types.basic import uint16_t
 from zigpy.zcl.clusters import lighting
 
-import homeassistant.components.zha.const as zha_const
+from homeassistant.components.zha import const as zha_const
 from homeassistant.components.zha.helpers import (
     cluster_command_schema_to_vol_schema,
     convert_to_zcl_values,
@@ -18,7 +18,7 @@ from homeassistant.components.zha.helpers import (
     get_zha_data,
 )
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv
 from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
diff --git a/tests/components/zha/test_siren.py b/tests/components/zha/test_siren.py
index f9837a7d016..5849cc6f233 100644
--- a/tests/components/zha/test_siren.py
+++ b/tests/components/zha/test_siren.py
@@ -28,7 +28,7 @@ from homeassistant.components.zha.helpers import (
 )
 from homeassistant.const import STATE_OFF, STATE_ON, Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from .common import find_entity_id
 
diff --git a/tests/components/zodiac/test_sensor.py b/tests/components/zodiac/test_sensor.py
index 19b9733e4f5..880e5c889ec 100644
--- a/tests/components/zodiac/test_sensor.py
+++ b/tests/components/zodiac/test_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import ATTR_DEVICE_CLASS
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.setup import async_setup_component
-import homeassistant.util.dt as dt_util
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry