diff --git a/tests/mcp_tests/test_mcp_server.py b/tests/mcp_tests/test_mcp_server.py
index d3ec7863504..75a0366519f 100644
--- a/tests/mcp_tests/test_mcp_server.py
+++ b/tests/mcp_tests/test_mcp_server.py
@@ -1535,6 +1535,21 @@ async def test_add_update_server_fallback_to_server_id():
     mock_mcp_server.authorization_url = None
     mock_mcp_server.registration_url = None
     mock_mcp_server.token_url = None
+    # Additional fields used by build_mcp_server_from_table - set explicitly
+    # to avoid MagicMock objects being passed to Pydantic MCPServer constructor
+    mock_mcp_server.extra_headers = None
+    mock_mcp_server.allow_all_keys = False
+    mock_mcp_server.available_on_public_internet = True
+    mock_mcp_server.mcp_access_groups = None
+    mock_mcp_server.allowed_tools = None
+    mock_mcp_server.disallowed_tools = None
+    mock_mcp_server.tool_name_to_display_name = None
+    mock_mcp_server.tool_name_to_description = None
+    mock_mcp_server.is_byok = False
+    mock_mcp_server.byok_description = None
+    mock_mcp_server.byok_api_key_help_url = None
+    mock_mcp_server.created_at = None
+    mock_mcp_server.updated_at = None
 
     # Add server to manager
     await test_manager.add_server(mock_mcp_server)