diff --git a/client/e2e/global-teardown.js b/client/e2e/global-teardown.js
new file mode 100644
index 00000000..9308d940
--- /dev/null
+++ b/client/e2e/global-teardown.js
@@ -0,0 +1,18 @@
+import { rimraf } from "rimraf";
+
+async function globalTeardown() {
+  if (!process.env.CI) {
+    console.log("Cleaning up test-results directory...");
+    // Add a small delay to ensure all Playwright files are written
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    await rimraf("./e2e/test-results");
+    console.log("Test-results directory cleaned up.");
+  }
+}
+
+export default globalTeardown;
+
+// Call the function when this script is run directly
+if (import.meta.url === `file://${process.argv[1]}`) {
+  globalTeardown().catch(console.error);
+}
diff --git a/client/package.json b/client/package.json
index a34ecbc4..6d2e7d1a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,7 +21,8 @@
     "preview": "vite preview --port 6274",
     "test": "jest --config jest.config.cjs",
     "test:watch": "jest --config jest.config.cjs --watch",
-    "test:e2e": "playwright test e2e"
+    "test:e2e": "playwright test e2e && npm run cleanup:e2e",
+    "cleanup:e2e": "node e2e/global-teardown.js"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.12.1",