diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 2798d61f736..da0cbb154dd 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -583,15 +583,9 @@ ctdb_init ()
 {
 	ctdb_nodes_stop >/dev/null 2>&1 || :
 
-	if ! ctdb_nodes_start ; then
-		echo "Cluster start failed"
-		return 1
-	fi
+	ctdb_nodes_start || ctdb_test_error "Cluster start failed"
 
-	if ! wait_until_ready 120 ; then
-		echo "Cluster didn't become ready"
-		return 1
-	fi
+	wait_until_ready 120 || ctdb_test_error "Cluster didn't become ready"
 
 	echo "Setting RerecoveryTimeout to 1"
 	onnode -pq all "$CTDB setvar RerecoveryTimeout 1"
@@ -602,16 +596,13 @@ ctdb_init ()
 
 	if ! onnode -q all "$CTDB_TEST_WRAPPER _cluster_is_recovered" ; then
 		echo "Cluster has gone into recovery again, waiting..."
-		if ! wait_until 30/2 onnode -q all \
-		     "$CTDB_TEST_WRAPPER _cluster_is_recovered" ; then
-			echo "Cluster did not come out of recovery"
-			return 1
-		fi
+		wait_until 30/2 onnode -q all \
+			   "$CTDB_TEST_WRAPPER _cluster_is_recovered" || \
+			ctdb_test_error "Cluster did not come out of recovery"
 	fi
 
 	if ! onnode 0 "$CTDB_TEST_WRAPPER _cluster_is_healthy" ; then
-		echo "Cluster became UNHEALTHY again [$(date)]"
-		return 1
+		ctdb_test_error "Cluster became UNHEALTHY again [$(date)]"
 	fi
 
 	echo "Doing a sync..."