diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 7236380d42a..45115d450ec 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -9,6 +9,7 @@ jinja2>=2.10
 PyJWT==1.6.4
 cryptography==2.3.1
 pip>=8.0.3
+python-slugify==1.2.6
 pytz>=2018.04
 pyyaml>=3.13,<4
 requests==2.20.1
diff --git a/homeassistant/util/__init__.py b/homeassistant/util/__init__.py
index 17849154ff7..b4d45b48079 100644
--- a/homeassistant/util/__init__.py
+++ b/homeassistant/util/__init__.py
@@ -10,10 +10,11 @@ import random
 import string
 from functools import wraps
 from types import MappingProxyType
-from unicodedata import normalize
 from typing import (Any, Optional, TypeVar, Callable, KeysView, Union,  # noqa
                     Iterable, List, Dict, Iterator, Coroutine, MutableSet)
 
+import slugify as unicode_slug
+
 from .dt import as_local, utcnow
 
 # pylint: disable=invalid-name
@@ -24,10 +25,6 @@ ENUM_T = TypeVar('ENUM_T', bound=enum.Enum)
 
 RE_SANITIZE_FILENAME = re.compile(r'(~|\.\.|/|\\)')
 RE_SANITIZE_PATH = re.compile(r'(~|\.(\.)+)')
-RE_SLUGIFY = re.compile(r'[^a-z0-9_]+')
-TBL_SLUGIFY = {
-    ord('ß'): 'ss'
-}
 
 
 def sanitize_filename(filename: str) -> str:
@@ -42,13 +39,7 @@ def sanitize_path(path: str) -> str:
 
 def slugify(text: str) -> str:
     """Slugify a given text."""
-    text = normalize('NFKD', text)
-    text = text.lower()
-    text = text.replace(" ", "_")
-    text = text.translate(TBL_SLUGIFY)
-    text = RE_SLUGIFY.sub("", text)
-
-    return text
+    return unicode_slug.slugify(text, separator='_')  # type: ignore
 
 
 def repr_helper(inp: Any) -> str:
diff --git a/requirements_all.txt b/requirements_all.txt
index c1696db9c1f..71c7f0b8039 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -10,6 +10,7 @@ jinja2>=2.10
 PyJWT==1.6.4
 cryptography==2.3.1
 pip>=8.0.3
+python-slugify==1.2.6
 pytz>=2018.04
 pyyaml>=3.13,<4
 requests==2.20.1
diff --git a/setup.py b/setup.py
index f4da5411ed5..2dc0c92e886 100755
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@ REQUIRES = [
     # PyJWT has loose dependency. We want the latest one.
     'cryptography==2.3.1',
     'pip>=8.0.3',
+    'python-slugify==1.2.6',
     'pytz>=2018.04',
     'pyyaml>=3.13,<4',
     'requests==2.20.1',
diff --git a/tests/components/device_tracker/test_init.py b/tests/components/device_tracker/test_init.py
index 6f0d881d257..e5fbced7293 100644
--- a/tests/components/device_tracker/test_init.py
+++ b/tests/components/device_tracker/test_init.py
@@ -408,10 +408,10 @@ async def test_see_state(hass, yaml_devices):
                                                     timedelta(seconds=0))
     assert len(config) == 1
 
-    state = hass.states.get('device_tracker.examplecom')
+    state = hass.states.get('device_tracker.example_com')
     attrs = state.attributes
     assert state.state == 'Work'
-    assert state.object_id == 'examplecom'
+    assert state.object_id == 'example_com'
     assert state.name == 'example.com'
     assert attrs['friendly_name'] == 'example.com'
     assert attrs['battery'] == 100
diff --git a/tests/components/device_tracker/test_meraki.py b/tests/components/device_tracker/test_meraki.py
index 582f112f69c..02b24c4c476 100644
--- a/tests/components/device_tracker/test_meraki.py
+++ b/tests/components/device_tracker/test_meraki.py
@@ -15,15 +15,19 @@ from homeassistant.components.device_tracker.meraki import URL
 @pytest.fixture
 def meraki_client(loop, hass, hass_client):
     """Meraki mock client."""
