diff --git a/tests/data/skill_code_blocks.json b/tests/data/skill_code_blocks.json
index b0e7bdb..9875008 100644
--- a/tests/data/skill_code_blocks.json
+++ b/tests/data/skill_code_blocks.json
@@ -11,7 +11,7 @@
    "kind": "example",
    "evidence": [
     "multi-agent-mux-create/scripts/create_session.sh:99",
-    "multi-agent-mux-create/scripts/create_session.sh:360"
+    "multi-agent-mux-create/scripts/create_session.sh:364"
    ],
    "mismatch": null,
    "note": "HERDR_SESSION_NAME environment example"
@@ -67,7 +67,7 @@
    "class": "c",
    "kind": "example",
    "evidence": [
-    "multi-agent-mux-create/scripts/create_session.sh:518-545"
+    "multi-agent-mux-create/scripts/create_session.sh:522-549"
    ],
    "mismatch": null,
    "note": "Output format: the row create_session.sh writes"
@@ -96,7 +96,7 @@
    "kind": "invocation",
    "evidence": [
     "multi-agent-mux-create/scripts/worktree_prepare.sh:24",
-    "multi-agent-mux-create/scripts/worktree_prepare.sh:250"
+    "multi-agent-mux-create/scripts/worktree_prepare.sh:251"
    ],
    "mismatch": null,
    "note": "worktree_prepare.sh call"
@@ -175,7 +175,7 @@
    "kind": "invocation",
    "evidence": [
     "lib_py/loop/runner.py:155",
-    "multi-agent-mux-create/scripts/worktree_prepare.sh:250"
+    "multi-agent-mux-create/scripts/worktree_prepare.sh:251"
    ],
    "mismatch": null,
    "note": "--worktree/--base --review-only call pattern"
@@ -560,9 +560,9 @@
    "evidence": [
     "multi-agent-mux-create/scripts/create_session.sh:166-168",
     "multi-agent-mux-create/scripts/create_session.sh:207",
-    "multi-agent-mux-create/scripts/create_session.sh:259-274",
-    "multi-agent-mux-create/scripts/create_session.sh:365-402",
-    "multi-agent-mux-create/scripts/create_session.sh:414-416"
+    "multi-agent-mux-create/scripts/create_session.sh:263-278",
+    "multi-agent-mux-create/scripts/create_session.sh:369-406",
+    "multi-agent-mux-create/scripts/create_session.sh:418-420"
    ],
    "mismatch": [
     "C1: an existing session is exit 1 in the doc, exit 3 in the script",
@@ -582,7 +582,7 @@
    "base_sha": "f71be0f26fb8",
    "class": "a",
    "evidence": [
-    "multi-agent-mux-create/scripts/create_session.sh:490-608"
+    "multi-agent-mux-create/scripts/create_session.sh:494-612"
    ],
    "mismatch": [],
    "replacement": "bash .agents/skills/multi-agent-mux-create/scripts/create_session.sh --workspace <path> --agent <agent> --role <role>",
diff --git a/tests/test_issue21_acceptance.py b/tests/test_issue21_acceptance.py
index 4caac28..29a4eba 100644
--- a/tests/test_issue21_acceptance.py
+++ b/tests/test_issue21_acceptance.py
@@ -44,7 +44,7 @@ def _sibling(main: Path, state_file):
     before = _rows(main)
     since = len(_raw_calls(state_file))
     wt = _wt(main)
-    res = _prepare(main, wt, "--creator-agent", "claude", "--herdr-session", HS)
+    res = _prepare(main, wt, "--creator-agent", "claude", "--herdr-session", HS, "--no-onboard")
     assert res.returncode == 0, res.stdout + res.stderr
     return wt, since, before
 
@@ -204,7 +204,7 @@ def test_a5b_a_stale_last_round_is_not_accepted(wt_repo, monkeypatch, tmp_path,
 def test_a6_row_recovery_and_resume_only_at_the_original_cwd(ctl, mock_herdr, mock_agents):
     main = ctl
     wt = _wt(main)
-    res = _prepare(main, wt, "--creator-agent", "claude")
+    res = _prepare(main, wt, "--creator-agent", "claude", "--no-onboard")
     assert res.returncode == 0, res.stdout + res.stderr
     (row,) = _rows(main)
     name, binding = row["name"], row["control_plane"]
diff --git a/tests/test_issue68_onboard_default.py b/tests/test_issue68_onboard_default.py
index 6e3640f..6fef745 100644
--- a/tests/test_issue68_onboard_default.py
+++ b/tests/test_issue68_onboard_default.py
@@ -245,4 +245,3 @@ def test_prepare_no_onboard_sends_none(ctl, mock_herdr, mock_agents):
                 assert rec.get("agent_session") != f"herdr:{row['name']}", rec
     finally:
         subprocess.run(["git", "worktree", "remove", "--force", str(wt)], cwd=str(main), capture_output=True)
-