From 2eee2d28d039961d0918cb707f13bb770f8c42a8 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:41:09 +0000
Subject: [PATCH 1/3] Fix flaky mcp_server tests with Python 3.14.3

---
 tests/components/mcp_server/conftest.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/components/mcp_server/conftest.py b/tests/components/mcp_server/conftest.py
index e109a9626d3d89..93f3bd6c656a85 100644
--- a/tests/components/mcp_server/conftest.py
+++ b/tests/components/mcp_server/conftest.py
@@ -9,10 +9,17 @@
 from homeassistant.const import CONF_LLM_HASS_API
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import llm
+from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
 
 
+@pytest.fixture(autouse=True)
+async def ensure_homeassistant_loaded(hass: HomeAssistant) -> None:
+    """Override async_setup_entry."""
+    assert await async_setup_component(hass, "homeassistant", {})
+
+
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
     """Override async_setup_entry."""

From e3583b6d6deadf4026c09da9a485527afad29c5a Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Tue, 28 Apr 2026 17:48:42 +0200
Subject: [PATCH 2/3] Improve docstring for Home Assistant fixture

Updated docstring for ensure_homeassistant_loaded fixture.
---
 tests/components/mcp_server/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/components/mcp_server/conftest.py b/tests/components/mcp_server/conftest.py
index 93f3bd6c656a85..a2e98c1121ac7b 100644
--- a/tests/components/mcp_server/conftest.py
+++ b/tests/components/mcp_server/conftest.py
@@ -16,7 +16,7 @@
 
 @pytest.fixture(autouse=True)
 async def ensure_homeassistant_loaded(hass: HomeAssistant) -> None:
-    """Override async_setup_entry."""
+    """Ensure homeassistant component is loaded."""
     assert await async_setup_component(hass, "homeassistant", {})
 
 

From f3acae6e279cd1a3489514316827adf7e6743618 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Tue, 28 Apr 2026 17:53:35 +0000
Subject: [PATCH 3/3] Remove homeassistant from manifest

---
 homeassistant/components/mcp_server/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/mcp_server/manifest.json b/homeassistant/components/mcp_server/manifest.json
index 2e4c645441b721..ca07e22e6808f1 100644
--- a/homeassistant/components/mcp_server/manifest.json
+++ b/homeassistant/components/mcp_server/manifest.json
@@ -3,7 +3,7 @@
   "name": "Model Context Protocol Server",
   "codeowners": ["@allenporter"],
   "config_flow": true,
-  "dependencies": ["homeassistant", "http", "conversation"],
+  "dependencies": ["http", "conversation"],
   "documentation": "https://www.home-assistant.io/integrations/mcp_server",
   "integration_type": "service",
   "iot_class": "local_push",