diff --git a/src/ZEO/StorageServer.py b/src/ZEO/StorageServer.py
index b089d8648..31fef9be9 100644
--- a/src/ZEO/StorageServer.py
+++ b/src/ZEO/StorageServer.py
@@ -49,7 +49,10 @@
 from ZODB.serialize import referencesf
 from ZODB.utils import oid_repr, p64, u64, z64
 
-from .asyncio.server import Acceptor
+if os.environ.get("ZEO_MTACCEPTOR"): # mainly for tests
+    from .asyncio.mtacceptor import Acceptor
+else:
+    from .asyncio.server import Acceptor
 
 logger = logging.getLogger('ZEO.StorageServer')
 
@@ -712,6 +715,7 @@ def __init__(self, addr, storages,
                  transaction_timeout=None,
                  ssl=None,
                  client_conflict_resolution=False,
+                 Acceptor=Acceptor,
                  ):
         """StorageServer constructor.