diff --git a/tests/ModelContextProtocol.Tests/ClientServerTestBase.cs b/tests/ModelContextProtocol.Tests/ClientServerTestBase.cs
index 564225abd..76eaac5ac 100644
--- a/tests/ModelContextProtocol.Tests/ClientServerTestBase.cs
+++ b/tests/ModelContextProtocol.Tests/ClientServerTestBase.cs
@@ -86,6 +86,12 @@ public async ValueTask DisposeAsync()
 
     protected async Task<McpClient> CreateMcpClientForServer(McpClientOptions? clientOptions = null)
     {
+        clientOptions ??= new McpClientOptions();
+
+        // Disable the server/discover probe timeout to avoid CI slowness spuriously tripping it (issue #1701).
+        // Tests that need a specific probe timeout should create their own client instead of using this helper.
+        clientOptions.DiscoverProbeTimeout = Timeout.InfiniteTimeSpan;
+
         return await McpClient.CreateAsync(
             new StreamClientTransport(
                 serverInput: _clientToServerPipe.Writer.AsStream(),