diff --git a/bluesky_httpserver/tests/test_access_control.py b/bluesky_httpserver/tests/test_access_control.py
index e6afdf0..2572123 100644
--- a/bluesky_httpserver/tests/test_access_control.py
+++ b/bluesky_httpserver/tests/test_access_control.py
@@ -3,7 +3,7 @@
 import pprint
 
 import pytest
-from bluesky_queueserver.manager.tests.common import re_manager, re_manager_cmd  # noqa F401
+from bluesky_queueserver.manager.tests.common import re_manager, re_manager_cmd, re_manager_factory  # noqa F401
 
 from bluesky_httpserver.authorization._defaults import (
     _DEFAULT_RESOURCE_ACCESS_GROUP,
diff --git a/bluesky_httpserver/tests/test_access_policies.py b/bluesky_httpserver/tests/test_access_policies.py
index 374d711..ef97ca7 100644
--- a/bluesky_httpserver/tests/test_access_policies.py
+++ b/bluesky_httpserver/tests/test_access_policies.py
@@ -6,7 +6,7 @@
 
 import pytest
 import requests
-from bluesky_queueserver.manager.tests.common import re_manager  # noqa F401
+from bluesky_queueserver.manager.tests.common import re_manager, re_manager_factory  # noqa F401
 from xprocess import ProcessStarter
 
 from bluesky_httpserver.authorization import (
diff --git a/bluesky_httpserver/tests/test_auth_api.py b/bluesky_httpserver/tests/test_auth_api.py
index ad23e5a..6aebdeb 100644
--- a/bluesky_httpserver/tests/test_auth_api.py
+++ b/bluesky_httpserver/tests/test_auth_api.py
@@ -1,7 +1,7 @@
 import pprint
 import time as ttime
 
-from bluesky_queueserver.manager.tests.common import re_manager, re_manager_cmd  # noqa F401
+from bluesky_queueserver.manager.tests.common import re_manager, re_manager_cmd, re_manager_factory  # noqa F401
 
 from bluesky_httpserver.authorization._defaults import _DEFAULT_ROLES
 
diff --git a/bluesky_httpserver/tests/test_auth_for_websockets.py b/bluesky_httpserver/tests/test_auth_for_websockets.py
index 3d26e22..44bac42 100644
--- a/bluesky_httpserver/tests/test_auth_for_websockets.py
+++ b/bluesky_httpserver/tests/test_auth_for_websockets.py
@@ -4,7 +4,7 @@
 import time as ttime
 
 import pytest
-from bluesky_queueserver.manager.tests.common import re_manager, re_manager_cmd  # noqa F401
+from bluesky_queueserver.manager.tests.common import re_manager, re_manager_cmd, re_manager_factory  # noqa F401
 from websockets.sync.client import connect
 
 from .conftest import fastapi_server_fs  # noqa: F401
diff --git a/bluesky_httpserver/tests/test_console_output.py b/bluesky_httpserver/tests/test_console_output.py
index 1f089ec..693f65f 100644
--- a/bluesky_httpserver/tests/test_console_output.py
+++ b/bluesky_httpserver/tests/test_console_output.py
@@ -6,7 +6,7 @@
 
 import pytest
 import requests
-from bluesky_queueserver.manager.tests.common import re_manager_cmd  # noqa F401
+from bluesky_queueserver.manager.tests.common import re_manager_cmd, re_manager_factory  # noqa F401
 from websockets.sync.client import connect
 
 from bluesky_httpserver.tests.conftest import (  # noqa F401
diff --git a/bluesky_httpserver/tests/test_core_api_fs.py b/bluesky_httpserver/tests/test_core_api_fs.py
index a00d99a..ace9205 100644
--- a/bluesky_httpserver/tests/test_core_api_fs.py
+++ b/bluesky_httpserver/tests/test_core_api_fs.py
@@ -7,6 +7,7 @@
     copy_default_profile_collection,
     re_manager,
     re_manager_cmd,
+    re_manager_factory,
     re_manager_pc_copy,
     set_qserver_zmq_address,
     set_qserver_zmq_public_key,
diff --git a/bluesky_httpserver/tests/test_core_api_main.py b/bluesky_httpserver/tests/test_core_api_main.py
index 487fe05..fae48bd 100644
--- a/bluesky_httpserver/tests/test_core_api_main.py
+++ b/bluesky_httpserver/tests/test_core_api_main.py
@@ -11,6 +11,7 @@
     ip_kernel_simple_client,
     re_manager,
     re_manager_cmd,
+    re_manager_factory,
     re_manager_pc_copy,
 )
 
diff --git a/bluesky_httpserver/tests/test_server.py b/bluesky_httpserver/tests/test_server.py
index 117f4df..19e7f3c 100644
--- a/bluesky_httpserver/tests/test_server.py
+++ b/bluesky_httpserver/tests/test_server.py
@@ -8,6 +8,7 @@
     copy_default_profile_collection,
     re_manager,
     re_manager_cmd,
+    re_manager_factory,
     re_manager_pc_copy,
     set_qserver_zmq_address,
     set_qserver_zmq_public_key,
diff --git a/bluesky_httpserver/tests/test_system_info_socket.py b/bluesky_httpserver/tests/test_system_info_socket.py
index 4d25dd6..6b5eb49 100644
--- a/bluesky_httpserver/tests/test_system_info_socket.py
+++ b/bluesky_httpserver/tests/test_system_info_socket.py
@@ -4,7 +4,7 @@
 import time as ttime
 
 import pytest
-from bluesky_queueserver.manager.tests.common import re_manager_cmd  # noqa F401
+from bluesky_queueserver.manager.tests.common import re_manager_cmd, re_manager_factory  # noqa F401
 from websockets.sync.client import connect
 
 from bluesky_httpserver.tests.conftest import (  # noqa F401