diff --git a/docs/source/api/util.rst b/docs/source/api/util.rst
index e31a1c9812970fd49756e3e82a09c24ad3189e79..fb61cd94fe6221012763e604f1672740fff2d803 100644
--- a/docs/source/api/util.rst
+++ b/docs/source/api/util.rst
@@ -4,10 +4,10 @@ homeassistant.util package
 Submodules
 ----------
 
-homeassistant.util.async module
+homeassistant.util.async_ module
 -------------------------------
 
-.. automodule:: homeassistant.util.async
+.. automodule:: homeassistant.util.async_
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index 319d00e6de55a30ee031ed8f26fd2ee1eef4cb20..3f6e0ef220f11e5d02860d07732c6b73c64e8151 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -272,7 +272,7 @@ def setup_and_run_hass(config_dir: str,
 
     if args.open_ui:
         # Imported here to avoid importing asyncio before monkey patch
-        from homeassistant.util.async import run_callback_threadsafe
+        from homeassistant.util.async_ import run_callback_threadsafe
 
         def open_browser(event):
             """Open the webinterface in a browser."""
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index 3f8c4bedc75a947e4ea1692b22c5972afb2d17f9..2f5d8d289794cd822238571762e13bf311aef4bc 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -21,7 +21,7 @@ from homeassistant.components.camera import (
     PLATFORM_SCHEMA, DEFAULT_CONTENT_TYPE, Camera)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers import config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/camera/proxy.py b/homeassistant/components/camera/proxy.py
index 56b9db5c0ec8b304eecd3eab10dbe270ce12bfaa..d045235c3ad5754d5173256d33dcde5ebbfb722b 100644
--- a/homeassistant/components/camera/proxy.py
+++ b/homeassistant/components/camera/proxy.py
@@ -11,7 +11,7 @@ import async_timeout
 
 import voluptuous as vol
 
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.helpers import config_validation as cv
 
 import homeassistant.util.dt as dt_util
diff --git a/homeassistant/components/configurator.py b/homeassistant/components/configurator.py
index eaba08f0e899214e573781eaf6b4a1dd1a197daa..2c159633a9b54cba9bb980fd24ffa1f7c96e2cd9 100644
--- a/homeassistant/components/configurator.py
+++ b/homeassistant/components/configurator.py
@@ -15,7 +15,7 @@ from homeassistant.const import EVENT_TIME_CHANGED, ATTR_FRIENDLY_NAME, \
     ATTR_ENTITY_PICTURE
 from homeassistant.loader import bind_hass
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 _KEY_INSTANCE = 'configurator'
diff --git a/homeassistant/components/device_tracker/__init__.py b/homeassistant/components/device_tracker/__init__.py
index 9fea2bc104d9922d5db127780985fbede8b1c3c5..682496335a024ee5365e5d89af28932bad1268d8 100644
--- a/homeassistant/components/device_tracker/__init__.py
+++ b/homeassistant/components/device_tracker/__init__.py
@@ -28,7 +28,7 @@ from homeassistant.helpers.typing import GPSType, ConfigType, HomeAssistantType
 import homeassistant.helpers.config_validation as cv
 from homeassistant.loader import get_component
 import homeassistant.util as util
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
 from homeassistant.util.yaml import dump
 
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index 3ece434f3c128255876bafad0ac3b6b965ad5a5f..67ad8066aff497ee392d5b35714188b00a60a897 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.entity import Entity, async_generate_entity_id
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_state_change
 import homeassistant.helpers.config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 DOMAIN = 'group'
 
diff --git a/homeassistant/components/image_processing/microsoft_face_identify.py b/homeassistant/components/image_processing/microsoft_face_identify.py
index 258731326eed359e8914fceffac3a20806b765b5..51f1cd42f47485559d15edd81df89677f3046e4e 100644
--- a/homeassistant/components/image_processing/microsoft_face_identify.py
+++ b/homeassistant/components/image_processing/microsoft_face_identify.py
@@ -17,7 +17,7 @@ from homeassistant.components.image_processing import (
     PLATFORM_SCHEMA, ImageProcessingEntity, CONF_CONFIDENCE, CONF_SOURCE,
     CONF_ENTITY_ID, CONF_NAME, ATTR_ENTITY_ID, ATTR_CONFIDENCE)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 DEPENDENCIES = ['microsoft_face']
 
diff --git a/homeassistant/components/image_processing/openalpr_local.py b/homeassistant/components/image_processing/openalpr_local.py
index ce06d98bf13aae644991c3ed2ae89b800a0882a1..227e32696280df7cc68947acf19104346078b95c 100644
--- a/homeassistant/components/image_processing/openalpr_local.py
+++ b/homeassistant/components/image_processing/openalpr_local.py
@@ -17,7 +17,7 @@ from homeassistant.const import STATE_UNKNOWN, CONF_REGION
 from homeassistant.components.image_processing import (
     PLATFORM_SCHEMA, ImageProcessingEntity, CONF_CONFIDENCE, CONF_SOURCE,
     CONF_ENTITY_ID, CONF_NAME, ATTR_ENTITY_ID, ATTR_CONFIDENCE)
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 27e7c0358ad542f6cb4c4149b9efc6c0e5e9ea77..590e16747c57c227ccc64787f7b23a838c6699f1 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -27,7 +27,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import bind_hass
 from homeassistant.helpers import template, config_validation as cv
 from homeassistant.helpers.entity import Entity
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_coroutine_threadsafe, run_callback_threadsafe)
 from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP, CONF_VALUE_TEMPLATE, CONF_USERNAME,
