diff --git a/src/agents/skills-install.download-test-utils.ts b/src/agents/skills-install.download-test-utils.ts
index a3ea85d9599..980ee653a7e 100644
--- a/src/agents/skills-install.download-test-utils.ts
+++ b/src/agents/skills-install.download-test-utils.ts
@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { captureEnv } from "../test-utils/env.js";
 
 export function setTempStateDir(workspaceDir: string): string {
   const stateDir = path.join(workspaceDir, "state");
@@ -11,11 +12,13 @@ export function setTempStateDir(workspaceDir: string): string {
 export async function withTempWorkspace(
   run: (params: { workspaceDir: string; stateDir: string }) => Promise<void>,
 ) {
+  const envSnapshot = captureEnv(["OPENCLAW_STATE_DIR"]);
   const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-skills-install-"));
   try {
     const stateDir = setTempStateDir(workspaceDir);
     await run({ workspaceDir, stateDir });
   } finally {
+    envSnapshot.restore();
     await fs.rm(workspaceDir, { recursive: true, force: true }).catch(() => undefined);
   }
 }
diff --git a/src/agents/skills-install.e2e.test.ts b/src/agents/skills-install.e2e.test.ts
index 696b03e828b..7fe9a37038c 100644
--- a/src/agents/skills-install.e2e.test.ts
+++ b/src/agents/skills-install.e2e.test.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import { withTempWorkspace } from "./skills-install.download-test-utils.js";
 import { installSkill } from "./skills-install.js";
 
 const runCommandWithTimeoutMock = vi.fn();
@@ -52,8 +52,7 @@ describe("installSkill code safety scanning", () => {
   });
 
   it("adds detailed warnings for critical findings and continues install", async () => {
-    const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-skills-install-"));
-    try {
+    await withTempWorkspace(async ({ workspaceDir }) => {
       const skillDir = await writeInstallableSkill(workspaceDir, "danger-skill");
       scanDirectoryWithSummaryMock.mockResolvedValue({
         scannedFiles: 1,
@@ -83,14 +82,11 @@ describe("installSkill code safety scanning", () => {
         true,
       );
       expect(result.warnings?.some((warning) => warning.includes("runner.js:1"))).toBe(true);
-    } finally {
-      await fs.rm(workspaceDir, { recursive: true, force: true }).catch(() => undefined);
-    }
+    });
   });
 
   it("warns and continues when skill scan fails", async () => {
-    const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-skills-install-"));
-    try {
+    await withTempWorkspace(async ({ workspaceDir }) => {
       await writeInstallableSkill(workspaceDir, "scanfail-skill");
       scanDirectoryWithSummaryMock.mockRejectedValue(new Error("scanner exploded"));
 
@@ -107,8 +103,6 @@ describe("installSkill code safety scanning", () => {
       expect(result.warnings?.some((warning) => warning.includes("Installation continues"))).toBe(
         true,
       );
-    } finally {
-      await fs.rm(workspaceDir, { recursive: true, force: true }).catch(() => undefined);
-    }
+    });
   });
 });