diff --git a/tests/issues/test_1027_win_unreachable_cleanup.py b/tests/issues/test_1027_win_unreachable_cleanup.py
index 63d6dd8dcf..dae44655ef 100644
--- a/tests/issues/test_1027_win_unreachable_cleanup.py
+++ b/tests/issues/test_1027_win_unreachable_cleanup.py
@@ -12,19 +12,13 @@
 import tempfile
 import textwrap
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 import anyio
 import pytest
 
 from mcp import ClientSession, StdioServerParameters
 from mcp.client.stdio import _create_platform_compatible_process, stdio_client
-
-# TODO(Marcelo): This doesn't seem to be the right path. We should fix this.
-if TYPE_CHECKING:
-    from ..shared.test_win32_utils import escape_path_for_python
-else:
-    from tests.shared.test_win32_utils import escape_path_for_python
+from tests.shared.test_win32_utils import escape_path_for_python
 
 
 @pytest.mark.anyio
diff --git a/tests/server/auth/__init__.py b/tests/server/auth/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/server/auth/middleware/__init__.py b/tests/server/auth/middleware/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/server/auth/test_error_handling.py b/tests/server/auth/test_error_handling.py
index f331b2cb2d..cbc333441d 100644
--- a/tests/server/auth/test_error_handling.py
+++ b/tests/server/auth/test_error_handling.py
@@ -3,7 +3,7 @@
 """
 
 import unittest.mock
-from typing import TYPE_CHECKING, Any
+from typing import Any
 from urllib.parse import parse_qs, urlparse
 
 import httpx
@@ -14,12 +14,7 @@
 
 from mcp.server.auth.provider import AuthorizeError, RegistrationError, TokenError
 from mcp.server.auth.routes import create_auth_routes
-
-# TODO(Marcelo): This TYPE_CHECKING shouldn't be here, but pytest doesn't seem to get the module correctly.
-if TYPE_CHECKING:
-    from ...server.fastmcp.auth.test_auth_integration import MockOAuthProvider
-else:
-    from tests.server.fastmcp.auth.test_auth_integration import MockOAuthProvider
+from tests.server.fastmcp.auth.test_auth_integration import MockOAuthProvider
 
 
 @pytest.fixture
diff --git a/tests/server/fastmcp/test_server.py b/tests/server/fastmcp/test_server.py
index 3935f3bd13..c68ff4ac96 100644
--- a/tests/server/fastmcp/test_server.py
+++ b/tests/server/fastmcp/test_server.py
@@ -1,6 +1,6 @@
 import base64
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import Any
 from unittest.mock import patch
 
 import pytest
@@ -14,9 +14,7 @@
 from mcp.server.session import ServerSession
 from mcp.server.transport_security import TransportSecuritySettings
 from mcp.shared.exceptions import McpError
-from mcp.shared.memory import (
-    create_connected_server_and_client_session as client_session,
-)
+from mcp.shared.memory import create_connected_server_and_client_session as client_session
 from mcp.types import (
     AudioContent,
     BlobResourceContents,
@@ -27,9 +25,6 @@
     TextResourceContents,
 )
 
-if TYPE_CHECKING:
-    from mcp.server.fastmcp import Context
-
 
 class TestServer:
     @pytest.mark.anyio
diff --git a/tests/shared/__init__.py b/tests/shared/__init__.py
new file mode 100644
index 0000000000..e69de29bb2