diff --git a/src/utils/responses.py b/src/utils/responses.py
index 6f9f7e4dd..e29036ff8 100644
--- a/src/utils/responses.py
+++ b/src/utils/responses.py
@@ -159,8 +159,8 @@ async def prepare_tools(
 
 
 def _build_provider_data_headers(
-    tools: Optional[list[dict[str, Any]]],
-) -> Optional[dict[str, str]]:
+    tools: list[dict[str, Any]] | None,
+) -> dict[str, str] | None:
     """Build extra HTTP headers containing MCP provider data for Llama Stack.
 
     Extracts per-server auth headers from MCP tool definitions and encodes
diff --git a/tests/unit/utils/test_responses.py b/tests/unit/utils/test_responses.py
index fae60b564..dadb8289d 100644
--- a/tests/unit/utils/test_responses.py
+++ b/tests/unit/utils/test_responses.py
@@ -983,12 +983,9 @@ async def test_prepare_responses_params_includes_mcp_provider_data_headers(
             },
         ]
 
-        mocker.patch("utils.responses.configuration", mocker.Mock())
-        mocker.patch(
-            "utils.responses.select_model_and_provider_id",
-            return_value=("provider1/model1", "model1", "provider1"),
-        )
-        mocker.patch("utils.responses.evaluate_model_hints", return_value=(None, None))
+        mock_config = mocker.Mock()
+        mock_config.inference = None
+        mocker.patch("utils.responses.configuration", mock_config)
         mocker.patch("utils.responses.get_system_prompt", return_value="System prompt")
         mocker.patch(
             "utils.responses.prepare_tools", return_value=mcp_tools_with_headers
@@ -1034,12 +1031,9 @@ async def test_prepare_responses_params_no_extra_headers_without_mcp_tools(
 
         query_request = QueryRequest(query="test")  # pyright: ignore[reportCallIssue]
 
-        mocker.patch("utils.responses.configuration", mocker.Mock())
-        mocker.patch(
-            "utils.responses.select_model_and_provider_id",
-            return_value=("provider1/model1", "model1", "provider1"),
-        )
-        mocker.patch("utils.responses.evaluate_model_hints", return_value=(None, None))
+        mock_config = mocker.Mock()
+        mock_config.inference = None
+        mocker.patch("utils.responses.configuration", mock_config)
         mocker.patch("utils.responses.get_system_prompt", return_value="System prompt")
         mocker.patch("utils.responses.prepare_tools", return_value=None)
         mocker.patch("utils.responses.prepare_input", return_value="test")