diff --git a/homeassistant/components/zone.py b/homeassistant/components/zone.py
index 9ba503e6666334bd4f8131b2416a9b6f88cdc1d3..b1a94f3809c0d212346055d0b033621d1d5a5a12 100644
--- a/homeassistant/components/zone.py
+++ b/homeassistant/components/zone.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 from homeassistant.loader import bind_hass
 from homeassistant.helpers import config_per_platform
 from homeassistant.helpers.entity import Entity, async_generate_entity_id
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 from homeassistant.util.location import distance
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 543aba2a0e70ee1770cd7d9db950cdcf50ee5e4c..a486ee1adbff0e3e2959b9b67cb60bc3d0e74835 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -33,7 +33,7 @@ from homeassistant.const import (
 from homeassistant import loader
 from homeassistant.exceptions import (
     HomeAssistantError, InvalidEntityFormatError, InvalidStateError)
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_coroutine_threadsafe, run_callback_threadsafe,
     fire_coroutine_threadsafe)
 import homeassistant.util as util
diff --git a/homeassistant/helpers/condition.py b/homeassistant/helpers/condition.py
index bad6bfe83c352104fbeece8abce26dcfd88bb880..f8f841cc44922006a1b7088330e48777f56769ea 100644
--- a/homeassistant/helpers/condition.py
+++ b/homeassistant/helpers/condition.py
@@ -18,7 +18,7 @@ from homeassistant.exceptions import TemplateError, HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.sun import get_astral_event_date
 import homeassistant.util.dt as dt_util
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 FROM_CONFIG_FORMAT = '{}_from_config'
 ASYNC_FROM_CONFIG_FORMAT = 'async_{}_from_config'
diff --git a/homeassistant/helpers/discovery.py b/homeassistant/helpers/discovery.py
index 6a527021c7743ac1726a16d1a03017b3f57c07ad..82322fec1e59f25e7653573ea3562aa8c191ca40 100644
--- a/homeassistant/helpers/discovery.py
+++ b/homeassistant/helpers/discovery.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     ATTR_DISCOVERED, ATTR_SERVICE, EVENT_PLATFORM_DISCOVERED)
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.loader import DEPENDENCY_BLACKLIST
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 EVENT_LOAD_PLATFORM = 'load_platform.{}'
 ATTR_PLATFORM = 'platform'
