diff --git a/tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs b/tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs
index e855be00b..bf24770b7 100644
--- a/tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs
+++ b/tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs
@@ -65,7 +65,7 @@ public async Task CreateAsync_WithValidStdioConfig_CreatesNewClient()
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(
+        await using var client = await McpClientFactory.CreateAsync(
             serverConfig,
             _defaultOptions,
             (_, __) => new NopTransport());
@@ -88,7 +88,7 @@ public async Task CreateAsync_WithNoTransportOptions_CreatesNewClient()
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(
+        await using var client = await McpClientFactory.CreateAsync(
             serverConfig,
             _defaultOptions,
             (_, __) => new NopTransport());
@@ -111,7 +111,7 @@ public async Task CreateAsync_WithValidSseConfig_CreatesNewClient()
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(
+        await using var client = await McpClientFactory.CreateAsync(
             serverConfig,
             _defaultOptions,
             (_, __) => new NopTransport());
@@ -141,7 +141,7 @@ public async Task CreateAsync_WithSse_CreatesCorrectTransportOptions()
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(
+        await using var client = await McpClientFactory.CreateAsync(
             serverConfig,
             _defaultOptions,
             (_, __) => new NopTransport());
diff --git a/tests/ModelContextProtocol.Tests/SseIntegrationTests.cs b/tests/ModelContextProtocol.Tests/SseIntegrationTests.cs
index 0ded57b40..6451e9e37 100644
--- a/tests/ModelContextProtocol.Tests/SseIntegrationTests.cs
+++ b/tests/ModelContextProtocol.Tests/SseIntegrationTests.cs
@@ -37,7 +37,7 @@ public async Task ConnectAndReceiveMessage_InMemoryServer()
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
+        await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
 
         // Wait for SSE connection to be established
         await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
@@ -82,7 +82,7 @@ public async Task ConnectAndReceiveMessage_EverythingServerWithSse()
         };
 
         // Create client and run tests
-        var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
+        await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
         var tools = await client.ListToolsAsync().ToListAsync();
 
         // assert
@@ -147,7 +147,7 @@ public async Task Sampling_Sse_EverythingServer()
             },
         };
 
-        var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
+        await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
 
         // Call the server's sampleLLM tool which should trigger our sampling handler
         var result = await client.CallToolAsync(
@@ -194,7 +194,7 @@ public async Task ConnectAndReceiveMessage_InMemoryServer_WithFullEndpointEventU
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
+        await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
 
         // Wait for SSE connection to be established
         await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
@@ -233,7 +233,7 @@ public async Task ConnectAndReceiveNotification_InMemoryServer()
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
+        await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
 
         // Wait for SSE connection to be established
         await server.WaitForConnectionAsync(TimeSpan.FromSeconds(10));
@@ -282,7 +282,7 @@ public async Task ConnectTwice_Throws()
         };
 
         // Act
-        var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
+        await using var client = await McpClientFactory.CreateAsync(defaultConfig, defaultOptions, loggerFactory: loggerFactory);
         var mcpClient = (McpClient)client;
         var transport = (SseClientTransport)mcpClient.Transport;
 
diff --git a/tests/ModelContextProtocol.Tests/SseServerIntegrationTestFixture.cs b/tests/ModelContextProtocol.Tests/SseServerIntegrationTestFixture.cs
index 4f3cb2ff3..7b2642284 100644
--- a/tests/ModelContextProtocol.Tests/SseServerIntegrationTestFixture.cs
+++ b/tests/ModelContextProtocol.Tests/SseServerIntegrationTestFixture.cs
@@ -63,8 +63,6 @@ public void Dispose()
     {
         try
         {
-            var client = McpClientFactory.CreateAsync(DefaultConfig, DefaultOptions, loggerFactory: LoggerFactory).GetAwaiter().GetResult();
-            client.DisposeAsync().AsTask().Wait();
             LoggerFactory?.Dispose();
         }
         finally