diff --git a/CODEOWNERS b/CODEOWNERS
index b447c87812880d..6670b411df4059 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1274,8 +1274,8 @@ build.json @home-assistant/supervisor
 /tests/components/rehlko/ @bdraco @peterager
 /homeassistant/components/remote/ @home-assistant/core
 /tests/components/remote/ @home-assistant/core
-/homeassistant/components/remote_calendar/ @Thomas55555
-/tests/components/remote_calendar/ @Thomas55555
+/homeassistant/components/remote_calendar/ @Thomas55555 @allenporter
+/tests/components/remote_calendar/ @Thomas55555 @allenporter
 /homeassistant/components/renault/ @epenet
 /tests/components/renault/ @epenet
 /homeassistant/components/renson/ @jimmyd-be
diff --git a/homeassistant/components/abode/services.py b/homeassistant/components/abode/services.py
index ffbdeb326f9ecf..7862b3e6dfe509 100644
--- a/homeassistant/components/abode/services.py
+++ b/homeassistant/components/abode/services.py
@@ -6,7 +6,7 @@
 import voluptuous as vol
 
 from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
 
@@ -70,6 +70,7 @@ def _trigger_automation(call: ServiceCall) -> None:
         dispatcher_send(call.hass, signal)
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Home Assistant services."""
 
diff --git a/homeassistant/components/alexa_devices/manifest.json b/homeassistant/components/alexa_devices/manifest.json
index 2a9e88cfd85d14..96f17d541fc9b4 100644
--- a/homeassistant/components/alexa_devices/manifest.json
+++ b/homeassistant/components/alexa_devices/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "bronze",
-  "requirements": ["aioamazondevices==3.0.6"]
+  "requirements": ["aioamazondevices==3.1.2"]
 }
diff --git a/homeassistant/components/amcrest/services.py b/homeassistant/components/amcrest/services.py
index 1ba869ce2d5140..084761c4978f99 100644
--- a/homeassistant/components/amcrest/services.py
+++ b/homeassistant/components/amcrest/services.py
@@ -5,7 +5,7 @@
 from homeassistant.auth.models import User
 from homeassistant.auth.permissions.const import POLICY_CONTROL
 from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, ENTITY_MATCH_NONE
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import Unauthorized, UnknownUser
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.service import async_extract_entity_ids
@@ -15,6 +15,7 @@
 from .helpers import service_signal
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the Amcrest IP Camera services."""
 