diff --git a/homeassistant/helpers/dispatcher.py b/homeassistant/helpers/dispatcher.py
index 8c41505bd29bf90e1250391780196595f519e412..136f4caa35a7d821e04d92731ac3c411a2cb33d8 100644
--- a/homeassistant/helpers/dispatcher.py
+++ b/homeassistant/helpers/dispatcher.py
@@ -3,7 +3,7 @@ import logging
 
 from homeassistant.core import callback
 from homeassistant.loader import bind_hass
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index f23a49c1851080515e61af026b5162cb0cd872da..4efe8d2f6c37925693b419bba05dfd67e49abb7b 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -15,7 +15,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.config import DATA_CUSTOMIZE
 from homeassistant.exceptions import NoEntitySpecifiedError
 from homeassistant.util import ensure_unique_string, slugify
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 SLOW_UPDATE_WARNING = 10
diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index d28212a34d18703ff419f227c3d6a3b9eb6bd9e1..712121bbdb5fe78aefcdb9d83207bc868905fa83 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 from homeassistant.const import DEVICE_DEFAULT_NAME
 from homeassistant.core import callback, valid_entity_id, split_entity_id
 from homeassistant.exceptions import HomeAssistantError, PlatformNotReady
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_callback_threadsafe, run_coroutine_threadsafe)
 import homeassistant.util.dt as dt_util
 
diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py
index eab2d583f450a57369cbea07c8fc2e319c1bf24a..d69a556b0cc37c3446784cb419b72577e895bee6 100644
--- a/homeassistant/helpers/event.py
+++ b/homeassistant/helpers/event.py
@@ -8,7 +8,7 @@ from ..core import HomeAssistant, callback
 from ..const import (
     ATTR_NOW, EVENT_STATE_CHANGED, EVENT_TIME_CHANGED, MATCH_ALL)
 from ..util import dt as dt_util
-from ..util.async import run_callback_threadsafe
+from ..util.async_ import run_callback_threadsafe
 
 # PyLint does not like the use of threaded_listener_factory
 # pylint: disable=invalid-name
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 6530cb6248582e1c38133879ccc062775cc9ea63..abfdde8c8e119e711c6ea8f2143d6f130bbddfe3 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -16,7 +16,7 @@ from homeassistant.helpers.event import (
     async_track_point_in_utc_time, async_track_template)
 from homeassistant.helpers.typing import ConfigType
 import homeassistant.util.dt as date_util
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_coroutine_threadsafe, run_callback_threadsafe)
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index 7118cab211afa3efede1878c2b4df355d6e37d3c..3595b258f123caf01dd48f31d28e6c0a5c67eed4 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -13,7 +13,7 @@ from homeassistant.helpers import template
 from homeassistant.loader import get_component, bind_hass
 from homeassistant.util.yaml import load_yaml
 import homeassistant.helpers.config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 CONF_SERVICE = 'service'
 CONF_SERVICE_TEMPLATE = 'service_template'
diff --git a/homeassistant/helpers/state.py b/homeassistant/helpers/state.py
index 6be0dbae914498c49f0b1ff552f8d0e31c64f109..f97d70514591c7f14e8a9951f82a6df1ec335bd7 100644
--- a/homeassistant/helpers/state.py
+++ b/homeassistant/helpers/state.py
@@ -40,7 +40,7 @@ from homeassistant.const import (
     STATE_ON, STATE_OPEN, STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN,
     STATE_UNLOCKED, SERVICE_SELECT_OPTION)
 from homeassistant.core import State
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index 6fab1c6c844450edf7b06e6249b96f98ac6ca8d5..3dd65aa362c38cc4eea3a139eae04509b8aa96ee 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -20,7 +20,7 @@ from homeassistant.loader import bind_hass, get_component
 from homeassistant.util import convert
 from homeassistant.util import dt as dt_util
 from homeassistant.util import location as loc_util
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 _SENTINEL = object()
diff --git a/homeassistant/setup.py b/homeassistant/setup.py
index 5be1547242ef2377f16ae0fba92f0bd6fe0653c3..169a160af657e58ab3d14f1278300b8e781c9311 100644
--- a/homeassistant/setup.py
+++ b/homeassistant/setup.py
@@ -10,7 +10,7 @@ from homeassistant import requirements, core, loader, config as conf_util
 from homeassistant.config import async_notify_setup_error
 from homeassistant.const import EVENT_COMPONENT_LOADED, PLATFORM_FORMAT
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/util/async.py b/homeassistant/util/async_.py
similarity index 100%
rename from homeassistant/util/async.py
rename to homeassistant/util/async_.py
diff --git a/homeassistant/util/logging.py b/homeassistant/util/logging.py
index 8a15c4f63203ecda7a46f1c43d8387161c758a42..f7306cae98bbc792ae9e49ea47e2232347c28149 100644
--- a/homeassistant/util/logging.py
+++ b/homeassistant/util/logging.py
@@ -3,7 +3,7 @@ import asyncio
 import logging
 import threading
 
