diff --git a/jupyter_server/tests/extension/test_manager.py b/jupyter_server/tests/extension/test_manager.py
index c5b4197279..310a058fdc 100644
--- a/jupyter_server/tests/extension/test_manager.py
+++ b/jupyter_server/tests/extension/test_manager.py
@@ -83,7 +83,8 @@ def test_extension_manager_api():
     }
     manager = ExtensionManager()
     assert manager.config_manager
-    assert _normalize_path(manager.config_manager.read_config_path) == _normalize_path(jupyter_config_path())
+    expected = _normalize_path(os.path.join(jupyter_config_path()[0], 'serverconfig'))
+    assert _normalize_path(manager.config_manager.read_config_path[0]) == expected
     manager.from_jpserver_extensions(jpserver_extensions)
     assert len(manager.extensions) == 1
     assert "jupyter_server.tests.extension.mockextensions" in manager.extensions
diff --git a/jupyter_server/tests/test_terminal.py b/jupyter_server/tests/test_terminal.py
index 18b776f5f2..7ad638d582 100644
--- a/jupyter_server/tests/test_terminal.py
+++ b/jupyter_server/tests/test_terminal.py
@@ -1,4 +1,4 @@
-# Only Run tests on MacOS and Linux
+import os
 import shutil
 import pytest
 import json
@@ -8,11 +8,6 @@
 from tornado.httpclient import HTTPClientError
 from traitlets.config import Config
 
-# Skip this whole module on Windows. The terminal API leads
-# to timeouts on Windows CI.
-if sys.platform.startswith('win'):
-    pytest.skip("Terminal API tests time out on Windows.", allow_module_level=True)
-
 
 # Kill all running terminals after each test to avoid cross-test issues
 # with still running terminals.
@@ -137,7 +132,7 @@ async def test_terminal_create_with_cwd(jp_fetch, jp_ws_fetch, terminal_path):
 
     ws.close()
 
-    assert str(terminal_path) in message_stdout
+    assert os.path.basename(terminal_path) in message_stdout
 
 
 async def test_culling_config(jp_server_config, jp_configurable_serverapp):