diff --git a/tests/components/google_assistant/test_smart_home.py b/tests/components/google_assistant/test_smart_home.py
index f471e6f862c57..6cfa796507425 100644
--- a/tests/components/google_assistant/test_smart_home.py
+++ b/tests/components/google_assistant/test_smart_home.py
@@ -39,7 +39,7 @@
 
 from . import BASIC_CONFIG, MockConfig
 
-from tests.common import async_capture_events
+from tests.common import MockConfigEntry, async_capture_events
 
 REQ_ID = "ff36a3cc-ec34-11e6-b1a0-64510650abcf"
 
@@ -251,10 +251,12 @@ async def test_sync_message(hass: HomeAssistant, registries) -> None:
 @pytest.mark.parametrize("area_on_device", [True, False])
 async def test_sync_in_area(area_on_device, hass: HomeAssistant, registries) -> None:
     """Test a sync message where room hint comes from area."""
+    entry = MockConfigEntry()
+    entry.add_to_hass(hass)
     area = registries.area.async_create("Living Room")
 
     device = registries.device.async_get_or_create(
-        config_entry_id="1234",
+        config_entry_id=entry.entry_id,
         manufacturer="Someone",
         model="Some model",
         sw_version="Some Version",
@@ -625,8 +627,8 @@ async def test_execute_times_out(
     """Test an execute command which times out."""
     orig_execute_limit = sh.EXECUTE_LIMIT
     sh.EXECUTE_LIMIT = 0.02  # Decrease timeout to 20ms
-    await async_setup_component(hass, "light", {"light": {"platform": "demo"}})
     await async_setup_component(hass, "homeassistant", {})
+    await async_setup_component(hass, "light", {"light": {"platform": "demo"}})
     await hass.async_block_till_done()
 
     await hass.services.async_call(