-from .async import run_coroutine_threadsafe
+from .async_ import run_coroutine_threadsafe
 
 
 class HideSensitiveDataFilter(logging.Filter):
diff --git a/tests/common.py b/tests/common.py
index 15ce80a95521cbc813ae6da16838003569a6055c..bc84b3493a8ec5edf338d7fd762584131bdb4a7d 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED, EVENT_PLATFORM_DISCOVERED, ATTR_SERVICE,
     ATTR_DISCOVERED, SERVER_PORT, EVENT_HOMEASSISTANT_CLOSE)
 from homeassistant.components import mqtt, recorder
-from homeassistant.util.async import (
+from homeassistant.util.async_ import (
     run_callback_threadsafe, run_coroutine_threadsafe)
 
 _TEST_INSTANCE_PORT = SERVER_PORT
diff --git a/tests/components/binary_sensor/test_template.py b/tests/components/binary_sensor/test_template.py
index c47f23bf9025556730e23a9e0dd2558ba355e650..18c095f4bc12c20682913d99967246b1e9a0f62d 100644
--- a/tests/components/binary_sensor/test_template.py
+++ b/tests/components/binary_sensor/test_template.py
@@ -9,7 +9,7 @@ from homeassistant import setup
 from homeassistant.components.binary_sensor import template
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import template as template_hlpr
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 import homeassistant.util.dt as dt_util
 
 from tests.common import (
diff --git a/tests/components/camera/test_init.py b/tests/components/camera/test_init.py
index 87612da9faa7879640afb4d90e097cdebab6f8b0..465d6276ad5931ccc93b93328cdfc66a3c90acaf 100644
--- a/tests/components/camera/test_init.py
+++ b/tests/components/camera/test_init.py
@@ -9,7 +9,7 @@ from homeassistant.const import ATTR_ENTITY_PICTURE
 import homeassistant.components.camera as camera
 import homeassistant.components.http as http
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import (
     get_test_home_assistant, get_test_instance_port, assert_setup_component)
diff --git a/tests/components/climate/test_generic_thermostat.py b/tests/components/climate/test_generic_thermostat.py
index abc9e6d74c27afc5a5f83e2d9b55f9d1e5125107..bd0b764c6fe176b2a4dfaac767aeb705c5d1535c 100644
--- a/tests/components/climate/test_generic_thermostat.py
+++ b/tests/components/climate/test_generic_thermostat.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 )
 from homeassistant import loader
 from homeassistant.util.unit_system import METRIC_SYSTEM
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.components import climate, input_boolean, switch
 import homeassistant.components as comps
 from tests.common import (assert_setup_component, get_test_home_assistant,
diff --git a/tests/components/device_tracker/test_init.py b/tests/components/device_tracker/test_init.py
index 9d122fa17b6cc5a12b8f45f3a4ff90404255dad6..c051983d8fa244354f239774b4175f2d619e5f35 100644
--- a/tests/components/device_tracker/test_init.py
+++ b/tests/components/device_tracker/test_init.py
@@ -13,7 +13,7 @@ from homeassistant.core import callback, State
 from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.helpers import discovery
 from homeassistant.loader import get_component
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME, ATTR_HIDDEN,
diff --git a/tests/components/device_tracker/test_owntracks.py b/tests/components/device_tracker/test_owntracks.py
index 2239e13e220dee422d352ef15cfc44cf25ac4032..37a3e570b536941b1a555fe320af316ce9b10270 100644
--- a/tests/components/device_tracker/test_owntracks.py
+++ b/tests/components/device_tracker/test_owntracks.py
@@ -11,7 +11,7 @@ import homeassistant.components.device_tracker.owntracks as owntracks
 from homeassistant.setup import setup_component
 from homeassistant.components import device_tracker
 from homeassistant.const import CONF_PLATFORM, STATE_NOT_HOME
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 USER = 'greg'
 DEVICE = 'phone'
diff --git a/tests/components/device_tracker/test_upc_connect.py b/tests/components/device_tracker/test_upc_connect.py
index 396d2b88b196128798c424c7d6a16473d51ef767..e45d70bc172d2f47b42f63b29d18f7d1f4f5e4b8 100644
--- a/tests/components/device_tracker/test_upc_connect.py
+++ b/tests/components/device_tracker/test_upc_connect.py
@@ -10,7 +10,7 @@ from homeassistant.const import (
     CONF_PLATFORM, CONF_HOST)
 from homeassistant.components.device_tracker import DOMAIN
 import homeassistant.components.device_tracker.upc_connect as platform
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import (
     get_test_home_assistant, assert_setup_component, load_fixture,
diff --git a/tests/components/emulated_hue/test_upnp.py b/tests/components/emulated_hue/test_upnp.py
index b30329544310a64b48faea2ef3a4b6b3f28c0f74..555802f9a2c7d2979cd6c1a2645ac27fc67a732e 100644
--- a/tests/components/emulated_hue/test_upnp.py
+++ b/tests/components/emulated_hue/test_upnp.py
@@ -9,7 +9,7 @@ from aiohttp.hdrs import CONTENT_TYPE
 from homeassistant import setup, const, core
 import homeassistant.components as core_components
 from homeassistant.components import emulated_hue, http
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import get_test_instance_port, get_test_home_assistant
 
diff --git a/tests/components/media_player/test_async_helpers.py b/tests/components/media_player/test_async_helpers.py
index 6acbf5c2db30dd0f467f1cb82e953181db4884a2..11e324e9132b2d61fbef027e9de332ebde65dbd8 100644
--- a/tests/components/media_player/test_async_helpers.py
+++ b/tests/components/media_player/test_async_helpers.py
@@ -5,7 +5,7 @@ import asyncio
 import homeassistant.components.media_player as mp
 from homeassistant.const import (
     STATE_PLAYING, STATE_PAUSED, STATE_ON, STATE_OFF, STATE_IDLE)
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import get_test_home_assistant
 
diff --git a/tests/components/media_player/test_universal.py b/tests/components/media_player/test_universal.py
index b7f3165f11c538ebc509b8b61ac17a8779d67eb5..c9a1cdc79d84599da1d8b7d473e6beed37cdb79a 100644
--- a/tests/components/media_player/test_universal.py
+++ b/tests/components/media_player/test_universal.py
@@ -11,7 +11,7 @@ import homeassistant.components.input_number as input_number
 import homeassistant.components.input_select as input_select
 import homeassistant.components.media_player as media_player
 import homeassistant.components.media_player.universal as universal
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import mock_service, get_test_home_assistant
 
diff --git a/tests/components/notify/test_group.py b/tests/components/notify/test_group.py
index ed988b0f9b58c14ef1b7d48195d70e727d9f583d..c96a49d7cb3d3cfea6f1cc927af4f32df0ab7c04 100644
--- a/tests/components/notify/test_group.py
+++ b/tests/components/notify/test_group.py
@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, patch
 from homeassistant.setup import setup_component
 import homeassistant.components.notify as notify
 from homeassistant.components.notify import group, demo
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import assert_setup_component, get_test_home_assistant
 
diff --git a/tests/components/sensor/test_uptime.py b/tests/components/sensor/test_uptime.py
index 541ea7ca771ee431549631fe0f349b5d5f38ae43..a919e7d20db922683e779b00be8c245a3e740680 100644
--- a/tests/components/sensor/test_uptime.py
+++ b/tests/components/sensor/test_uptime.py
@@ -3,7 +3,7 @@ import unittest
 from unittest.mock import patch
 from datetime import timedelta
 
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.setup import setup_component
 from homeassistant.components.sensor.uptime import UptimeSensor
 from tests.common import get_test_home_assistant
diff --git a/tests/components/switch/test_rest.py b/tests/components/switch/test_rest.py
index 064d0b1825b861244ad3c75e214062a9752d8638..e3f11ec19a0b31036537b3fe2efd4758dc9332d3 100644
--- a/tests/components/switch/test_rest.py
+++ b/tests/components/switch/test_rest.py
@@ -5,7 +5,7 @@ import aiohttp
 
 import homeassistant.components.switch.rest as rest
 from homeassistant.setup import setup_component
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.helpers.template import Template
 from tests.common import get_test_home_assistant, assert_setup_component
 
diff --git a/tests/components/test_init.py b/tests/components/test_init.py
index eca4763b4b3fabe0dc4a9bd5809557696cc84aa0..991982af9b2bf615787e04b4fd254c1d34276205 100644
--- a/tests/components/test_init.py
+++ b/tests/components/test_init.py
@@ -14,7 +14,7 @@ import homeassistant.components as comps
 import homeassistant.helpers.intent as intent
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 from tests.common import (
     get_test_home_assistant, mock_service, patch_yaml_files, mock_coro,
diff --git a/tests/helpers/test_aiohttp_client.py b/tests/helpers/test_aiohttp_client.py
index f5415ffe212195acbca34ed2bac0822ba40c1fdf..abe30d80a497fb3e3079a5cb8f9f383d955f148e 100644
--- a/tests/helpers/test_aiohttp_client.py
+++ b/tests/helpers/test_aiohttp_client.py
@@ -8,7 +8,7 @@ import pytest
 from homeassistant.core import EVENT_HOMEASSISTANT_CLOSE
 from homeassistant.setup import async_setup_component
 import homeassistant.helpers.aiohttp_client as client
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 from tests.common import get_test_home_assistant
 
diff --git a/tests/helpers/test_state.py b/tests/helpers/test_state.py
index cc42bc8d7f8799c23e56cc665186ab32e67861e5..f230d03e51ea653b4686d7c671c91a2cdbd292b2 100644
--- a/tests/helpers/test_state.py
+++ b/tests/helpers/test_state.py
@@ -7,7 +7,7 @@ from unittest.mock import patch
 import homeassistant.core as ha
 import homeassistant.components as core_components
 from homeassistant.const import (SERVICE_TURN_ON, SERVICE_TURN_OFF)
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.util import dt as dt_util
 from homeassistant.helpers import state
 from homeassistant.const import (
diff --git a/tests/test_config.py b/tests/test_config.py
index 99c21493711c0b1cd2eb088ab6bf3b964d748d29..ab6b860ea8f5eeffad6ec9b310be75482728c3ba 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     CONF_UNIT_SYSTEM_METRIC, CONF_UNIT_SYSTEM_IMPERIAL, CONF_TEMPERATURE_UNIT)
 from homeassistant.util import location as location_util, dt as dt_util
 from homeassistant.util.yaml import SECRET_YAML
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 from homeassistant.helpers.entity import Entity
 from homeassistant.components.config.group import (
     CONFIG_PATH as GROUP_CONFIG_PATH)
diff --git a/tests/test_core.py b/tests/test_core.py
index 261b6385b048fa996405e544fd1a25f99451eceb..7a1610c09664403721fe7a44d68beadcc7df64e5 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -14,7 +14,7 @@ import pytest
 import homeassistant.core as ha
 from homeassistant.exceptions import (InvalidEntityFormatError,
                                       InvalidStateError)
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
 from homeassistant.util.unit_system import (METRIC_SYSTEM)
 from homeassistant.const import (
diff --git a/tests/util/test_async.py b/tests/util/test_async.py
index b6ae58a484f7720e271053a23ac5dc3f53b354e5..3e57ea20b5ca5f1885fe6d13e86dec12764748bb 100644
--- a/tests/util/test_async.py
+++ b/tests/util/test_async.py
@@ -5,7 +5,7 @@ from unittest import TestCase
 
 import pytest
 
-from homeassistant.util import async as hasync
+from homeassistant.util import async_ as hasync
 
 
 @patch('asyncio.coroutines.iscoroutine')