diff --git a/hardware-specific-tests/picamera2/test_sensor_mode.py b/hardware-specific-tests/picamera2/test_sensor_mode.py
index af875d9c..87c16d7c 100644
--- a/hardware-specific-tests/picamera2/test_sensor_mode.py
+++ b/hardware-specific-tests/picamera2/test_sensor_mode.py
@@ -2,25 +2,16 @@
 
 import logging
 
-from fastapi.testclient import TestClient
 import numpy as np
 
-from labthings_fastapi.server import ThingServer
-from labthings_fastapi.client import ThingClient
-
-from openflexure_microscope_server.things.camera.picamera import StreamingPiCamera2
+from .cam_test_utils import camera_test_client
 
 logging.basicConfig(level=logging.DEBUG)
 
 
 def test_sensor_mode():
     """Test capturing raw arrays in two different sensor modes."""
-    cam = StreamingPiCamera2()
-    server = ThingServer()
-    server.add_thing(cam, "/camera/")
-
-    with TestClient(server.app) as test_client:
-        client = ThingClient.from_url("/camera/", client=test_client)
+    with camera_test_client() as client:
         for size in [(3280, 2464), (1640, 1232)]:
             client.sensor_mode = {"output_size": size, "bit_depth": 10}
             arr = np.array(client.capture_array(stream_name="raw"))