diff --git a/poetry.lock b/poetry.lock
index b266524adb..23f921f318 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d819ba33852e8be375cc0914a1ac5b344df6fc200441f8daf45e3ab3c8787a88
-size 376782
+oid sha256:bd848e2d24544e5ed93db3b68770036ddfd0af475f11a1a7c35f7ec84fd93a6c
+size 377110
diff --git a/pyproject.toml b/pyproject.toml
index e350f070c4..b7952d3fa8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,8 +1,8 @@
 [tool.pytest.ini_options]
 minversion = "6.0"
-addopts = "--ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=laika_repo/"
+addopts = "--ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=laika_repo/ -Werror --strict-config --strict-markers"
 python_files = "test_*.py"
-timeout = "30"  # you get this long by default
+#timeout = "30"  # you get this long by default
 
 [tool.mypy]
 python_version = "3.11"
@@ -124,6 +124,8 @@ pytest = "*"
 pytest-cov = "*"
 pytest-subtests = "*"
 pytest-xdist = "*"
+pytest-timeout = "*"
+pytest-timeouts = "*"
 scipy = "*"
 sphinx = "*"
 sphinx-rtd-theme = "*"
diff --git a/system/loggerd/tests/test_uploader.py b/system/loggerd/tests/test_uploader.py
index bf21d8d7a9..6e2f86d6ca 100755
--- a/system/loggerd/tests/test_uploader.py
+++ b/system/loggerd/tests/test_uploader.py
@@ -14,7 +14,7 @@ from openpilot.system.loggerd.uploader import uploader_fn, UPLOAD_ATTR_NAME, UPL
 from openpilot.system.loggerd.tests.loggerd_tests_common import UploaderTestCase
 
 
-class TestLogHandler(logging.Handler):
+class FakeLogHandler(logging.Handler):
   def __init__(self):
     logging.Handler.__init__(self)
     self.reset()
@@ -33,7 +33,7 @@ class TestLogHandler(logging.Handler):
     except Exception:
       pass
 
-log_handler = TestLogHandler()
+log_handler = FakeLogHandler()
 cloudlog.addHandler(log_handler)
 
 
diff --git a/tools/plotjuggler/test_plotjuggler.py b/tools/plotjuggler/test_plotjuggler.py
index e29e33f921..b002331cd7 100755
--- a/tools/plotjuggler/test_plotjuggler.py
+++ b/tools/plotjuggler/test_plotjuggler.py
@@ -18,19 +18,18 @@ class TestPlotJuggler(unittest.TestCase):
     install()
 
     pj = os.path.join(PJ_DIR, "juggle.py")
-    p = subprocess.Popen(f'QT_QPA_PLATFORM=offscreen {pj} --demo None 1 --qlog',
-                         stderr=subprocess.PIPE, shell=True, start_new_session=True)
-
-    # Wait for "Done reading Rlog data" signal from the plugin
-    output = "\n"
-    with Timeout(180, error_msg=output):
-      while output.splitlines()[-1] != "Done reading Rlog data":
-        output += p.stderr.readline().decode("utf-8")
-
-    # ensure plotjuggler didn't crash after exiting the plugin
-    time.sleep(15)
-    self.assertEqual(p.poll(), None)
-    os.killpg(os.getpgid(p.pid), signal.SIGTERM)
+    with subprocess.Popen(f'QT_QPA_PLATFORM=offscreen {pj} --demo None 1 --qlog',
+                          stderr=subprocess.PIPE, shell=True, start_new_session=True) as p:
+      # Wait for "Done reading Rlog data" signal from the plugin
+      output = "\n"
+      with Timeout(180, error_msg=output):
+        while output.splitlines()[-1] != "Done reading Rlog data":
+          output += p.stderr.readline().decode("utf-8")
+
+      # ensure plotjuggler didn't crash after exiting the plugin
+      time.sleep(15)
+      self.assertEqual(p.poll(), None)
+      os.killpg(os.getpgid(p.pid), signal.SIGTERM)
 
   # TODO: also test that layouts successfully load
   def test_layouts(self):