diff --git a/tests/components/husqvarna_automower/conftest.py b/tests/components/husqvarna_automower/conftest.py
index dbb8f3b4c72..de379cc745b 100644
--- a/tests/components/husqvarna_automower/conftest.py
+++ b/tests/components/husqvarna_automower/conftest.py
@@ -1,5 +1,6 @@
 """Test helpers for Husqvarna Automower."""
 
+import asyncio
 from collections.abc import Generator
 import time
 from unittest.mock import AsyncMock, patch
@@ -80,8 +81,14 @@ async def setup_credentials(hass: HomeAssistant) -> None:
     )
 
 
+@pytest.fixture(name="listen_block")
+def mock_listen_block_fixture():
+    """Mock a listen block."""
+    return asyncio.Event()
+
+
 @pytest.fixture
-def mock_automower_client() -> Generator[AsyncMock]:
+def mock_automower_client(listen_block) -> Generator[AsyncMock]:
     """Mock a Husqvarna Automower client."""
 
     mower_dict = mower_list_to_dictionary_dataclass(
@@ -96,5 +103,17 @@ def mock_automower_client() -> Generator[AsyncMock]:
     with patch(
         "homeassistant.components.husqvarna_automower.AutomowerSession",
         return_value=mock,
-    ):
-        yield mock
+    ) as client_class:
+        client = client_class.return_value
+
+        async def connect():
+            await asyncio.sleep(0)
+            client.auth.websocket_connect = AsyncMock()
+
+        async def listen() -> None:
+            await listen_block.wait()
+
+        client.auth.websocket_connect = AsyncMock(side_effect=connect)
+        client.start_listening = AsyncMock(side_effect=listen)
+
+        yield client
diff --git a/tests/components/husqvarna_automower/test_init.py b/tests/components/husqvarna_automower/test_init.py
index a18a45b6c64..1fd1121cf3e 100644
--- a/tests/components/husqvarna_automower/test_init.py
+++ b/tests/components/husqvarna_automower/test_init.py
@@ -8,7 +8,6 @@ from aioautomower.exceptions import (
     ApiException,
     AuthException,
     HusqvarnaWSServerHandshakeError,
-    TimeoutException,
 )
 from aioautomower.utils import mower_list_to_dictionary_dataclass
 from freezegun.api import FrozenDateTimeFactory
@@ -23,11 +22,7 @@ from homeassistant.helpers import device_registry as dr, entity_registry as er
 from . import setup_integration
 from .const import TEST_MOWER_ID
 
-from tests.common import (
-    MockConfigEntry,
-    async_fire_time_changed,
-    load_json_value_fixture,
-)
+from tests.common import MockConfigEntry, load_json_value_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 
@@ -130,21 +125,21 @@ async def test_websocket_not_available(
     mock_automower_client: AsyncMock,
     mock_config_entry: MockConfigEntry,
     caplog: pytest.LogCaptureFixture,
+    listen_block,
     freezer: FrozenDateTimeFactory,
 ) -> None:
     """Test trying to reload the websocket."""
-    # Patch DEFAULT_RECONNECT_TIME to 0 for the test
     with patch(
         "homeassistant.components.husqvarna_automower.coordinator.DEFAULT_RECONNECT_TIME",
         new=0,
     ):
-        # Simulate a WebSocket handshake error
         mock_automower_client.auth.websocket_connect.side_effect = (
             HusqvarnaWSServerHandshakeError("Boom")
         )
-
         # Setup integration and verify initial log error message
+
         await setup_integration(hass, mock_config_entry)
+
         assert (
             "Failed to connect to websocket. Trying to reconnect: Boom" in caplog.text
         )
@@ -158,17 +153,16 @@ async def test_websocket_not_available(
         assert "Trying to reconnect: Boom" not in caplog.text
 
         # Simulate a start_listening TimeoutException
-        mock_automower_client.start_listening.side_effect = TimeoutException("Boom")
+        listen_block.set()
         await hass.async_block_till_done()
-        assert mock_automower_client.auth.websocket_connect.call_count == 2
-        assert mock_automower_client.start_listening.call_count == 2
+        assert mock_automower_client.auth.websocket_connect.call_count == 1
+        assert mock_automower_client.start_listening.call_count == 1
 
         # Simulate a successful connection
         caplog.clear()
-        mock_automower_client.start_listening.side_effect = None
         await hass.async_block_till_done()
-        assert mock_automower_client.auth.websocket_connect.call_count == 3
-        assert mock_automower_client.start_listening.call_count == 3
+        assert mock_automower_client.auth.websocket_connect.call_count == 2
+        assert mock_automower_client.start_listening.call_count == 2
         assert "Trying to reconnect: Boom" not in caplog.text
 
         # Simulate hass shutting down