diff --git a/tests/gate-predicate-evaluator.test.cjs b/tests/gate-predicate-evaluator.test.cjs
index d3e2579a1..7d5c9fb39 100644
--- a/tests/gate-predicate-evaluator.test.cjs
+++ b/tests/gate-predicate-evaluator.test.cjs
@@ -22,8 +22,6 @@ const fc = require('fast-check');
 
 const {
   evaluatePredicate,
-  evaluateCommandExitZero,
-  interpolate,
   COMMAND_EXIT_ZERO_DEFAULT_TIMEOUT_MS,
   COMMAND_MAX_OUTPUT_CHARS,
   COMMAND_MAX_LENGTH,
diff --git a/tests/surface-empty-manifest-agents.test.cjs b/tests/surface-empty-manifest-agents.test.cjs
index ba884511b..9d5aa36cc 100644
--- a/tests/surface-empty-manifest-agents.test.cjs
+++ b/tests/surface-empty-manifest-agents.test.cjs
@@ -13,6 +13,7 @@ const os = require('os');
 const path = require('path');
 
 const { _syncGsdDir } = require('../gsd-core/bin/lib/surface.cjs');
+const { cleanup } = require('./helpers.cjs');
 
 function tmp() { return fs.mkdtempSync(path.join(os.tmpdir(), 'gsd-surface-empty-')); }
 
@@ -26,7 +27,7 @@ describe('#2018 — empty manifest must not delete gsd-* agents', () => {
     }
     // Staged dir is EMPTY (unresolvable manifest → nothing staged)
   });
-  afterEach(() => { try { fs.rmSync(dest, { recursive: true, force: true }); } catch {} try { fs.rmSync(staged, { recursive: true, force: true }); } catch {} });
+  afterEach(() => { cleanup(dest); cleanup(staged); });
 
   test('empty manifest → agents preserved (not deleted)', () => {
     _syncGsdDir(staged, dest, 'agents', new Map());