diff --git a/‎tests/functional/api/test_merge_requests.py‎
Lines changed: 19 additions & 8 deletions b/‎tests/functional/api/test_merge_requests.py‎
Lines changed: 19 additions & 8 deletions
diff --git a/‎tests/functional/cli/test_cli_v4.py‎
Lines changed: 14 additions & 3 deletions b/‎tests/functional/cli/test_cli_v4.py‎
Lines changed: 14 additions & 3 deletions
diff --git a/‎tests/functional/conftest.py‎
Lines changed: 9 additions & 11 deletions b/‎tests/functional/conftest.py‎
Lines changed: 9 additions & 11 deletions
diff --git a/‎tests/functional/helpers.py‎
Lines changed: 24 additions & 1 deletion b/‎tests/functional/helpers.py‎
Lines changed: 24 additions & 1 deletion
@@ -5,6 +5,7 @@
 
 import gitlab
 import gitlab.v4.objects
+import tests.functional.helpers
 
 
 def test_merge_requests(project):
@@ -229,11 +230,16 @@ def test_merge_request_should_remove_source_branch(project, merge_request) -> No
     # Wait until it is merged
     mr = None
     mr_iid = merge_request.iid
-    for _ in range(60):
+
+    def _merge_completed() -> bool:
+        nonlocal mr
         mr = project.mergerequests.get(mr_iid)
-        if mr.merged_at is not None:
-            break
-        time.sleep(0.5)
+        return mr.merged_at is not None
+
+    tests.functional.helpers.poll_until(
+        condition=_merge_completed,
+        description=f"merge request {mr_iid} merged_at to be set",
+    )
 
     assert mr is not None
     assert mr.merged_at is not None
@@ -271,11 +277,16 @@ def test_merge_request_large_commit_message(project, merge_request) -> None:
     # Wait until it is merged
     mr = None
     mr_iid = merge_request.iid
-    for _ in range(60):
+
+    def _merge_completed() -> bool:
+        nonlocal mr
         mr = project.mergerequests.get(mr_iid)
-        if mr.merged_at is not None:
-            break
-        time.sleep(0.5)
+        return mr.merged_at is not None
+
+    tests.functional.helpers.poll_until(
+        condition=_merge_completed,
+        description=f"merge request {mr_iid} merged_at to be set",
+    )
 
     assert mr is not None
     assert mr.merged_at is not None
 
@@ -1,6 +1,7 @@
 import datetime
 import os
-import time
+
+import tests.functional.helpers
 
 branch = "BRANCH-cli-v4"
 
@@ -240,8 +241,18 @@ def test_accept_request_merge(gitlab_cli, project):
         "commit_message": "chore: test-cli-v4 change",
     }
     project.files.create(file_data)
-    # Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
-    time.sleep(30)
+
+    def _merge_status_settled() -> bool:
+        nonlocal mr
+        mr = project.mergerequests.get(mr.iid)
+        return mr.detailed_merge_status not in ("checking", "unchecked")
+
+    # Wait until GitLab has finished evaluating mergeability instead of a
+    # blind sleep, so the test fails fast if it never becomes mergeable.
+    tests.functional.helpers.poll_until(
+        condition=_merge_status_settled,
+        description=f"merge request {mr.iid} detailed_merge_status to settle",
+    )
 
     approve_cmd = [
         "project-merge-request",
 
@@ -413,19 +413,17 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
             }
         )
 
-        # Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
-        time.sleep(5)
-
         mr_iid = mr.iid
-        for _ in range(60):
+
+        def _merge_status_settled() -> bool:
+            nonlocal mr
             mr = project.mergerequests.get(mr_iid)
-            if (
-                mr.detailed_merge_status == "checking"
-                or mr.detailed_merge_status == "unchecked"
-            ):
-                time.sleep(0.5)
-            else:
-                break
+            return mr.detailed_merge_status not in ("checking", "unchecked")
+
+        helpers.poll_until(
+            condition=_merge_status_settled,
+            description=f"merge request {mr_iid} detailed_merge_status to settle",
+        )
 
         assert mr.detailed_merge_status != "checking"
         assert mr.detailed_merge_status != "unchecked"
 
@@ -2,7 +2,7 @@
 
 import logging
 import time
-from typing import TYPE_CHECKING
+from typing import Callable, TYPE_CHECKING
 
 import pytest
 
@@ -29,6 +29,29 @@ def get_gitlab_plan(gl: gitlab.Gitlab) -> str | None:
     return license["plan"]
 
 
+def poll_until(
+    *,
+    condition: Callable[[], bool],
+    description: str,
+    timeout: float = TIMEOUT,
+    interval: float = SLEEP_INTERVAL,
+) -> None:
+    """Repeatedly call `condition` until it returns truthy, sleeping `interval`
+    seconds between attempts. Fails the test via `pytest.fail` if `timeout`
+    seconds elapse first, so callers can replace a blind `time.sleep()` "let
+    GitLab catch up" pause with a check that fails fast when something is
+    actually wrong instead of always waiting the full duration.
+    """
+    # Use a monotonic deadline rather than counting iterations so the timeout
+    # is accurate even if `condition()` itself is slow (e.g. a slow API call).
+    deadline = time.monotonic() + timeout
+    while time.monotonic() < deadline:
+        if condition():
+            return
+        time.sleep(interval)
+    pytest.fail(f"Timed out after {timeout}s waiting for: {description}")
+
+
 def safe_delete(object: gitlab.base.RESTObject) -> None:
     """Ensure the object specified can not be retrieved. If object still exists after
     timeout period, fail the test"""