diff --git a/tests/test_issue26_ints.py b/tests/test_issue26_ints.py
index 16ae432..99dad06 100644
--- a/tests/test_issue26_ints.py
+++ b/tests/test_issue26_ints.py
@@ -55,6 +55,10 @@ INT_KNOBS = {
     "MAM_DIFF_MAX_BYTES": (1, "200000"),    # 0 would truncate every diff
     "MAM_DIFF_MAX_LINES": (1, "4000"),
     "RECONCILE_POLL_INTERVAL": (1, "15"),   # sleep; 0 would poll in a busy loop
+    # Issue #50: create's wait for the onboarding job to end (0 would exit 45 at
+    # once) and the wrapper's registry wait (0: decide at once - clear or busy)
+    "MAM_ONBOARD_WAIT_S": (1, "600"),
+    "MAM_DISPATCH_WAIT_S": (0, "600"),
     # delegate_wait_started's ack_s (MAM_ONBOARD_ACK_S / DELEGATE_JOB_ACK_S via create_session.sh)
     "delegate_wait_started:ack_s": (0, "180"),
     # wrapper flags
diff --git a/tests/test_issue50_dispatch_herdr.py b/tests/test_issue50_dispatch_herdr.py
index 358955b..a6dc623 100644
--- a/tests/test_issue50_dispatch_herdr.py
+++ b/tests/test_issue50_dispatch_herdr.py
@@ -223,6 +223,10 @@ def _teardown(box: Box) -> None:
         except OSError:
             pass
     shutil.rmtree(box.home, ignore_errors=True)
+    # herdr writes its agent-detection state under $HOME/.local/state a moment
+    # after the server is gone: sweep once more
+    time.sleep(1)
+    shutil.rmtree(box.home, ignore_errors=True)
 
 
 @pytest.fixture