diff --git a/bunfig.toml b/bunfig.toml
new file mode 100644
index 000000000..9e75dd230
--- /dev/null
+++ b/bunfig.toml
@@ -0,0 +1,2 @@
+[test]
+preload = ["./test-setup.ts"]
diff --git a/test-setup.ts b/test-setup.ts
new file mode 100644
index 000000000..5ac63e4e6
--- /dev/null
+++ b/test-setup.ts
@@ -0,0 +1,6 @@
+import { beforeEach } from "bun:test"
+import { _resetForTesting } from "./src/features/claude-code-session-state/state"
+
+beforeEach(() => {
+  _resetForTesting()
+})