diff --git a/pyproject.toml b/pyproject.toml
index 38c3337c6f..1426905d06 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,6 +2,7 @@
 minversion = "6.0"
 addopts = "--ignore=openpilot/ --ignore=cereal/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ -Werror --strict-config --strict-markers --durations=10 -n auto --dist=loadgroup"
 cpp_files = "test_*"
+cpp_harness = "selfdrive/test/cpp_harness.py"
 python_files = "test_*.py"
 #timeout = "30"  # you get this long by default
 markers = [
diff --git a/selfdrive/test/cpp_harness.py b/selfdrive/test/cpp_harness.py
new file mode 100755
index 0000000000..a16b5707f5
--- /dev/null
+++ b/selfdrive/test/cpp_harness.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+import subprocess
+import sys
+
+from openpilot.common.prefix import OpenpilotPrefix
+
+
+with OpenpilotPrefix():
+  ret = subprocess.call(sys.argv[1:])
+
+exit(ret)
\ No newline at end of file