diff --git a/poetry.lock b/poetry.lock
index 19c89f006a..94e290991c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99aa7f343d882ca880dbc0d30e7578aebe85c668a49a495947d5d5108b9ff978
-size 586816
+oid sha256:9574edb29b6b989e30b34d8bbfa6e439207b2f6d7daeb50f6d66c20febe12166
+size 588084
diff --git a/pyproject.toml b/pyproject.toml
index 0d9772f695..647f3df6b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -111,7 +111,6 @@ markdown-it-py = "*"
 timezonefinder = "*"
 setproctitle = "*"
 
-
 [tool.poetry.group.dev.dependencies]
 av = "*"
 azure-identity = "*"
@@ -121,6 +120,7 @@ control = "*"
 coverage = "*"
 dictdiffer = "*"
 ft4222 = "*"
+flaky = "*"
 hypothesis = "~6.47"
 inputs = "*"
 Jinja2 = "*"
diff --git a/system/camerad/test/test_camerad.py b/system/camerad/test/test_camerad.py
index c6dc3be99c..408115607e 100755
--- a/system/camerad/test/test_camerad.py
+++ b/system/camerad/test/test_camerad.py
@@ -22,44 +22,39 @@ CAMERAS = ('roadCameraState', 'driverCameraState', 'wideRoadCameraState')
 @flaky(max_runs=3)
 @pytest.mark.tici
 class TestCamerad:
-  @classmethod
-  def setup_class(cls):
+  def setup_method(self):
     # run camerad and record logs
     managed_processes['camerad'].start()
     time.sleep(3)
     socks = {c: messaging.sub_sock(c, conflate=False, timeout=100) for c in CAMERAS}
 
-    cls.logs = defaultdict(list)
+    self.logs = defaultdict(list)
     start_time = time.monotonic()
     while time.monotonic()- start_time < TEST_TIMESPAN:
       for cam, s in socks.items():
-        cls.logs[cam] += messaging.drain_sock(s)
+        self.logs[cam] += messaging.drain_sock(s)
       time.sleep(0.2)
     managed_processes['camerad'].stop()
 
-    cls.log_by_frame_id = defaultdict(list)
-    cls.sensor_type = None
-    for cam, msgs in cls.logs.items():
-      if cls.sensor_type is None:
-        cls.sensor_type = getattr(msgs[0], msgs[0].which()).sensor.raw
+    self.log_by_frame_id = defaultdict(list)
+    self.sensor_type = None
+    for cam, msgs in self.logs.items():
+      if self.sensor_type is None:
+        self.sensor_type = getattr(msgs[0], msgs[0].which()).sensor.raw
       expected_frames = SERVICE_LIST[cam].frequency * TEST_TIMESPAN
       assert expected_frames*0.95 < len(msgs) < expected_frames*1.05, f"unexpected frame count {cam}: {expected_frames=}, got {len(msgs)}"
 
       dts = np.abs(np.diff([getattr(m, m.which()).timestampSof/1e6 for m in msgs]) - 1000/SERVICE_LIST[cam].frequency)
-      assert (dts < FRAME_DELTA_TOLERANCE[cls.sensor_type]).all(), f"{cam} dts(ms) out of spec: max diff {dts.max()}, 99 percentile {np.percentile(dts, 99)}"
+      assert (dts < FRAME_DELTA_TOLERANCE[self.sensor_type]).all(), f"{cam} dts(ms) out of spec: max diff {dts.max()}, 99 percentile {np.percentile(dts, 99)}"
 
       for m in msgs:
-        cls.log_by_frame_id[getattr(m, m.which()).frameId].append(m)
+        self.log_by_frame_id[getattr(m, m.which()).frameId].append(m)
 
     # strip beginning and end
     for _ in range(3):
-      mn, mx = min(cls.log_by_frame_id.keys()), max(cls.log_by_frame_id.keys())
-      del cls.log_by_frame_id[mn]
-      del cls.log_by_frame_id[mx]
-
-  @classmethod
-  def tearDownClass(cls):
-    managed_processes['camerad'].stop()
+      mn, mx = min(self.log_by_frame_id.keys()), max(self.log_by_frame_id.keys())
+      del self.log_by_frame_id[mn]
+      del self.log_by_frame_id[mx]
 
   def test_frame_skips(self):
     skips = {}