diff --git a/tests/mcp_tests/test_configs/test_config_mcp_e2e.yaml b/tests/mcp_tests/test_configs/test_config_mcp_e2e.yaml
index 37d5359e3ce..ad68a03781d 100644
--- a/tests/mcp_tests/test_configs/test_config_mcp_e2e.yaml
+++ b/tests/mcp_tests/test_configs/test_config_mcp_e2e.yaml
@@ -18,6 +18,8 @@ mcp_servers:
     command: python3
     args:
       - tests/mcp_tests/mcp_server.py
+    allow_all_keys: true  # Needed for master_key auth when DB/object_permission not used
   math_streamable_http:
     transport: http
     url: http://127.0.0.1:0/mcp
+    allow_all_keys: true
diff --git a/tests/mcp_tests/test_proxy_mcp_e2e.py b/tests/mcp_tests/test_proxy_mcp_e2e.py
index 5aff63a51ef..cd09cc936fd 100644
--- a/tests/mcp_tests/test_proxy_mcp_e2e.py
+++ b/tests/mcp_tests/test_proxy_mcp_e2e.py
@@ -274,6 +274,11 @@ class TestProxyMcpStatelessBehavior:
                     text_a = getattr(result_a.content[0], "text", None)
                     assert text_a == "30"
 
+            # Allow proxy and MCP SDK to fully clean up the first connection before
+            # opening the second. Without this, the SDK's TaskGroup can raise
+            # ExceptionGroup when the server closes the connection (see MCP SDK #915).
+            await asyncio.sleep(0.5)
+
             # --- Client B: completely independent connection ---
             async with streamablehttp_client(
                 url=f"{proxy_server_url}/mcp",
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.test.tsx b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.test.tsx
index 2b7273c1905..a52f692b3e7 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.test.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.test.tsx
@@ -220,53 +220,57 @@ describe("CreateMCPServer", () => {
       });
     });
 
-    it("should successfully create a server when auth value is provided", async () => {
-      await selectHttpTransport();
+    it(
+      "should successfully create a server when auth value is provided",
+      { timeout: 15000 },
+      async () => {
+        await selectHttpTransport();
 
-      const user = userEvent.setup();
+        const user = userEvent.setup({ delay: null });
 
-      const nameInput = getServerNameInput();
-      await user.type(nameInput, "My_Server");
+        const nameInput = getServerNameInput();
+        await user.type(nameInput, "My_Server");
 
-      const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
-      await user.type(urlInput, "https://example.com/mcp");
+        const urlInput = screen.getByPlaceholderText("https://your-mcp-server.com");
+        await user.type(urlInput, "https://example.com/mcp");
 
-      await selectAntOption("Authentication", "API Key");
+        await selectAntOption("Authentication", "API Key");
 
-      await waitFor(() => {
-        expect(screen.getByText("Authentication Value")).toBeInTheDocument();
-      });
+        await waitFor(() => {
+          expect(screen.getByText("Authentication Value")).toBeInTheDocument();
+        });
 
-      // Fill in auth value
-      const authInput = screen.getByPlaceholderText("Enter token or secret");
-      await user.type(authInput, "my-secret-key");
+        // Fill in auth value
+        const authInput = screen.getByPlaceholderText("Enter token or secret");
+        await user.type(authInput, "my-secret-key");
 
-      vi.mocked(networking.createMCPServer).mockResolvedValue({
-        server_id: "new-server-1",
-        server_name: "My_Server",
-        alias: "My_Server",
-        url: "https://example.com/mcp",
-        transport: "http",
-        auth_type: "api_key",
-        created_at: "2024-01-01T00:00:00Z",
-        created_by: "user-1",
-        updated_at: "2024-01-01T00:00:00Z",
-        updated_by: "user-1",
-      });
+        vi.mocked(networking.createMCPServer).mockResolvedValue({
+          server_id: "new-server-1",
+          server_name: "My_Server",
+          alias: "My_Server",
+          url: "https://example.com/mcp",
+          transport: "http",
+          auth_type: "api_key",
+          created_at: "2024-01-01T00:00:00Z",
+          created_by: "user-1",
+          updated_at: "2024-01-01T00:00:00Z",
+          updated_by: "user-1",
+        });
 
-      const submitButton = screen.getByRole("button", { name: "Add MCP Server" });
-      await act(async () => {
-        fireEvent.click(submitButton);
-      });
+        const submitButton = screen.getByRole("button", { name: "Add MCP Server" });
+        await act(async () => {
+          fireEvent.click(submitButton);
+        });
 
-      await waitFor(() => {
-        expect(networking.createMCPServer).toHaveBeenCalledTimes(1);
-      });
+        await waitFor(() => {
+          expect(networking.createMCPServer).toHaveBeenCalledTimes(1);
+        });
 
-      const [token, payload] = vi.mocked(networking.createMCPServer).mock.calls[0];
-      expect(token).toBe("test-token");
-      expect(payload.credentials).toEqual({ auth_value: "my-secret-key" });
-    });
+        const [token, payload] = vi.mocked(networking.createMCPServer).mock.calls[0];
+        expect(token).toBe("test-token");
+        expect(payload.credentials).toEqual({ auth_value: "my-secret-key" });
+      },
+    );
 
     it("should not show auth value field when None auth type is selected", async () => {
       await selectHttpTransport();