diff --git a/src/tasks/task-executor.test.ts b/src/tasks/task-executor.test.ts
index e9db6feb840..aa41126734e 100644
--- a/src/tasks/task-executor.test.ts
+++ b/src/tasks/task-executor.test.ts
@@ -25,6 +25,7 @@ import {
   getTaskById,
   findLatestTaskForFlowId,
   findTaskByRunId,
+  resetTaskRegistryDeliveryRuntimeForTests,
   resetTaskRegistryForTests,
 } from "./task-registry.js";
 
@@ -57,11 +58,13 @@ vi.mock("../agents/subagent-control.js", () => ({
 async function withTaskExecutorStateDir(run: (root: string) => Promise<void>): Promise<void> {
   await withTempDir({ prefix: "openclaw-task-executor-" }, async (root) => {
     process.env.OPENCLAW_STATE_DIR = root;
+    resetTaskRegistryDeliveryRuntimeForTests();
     resetTaskRegistryForTests();
     resetFlowRegistryForTests();
     try {
       await run(root);
     } finally {
+      resetTaskRegistryDeliveryRuntimeForTests();
       resetTaskRegistryForTests();
       resetFlowRegistryForTests();
     }
@@ -75,6 +78,7 @@ describe("task-executor", () => {
     } else {
       process.env.OPENCLAW_STATE_DIR = ORIGINAL_STATE_DIR;
     }
+    resetTaskRegistryDeliveryRuntimeForTests();
     resetTaskRegistryForTests();
     resetFlowRegistryForTests();
     hoisted.sendMessageMock.mockReset();
diff --git a/src/tasks/task-registry.ts b/src/tasks/task-registry.ts
index c8d032159a0..560ad714674 100644
--- a/src/tasks/task-registry.ts
+++ b/src/tasks/task-registry.ts
@@ -1932,3 +1932,7 @@ export function resetTaskRegistryForTests(opts?: { persist?: boolean }) {
     getTaskRegistryStore().close?.();
   }
 }
+
+export function resetTaskRegistryDeliveryRuntimeForTests() {
+  deliveryRuntimePromise = null;
+}