-    assert loop.run_until_complete(async_setup_component(
-        hass, device_tracker.DOMAIN, {
-            device_tracker.DOMAIN: {
-                CONF_PLATFORM: 'meraki',
-                CONF_VALIDATOR: 'validator',
-                CONF_SECRET: 'secret'
-
-            }
-        }))
+    assert loop.run_until_complete(
+        async_setup_component(
+            hass,
+            device_tracker.DOMAIN,
+            {
+                device_tracker.DOMAIN: {
+                    CONF_PLATFORM: "meraki",
+                    CONF_VALIDATOR: "validator",
+                    CONF_SECRET: "secret",
+                }
+            },
+        )
+    )
 
     yield loop.run_until_complete(hass_client())
 
@@ -34,53 +38,41 @@ def test_invalid_or_missing_data(mock_device_tracker_conf, meraki_client):
     req = yield from meraki_client.get(URL)
     text = yield from req.text()
     assert req.status == 200
-    assert text == 'validator'
+    assert text == "validator"
 
     req = yield from meraki_client.post(URL, data=b"invalid")
     text = yield from req.json()
     assert req.status == 400
-    assert text['message'] == 'Invalid JSON'
+    assert text["message"] == "Invalid JSON"
 
     req = yield from meraki_client.post(URL, data=b"{}")
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'No secret'
+    assert text["message"] == "No secret"
 
-    data = {
-        "version": "1.0",
-        "secret": "secret"
-    }
+    data = {"version": "1.0", "secret": "secret"}
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'Invalid version'
+    assert text["message"] == "Invalid version"
 
-    data = {
-        "version": "2.0",
-        "secret": "invalid"
-    }
+    data = {"version": "2.0", "secret": "invalid"}
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'Invalid secret'
+    assert text["message"] == "Invalid secret"
 
-    data = {
-        "version": "2.0",
-        "secret": "secret",
-        "type": "InvalidType"
-    }
+    data = {"version": "2.0", "secret": "secret", "type": "InvalidType"}
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'Invalid device type'
+    assert text["message"] == "Invalid device type"
 
     data = {
         "version": "2.0",
         "secret": "secret",
         "type": "BluetoothDevicesSeen",
-        "data": {
-            "observations": []
-        }
+        "data": {"observations": []},
     }
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     assert req.status == 200
@@ -102,13 +94,13 @@ def test_data_will_be_saved(mock_device_tracker_conf, hass, meraki_client):
                         "unc": "46.3610585",
                     },
                     "seenTime": "2016-09-12T16:23:13Z",
-                    "ssid": 'ssid',
-                    "os": 'HA',
-                    "ipv6": '2607:f0d0:1002:51::4/64',
+                    "ssid": "ssid",
+                    "os": "HA",
+                    "ipv6": "2607:f0d0:1002:51::4/64",
                     "clientMac": "00:26:ab:b8:a9:a4",
                     "seenEpoch": "147369739",
                     "rssi": "20",
-                    "manufacturer": "Seiko Epson"
+                    "manufacturer": "Seiko Epson",
                 },
                 {
                     "location": {
@@ -117,24 +109,26 @@ def test_data_will_be_saved(mock_device_tracker_conf, hass, meraki_client):
                         "unc": "46.3610585",
                     },
                     "seenTime": "2016-09-12T16:21:13Z",
-                    "ssid": 'ssid',
-                    "os": 'HA',
-                    "ipv4": '192.168.0.1',
+                    "ssid": "ssid",
+                    "os": "HA",
+                    "ipv4": "192.168.0.1",
                     "clientMac": "00:26:ab:b8:a9:a5",
                     "seenEpoch": "147369750",
                     "rssi": "20",
-                    "manufacturer": "Seiko Epson"
-                }
+                    "manufacturer": "Seiko Epson",
+                },
             ]
-        }
+        },
     }
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     assert req.status == 200
     yield from hass.async_block_till_done()
-    state_name = hass.states.get('{}.{}'.format('device_tracker',
-                                                '0026abb8a9a4')).state
-    assert 'home' == state_name
+    state_name = hass.states.get(
+        "{}.{}".format("device_tracker", "00_26_ab_b8_a9_a4")
+    ).state
+    assert "home" == state_name
 
