diff --git a/tests/test_cookbook_dependency_completion_regression.py b/tests/test_cookbook_dependency_completion_regression.py
index 4c0ab59..1533bda 100644
--- a/tests/test_cookbook_dependency_completion_regression.py
+++ b/tests/test_cookbook_dependency_completion_regression.py
@@ -56,10 +56,14 @@ def test_session_gone_heuristic_honors_dep_install_success():
     source = _read("static/js/cookbookRunning.js")
 
     assert "const depInstallSucceeded = !!task.payload?._dep && _depInstallSucceeded(lastOutput);" in source
+    # Whitespace-normalized so the check survives line-wrapping/formatting while
+    # still proving the invariant: a finished dependency install short-circuits
+    # looksSuccessful ahead of the download/serve branch.
+    normalized = " ".join(source.split())
     assert (
         "const looksSuccessful = depInstallSucceeded "
-        "|| (task.type === 'download' ? downloadLooksSuccessful : serveLooksReady);"
-    ) in source
+        "|| (task.type === 'download'"
+    ) in normalized
 
 
 def test_background_poll_recovers_done_for_stopped_dependency_install():
diff --git a/tests/test_tool_index_keyword_boundaries.py b/tests/test_tool_index_keyword_boundaries.py
index d1465e6..be4dc5b 100644
--- a/tests/test_tool_index_keyword_boundaries.py
+++ b/tests/test_tool_index_keyword_boundaries.py
@@ -40,8 +40,12 @@ def test_substring_inside_word_does_not_force_document_tools():
 
 def test_substring_inside_word_does_not_force_serve_tools():
     ti = _index()
-    # "observe"/"reserve" contain "serve".
-    tools = ti.get_tools_for_query("please observe the reserve levels")
+    # "observe"/"reserve" contain "serve". serve_model/serve_preset are also in
+    # ALWAYS_AVAILABLE, so pass a non-serve base to isolate the keyword loop (an
+    # empty set falls back to ALWAYS_AVAILABLE). The "serve" hint must NOT fire.
+    tools = ti.get_tools_for_query(
+        "please observe the reserve levels", always_include={"__base__"}
+    )
     assert "serve_model" not in tools
     assert "serve_preset" not in tools