diff --git a/src/media/store.redirect.test.ts b/src/media/store.redirect.test.ts
index da666f0c4fb..358efbecea3 100644
--- a/src/media/store.redirect.test.ts
+++ b/src/media/store.redirect.test.ts
@@ -1,13 +1,15 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 import { PassThrough } from "node:stream";
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { createPinnedLookup } from "../infra/net/ssrf.js";
+import { createSuiteTempRootTracker } from "../test-helpers/temp-dir.js";
 import { captureEnv } from "../test-utils/env.js";
 import { saveMediaSource, setMediaStoreNetworkDepsForTest } from "./store.js";
 
-const HOME = path.join(os.tmpdir(), "openclaw-home-redirect");
+const homeRootTracker = createSuiteTempRootTracker({
+  prefix: "openclaw-home-redirect-",
+});
 const mockRequest = vi.fn();
 
 function createMockHttpExchange() {
@@ -92,11 +94,13 @@ async function expectRedirectSaveFailure(expectedMessage: string) {
 
 describe("media store redirects", () => {
   let envSnapshot: ReturnType<typeof captureEnv>;
+  let home = "";
 
   beforeAll(async () => {
     envSnapshot = captureEnv(["OPENCLAW_STATE_DIR"]);
-    await fs.rm(HOME, { recursive: true, force: true });
-    process.env.OPENCLAW_STATE_DIR = HOME;
+    await homeRootTracker.setup();
+    home = await homeRootTracker.make("state");
+    process.env.OPENCLAW_STATE_DIR = home;
   });
 
   beforeEach(() => {
@@ -113,7 +117,8 @@ describe("media store redirects", () => {
   });
 
   afterAll(async () => {
-    await fs.rm(HOME, { recursive: true, force: true });
+    await homeRootTracker.cleanup();
+    home = "";
     envSnapshot.restore();
     setMediaStoreNetworkDepsForTest();
     vi.clearAllMocks();