-    state_name = hass.states.get('{}.{}'.format('device_tracker',
-                                                '0026abb8a9a5')).state
-    assert 'home' == state_name
+    state_name = hass.states.get(
+        "{}.{}".format("device_tracker", "00_26_ab_b8_a9_a5")
+    ).state
+    assert "home" == state_name
diff --git a/tests/components/device_tracker/test_owntracks.py b/tests/components/device_tracker/test_owntracks.py
index 68c1f1e8766..79d0bdb6f73 100644
--- a/tests/components/device_tracker/test_owntracks.py
+++ b/tests/components/device_tracker/test_owntracks.py
@@ -252,10 +252,10 @@ WAYPOINT_MESSAGE = {
 }
 
 WAYPOINT_ENTITY_NAMES = [
-    'zone.greg_phone__exp_wayp1',
-    'zone.greg_phone__exp_wayp2',
-    'zone.ram_phone__exp_wayp1',
-    'zone.ram_phone__exp_wayp2',
+    'zone.greg_phone_exp_wayp1',
+    'zone.greg_phone_exp_wayp2',
+    'zone.ram_phone_exp_wayp1',
+    'zone.ram_phone_exp_wayp2',
 ]
 
 LWT_MESSAGE = {
@@ -407,7 +407,7 @@ def assert_mobile_tracker_accuracy(hass, accuracy, beacon=IBEACON_DEVICE):
 async def test_location_invalid_devid(hass, context):
     """Test the update of a location."""
     await send_message(hass, 'owntracks/paulus/nexus-5x', LOCATION_MESSAGE)
-    state = hass.states.get('device_tracker.paulus_nexus5x')
+    state = hass.states.get('device_tracker.paulus_nexus_5x')
     assert state.state == 'outer'
 
 
diff --git a/tests/components/sensor/test_awair.py b/tests/components/sensor/test_awair.py
index b539bdbfe7d..d3de2abb121 100644
--- a/tests/components/sensor/test_awair.py
+++ b/tests/components/sensor/test_awair.py
@@ -8,51 +8,53 @@ from unittest.mock import patch
 
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.sensor.awair import (
-    ATTR_LAST_API_UPDATE, ATTR_TIMESTAMP, DEVICE_CLASS_CARBON_DIOXIDE,
-    DEVICE_CLASS_PM2_5, DEVICE_CLASS_SCORE,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS)
+    ATTR_LAST_API_UPDATE,
+    ATTR_TIMESTAMP,
+    DEVICE_CLASS_CARBON_DIOXIDE,
+    DEVICE_CLASS_PM2_5,
+    DEVICE_CLASS_SCORE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+)
 from homeassistant.const import (
-    DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, STATE_UNAVAILABLE,
-    TEMP_CELSIUS)
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_UNAVAILABLE,
+    TEMP_CELSIUS,
+)
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import parse_datetime, utcnow
 
 from tests.common import async_fire_time_changed, load_fixture, mock_coro
 
-DISCOVERY_CONFIG = {
-    'sensor': {
-        'platform': 'awair',
-        'access_token': 'qwerty',
-    }
-}
+DISCOVERY_CONFIG = {"sensor": {"platform": "awair", "access_token": "qwerty"}}
 
 MANUAL_CONFIG = {
-    'sensor': {
-        'platform': 'awair',
-        'access_token': 'qwerty',
-        'devices': [
-            {'uuid': 'awair_foo'}
-        ]
+    "sensor": {
+        "platform": "awair",
+        "access_token": "qwerty",
+        "devices": [{"uuid": "awair_foo"}],
     }
 }
 
 _LOGGER = logging.getLogger(__name__)
 
 NOW = utcnow()
-AIR_DATA_FIXTURE = json.loads(load_fixture('awair_air_data_latest.json'))
+AIR_DATA_FIXTURE = json.loads(load_fixture("awair_air_data_latest.json"))
 AIR_DATA_FIXTURE[0][ATTR_TIMESTAMP] = str(NOW)
 AIR_DATA_FIXTURE_UPDATED = json.loads(
-    load_fixture('awair_air_data_latest_updated.json'))
+    load_fixture("awair_air_data_latest_updated.json")
+)
 AIR_DATA_FIXTURE_UPDATED[0][ATTR_TIMESTAMP] = str(NOW + timedelta(minutes=5))
 
 
 @contextmanager
 def alter_time(retval):
     """Manage multiple time mocks."""
