diff --git a/tests/test_create_grand_central.py b/tests/test_create_grand_central.py
index 334baf51..b019f5bc 100644
--- a/tests/test_create_grand_central.py
+++ b/tests/test_create_grand_central.py
@@ -502,7 +502,7 @@ async def test_gc_change_exposure_loadbalancer_to_traefik(
         name,
         namespace.metadata.name,
         f"{KOPF_STATE_STORE_PREFIX}/cluster_create",
-        timeout=DEFAULT_TIMEOUT * 3,
+        timeout=DEFAULT_TIMEOUT * 5,
     )
     await _start_gc_on_cluster(coapi, name, namespace.metadata.name)
 
diff --git a/tests/test_master_nodes.py b/tests/test_master_nodes.py
index cb20b5a3..d6fd6f18 100644
--- a/tests/test_master_nodes.py
+++ b/tests/test_master_nodes.py
@@ -95,6 +95,15 @@ async def _master_pods_present(core: CoreV1Api, namespace: str, name: str) -> bo
     return len(await get_pods_in_statefulset(core, namespace, name, "master")) > 0
 
 
+async def _data_nodes_ready(
+    apps: AppsV1Api, namespace: str, name: str, expected: int
+) -> bool:
+    sts = await apps.read_namespaced_stateful_set(
+        namespace=namespace, name=f"crate-data-hot-{name}"
+    )
+    return (sts.status.ready_replicas or 0) == expected
+
+
 async def _data_service_target_pods(core: CoreV1Api, namespace: str, name: str):
     """Pod names currently backing the client-facing ``crate-<name>`` service."""
     ep = await core.read_namespaced_endpoints(f"crate-{name}", namespace)
@@ -401,12 +410,13 @@ async def test_legacy_cluster_without_masters_regression(
         err_msg="Resume has not finished",
         timeout=DEFAULT_TIMEOUT * 5,
     )
-    host = await get_host(core, namespace.metadata.name, name)
     await assert_wait_for(
         True,
-        is_cluster_healthy,
-        connection_factory(*require_connection(host, password)),
+        _data_nodes_ready,
+        apps,
+        namespace.metadata.name,
+        name,
         HOT_REPLICAS,
-        err_msg="Legacy cluster wasn't healthy after resume.",
+        err_msg="Data nodes were not scaled back up after resume.",
         timeout=DEFAULT_TIMEOUT * 5,
     )