diff --git a/test/test_helper/common.bash b/test/test_helper/common.bash
index 7d14c2d8..46d42519 100644
--- a/test/test_helper/common.bash
+++ b/test/test_helper/common.bash
@@ -169,7 +169,7 @@ function container_has_service_running() {
 function wait_for_service() {
     containerName="$1"
     serviceName="$2"
-    repeat_in_container_until_success_or_timeout 600 "$containerName" \
+    repeat_until_success_or_timeout --fatal-test "container_is_running $containerName" 60 \
         container_has_service_running "$containerName" "$serviceName"
 }