-    patch_one = patch('homeassistant.util.dt.utcnow', return_value=retval)
-    patch_two = patch('homeassistant.util.utcnow', return_value=retval)
-    patch_three = patch('homeassistant.components.sensor.awair.dt.utcnow',
-                        return_value=retval)
+    patch_one = patch("homeassistant.util.dt.utcnow", return_value=retval)
+    patch_two = patch("homeassistant.util.utcnow", return_value=retval)
+    patch_three = patch(
+        "homeassistant.components.sensor.awair.dt.utcnow", return_value=retval
+    )
 
     with patch_one, patch_two, patch_three:
         yield
@@ -60,13 +62,14 @@ def alter_time(retval):
 
 async def setup_awair(hass, config=None):
     """Load the Awair platform."""
-    devices_json = json.loads(load_fixture('awair_devices.json'))
+    devices_json = json.loads(load_fixture("awair_devices.json"))
     devices_mock = mock_coro(devices_json)
-    devices_patch = patch('python_awair.AwairClient.devices',
-                          return_value=devices_mock)
+    devices_patch = patch(
+        "python_awair.AwairClient.devices", return_value=devices_mock)
     air_data_mock = mock_coro(AIR_DATA_FIXTURE)
-    air_data_patch = patch('python_awair.AwairClient.air_data_latest',
-                           return_value=air_data_mock)
+    air_data_patch = patch(
+        "python_awair.AwairClient.air_data_latest", return_value=air_data_mock
+    )
 
     if config is None:
         config = DISCOVERY_CONFIG
@@ -84,8 +87,8 @@ async def test_platform_manually_configured(hass):
 
     # Ensure that we loaded the device with uuid 'awair_foo', not the
     # 'awair_12345' device that we stub out for API device discovery
-    entity = hass.data[SENSOR_DOMAIN].get_entity('sensor.awair_co2')
-    assert entity.unique_id == 'awair_foo_CO2'
+    entity = hass.data[SENSOR_DOMAIN].get_entity("sensor.awair_co2")
+    assert entity.unique_id == "awair_foo_CO2"
 
 
 async def test_platform_automatically_configured(hass):
@@ -96,34 +99,40 @@ async def test_platform_automatically_configured(hass):
 
     # Ensure that we loaded the device with uuid 'awair_12345', which is
     # the device that we stub out for API device discovery
-    entity = hass.data[SENSOR_DOMAIN].get_entity('sensor.awair_co2')
-    assert entity.unique_id == 'awair_12345_CO2'
+    entity = hass.data[SENSOR_DOMAIN].get_entity("sensor.awair_co2")
+    assert entity.unique_id == "awair_12345_CO2"
 
 
 async def test_bad_platform_setup(hass):
     """Tests that we throw correct exceptions when setting up Awair."""
     from python_awair import AwairClient
 
-    auth_patch = patch('python_awair.AwairClient.devices',
-                       side_effect=AwairClient.AuthError)
-    rate_patch = patch('python_awair.AwairClient.devices',
-                       side_effect=AwairClient.RatelimitError)
-    generic_patch = patch('python_awair.AwairClient.devices',
-                          side_effect=AwairClient.GenericError)
+    auth_patch = patch(
+        "python_awair.AwairClient.devices",
+        side_effect=AwairClient.AuthError
+    )
+    rate_patch = patch(
+        "python_awair.AwairClient.devices",
+        side_effect=AwairClient.RatelimitError
+    )
+    generic_patch = patch(
+        "python_awair.AwairClient.devices",
+        side_effect=AwairClient.GenericError
+    )
 
     with auth_patch:
-        assert await async_setup_component(hass, SENSOR_DOMAIN,
-                                           DISCOVERY_CONFIG)
+        assert await async_setup_component(
+            hass, SENSOR_DOMAIN, DISCOVERY_CONFIG)
         assert not hass.states.async_all()
 
     with rate_patch:
-        assert await async_setup_component(hass, SENSOR_DOMAIN,
-                                           DISCOVERY_CONFIG)
+        assert await async_setup_component(
+            hass, SENSOR_DOMAIN, DISCOVERY_CONFIG)
         assert not hass.states.async_all()
 
     with generic_patch:
-        assert await async_setup_component(hass, SENSOR_DOMAIN,
-                                           DISCOVERY_CONFIG)
+        assert await async_setup_component(
+            hass, SENSOR_DOMAIN, DISCOVERY_CONFIG)
         assert not hass.states.async_all()
 
 
@@ -131,60 +140,62 @@ async def test_awair_misc_attributes(hass):
     """Test that desired attributes are set."""
     await setup_awair(hass)
 
