diff --git a/CHANGES b/CHANGES
index 70cecc49a..1892af670 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,11 @@ $ uvx --from 'libtmux' --prerelease allow python
 _Notes on the upcoming release will go here._
 <!-- END PLACEHOLDER - ADD NEW CHANGELOG ENTRIES BELOW THIS LINE -->
 
+### Bug fixes
+
+- Fix flaky `test_capture_pane_flags[join_wrapped_numbers]` — marker detection now
+  skips the shell command echo line to avoid false-positive completion (#655)
+
 ## libtmux 0.55.0 (2026-03-07)
 
 ### What's new
diff --git a/tests/test_pane_capture_pane.py b/tests/test_pane_capture_pane.py
index 28e28648a..a18e5847f 100644
--- a/tests/test_pane_capture_pane.py
+++ b/tests/test_pane_capture_pane.py
@@ -356,10 +356,12 @@ def prompt_ready() -> bool:
     full_command = f'{command}; echo "{marker}"'
     pane.send_keys(full_command, literal=False, suppress_history=False)
 
-    # Wait for marker to appear
+    # Wait for marker to appear as command output (not in the command echo line)
     def command_complete() -> bool:
-        output = "\n".join(pane.capture_pane())
-        return marker in output
+        lines = pane.capture_pane()
+        return any(
+            marker in line and not line.lstrip().startswith("$") for line in lines
+        )
 
     retry_until(command_complete, 5, raises=True)