diff --git a/src/ophyd_async/core/__init__.py b/src/ophyd_async/core/__init__.py
index 6ae93cd822..39d5030204 100644
--- a/src/ophyd_async/core/__init__.py
+++ b/src/ophyd_async/core/__init__.py
@@ -16,7 +16,7 @@
     set_signal_values,
     walk_rw_signals,
 )
-from ._flyer import StandardFlyer, FlyerController
+from ._flyer import FlyerController, StandardFlyer
 from ._hdf_dataset import HDFDataset, HDFFile
 from ._log import config_ophyd_async_logging
 from ._mock_signal_backend import MockSignalBackend
diff --git a/tests/core/test_flyer.py b/tests/core/test_flyer.py
index d0ab85c16d..6293527192 100644
--- a/tests/core/test_flyer.py
+++ b/tests/core/test_flyer.py
@@ -15,10 +15,10 @@
     DetectorController,
     DetectorTrigger,
     DetectorWriter,
+    FlyerController,
     StandardDetector,
     StandardFlyer,
     TriggerInfo,
-    FlyerController,
     observe_value,
 )
 from ophyd_async.epics.signal import epics_signal_rw
diff --git a/tests/epics/adcore/test_scans.py b/tests/epics/adcore/test_scans.py
index 38c786df0e..a3fbf842be 100644
--- a/tests/epics/adcore/test_scans.py
+++ b/tests/epics/adcore/test_scans.py
@@ -13,10 +13,10 @@
     DetectorController,
     DetectorTrigger,
     DeviceCollector,
+    FlyerController,
     StandardDetector,
     StandardFlyer,
     TriggerInfo,
-    FlyerController,
     set_mock_value,
 )
 from ophyd_async.epics import adcore, adsimdetector
diff --git a/tests/plan_stubs/test_fly.py b/tests/plan_stubs/test_fly.py
index c016d9f2da..86af5687a9 100644
--- a/tests/plan_stubs/test_fly.py
+++ b/tests/plan_stubs/test_fly.py
@@ -15,10 +15,10 @@
     DetectorController,
     DetectorWriter,
     DeviceCollector,
+    FlyerController,
     SignalR,
     StandardDetector,
     StandardFlyer,
-    FlyerController,
     WatchableAsyncStatus,
     WatcherUpdate,
     observe_value,