-    attributes = hass.states.get('sensor.awair_co2').attributes
-    assert (attributes[ATTR_LAST_API_UPDATE] ==
-            parse_datetime(AIR_DATA_FIXTURE[0][ATTR_TIMESTAMP]))
+    attributes = hass.states.get("sensor.awair_co2").attributes
+    assert attributes[ATTR_LAST_API_UPDATE] == parse_datetime(
+        AIR_DATA_FIXTURE[0][ATTR_TIMESTAMP]
+    )
 
 
 async def test_awair_score(hass):
     """Test that we create a sensor for the 'Awair score'."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_score')
-    assert sensor.state == '78'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_SCORE
-    assert sensor.attributes['unit_of_measurement'] == '%'
+    sensor = hass.states.get("sensor.awair_score")
+    assert sensor.state == "78"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_SCORE
+    assert sensor.attributes["unit_of_measurement"] == "%"
 
 
 async def test_awair_temp(hass):
     """Test that we create a temperature sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_temperature')
-    assert sensor.state == '22.4'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_TEMPERATURE
-    assert sensor.attributes['unit_of_measurement'] == TEMP_CELSIUS
+    sensor = hass.states.get("sensor.awair_temperature")
+    assert sensor.state == "22.4"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_TEMPERATURE
+    assert sensor.attributes["unit_of_measurement"] == TEMP_CELSIUS
 
 
 async def test_awair_humid(hass):
     """Test that we create a humidity sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_humidity')
-    assert sensor.state == '32.73'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_HUMIDITY
-    assert sensor.attributes['unit_of_measurement'] == '%'
+    sensor = hass.states.get("sensor.awair_humidity")
+    assert sensor.state == "32.73"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_HUMIDITY
+    assert sensor.attributes["unit_of_measurement"] == "%"
 
 
 async def test_awair_co2(hass):
     """Test that we create a CO2 sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_co2')
