diff --git a/tests/components/sensor/test_pilight.py b/tests/components/pilight/test_sensor.py
similarity index 100%
rename from tests/components/sensor/test_pilight.py
rename to tests/components/pilight/test_sensor.py
diff --git a/tests/components/cover/test_rfxtrx.py b/tests/components/rfxtrx/test_cover.py
similarity index 100%
rename from tests/components/cover/test_rfxtrx.py
rename to tests/components/rfxtrx/test_cover.py
diff --git a/tests/components/light/test_rfxtrx.py b/tests/components/rfxtrx/test_light.py
similarity index 100%
rename from tests/components/light/test_rfxtrx.py
rename to tests/components/rfxtrx/test_light.py
diff --git a/tests/components/sensor/test_rfxtrx.py b/tests/components/rfxtrx/test_sensor.py
similarity index 100%
rename from tests/components/sensor/test_rfxtrx.py
rename to tests/components/rfxtrx/test_sensor.py
diff --git a/tests/components/switch/test_rfxtrx.py b/tests/components/rfxtrx/test_switch.py
similarity index 100%
rename from tests/components/switch/test_rfxtrx.py
rename to tests/components/rfxtrx/test_switch.py
diff --git a/tests/components/light/test_tradfri.py b/tests/components/tradfri/test_light.py
similarity index 100%
rename from tests/components/light/test_tradfri.py
rename to tests/components/tradfri/test_light.py
diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py
index 140a938201b..b34d74bd0c6 100644
--- a/tests/components/tts/test_init.py
+++ b/tests/components/tts/test_init.py
@@ -607,6 +607,10 @@ async def test_setup_component_and_web_get_url(hass, hass_client):
         ("{}/api/tts_proxy/265944c108cbb00b2a62"
          "1be5930513e03a0bb2cd_en_-_demo.mp3".format(hass.config.api.base_url))
 
+    tts_cache = hass.config.path(tts.DEFAULT_CACHE_DIR)
+    if os.path.isdir(tts_cache):
+        shutil.rmtree(tts_cache)
+
 
 async def test_setup_component_and_web_get_url_bad_config(hass, hass_client):
     """Set up the demo platform and receive wrong file from web."""
diff --git a/tests/components/switch/test_unifi.py b/tests/components/unifi/test_switch.py
similarity index 100%
rename from tests/components/switch/test_unifi.py
rename to tests/components/unifi/test_switch.py