diff --git a/tests/components/zha/test_diagnostics.py b/tests/components/zha/test_diagnostics.py
index ed3f83c0c36..0e78a9a1b5b 100644
--- a/tests/components/zha/test_diagnostics.py
+++ b/tests/components/zha/test_diagnostics.py
@@ -69,10 +69,11 @@ async def test_diagnostics_for_config_entry(
 
     scan = {c: c for c in range(11, 26 + 1)}
 
-    with patch.object(gateway.application_controller, "energy_scan", return_value=scan):
-        diagnostics_data = await get_diagnostics_for_config_entry(
-            hass, hass_client, config_entry
-        )
+    gateway.application_controller.energy_scan.side_effect = None
+    gateway.application_controller.energy_scan.return_value = scan
+    diagnostics_data = await get_diagnostics_for_config_entry(
+        hass, hass_client, config_entry
+    )
 
     assert diagnostics_data == snapshot(
         exclude=props("created_at", "modified_at", "entry_id", "versions")
diff --git a/tests/components/zha/test_init.py b/tests/components/zha/test_init.py
index 00fc3afd0ea..887284919da 100644
--- a/tests/components/zha/test_init.py
+++ b/tests/components/zha/test_init.py
@@ -252,7 +252,7 @@ async def test_zha_retry_unique_ids(
     ) as mock_connect:
         with patch(
             "homeassistant.config_entries.async_call_later",
-            lambda hass, delay, action: async_call_later(hass, 0, action),
+            lambda hass, delay, action: async_call_later(hass, 0.01, action),
         ):
             await hass.config_entries.async_setup(config_entry.entry_id)
             await hass.async_block_till_done(wait_background_tasks=True)