diff --git a/client/commands/v2/__init__.py b/client/commands/v2/__init__.py
index 390d44bc90b..5be1df6ab40 100644
--- a/client/commands/v2/__init__.py
+++ b/client/commands/v2/__init__.py
@@ -10,7 +10,6 @@
 from . import kill  # noqa F401
 from . import persistent  # noqa F401
 from . import profile  # noqa F401
-from . import pysa_server  # noqa F401
 from . import query  # noqa F401
 from . import rage  # noqa F401
 from . import restart  # noqa F401
@@ -18,3 +17,4 @@
 from . import start  # noqa F401
 from . import stop  # noqa F401
 from . import validate_models  # noqa F401
+from ....client.commands.v2 import pysa_server  # noqa F401
diff --git a/client/commands/v2/pysa_server.py b/client/commands/v2/pysa_server.py
index 5f2da7a74a5..c32d5d97dc9 100644
--- a/client/commands/v2/pysa_server.py
+++ b/client/commands/v2/pysa_server.py
@@ -15,6 +15,9 @@
 from collections import defaultdict
 from typing import List, Sequence, Dict
 
+from ....api import query, connection as api_connection
+from ....api.connection import PyreQueryError
+
 from ... import (
     json_rpc,
     command_arguments,
@@ -36,8 +39,6 @@
     InitializationSuccess,
     InitializationFailure,
 )
-from ....api import query, connection as api_connection
-from ....api.connection import PyreQueryError
 
 LOG: logging.Logger = logging.getLogger(__name__)
 
diff --git a/client/tests/pyre_test.py b/client/tests/pyre_test.py
index 79c59775015..97932c439c4 100644
--- a/client/tests/pyre_test.py
+++ b/client/tests/pyre_test.py
@@ -13,9 +13,9 @@
 from .. import (
     command_arguments,
     configuration,
-    pyre,
     recently_used_configurations,
 )
+from ...client import pyre
 from .setup import (
     ensure_directories_exists,
     switch_working_directory,