-    assert sensor.state == '612'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_CARBON_DIOXIDE
-    assert sensor.attributes['unit_of_measurement'] == 'ppm'
+    sensor = hass.states.get("sensor.awair_co2")
+    assert sensor.state == "612"
+    assert sensor.attributes["device_class"] == \
+        DEVICE_CLASS_CARBON_DIOXIDE
+    assert sensor.attributes["unit_of_measurement"] == "ppm"
 
 
 async def test_awair_voc(hass):
     """Test that we create a CO2 sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_voc')
-    assert sensor.state == '1012'
-    assert (sensor.attributes['device_class'] ==
-            DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS)
-    assert sensor.attributes['unit_of_measurement'] == 'ppb'
+    sensor = hass.states.get("sensor.awair_voc")
+    assert sensor.state == "1012"
+    assert sensor.attributes["device_class"] == \
+        DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS
+    assert sensor.attributes["unit_of_measurement"] == "ppb"
 
 
 async def test_awair_dust(hass):
@@ -193,10 +204,10 @@ async def test_awair_dust(hass):
 
     # The Awair Gen1 that we mock actually returns 'DUST', but that
     # is mapped to pm25 internally so that it shows up in Homekit
-    sensor = hass.states.get('sensor.awair_pm25')
-    assert sensor.state == '6.2'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_PM2_5
-    assert sensor.attributes['unit_of_measurement'] == 'µg/m3'
+    sensor = hass.states.get("sensor.awair_pm2_5")
+    assert sensor.state == "6.2"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_PM2_5
+    assert sensor.attributes["unit_of_measurement"] == "µg/m3"
 
 
 async def test_awair_unsupported_sensors(hass):
@@ -206,36 +217,40 @@ async def test_awair_unsupported_sensors(hass):
     # Our tests mock an Awair Gen 1 device, which should never return
     # PM10 sensor readings. Assert that we didn't create a pm10 sensor,
     # which could happen if someone were ever to refactor incorrectly.
-    assert hass.states.get('sensor.awair_pm10') is None
+    assert hass.states.get("sensor.awair_pm10") is None
 
 
 async def test_availability(hass):
     """Ensure that we mark the component available/unavailable correctly."""
     await setup_awair(hass)
 
-    assert hass.states.get('sensor.awair_score').state == '78'
+    assert hass.states.get("sensor.awair_score").state == "78"
 
     future = NOW + timedelta(minutes=30)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(AIR_DATA_FIXTURE))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(AIR_DATA_FIXTURE),
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == STATE_UNAVAILABLE
+    assert hass.states.get("sensor.awair_score").state == STATE_UNAVAILABLE
 
     future = NOW + timedelta(hours=1)
     fixture = AIR_DATA_FIXTURE_UPDATED
     fixture[0][ATTR_TIMESTAMP] = str(future)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(fixture))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(fixture)
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == '79'
+    assert hass.states.get("sensor.awair_score").state == "79"
 
 
 async def test_async_update(hass):
@@ -243,21 +258,23 @@ async def test_async_update(hass):
     await setup_awair(hass)
 
     future = NOW + timedelta(minutes=10)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED),
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    score_sensor = hass.states.get('sensor.awair_score')
-    assert score_sensor.state == '79'
+    score_sensor = hass.states.get("sensor.awair_score")
+    assert score_sensor.state == "79"
 
-    assert hass.states.get('sensor.awair_temperature').state == '23.4'
-    assert hass.states.get('sensor.awair_humidity').state == '33.73'
-    assert hass.states.get('sensor.awair_co2').state == '613'
-    assert hass.states.get('sensor.awair_voc').state == '1013'
-    assert hass.states.get('sensor.awair_pm25').state == '7.2'
+    assert hass.states.get("sensor.awair_temperature").state == "23.4"
+    assert hass.states.get("sensor.awair_humidity").state == "33.73"
+    assert hass.states.get("sensor.awair_co2").state == "613"
+    assert hass.states.get("sensor.awair_voc").state == "1013"
+    assert hass.states.get("sensor.awair_pm2_5").state == "7.2"
 
 
 async def test_throttle_async_update(hass):
@@ -265,18 +282,20 @@ async def test_throttle_async_update(hass):
     await setup_awair(hass)
 
     future = NOW + timedelta(minutes=1)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED),
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == '78'
+    assert hass.states.get("sensor.awair_score").state == "78"
 
     future = NOW + timedelta(minutes=15)
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == '79'
+    assert hass.states.get("sensor.awair_score").state == "79"
diff --git a/tests/components/sensor/test_filesize.py b/tests/components/sensor/test_filesize.py
index f0ea5c95de5..b8b5c67da7d 100644
--- a/tests/components/sensor/test_filesize.py
+++ b/tests/components/sensor/test_filesize.py
@@ -8,12 +8,12 @@ from tests.common import get_test_home_assistant
 
 
 TEST_DIR = os.path.join(os.path.dirname(__file__))
-TEST_FILE = os.path.join(TEST_DIR, 'mock_file_test_filesize.txt')
+TEST_FILE = os.path.join(TEST_DIR, "mock_file_test_filesize.txt")
 
 
 def create_file(path):
     """Create a test file."""
-    with open(path, 'w') as test_file:
+    with open(path, "w") as test_file:
         test_file.write("test")
 
 
@@ -34,23 +34,23 @@ class TestFileSensor(unittest.TestCase):
     def test_invalid_path(self):
         """Test that an invalid path is caught."""
         config = {
-            'sensor': {
-                'platform': 'filesize',
-                CONF_FILE_PATHS: ['invalid_path']}
+            "sensor": {
+                "platform": "filesize", CONF_FILE_PATHS: ["invalid_path"]
+            }
         }
-        assert setup_component(self.hass, 'sensor', config)
+        assert setup_component(self.hass, "sensor", config)
         assert len(self.hass.states.entity_ids()) == 0
 
     def test_valid_path(self):
         """Test for a valid path."""
         create_file(TEST_FILE)
         config = {
-            'sensor': {
-                'platform': 'filesize',
-                CONF_FILE_PATHS: [TEST_FILE]}
+            "sensor": {
+                "platform": "filesize", CONF_FILE_PATHS: [TEST_FILE]
+            }
         }
-        assert setup_component(self.hass, 'sensor', config)
+        assert setup_component(self.hass, "sensor", config)
         assert len(self.hass.states.entity_ids()) == 1
-        state = self.hass.states.get('sensor.mock_file_test_filesizetxt')
-        assert state.state == '0.0'
-        assert state.attributes.get('bytes') == 4
+        state = self.hass.states.get("sensor.mock_file_test_filesize_txt")
+        assert state.state == "0.0"
+        assert state.attributes.get("bytes") == 4
diff --git a/tests/components/sensor/test_foobot.py b/tests/components/sensor/test_foobot.py
index f9382a04b6b..71f2d0481bf 100644
--- a/tests/components/sensor/test_foobot.py
+++ b/tests/components/sensor/test_foobot.py
@@ -32,7 +32,7 @@ async def test_default_setup(hass, aioclient_mock):
     metrics = {'co2': ['1232.0', 'ppm'],
                'temperature': ['21.1', TEMP_CELSIUS],
                'humidity': ['49.5', '%'],
-               'pm25': ['144.8', 'µg/m3'],
+               'pm2_5': ['144.8', 'µg/m3'],
                'voc': ['340.7', 'ppb'],
                'index': ['138.9', '%']}
 
diff --git a/tests/components/sensor/test_hddtemp.py b/tests/components/sensor/test_hddtemp.py
index eeca7fcf565..cc2eb361c87 100644
--- a/tests/components/sensor/test_hddtemp.py
+++ b/tests/components/sensor/test_hddtemp.py
@@ -155,7 +155,7 @@ class TestHDDTempSensor(unittest.TestCase):
         """Test hddtemp one disk configuration."""
         assert setup_component(self.hass, 'sensor', VALID_CONFIG_ONE_DISK)
 
-        state = self.hass.states.get('sensor.hd_temperature_devsdd1')
+        state = self.hass.states.get('sensor.hd_temperature_dev_sdd1')
 
         reference = self.reference[state.attributes.get('device')]
 
@@ -173,7 +173,7 @@ class TestHDDTempSensor(unittest.TestCase):
         assert setup_component(self.hass, 'sensor', VALID_CONFIG_WRONG_DISK)
 
         assert len(self.hass.states.all()) == 1
-        state = self.hass.states.get('sensor.hd_temperature_devsdx1')
+        state = self.hass.states.get('sensor.hd_temperature_dev_sdx1')
         assert state.attributes.get('friendly_name') == \
             'HD Temperature ' + '/dev/sdx1'
 
@@ -183,9 +183,9 @@ class TestHDDTempSensor(unittest.TestCase):
         assert setup_component(self.hass,
                                'sensor', VALID_CONFIG_MULTIPLE_DISKS)
 
-        for sensor in ['sensor.hd_temperature_devsda1',
-                       'sensor.hd_temperature_devsdb1',
-                       'sensor.hd_temperature_devsdc1']:
+        for sensor in ['sensor.hd_temperature_dev_sda1',
+                       'sensor.hd_temperature_dev_sdb1',
+                       'sensor.hd_temperature_dev_sdc1']:
 
             state = self.hass.states.get(sensor)
 
diff --git a/tests/components/sensor/test_openhardwaremonitor.py b/tests/components/sensor/test_openhardwaremonitor.py
index 5117f87cd70..089e5e85a08 100644
--- a/tests/components/sensor/test_openhardwaremonitor.py
+++ b/tests/components/sensor/test_openhardwaremonitor.py
@@ -34,7 +34,7 @@ class TestOpenHardwareMonitorSetup(unittest.TestCase):
         assert len(entities) == 38
 
         state = self.hass.states.get(
-            'sensor.testpc_intel_core_i77700_clocks_bus_speed')
+            'sensor.test_pc_intel_core_i7_7700_clocks_bus_speed')
 
         assert state is not None
         assert state.state == '100'
diff --git a/tests/components/sensor/test_startca.py b/tests/components/sensor/test_startca.py
index 95da1c93a0c..eb5ca2203e0 100644
--- a/tests/components/sensor/test_startca.py
+++ b/tests/components/sensor/test_startca.py
@@ -47,51 +47,51 @@ def test_capped_setup(hass, aioclient_mock):
 
     yield from async_setup_component(hass, 'sensor', {'sensor': config})
 
-    state = hass.states.get('sensor.startca_usage_ratio')
+    state = hass.states.get('sensor.start_ca_usage_ratio')
     assert state.attributes.get('unit_of_measurement') == '%'
     assert state.state == '76.24'
 
-    state = hass.states.get('sensor.startca_usage')
+    state = hass.states.get('sensor.start_ca_usage')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_data_limit')
+    state = hass.states.get('sensor.start_ca_data_limit')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '400'
 
-    state = hass.states.get('sensor.startca_used_download')
+    state = hass.states.get('sensor.start_ca_used_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_used_upload')
+    state = hass.states.get('sensor.start_ca_used_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_used_total')
+    state = hass.states.get('sensor.start_ca_used_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '311.43'
 
-    state = hass.states.get('sensor.startca_grace_download')
+    state = hass.states.get('sensor.start_ca_grace_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_grace_upload')
+    state = hass.states.get('sensor.start_ca_grace_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_grace_total')
+    state = hass.states.get('sensor.start_ca_grace_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '311.43'
 
-    state = hass.states.get('sensor.startca_total_download')
+    state = hass.states.get('sensor.start_ca_total_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_total_upload')
+    state = hass.states.get('sensor.start_ca_total_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_remaining')
+    state = hass.states.get('sensor.start_ca_remaining')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '95.05'
 
@@ -138,51 +138,51 @@ def test_unlimited_setup(hass, aioclient_mock):
 
     yield from async_setup_component(hass, 'sensor', {'sensor': config})
 
-    state = hass.states.get('sensor.startca_usage_ratio')
+    state = hass.states.get('sensor.start_ca_usage_ratio')
     assert state.attributes.get('unit_of_measurement') == '%'
     assert state.state == '0'
 
-    state = hass.states.get('sensor.startca_usage')
+    state = hass.states.get('sensor.start_ca_usage')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_data_limit')
+    state = hass.states.get('sensor.start_ca_data_limit')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == 'inf'
 
-    state = hass.states.get('sensor.startca_used_download')
+    state = hass.states.get('sensor.start_ca_used_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_used_upload')
+    state = hass.states.get('sensor.start_ca_used_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_used_total')
+    state = hass.states.get('sensor.start_ca_used_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_grace_download')
+    state = hass.states.get('sensor.start_ca_grace_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_grace_upload')
+    state = hass.states.get('sensor.start_ca_grace_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_grace_total')
+    state = hass.states.get('sensor.start_ca_grace_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '311.43'
 
-    state = hass.states.get('sensor.startca_total_download')
+    state = hass.states.get('sensor.start_ca_total_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_total_upload')
+    state = hass.states.get('sensor.start_ca_total_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_remaining')
+    state = hass.states.get('sensor.start_ca_remaining')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == 'inf'
 
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index a51787225ca..d79f84d416d 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -33,14 +33,6 @@ def test_generate_entity_id_given_keys():
             'test.another_entity']) == 'test.overwrite_hidden_true'
 
 
-def test_generate_entity_id_with_nonlatin_name():
-    """Test generate_entity_id given a name containing non-latin characters."""
-    fmt = 'test.{}'
-    assert entity.generate_entity_id(
-        fmt, 'ホームアシスタント', current_ids=[]
-    ) == 'test.unnamed_device'
-
-
 def test_async_update_support(hass):
     """Test async update getting called."""
     sync_update = []
diff --git a/tests/util/test_init.py b/tests/util/test_init.py
index 10b4fe0ad8c..98fe8774b96 100644
--- a/tests/util/test_init.py
+++ b/tests/util/test_init.py
@@ -27,17 +27,19 @@ class TestUtil(unittest.TestCase):
 
     def test_slugify(self):
         """Test slugify."""
-        assert "test" == util.slugify("T-!@#$!#@$!$est")
+        assert "t_est" == util.slugify("T-!@#$!#@$!$est")
         assert "test_more" == util.slugify("Test More")
         assert "test_more" == util.slugify("Test_(More)")
         assert "test_more" == util.slugify("Tèst_Mörê")
-        assert "b827eb000000" == util.slugify("B8:27:EB:00:00:00")
-        assert "testcom" == util.slugify("test.com")
-        assert "greg_phone__exp_wayp1" == \
+        assert "b8_27_eb_00_00_00" == util.slugify("B8:27:EB:00:00:00")
+        assert "test_com" == util.slugify("test.com")
+        assert "greg_phone_exp_wayp1" == \
             util.slugify("greg_phone - exp_wayp1")
         assert "we_are_we_are_a_test_calendar" == \
             util.slugify("We are, we are, a... Test Calendar")
         assert "test_aouss_aou" == util.slugify("Tèst_äöüß_ÄÖÜ")
+        assert "ying_shi_ma" == util.slugify("影師嗎")
+        assert "keihuonto" == util.slugify("けいふぉんと")
 
     def test_repr_helper(self):
         """Test repr_helper."""