diff --git a/homeassistant/components/anthropic/conversation.py b/homeassistant/components/anthropic/conversation.py
index 3e79be0b169305..846249b1cafac1 100644
--- a/homeassistant/components/anthropic/conversation.py
+++ b/homeassistant/components/anthropic/conversation.py
@@ -375,6 +375,26 @@ async def _async_handle_message(
         except conversation.ConverseError as err:
             return err.as_conversation_result()
 
+        await self._async_handle_chat_log(chat_log)
+
+        response_content = chat_log.content[-1]
+        if not isinstance(response_content, conversation.AssistantContent):
+            raise TypeError("Last message must be an assistant message")
+        intent_response = intent.IntentResponse(language=user_input.language)
+        intent_response.async_set_speech(response_content.content or "")
+        return conversation.ConversationResult(
+            response=intent_response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
+        )
+
+    async def _async_handle_chat_log(
+        self,
+        chat_log: conversation.ChatLog,
+    ) -> None:
+        """Generate an answer for the chat log."""
+        options = self.entry.options
+
         tools: list[ToolParam] | None = None
         if chat_log.llm_api:
             tools = [
@@ -424,7 +444,7 @@ async def _async_handle_message(
                     [
                         content
                         async for content in chat_log.async_add_delta_content_stream(
-                            user_input.agent_id,
+                            self.entity_id,
                             _transform_stream(chat_log, stream, messages),
                         )
                         if not isinstance(content, conversation.AssistantContent)
@@ -435,17 +455,6 @@ async def _async_handle_message(
             if not chat_log.unresponded_tool_results:
                 break
 
-        response_content = chat_log.content[-1]
-        if not isinstance(response_content, conversation.AssistantContent):
-            raise TypeError("Last message must be an assistant message")
-        intent_response = intent.IntentResponse(language=user_input.language)
-        intent_response.async_set_speech(response_content.content or "")
-        return conversation.ConversationResult(
-            response=intent_response,
-            conversation_id=chat_log.conversation_id,
-            continue_conversation=chat_log.continue_conversation,
-        )
-
     async def _async_entry_update_listener(
         self, hass: HomeAssistant, entry: ConfigEntry
     ) -> None:
diff --git a/homeassistant/components/downloader/services.py b/homeassistant/components/downloader/services.py
index 19f6e827fb02d3..7f651c6b1f99ed 100644
--- a/homeassistant/components/downloader/services.py
+++ b/homeassistant/components/downloader/services.py
@@ -10,7 +10,7 @@
 import requests
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.util import raise_if_invalid_filename, raise_if_invalid_path
@@ -141,6 +141,7 @@ def do_download() -> None:
     threading.Thread(target=do_download).start()
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register the services for the downloader component."""
     async_register_admin_service(
diff --git a/homeassistant/components/elkm1/services.py b/homeassistant/components/elkm1/services.py
index 622ce65ae5e335..bfdd968680c3d6 100644
--- a/homeassistant/components/elkm1/services.py
+++ b/homeassistant/components/elkm1/services.py
@@ -63,6 +63,7 @@ def _set_time_service(service: ServiceCall) -> None:
     _async_get_elk_panel(service).set_time(dt_util.now())
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Create ElkM1 services."""
 
diff --git a/homeassistant/components/ffmpeg/services.py b/homeassistant/components/ffmpeg/services.py
index ad7946869ec3a6..6b522799f4ff4b 100644
--- a/homeassistant/components/ffmpeg/services.py
+++ b/homeassistant/components/ffmpeg/services.py
@@ -5,7 +5,7 @@
 import voluptuous as vol
 
 from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
@@ -35,6 +35,7 @@ async def _async_service_handle(service: ServiceCall) -> None:
         async_dispatcher_send(service.hass, SIGNAL_FFMPEG_RESTART, entity_ids)
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register FFmpeg services."""
 
diff --git a/homeassistant/components/google_assistant_sdk/services.py b/homeassistant/components/google_assistant_sdk/services.py
index 7f0227bf040a64..981f4d8ba5c546 100644
--- a/homeassistant/components/google_assistant_sdk/services.py
+++ b/homeassistant/components/google_assistant_sdk/services.py
@@ -11,6 +11,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.helpers import config_validation as cv
 
@@ -49,6 +50,7 @@ async def _send_text_command(call: ServiceCall) -> ServiceResponse:
     return None
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Add the services for Google Assistant SDK."""
 
diff --git a/homeassistant/components/google_generative_ai_conversation/conversation.py b/homeassistant/components/google_generative_ai_conversation/conversation.py
index c466101e7e4317..85183cfbf99186 100644
--- a/homeassistant/components/google_generative_ai_conversation/conversation.py
+++ b/homeassistant/components/google_generative_ai_conversation/conversation.py
@@ -199,9 +199,11 @@ def _create_google_tool_response_content(
 
 
 def _convert_content(
-    content: conversation.UserContent
-    | conversation.AssistantContent
-    | conversation.SystemContent,
+    content: (
+        conversation.UserContent
+        | conversation.AssistantContent
+        | conversation.SystemContent
+    ),
 ) -> Content:
     """Convert HA content to Google content."""
     if content.role != "assistant" or not content.tool_calls:
@@ -381,6 +383,29 @@ async def _async_handle_message(
         except conversation.ConverseError as err:
             return err.as_conversation_result()
 
+        await self._async_handle_chat_log(chat_log)
+
+        response = intent.IntentResponse(language=user_input.language)
+        if not isinstance(chat_log.content[-1], conversation.AssistantContent):
+            LOGGER.error(
+                "Last content in chat log is not an AssistantContent: %s. This could be due to the model not returning a valid response",
+                chat_log.content[-1],
+            )
+            raise HomeAssistantError(f"{ERROR_GETTING_RESPONSE}")
+        response.async_set_speech(chat_log.content[-1].content or "")
+        return conversation.ConversationResult(
+            response=response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
+        )
+
+    async def _async_handle_chat_log(
+        self,
+        chat_log: conversation.ChatLog,
+    ) -> None:
+        """Generate an answer for the chat log."""
+        options = self.entry.options
+
         tools: list[Tool | Callable[..., Any]] | None = None
         if chat_log.llm_api:
             tools = [
@@ -499,7 +524,9 @@ async def _async_handle_message(
         chat = self._genai_client.aio.chats.create(
             model=model_name, history=messages, config=generateContentConfig
         )
-        chat_request: str | list[Part] = user_input.text
+        user_message = chat_log.content[-1]
+        assert isinstance(user_message, conversation.UserContent)
+        chat_request: str | list[Part] = user_message.content
         # To prevent infinite loops, we limit the number of iterations
         for _iteration in range(MAX_TOOL_ITERATIONS):
             try:
@@ -519,7 +546,7 @@ async def _async_handle_message(
                 [
                     content
                     async for content in chat_log.async_add_delta_content_stream(
-                        user_input.agent_id,
+                        self.entity_id,
                         _transform_stream(chat_response_generator),
                     )
                     if isinstance(content, conversation.ToolResultContent)
@@ -529,20 +556,6 @@ async def _async_handle_message(
             if not chat_log.unresponded_tool_results:
                 break
 
-        response = intent.IntentResponse(language=user_input.language)
-        if not isinstance(chat_log.content[-1], conversation.AssistantContent):
-            LOGGER.error(
-                "Last content in chat log is not an AssistantContent: %s. This could be due to the model not returning a valid response",
-                chat_log.content[-1],
-            )
-            raise HomeAssistantError(f"{ERROR_GETTING_RESPONSE}")
-        response.async_set_speech(chat_log.content[-1].content or "")
-        return conversation.ConversationResult(
-            response=response,
-            conversation_id=chat_log.conversation_id,
-            continue_conversation=chat_log.continue_conversation,
-        )
-
     async def _async_entry_update_listener(
         self, hass: HomeAssistant, entry: ConfigEntry
     ) -> None:
diff --git a/homeassistant/components/google_photos/services.py b/homeassistant/components/google_photos/services.py
index ab4fb86af5aa1a..a74fabb3b77585 100644
--- a/homeassistant/components/google_photos/services.py
+++ b/homeassistant/components/google_photos/services.py
@@ -16,6 +16,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
@@ -77,6 +78,7 @@ def _read_file_contents(
     return results
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register Google Photos services."""
 
diff --git a/homeassistant/components/google_sheets/services.py b/homeassistant/components/google_sheets/services.py
index ea0c1e5a4ed3a0..6425aec4eb094c 100644
--- a/homeassistant/components/google_sheets/services.py
+++ b/homeassistant/components/google_sheets/services.py
@@ -13,7 +13,7 @@
 import voluptuous as vol
 
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import ConfigEntrySelector
@@ -76,6 +76,7 @@ async def _async_append_to_sheet(call: ServiceCall) -> None:
     await call.hass.async_add_executor_job(_append_to_sheet, call, entry)
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Add the services for Google Sheets."""
 
diff --git a/homeassistant/components/habitica/services.py b/homeassistant/components/habitica/services.py
index 8ef12a38f1c90e..c5207ae4ec06e9 100644
--- a/homeassistant/components/habitica/services.py
+++ b/homeassistant/components/habitica/services.py
@@ -35,6 +35,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
@@ -249,6 +250,7 @@ def get_config_entry(hass: HomeAssistant, entry_id: str) -> HabiticaConfigEntry:
     return entry
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:  # noqa: C901
     """Set up services for Habitica integration."""
 
diff --git a/homeassistant/components/hue/services.py b/homeassistant/components/hue/services.py
index 3fcf4aa45f98dd..0fd6e8bdae0d68 100644
--- a/homeassistant/components/hue/services.py
+++ b/homeassistant/components/hue/services.py
@@ -8,7 +8,7 @@
 from aiohue import HueBridgeV1, HueBridgeV2
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service import verify_domain_control
 
@@ -25,6 +25,7 @@
 LOGGER = logging.getLogger(__name__)
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register services for Hue integration."""
 
diff --git a/homeassistant/components/icloud/services.py b/homeassistant/components/icloud/services.py
index 6262710460f628..dbb843e821681a 100644
--- a/homeassistant/components/icloud/services.py
+++ b/homeassistant/components/icloud/services.py
@@ -4,7 +4,7 @@
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.util import slugify
 
@@ -115,6 +115,7 @@ def _get_account(hass: HomeAssistant, account_identifier: str) -> IcloudAccount:
     return icloud_account
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register iCloud services."""
 
diff --git a/homeassistant/components/jewish_calendar/services.py b/homeassistant/components/jewish_calendar/services.py
index a065ee9c969cf3..6fdebe6f74d1a7 100644
--- a/homeassistant/components/jewish_calendar/services.py
+++ b/homeassistant/components/jewish_calendar/services.py
@@ -15,6 +15,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
@@ -39,6 +40,7 @@
 )
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the Jewish Calendar services."""
 
diff --git a/homeassistant/components/lcn/services.py b/homeassistant/components/lcn/services.py
index ef6343bdfef648..33550d9785d189 100644
--- a/homeassistant/components/lcn/services.py
+++ b/homeassistant/components/lcn/services.py
@@ -16,6 +16,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv, device_registry as dr
@@ -438,6 +439,7 @@ class LcnService(StrEnum):
 )
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register services for LCN."""
     for service_name, service in SERVICES:
diff --git a/homeassistant/components/local_calendar/calendar.py b/homeassistant/components/local_calendar/calendar.py
index 8534cc1bfbf9bc..639cf5234d114a 100644
--- a/homeassistant/components/local_calendar/calendar.py
+++ b/homeassistant/components/local_calendar/calendar.py
@@ -36,11 +36,6 @@
 
 PRODID = "-//homeassistant.io//local_calendar 1.0//EN"
 
-# The calendar on disk is only changed when this entity is updated, so there
-# is no need to poll for changes. The calendar enttiy base class will handle
-# refreshing the entity state based on the start or end time of the event.
-SCAN_INTERVAL = timedelta(days=1)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/nordpool/services.py b/homeassistant/components/nordpool/services.py
index 628962811e3a47..9bb97d0737b071 100644
--- a/homeassistant/components/nordpool/services.py
+++ b/homeassistant/components/nordpool/services.py
@@ -22,6 +22,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
@@ -66,6 +67,7 @@ def get_config_entry(hass: HomeAssistant, entry_id: str) -> NordPoolConfigEntry:
     return entry
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Set up services for Nord Pool integration."""
 
diff --git a/homeassistant/components/nzbget/services.py b/homeassistant/components/nzbget/services.py
index 1072000cfea6b9..ebcdd362b0c17d 100644
--- a/homeassistant/components/nzbget/services.py
+++ b/homeassistant/components/nzbget/services.py
@@ -2,7 +2,7 @@
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 
@@ -48,6 +48,7 @@ def set_speed(call: ServiceCall) -> None:
     _get_coordinator(call).nzbget.rate(call.data[ATTR_SPEED])
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register integration-level services."""
 
diff --git a/homeassistant/components/ohme/services.py b/homeassistant/components/ohme/services.py
index 8ed29aa373d7ae..bebfe7180956bf 100644
--- a/homeassistant/components/ohme/services.py
+++ b/homeassistant/components/ohme/services.py
@@ -11,6 +11,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import selector
@@ -70,6 +71,7 @@ def __get_client(call: ServiceCall) -> OhmeApiClient:
     return entry.runtime_data.charge_session_coordinator.client
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register services."""
 
diff --git a/homeassistant/components/ollama/conversation.py b/homeassistant/components/ollama/conversation.py
index 928d556508161d..4b4f79d4eed3cf 100644
--- a/homeassistant/components/ollama/conversation.py
+++ b/homeassistant/components/ollama/conversation.py
@@ -218,9 +218,6 @@ async def _async_handle_message(
         """Call the API."""
         settings = {**self.entry.data, **self.entry.options}
 
-        client = self.hass.data[DOMAIN][self.entry.entry_id]
-        model = settings[CONF_MODEL]
-
         try:
             await chat_log.async_update_llm_data(
                 DOMAIN,
@@ -231,6 +228,31 @@ async def _async_handle_message(
         except conversation.ConverseError as err:
             return err.as_conversation_result()
 
+        await self._async_handle_chat_log(chat_log)
+
+        # Create intent response
+        intent_response = intent.IntentResponse(language=user_input.language)
+        if not isinstance(chat_log.content[-1], conversation.AssistantContent):
+            raise TypeError(
+                f"Unexpected last message type: {type(chat_log.content[-1])}"
+            )
+        intent_response.async_set_speech(chat_log.content[-1].content or "")
+        return conversation.ConversationResult(
+            response=intent_response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
+        )
+
+    async def _async_handle_chat_log(
+        self,
+        chat_log: conversation.ChatLog,
+    ) -> None:
+        """Generate an answer for the chat log."""
+        settings = {**self.entry.data, **self.entry.options}
+
+        client = self.hass.data[DOMAIN][self.entry.entry_id]
+        model = settings[CONF_MODEL]
+
         tools: list[dict[str, Any]] | None = None
         if chat_log.llm_api:
             tools = [
@@ -269,7 +291,7 @@ async def _async_handle_message(
                 [
                     _convert_content(content)
                     async for content in chat_log.async_add_delta_content_stream(
-                        user_input.agent_id, _transform_stream(response_generator)
+                        self.entity_id, _transform_stream(response_generator)
                     )
                 ]
             )
@@ -277,19 +299,6 @@ async def _async_handle_message(
             if not chat_log.unresponded_tool_results:
                 break
 
-        # Create intent response
-        intent_response = intent.IntentResponse(language=user_input.language)
-        if not isinstance(chat_log.content[-1], conversation.AssistantContent):
-            raise TypeError(
-                f"Unexpected last message type: {type(chat_log.content[-1])}"
-            )
-        intent_response.async_set_speech(chat_log.content[-1].content or "")
-        return conversation.ConversationResult(
-            response=intent_response,
-            conversation_id=chat_log.conversation_id,
-            continue_conversation=chat_log.continue_conversation,
-        )
-
     def _trim_history(self, message_history: MessageHistory, max_messages: int) -> None:
         """Trims excess messages from a single history.
 
diff --git a/homeassistant/components/onedrive/services.py b/homeassistant/components/onedrive/services.py
index f29133a4ca4405..971a4da1f6be48 100644
--- a/homeassistant/components/onedrive/services.py
+++ b/homeassistant/components/onedrive/services.py
@@ -16,6 +16,7 @@
     ServiceCall,
     ServiceResponse,
     SupportsResponse,
+    callback,
 )
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
@@ -70,6 +71,7 @@ def _read_file_contents(
     return results
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register OneDrive services."""
 
diff --git a/homeassistant/components/onkyo/services.py b/homeassistant/components/onkyo/services.py
index e602c5a24e0908..26a22523a0e38c 100644
--- a/homeassistant/components/onkyo/services.py
+++ b/homeassistant/components/onkyo/services.py
@@ -8,7 +8,7 @@
 
 from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN
 from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.util.hass_dict import HassKey
 
@@ -40,6 +40,7 @@
 SERVICE_SELECT_HDMI_OUTPUT = "onkyo_select_hdmi_output"
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register Onkyo services."""
 
diff --git a/homeassistant/components/opentherm_gw/services.py b/homeassistant/components/opentherm_gw/services.py
index c8f5c748875724..5031393e8677cd 100644
--- a/homeassistant/components/opentherm_gw/services.py
+++ b/homeassistant/components/opentherm_gw/services.py
@@ -15,7 +15,7 @@
     ATTR_TEMPERATURE,
     ATTR_TIME,
 )
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 
@@ -61,6 +61,7 @@ def _get_gateway(call: ServiceCall) -> OpenThermGatewayHub:
     return gw_hub
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register services for the component."""
     service_reset_schema = vol.Schema({vol.Required(ATTR_GW_ID): vol.All(cv.string)})
diff --git a/homeassistant/components/opower/config_flow.py b/homeassistant/components/opower/config_flow.py
index 6396ba24a15e5b..4753a77894ee54 100644
--- a/homeassistant/components/opower/config_flow.py
+++ b/homeassistant/components/opower/config_flow.py
@@ -10,6 +10,7 @@
     CannotConnect,
     InvalidAuth,
     Opower,
+    create_cookie_jar,
     get_supported_utility_names,
     select_utility,
 )
@@ -39,7 +40,7 @@ async def _validate_login(
 ) -> dict[str, str]:
     """Validate login data and return any errors."""
     api = Opower(
-        async_create_clientsession(hass),
+        async_create_clientsession(hass, cookie_jar=create_cookie_jar()),
         login_data[CONF_UTILITY],
         login_data[CONF_USERNAME],
         login_data[CONF_PASSWORD],
diff --git a/homeassistant/components/opower/coordinator.py b/homeassistant/components/opower/coordinator.py
index d03c30b7db03b2..189fa185cd17eb 100644
--- a/homeassistant/components/opower/coordinator.py
+++ b/homeassistant/components/opower/coordinator.py
@@ -12,6 +12,7 @@
     MeterType,
     Opower,
     ReadResolution,
+    create_cookie_jar,
 )
 from opower.exceptions import ApiException, CannotConnect, InvalidAuth
 
@@ -30,7 +31,8 @@
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, UnitOfEnergy, UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers import aiohttp_client, issue_registry as ir
+from homeassistant.helpers import issue_registry as ir
+from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
@@ -62,7 +64,7 @@ def __init__(
             update_interval=timedelta(hours=12),
         )
         self.api = Opower(
-            aiohttp_client.async_get_clientsession(hass),
+            async_create_clientsession(hass, cookie_jar=create_cookie_jar()),
             config_entry.data[CONF_UTILITY],
             config_entry.data[CONF_USERNAME],
             config_entry.data[CONF_PASSWORD],
diff --git a/homeassistant/components/opower/manifest.json b/homeassistant/components/opower/manifest.json
index 0aa26dbb4b1a41..4e88c5a68ccaae 100644
--- a/homeassistant/components/opower/manifest.json
+++ b/homeassistant/components/opower/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opower",
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
-  "requirements": ["opower==0.12.3"]
+  "requirements": ["opower==0.12.4"]
 }
diff --git a/homeassistant/components/picnic/services.py b/homeassistant/components/picnic/services.py
index 0717b669da3361..8ecae8dc301dd4 100644
--- a/homeassistant/components/picnic/services.py
+++ b/homeassistant/components/picnic/services.py
@@ -7,7 +7,7 @@
 from python_picnic_api2 import PicnicAPI
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 
 from .const import (
@@ -26,6 +26,7 @@ class PicnicServiceException(Exception):
     """Exception for Picnic services."""
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register services for the Picnic integration, if not registered yet."""
 
diff --git a/homeassistant/components/ps4/services.py b/homeassistant/components/ps4/services.py
index 88751660f7538c..583366602edd17 100644
--- a/homeassistant/components/ps4/services.py
+++ b/homeassistant/components/ps4/services.py
@@ -5,7 +5,7 @@
 import voluptuous as vol
 
 from homeassistant.const import ATTR_COMMAND, ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 
 from .const import COMMANDS, DOMAIN, PS4_DATA
@@ -29,6 +29,7 @@ async def async_service_command(call: ServiceCall) -> None:
             await device.async_send_command(command)
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Handle for services."""
 
diff --git a/homeassistant/components/remote_calendar/calendar.py b/homeassistant/components/remote_calendar/calendar.py
index 2f60918f010e3d..f6918ea9706e96 100644
--- a/homeassistant/components/remote_calendar/calendar.py
+++ b/homeassistant/components/remote_calendar/calendar.py
@@ -4,6 +4,7 @@
 import logging
 
 from ical.event import Event
+from ical.timeline import Timeline
 
 from homeassistant.components.calendar import CalendarEntity, CalendarEvent
 from homeassistant.core import HomeAssistant
@@ -48,12 +49,18 @@ def __init__(
         super().__init__(coordinator)
         self._attr_name = entry.data[CONF_CALENDAR_NAME]
         self._attr_unique_id = entry.entry_id
-        self._event: CalendarEvent | None = None
+        self._timeline: Timeline | None = None
 
     @property
     def event(self) -> CalendarEvent | None:
         """Return the next upcoming event."""
-        return self._event
+        if self._timeline is None:
+            return None
+        now = dt_util.now()
+        events = self._timeline.active_after(now)
+        if event := next(events, None):
+            return _get_calendar_event(event)
+        return None
 
     async def async_get_events(
         self, hass: HomeAssistant, start_date: datetime, end_date: datetime
@@ -79,15 +86,12 @@ async def async_update(self) -> None:
         """
         await super().async_update()
 
-        def next_timeline_event() -> CalendarEvent | None:
+        def _get_timeline() -> Timeline | None:
             """Return the next active event."""
             now = dt_util.now()
-            events = self.coordinator.data.timeline_tz(now.tzinfo).active_after(now)
-            if event := next(events, None):
-                return _get_calendar_event(event)
-            return None
+            return self.coordinator.data.timeline_tz(now.tzinfo)
 
-        self._event = await self.hass.async_add_executor_job(next_timeline_event)
+        self._timeline = await self.hass.async_add_executor_job(_get_timeline)
 
 
 def _get_calendar_event(event: Event) -> CalendarEvent:
diff --git a/homeassistant/components/remote_calendar/manifest.json b/homeassistant/components/remote_calendar/manifest.json
index 7bdc5362ae78cb..052b409dfe7734 100644
--- a/homeassistant/components/remote_calendar/manifest.json
+++ b/homeassistant/components/remote_calendar/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "remote_calendar",
   "name": "Remote Calendar",
-  "codeowners": ["@Thomas55555"],
+  "codeowners": ["@Thomas55555", "@allenporter"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/remote_calendar",
   "integration_type": "service",
diff --git a/homeassistant/components/reolink/icons.json b/homeassistant/components/reolink/icons.json
index fef175457f7d8d..c79d9b895fa7e6 100644
--- a/homeassistant/components/reolink/icons.json
+++ b/homeassistant/components/reolink/icons.json
@@ -172,6 +172,9 @@
       "floodlight_brightness": {
         "default": "mdi:spotlight-beam"
       },
+      "ir_brightness": {
+        "default": "mdi:led-off"
+      },
       "volume": {
         "default": "mdi:volume-high",
         "state": {
diff --git a/homeassistant/components/reolink/number.py b/homeassistant/components/reolink/number.py
index 2a6fb740ee0e53..e28b8c976975f0 100644
--- a/homeassistant/components/reolink/number.py
+++ b/homeassistant/components/reolink/number.py
@@ -122,6 +122,20 @@ class ReolinkChimeNumberEntityDescription(
         value=lambda api, ch: api.whiteled_brightness(ch),
         method=lambda api, ch, value: api.set_whiteled(ch, brightness=int(value)),
     ),
+    ReolinkNumberEntityDescription(
+        key="ir_brightness",
+        cmd_key="208",
+        translation_key="ir_brightness",
+        entity_category=EntityCategory.CONFIG,
+        native_step=1,
+        native_min_value=0,
+        native_max_value=100,
+        supported=lambda api, ch: api.supported(ch, "ir_brightness"),
+        value=lambda api, ch: api.baichuan.ir_brightness(ch),
+        method=lambda api, ch, value: (
+            api.baichuan.set_status_led(ch, ir_brightness=int(value))
+        ),
+    ),
     ReolinkNumberEntityDescription(
         key="volume",
         cmd_key="GetAudioCfg",
diff --git a/homeassistant/components/reolink/strings.json b/homeassistant/components/reolink/strings.json
index d1d51d9229a193..45448e2a03ca95 100644
--- a/homeassistant/components/reolink/strings.json
+++ b/homeassistant/components/reolink/strings.json
@@ -532,6 +532,9 @@
       "floodlight_brightness": {
         "name": "Floodlight turn on brightness"
       },
+      "ir_brightness": {
+        "name": "Infrared light brightness"
+      },
       "volume": {
         "name": "Volume"
       },
diff --git a/homeassistant/components/samsungtv/entity.py b/homeassistant/components/samsungtv/entity.py
index 1918f6ef28c420..2927dcf2683240 100644
--- a/homeassistant/components/samsungtv/entity.py
+++ b/homeassistant/components/samsungtv/entity.py
@@ -76,10 +76,10 @@ async def async_added_to_hass(self) -> None:
 
     def _wake_on_lan(self) -> None:
         """Wake the device via wake on lan."""
-        send_magic_packet(self._mac, ip_address=self._host)
+        send_magic_packet(self._mac, ip_address=self._host)  # type: ignore[arg-type]
         # If the ip address changed since we last saw the device
         # broadcast a packet as well
-        send_magic_packet(self._mac)
+        send_magic_packet(self._mac)  # type: ignore[arg-type]
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
diff --git a/homeassistant/components/samsungtv/manifest.json b/homeassistant/components/samsungtv/manifest.json
index 5bb69e7f121daa..dc8133a1b1ffbc 100644
--- a/homeassistant/components/samsungtv/manifest.json
+++ b/homeassistant/components/samsungtv/manifest.json
@@ -38,7 +38,7 @@
     "getmac==0.9.5",
     "samsungctl[websocket]==0.7.1",
     "samsungtvws[async,encrypted]==2.7.2",
-    "wakeonlan==2.1.0",
+    "wakeonlan==3.1.0",
     "async-upnp-client==0.44.0"
   ],
   "ssdp": [
diff --git a/homeassistant/components/teslemetry/services.py b/homeassistant/components/teslemetry/services.py
index d989e7b8f40623..246cc097a2a434 100644
--- a/homeassistant/components/teslemetry/services.py
+++ b/homeassistant/components/teslemetry/services.py
@@ -7,7 +7,7 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_DEVICE_ID, CONF_LATITUDE, CONF_LONGITUDE
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv, device_registry as dr
 
@@ -98,6 +98,7 @@ def async_get_energy_site_for_entry(
     return energy_data
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the Teslemetry services."""
 
diff --git a/homeassistant/components/unifiprotect/services.py b/homeassistant/components/unifiprotect/services.py
index 402aae2eebabc4..40fe0a991f2f40 100644
--- a/homeassistant/components/unifiprotect/services.py
+++ b/homeassistant/components/unifiprotect/services.py
@@ -303,6 +303,7 @@ async def get_user_keyring_info(call: ServiceCall) -> ServiceResponse:
 ]
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the global UniFi Protect services."""
 
diff --git a/homeassistant/components/wake_on_lan/__init__.py b/homeassistant/components/wake_on_lan/__init__.py
index d68d950e64141a..b2b2bac6480a09 100644
--- a/homeassistant/components/wake_on_lan/__init__.py
+++ b/homeassistant/components/wake_on_lan/__init__.py
@@ -52,7 +52,7 @@ async def send_magic_packet(call: ServiceCall) -> None:
         )
 
         await hass.async_add_executor_job(
-            partial(wakeonlan.send_magic_packet, mac_address, **service_kwargs)
+            partial(wakeonlan.send_magic_packet, mac_address, **service_kwargs)  # type: ignore[arg-type]
         )
 
     hass.services.async_register(
diff --git a/homeassistant/components/wake_on_lan/manifest.json b/homeassistant/components/wake_on_lan/manifest.json
index c716a851ae40a5..34e9ccd5d219d0 100644
--- a/homeassistant/components/wake_on_lan/manifest.json
+++ b/homeassistant/components/wake_on_lan/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/wake_on_lan",
   "iot_class": "local_push",
-  "requirements": ["wakeonlan==2.1.0"]
+  "requirements": ["wakeonlan==3.1.0"]
 }
diff --git a/homeassistant/components/yolink/services.py b/homeassistant/components/yolink/services.py
index 10d90d274a4b92..5bc5f2f9660559 100644
--- a/homeassistant/components/yolink/services.py
+++ b/homeassistant/components/yolink/services.py
@@ -4,7 +4,7 @@
 from yolink.client_request import ClientRequest
 
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv, device_registry as dr
 
@@ -25,6 +25,7 @@
 )
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register services for YoLink integration."""
 
diff --git a/homeassistant/components/zwave_js/services.py b/homeassistant/components/zwave_js/services.py
index 33195fe6c8bd50..076e3b6a50d302 100644
--- a/homeassistant/components/zwave_js/services.py
+++ b/homeassistant/components/zwave_js/services.py
@@ -58,6 +58,7 @@
 }
 
 
+@callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register integration services."""
     services = ZWaveServices(hass, er.async_get(hass), dr.async_get(hass))
diff --git a/requirements_all.txt b/requirements_all.txt
index cfa14b73b4c5dd..8e8631e8221d77 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -182,7 +182,7 @@ aioairzone-cloud==0.6.12
 aioairzone==1.0.0
 
 # homeassistant.components.alexa_devices
-aioamazondevices==3.0.6
+aioamazondevices==3.1.2
 
 # homeassistant.components.ambient_network
 # homeassistant.components.ambient_station
@@ -1617,7 +1617,7 @@ openwrt-luci-rpc==1.1.17
 openwrt-ubus-rpc==0.0.2
 
 # homeassistant.components.opower
-opower==0.12.3
+opower==0.12.4
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -3059,7 +3059,7 @@ vultr==0.1.2
 
 # homeassistant.components.samsungtv
 # homeassistant.components.wake_on_lan
-wakeonlan==2.1.0
+wakeonlan==3.1.0
 
 # homeassistant.components.wallbox
 wallbox==0.9.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 5eb8e0e3554ccf..094fafb1afd041 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -170,7 +170,7 @@ aioairzone-cloud==0.6.12
 aioairzone==1.0.0
 
 # homeassistant.components.alexa_devices
-aioamazondevices==3.0.6
+aioamazondevices==3.1.2
 
 # homeassistant.components.ambient_network
 # homeassistant.components.ambient_station
@@ -1370,7 +1370,7 @@ openhomedevice==2.2.0
 openwebifpy==4.3.1
 
 # homeassistant.components.opower
-opower==0.12.3
+opower==0.12.4
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -2518,7 +2518,7 @@ vultr==0.1.2
 
 # homeassistant.components.samsungtv
 # homeassistant.components.wake_on_lan
-wakeonlan==2.1.0
+wakeonlan==3.1.0
 
 # homeassistant.components.wallbox
 wallbox==0.9.0
diff --git a/tests/components/alexa_devices/conftest.py b/tests/components/alexa_devices/conftest.py
index 4ce2eb743eab71..f1f40eebd2747f 100644
--- a/tests/components/alexa_devices/conftest.py
+++ b/tests/components/alexa_devices/conftest.py
@@ -56,6 +56,9 @@ def mock_amazon_devices_client() -> Generator[AsyncMock]:
                 do_not_disturb=False,
                 response_style=None,
                 bluetooth_state=True,
+                entity_id="11111111-2222-3333-4444-555555555555",
+                appliance_id="G1234567890123456789012345678A",
+                sensors={},
             )
         }
         client.get_model_details = lambda device: DEVICE_TYPE_TO_MODEL.get(
diff --git a/tests/components/androidtv/patchers.py b/tests/components/androidtv/patchers.py
index 500b9e75cb3c7a..27171d4366ab5b 100644
--- a/tests/components/androidtv/patchers.py
+++ b/tests/components/androidtv/patchers.py
@@ -1,5 +1,6 @@
 """Define patches used for androidtv tests."""
 
+import os.path
 from typing import Any
 from unittest.mock import patch
 
@@ -12,6 +13,8 @@
     DEVICE_FIRETV,
 )
 
+_original_isfile = os.path.isfile
+
 ADB_SERVER_HOST = "127.0.0.1"
 KEY_PYTHON = "python"
 KEY_SERVER = "server"
@@ -185,7 +188,9 @@ def patch_androidtv_update(
 
 def isfile(filepath):
     """Mock `os.path.isfile`."""
-    return filepath.endswith("adbkey")
+    if str(filepath).endswith("adbkey"):
+        return True
+    return _original_isfile(filepath)
 
 
 PATCH_SCREENCAP = patch(
diff --git a/tests/components/asuswrt/test_config_flow.py b/tests/components/asuswrt/test_config_flow.py
index 14b70811cdeb47..83c3204d239cd6 100644
--- a/tests/components/asuswrt/test_config_flow.py
+++ b/tests/components/asuswrt/test_config_flow.py
@@ -175,7 +175,12 @@ async def test_error_invalid_ssh(hass: HomeAssistant, patch_is_file) -> None:
     config_data = {k: v for k, v in CONFIG_DATA_SSH.items() if k != CONF_PASSWORD}
     config_data[CONF_SSH_KEY] = SSH_KEY
 
-    patch_is_file.return_value = False
+    def mock_is_file(file) -> bool:
+        if str(file).endswith(SSH_KEY):
+            return False
+        return True
+
+    patch_is_file.side_effect = mock_is_file
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         context={"source": SOURCE_USER, "show_advanced_options": True},
diff --git a/tests/components/reolink/snapshots/test_diagnostics.ambr b/tests/components/reolink/snapshots/test_diagnostics.ambr
index 3b866aa14cad76..771aeba2a9e564 100644
--- a/tests/components/reolink/snapshots/test_diagnostics.ambr
+++ b/tests/components/reolink/snapshots/test_diagnostics.ambr
@@ -64,6 +64,10 @@
       0,
     ]),
     'cmd list': dict({
+      '208': dict({
+        '0': 1,
+        'null': 1,
+      }),
       '296': dict({
         '0': 1,
         'null': 1,
diff --git a/tests/components/toon/test_config_flow.py b/tests/components/toon/test_config_flow.py
index 1ad5ea1ca3dab6..affdadd75c2475 100644
--- a/tests/components/toon/test_config_flow.py
+++ b/tests/components/toon/test_config_flow.py
@@ -27,13 +27,12 @@ async def setup_component(hass: HomeAssistant) -> None:
         {"external_url": "https://example.com"},
     )
 
-    with patch("os.path.isfile", return_value=False):
-        assert await async_setup_component(
-            hass,
-            DOMAIN,
-            {DOMAIN: {CONF_CLIENT_ID: "client", CONF_CLIENT_SECRET: "secret"}},
-        )
-        await hass.async_block_till_done()
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {DOMAIN: {CONF_CLIENT_ID: "client", CONF_CLIENT_SECRET: "secret"}},
+    )
+    await hass.async_block_till_done()
 
 
 async def test_abort_if_no_configuration(hass: HomeAssistant) -> None:
diff --git a/tests/conftest.py b/tests/conftest.py
index c326f57ca2fcb6..8b5c5e26c364c6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -382,8 +382,10 @@ def verify_cleanup(
     # Verify no threads where left behind.
     threads = frozenset(threading.enumerate()) - threads_before
     for thread in threads:
-        assert isinstance(thread, threading._DummyThread) or thread.name.startswith(
-            "waitpid-"
+        assert (
+            isinstance(thread, threading._DummyThread)
+            or thread.name.startswith("waitpid-")
+            or "_run_safe_shutdown_loop" in thread.name
         )
 
     try:
diff --git a/tests/test_core.py b/tests/test_core.py
index 50f7f92727b297..d4b5933aebefd1 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -255,45 +255,51 @@ async def test_async_add_hass_job_schedule_partial_callback() -> None:
     partial = functools.partial(ha.callback(job))
 
     ha.HomeAssistant._async_add_hass_job(hass, ha.HassJob(partial))
-    assert len(hass.loop.call_soon.mock_calls) == 1
-    assert len(hass.loop.create_task.mock_calls) == 0
-    assert len(hass.add_job.mock_calls) == 0
+    assert hass.loop.call_soon.call_count == 1
+    assert hass.loop.create_task.call_count == 0
+    assert hass.add_job.call_count == 0
 
 
 async def test_async_add_hass_job_schedule_corofunction_eager_start() -> None:
     """Test that we schedule coroutines and add jobs to the job pool."""
-    hass = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop()))
+    hass = MagicMock(loop=(loop := asyncio.get_running_loop()))
 
     async def job():
         pass
 
-    with patch(
-        "homeassistant.core.create_eager_task", wraps=create_eager_task
-    ) as mock_create_eager_task:
+    with (
+        patch(
+            "homeassistant.core.create_eager_task", wraps=create_eager_task
+        ) as mock_create_eager_task,
+        patch.object(loop, "call_soon") as mock_loop_call_soon,
+    ):
         hass_job = ha.HassJob(job)
         task = ha.HomeAssistant._async_add_hass_job(hass, hass_job)
-        assert len(hass.loop.call_soon.mock_calls) == 0
-        assert len(hass.add_job.mock_calls) == 0
+        assert mock_loop_call_soon.call_count == 0
+        assert hass.add_job.call_count == 0
         assert mock_create_eager_task.mock_calls
         await task
 
 
 async def test_async_add_hass_job_schedule_partial_corofunction_eager_start() -> None:
     """Test that we schedule coroutines and add jobs to the job pool."""
-    hass = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop()))
+    hass = MagicMock(loop=(loop := asyncio.get_running_loop()))
 
     async def job():
         pass
 
     partial = functools.partial(job)
 
-    with patch(
-        "homeassistant.core.create_eager_task", wraps=create_eager_task
-    ) as mock_create_eager_task:
+    with (
+        patch(
+            "homeassistant.core.create_eager_task", wraps=create_eager_task
+        ) as mock_create_eager_task,
+        patch.object(loop, "call_soon") as mock_loop_call_soon,
+    ):
         hass_job = ha.HassJob(partial)
         task = ha.HomeAssistant._async_add_hass_job(hass, hass_job)
-        assert len(hass.loop.call_soon.mock_calls) == 0
-        assert len(hass.add_job.mock_calls) == 0
+        assert mock_loop_call_soon.call_count == 0
+        assert hass.add_job.call_count == 0
         assert mock_create_eager_task.mock_calls
         await task
 
@@ -306,35 +312,42 @@ def job():
         pass
 
     ha.HomeAssistant._async_add_hass_job(hass, ha.HassJob(job))
-    assert len(hass.loop.call_soon.mock_calls) == 0
-    assert len(hass.loop.create_task.mock_calls) == 0
-    assert len(hass.loop.run_in_executor.mock_calls) == 2
+    assert hass.loop.call_soon.call_count == 0
+    assert hass.loop.create_task.call_count == 0
+    assert hass.loop.run_in_executor.call_count == 1
 
 
 async def test_async_create_task_schedule_coroutine() -> None:
     """Test that we schedule coroutines and add jobs to the job pool."""
-    hass = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop()))
+    hass = MagicMock(loop=(loop := asyncio.get_running_loop()))
 
     async def job():
         pass
 
-    ha.HomeAssistant.async_create_task_internal(hass, job(), eager_start=False)
-    assert len(hass.loop.call_soon.mock_calls) == 0
-    assert len(hass.loop.create_task.mock_calls) == 1
-    assert len(hass.add_job.mock_calls) == 0
+    with (
+        patch.object(loop, "call_soon") as mock_loop_call_soon,
+        patch.object(loop, "create_task") as mock_loop_create_task,
+    ):
+        coro = job()
+        ha.HomeAssistant.async_create_task_internal(hass, coro, eager_start=False)
+        assert mock_loop_call_soon.call_count == 0
+        assert mock_loop_create_task.call_count == 1
+        assert hass.add_job.call_count == 0
+        await coro
 
 
 async def test_async_create_task_eager_start_schedule_coroutine() -> None:
     """Test that we schedule coroutines and add jobs to the job pool."""
-    hass = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop()))
+    hass = MagicMock(loop=(loop := asyncio.get_running_loop()))
 
     async def job():
         pass
 
-    ha.HomeAssistant.async_create_task_internal(hass, job(), eager_start=True)
-    # Should create the task directly since 3.12 supports eager_start
-    assert len(hass.loop.create_task.mock_calls) == 0
-    assert len(hass.add_job.mock_calls) == 0
+    with patch.object(loop, "create_task") as mock_loop_create_task:
+        ha.HomeAssistant.async_create_task_internal(hass, job(), eager_start=True)
+        # Should create the task directly since 3.12 supports eager_start
+        assert mock_loop_create_task.call_count == 0
+        assert hass.add_job.call_count == 0
 
 
 async def test_async_create_task_schedule_coroutine_with_name() -> None:
@@ -344,13 +357,15 @@ async def test_async_create_task_schedule_coroutine_with_name() -> None:
     async def job():
         pass
 
+    coro = job()
     task = ha.HomeAssistant.async_create_task_internal(
-        hass, job(), "named task", eager_start=False
+        hass, coro, "named task", eager_start=False
     )
-    assert len(hass.loop.call_soon.mock_calls) == 0
-    assert len(hass.loop.create_task.mock_calls) == 1
-    assert len(hass.add_job.mock_calls) == 0
+    assert hass.loop.call_soon.call_count == 0
+    assert hass.loop.create_task.call_count == 1
+    assert hass.add_job.call_count == 0
     assert "named task" in str(task)
+    await coro
 
 
 async def test_async_run_eager_hass_job_calls_callback() -> None: