diff --git a/tests/client/client/test_error_handling.py b/tests/client/client/test_error_handling.py
index 8f40e2ce6..96e85d56d 100644
--- a/tests/client/client/test_error_handling.py
+++ b/tests/client/client/test_error_handling.py
@@ -14,7 +14,7 @@ import logging
 
 import mcp_types
 import pytest
-from mcp_types import TextContent, ToolUseContent
+from mcp_types import TextContent
 from pydantic import AnyUrl
 
 from fastmcp.client import Client
@@ -414,4 +414,3 @@ class TestLogLevel:
             and record.levelname == "ERROR"
             for record in caplog.records
         )
-
diff --git a/tests/conformance/expected-failures.yml b/tests/conformance/expected-failures.yml
index 46b2081de..45ab3c1e3 100644
--- a/tests/conformance/expected-failures.yml
+++ b/tests/conformance/expected-failures.yml
@@ -4,3 +4,7 @@ server:
   - resources-subscribe
   - resources-unsubscribe
   - dns-rebinding-protection
+  # Server-initiated sampling was removed from the server API (SEP-2577), so
+  # the fixture has no `test_sampling` tool for this handshake-era scenario to
+  # drive. Modern sampling is exercised by input-required-result-basic-sampling.
+  - tools-call-sampling
diff --git a/tests/server/test_context.py b/tests/server/test_context.py
index e37e5531b..26b57d694 100644
--- a/tests/server/test_context.py
+++ b/tests/server/test_context.py
@@ -1,7 +1,6 @@
 from unittest.mock import MagicMock
 
 import pytest
-from mcp_types import ModelPreferences
 
 from fastmcp.server.context import (
     Context,