diff --git a/src/mx_bluesky/hyperion/utils/validation.py b/src/mx_bluesky/hyperion/utils/validation.py
index 639b61929..90bc0a8fa 100644
--- a/src/mx_bluesky/hyperion/utils/validation.py
+++ b/src/mx_bluesky/hyperion/utils/validation.py
@@ -80,7 +80,7 @@ def plan():
 
 def fake_create_rotation_devices():
     beamstop = i03.beamstop(connect_immediately=True, mock=True)
-    eiger = i03.eiger(fake_with_ophyd_sim=True)
+    eiger = i03.eiger(connect_immediately=True, mock=True)
     smargon = i03.smargon(connect_immediately=True, mock=True)
     zebra = i03.zebra(connect_immediately=True, mock=True)
     detector_motion = i03.detector_motion(connect_immediately=True, mock=True)
diff --git a/tests/conftest.py b/tests/conftest.py
index 27358157e..03cce5903 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -294,7 +294,7 @@ def done_status():
 
 @pytest.fixture
 def eiger(done_status):
-    eiger = i03.eiger(fake_with_ophyd_sim=True)
+    eiger = i03.eiger(connect_immediately=True, mock=True)
     eiger.stage = MagicMock(return_value=done_status)
     eiger.do_arm.set = MagicMock(return_value=done_status)
     eiger.unstage = MagicMock(return_value=done_status)
@@ -811,7 +811,7 @@ async def fake_fgs_composite(
         backlight=backlight,
         dcm=dcm,
         # We don't use the eiger fixture here because .unstage() is used in some tests
-        eiger=i03.eiger(fake_with_ophyd_sim=True),
+        eiger=i03.eiger(connect_immediately=True, mock=True),
         zebra_fast_grid_scan=i03.zebra_fast_grid_scan(
             connect_immediately=True, mock=True
         ),
diff --git a/tests/system_tests/hyperion/experiment_plans/test_plan_system.py b/tests/system_tests/hyperion/experiment_plans/test_plan_system.py
index 524d4b5b7..e7148da32 100644
--- a/tests/system_tests/hyperion/experiment_plans/test_plan_system.py
+++ b/tests/system_tests/hyperion/experiment_plans/test_plan_system.py
@@ -41,7 +41,7 @@ async def test_getting_data_for_ispyb():
         tolerances=AperturePosition.tolerances_from_gda_params(params),
     )
     smargon = i03.smargon(connect_immediately=True, mock=True)
-    eiger = i03.eiger(fake_with_ophyd_sim=True)
+    eiger = i03.eiger(mock=True)
     await undulator.connect()
     slit_gaps.wait_for_connection()
     flux.wait_for_connection()
diff --git a/tests/unit_tests/common/device_setup_plans/test_read_hardware_for_setup.py b/tests/unit_tests/common/device_setup_plans/test_read_hardware_for_setup.py
index 14d3ac22a..ddfa44020 100644
--- a/tests/unit_tests/common/device_setup_plans/test_read_hardware_for_setup.py
+++ b/tests/unit_tests/common/device_setup_plans/test_read_hardware_for_setup.py
@@ -12,7 +12,7 @@
 
 @pytest.fixture
 def fake_eiger() -> EigerDetector:
-    return eiger(fake_with_ophyd_sim=True)
+    return eiger(mock=True)
 
 
 def test_read_hardware_for_zocalo_in_RE(fake_eiger, RE: RunEngine):
diff --git a/tests/unit_tests/common/plan_stubs/test_do_fgs.py b/tests/unit_tests/common/plan_stubs/test_do_fgs.py
index 3a092fbb2..54d321df4 100644
--- a/tests/unit_tests/common/plan_stubs/test_do_fgs.py
+++ b/tests/unit_tests/common/plan_stubs/test_do_fgs.py
@@ -31,7 +31,7 @@ def fgs_devices(RE):
         grid_scan_device = ZebraFastGridScan("zebra_fgs")
 
     # Eiger done separately as not ophyd-async yet
-    detector = eiger(fake_with_ophyd_sim=True)
+    detector = eiger(mock=True)
 
     return {
         "synchrotron": synchrotron,
diff --git a/tests/unit_tests/hyperion/device_setup_plans/test_utils.py b/tests/unit_tests/hyperion/device_setup_plans/test_utils.py
index d92cea39a..3ea80fb02 100644
--- a/tests/unit_tests/hyperion/device_setup_plans/test_utils.py
+++ b/tests/unit_tests/hyperion/device_setup_plans/test_utils.py
@@ -14,7 +14,7 @@
 
 @pytest.fixture()
 def mock_eiger():
-    eiger = i03.eiger(fake_with_ophyd_sim=True)
+    eiger = i03.eiger(mock=True)
     eiger.detector_params = MagicMock()
     eiger.async_stage = MagicMock()
     eiger.disarm_detector = MagicMock()