diff --git a/csaxs_bec/devices/tests_utils/__init__.py b/csaxs_bec/devices/tests_utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/tests_devices/conftest.py b/csaxs_bec/devices/tests_utils/utils.py
similarity index 100%
rename from tests/tests_devices/conftest.py
rename to csaxs_bec/devices/tests_utils/utils.py
diff --git a/tests/tests_devices/test_delay_generator_csaxs.py b/tests/tests_devices/test_delay_generator_csaxs.py
index 1afe0ea..e12efa5 100644
--- a/tests/tests_devices/test_delay_generator_csaxs.py
+++ b/tests/tests_devices/test_delay_generator_csaxs.py
@@ -7,16 +7,6 @@ from ophyd_devices.interfaces.base_classes.psi_delay_generator_base import Trigg
 from csaxs_bec.devices.epics.delay_generator_csaxs import DDGSetup
 
 
-def patch_dual_pvs(device):
-    for walk in device.walk_signals():
-        if not hasattr(walk.item, "_read_pv"):
-            continue
-        if not hasattr(walk.item, "_write_pv"):
-            continue
-        if walk.item._read_pv.pvname.endswith("_RBV"):
-            walk.item._read_pv = walk.item._write_pv
-
-
 @pytest.fixture(scope="function")
 def mock_DDGSetup():
     mock_ddg = mock.MagicMock()
diff --git a/tests/tests_devices/test_eiger9m_csaxs.py b/tests/tests_devices/test_eiger9m_csaxs.py
index 64cfdcd..805f36a 100644
--- a/tests/tests_devices/test_eiger9m_csaxs.py
+++ b/tests/tests_devices/test_eiger9m_csaxs.py
@@ -10,6 +10,7 @@ from bec_server.device_server.tests.utils import DMMock
 from ophyd_devices.tests.utils import MockPV
 
 from csaxs_bec.devices.epics.devices.eiger9m_csaxs import Eiger9McSAXS
+from csaxs_bec.devices.tests_utils.utils import patch_dual_pvs
 
 
 @pytest.fixture(scope="function")
diff --git a/tests/tests_devices/test_falcon_csaxs.py b/tests/tests_devices/test_falcon_csaxs.py
index 4022a99..4d6d621 100644
--- a/tests/tests_devices/test_falcon_csaxs.py
+++ b/tests/tests_devices/test_falcon_csaxs.py
@@ -11,6 +11,7 @@ from bec_server.device_server.tests.utils import DMMock
 from ophyd_devices.tests.utils import MockPV
 
 from csaxs_bec.devices.epics.devices.falcon_csaxs import FalconcSAXS, FalconTimeoutError
+from csaxs_bec.devices.tests_utils.utils import patch_dual_pvs
 
 
 @pytest.fixture(scope="function")
diff --git a/tests/tests_devices/test_mcs_card.py b/tests/tests_devices/test_mcs_card.py
index 4afb1a4..b8f2ce0 100644
--- a/tests/tests_devices/test_mcs_card.py
+++ b/tests/tests_devices/test_mcs_card.py
@@ -16,6 +16,7 @@ from csaxs_bec.devices.epics.mcs_csaxs import (
     ReadoutMode,
     TriggerSource,
 )
+from csaxs_bec.devices.tests_utils.utils import patch_dual_pvs
 
 
 @pytest.fixture(scope="function")
diff --git a/tests/tests_devices/test_pilatus_csaxs.py b/tests/tests_devices/test_pilatus_csaxs.py
index d3b2eda..1b4d7a8 100644
--- a/tests/tests_devices/test_pilatus_csaxs.py
+++ b/tests/tests_devices/test_pilatus_csaxs.py
@@ -11,6 +11,7 @@ from bec_server.device_server.tests.utils import DMMock
 from ophyd_devices.tests.utils import MockPV
 
 from csaxs_bec.devices.epics.devices.pilatus_csaxs import PilatuscSAXS
+from csaxs_bec.devices.tests_utils.utils import patch_dual_pvs
 
 
 @pytest.fixture(scope="function")