diff --git a/CHANGES b/CHANGES
index 4c9cbe8e9..a044b9c18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -162,6 +162,11 @@ attribute reads after a move could appear stale until a manual
 {meth}`~libtmux.Window.refresh` call. The moved window now refreshes
 automatically.
 
+#### Flaky `test_capture_pane_flags[join_wrapped_numbers]` (#655)
+
+Marker detection now skips the shell command echo line to avoid
+false-positive completion.
+
 ### Documentation
 
 - Bump gp-sphinx docs stack to v0.0.1a16 — docs site now renders
diff --git a/tests/test_pane_capture_pane.py b/tests/test_pane_capture_pane.py
index 5858cbd45..468025a78 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)