diff --git a/tests/components/waze_travel_time/conftest.py b/tests/components/waze_travel_time/conftest.py
index d2bb647b2ca..4d964d9f08a 100644
--- a/tests/components/waze_travel_time/conftest.py
+++ b/tests/components/waze_travel_time/conftest.py
@@ -14,6 +14,13 @@ def mock_wrc_fixture():
         yield mock_wrc
 
 
+@pytest.fixture(name="mock_update")
+def mock_update_fixture(mock_wrc):
+    """Mock an update to the sensor."""
+    obj = mock_wrc.return_value
+    obj.calc_all_routes_info.return_value = {"My route": (150, 300)}
+
+
 @pytest.fixture(name="validate_config_entry")
 def validate_config_entry_fixture():
     """Return valid config entry."""
@@ -22,17 +29,15 @@ def validate_config_entry_fixture():
     ) as mock_wrc:
         obj = mock_wrc.return_value
         obj.calc_all_routes_info.return_value = None
-        yield
+        yield mock_wrc
 
 
-@pytest.fixture(name="bypass_setup")
-def bypass_setup_fixture():
-    """Bypass entry setup."""
-    with patch(
-        "homeassistant.components.waze_travel_time.async_setup_entry",
-        return_value=True,
-    ):
-        yield
+@pytest.fixture(name="invalidate_config_entry")
+def invalidate_config_entry_fixture(validate_config_entry):
+    """Return invalid config entry."""
+    obj = validate_config_entry.return_value
+    obj.calc_all_routes_info.return_value = {}
+    obj.calc_all_routes_info.side_effect = WRCError("test")
 
 
 @pytest.fixture(name="bypass_platform_setup")
@@ -45,21 +50,11 @@ def bypass_platform_setup_fixture():
         yield
 
 
-@pytest.fixture(name="mock_update")
-def mock_update_fixture(mock_wrc):
-    """Mock an update to the sensor."""
-    obj = mock_wrc.return_value
-    obj.calc_all_routes_info.return_value = {"My route": (150, 300)}
-    yield
-
-
-@pytest.fixture(name="invalidate_config_entry")
-def invalidate_config_entry_fixture():
-    """Return invalid config entry."""
+@pytest.fixture(name="bypass_setup")
+def bypass_setup_fixture():
+    """Bypass entry setup."""
     with patch(
-        "homeassistant.components.waze_travel_time.helpers.WazeRouteCalculator"
-    ) as mock_wrc:
-        obj = mock_wrc.return_value
-        obj.calc_all_routes_info.return_value = {}
-        obj.calc_all_routes_info.side_effect = WRCError("test")
+        "homeassistant.components.waze_travel_time.async_setup_entry",
+        return_value=True,
+    ):
         yield
diff --git a/tests/components/waze_travel_time/test_config_flow.py b/tests/components/waze_travel_time/test_config_flow.py
index 8a57a34b739..c4414cdbefd 100644
--- a/tests/components/waze_travel_time/test_config_flow.py
+++ b/tests/components/waze_travel_time/test_config_flow.py
@@ -1,4 +1,6 @@
 """Test the Waze Travel Time config flow."""
+import pytest
+
 from homeassistant import config_entries, data_entry_flow
 from homeassistant.components.waze_travel_time.const import (
     CONF_AVOID_FERRIES,
@@ -21,7 +23,8 @@ from .const import MOCK_CONFIG
 from tests.common import MockConfigEntry
 
 
-async def test_minimum_fields(hass, validate_config_entry, bypass_setup):
+@pytest.mark.usefixtures("validate_config_entry")
+async def test_minimum_fields(hass):
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -45,9 +48,8 @@ async def test_minimum_fields(hass, validate_config_entry, bypass_setup):
     }
 
 
-async def test_options(hass, validate_config_entry, mock_update):
+async def test_options(hass):
     """Test options flow."""
-
     entry = MockConfigEntry(
         domain=DOMAIN,
         data=MOCK_CONFIG,
@@ -99,7 +101,8 @@ async def test_options(hass, validate_config_entry, mock_update):
     }
 
 
-async def test_import(hass, validate_config_entry, mock_update):
+@pytest.mark.usefixtures("validate_config_entry")
+async def test_import(hass):
     """Test import for config flow."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
@@ -139,30 +142,8 @@ async def test_import(hass, validate_config_entry, mock_update):
     }
 
 
-async def _setup_dupe_import(hass, mock_update):
-    """Set up dupe import."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data={
-            CONF_ORIGIN: "location1",
-            CONF_DESTINATION: "location2",
-            CONF_REGION: "US",
-            CONF_AVOID_FERRIES: True,
-            CONF_AVOID_SUBSCRIPTION_ROADS: True,
-            CONF_AVOID_TOLL_ROADS: True,
-            CONF_EXCL_FILTER: "exclude",
-            CONF_INCL_FILTER: "include",
-            CONF_REALTIME: False,
-            CONF_UNITS: CONF_UNIT_SYSTEM_IMPERIAL,
-            CONF_VEHICLE_TYPE: "taxi",
-        },
-    )
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-    await hass.async_block_till_done()
-
-
-async def test_dupe(hass, validate_config_entry, bypass_setup):
+@pytest.mark.usefixtures("validate_config_entry")
+async def test_dupe(hass):
     """Test setting up the same entry data twice is OK."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -194,7 +175,8 @@ async def test_dupe(hass, validate_config_entry, bypass_setup):
     assert result2["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
 
-async def test_invalid_config_entry(hass, invalidate_config_entry):
+@pytest.mark.usefixtures("invalidate_config_entry")
+async def test_invalid_config_entry(hass):
     """Test we get the form."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}