diff --git a/src/commands/doctor/shared/codex-native-assets.test.ts b/src/commands/doctor/shared/codex-native-assets.test.ts
index e79e98ef702..a0c0411acfa 100644
--- a/src/commands/doctor/shared/codex-native-assets.test.ts
+++ b/src/commands/doctor/shared/codex-native-assets.test.ts
@@ -118,11 +118,13 @@ describe("collectCodexNativeAssetWarnings", () => {
       env: { CODEX_HOME: codexHome, HOME: root },
     });
 
-    expect(warnings).toHaveLength(1);
-    expect(warnings[0]).toContain("isolated per-agent Codex homes");
-    expect(warnings[0]).toContain(codexHome);
-    expect(warnings[0]).toContain(path.join(root, ".agents", "skills"));
-    expect(warnings[0]).toContain("openclaw migrate codex --dry-run");
-    expect(warnings[0]).toContain("manual-review only");
+    expect(warnings).toStrictEqual([
+      [
+        "- Personal Codex CLI assets were found, but native Codex-mode OpenClaw agents use isolated per-agent Codex homes.",
+        `- Sources: ${codexHome} and ${path.join(root, ".agents", "skills")} (1 skill, 0 plugins, 0 config files, 0 hook files).`,
+        "- These assets will not be loaded by the Codex app-server child unless you intentionally promote them.",
+        "- Run `openclaw migrate codex --dry-run` to inventory them. Applying that migration copies skills into the current OpenClaw agent workspace; Codex plugins, hooks, and config stay manual-review only.",
+      ].join("\n"),
+    ]);
   });
 });
diff --git a/src/commands/doctor/shared/plugin-registry-migration.test.ts b/src/commands/doctor/shared/plugin-registry-migration.test.ts
index 02aa24e18e4..f7d10a097e4 100644
--- a/src/commands/doctor/shared/plugin-registry-migration.test.ts
+++ b/src/commands/doctor/shared/plugin-registry-migration.test.ts
@@ -395,10 +395,9 @@ describe("plugin registry install migration", () => {
       action: "migrate",
       force: true,
     });
-    expect(result.deprecationWarnings).toHaveLength(1);
-    expect(result.deprecationWarnings[0]).toContain(
-      `${FORCE_PLUGIN_REGISTRY_MIGRATION_ENV} is deprecated`,
-    );
+    expect(result.deprecationWarnings).toStrictEqual([
+      `${FORCE_PLUGIN_REGISTRY_MIGRATION_ENV} is deprecated and will be removed after the plugin registry migration rollout; use doctor registry repair once available.`,
+    ]);
   });
 
   it("treats falsey env flag strings as unset", async () => {