diff --git a/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test b/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
index 750f840c470..fe71303277c 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
@@ -77,6 +77,8 @@ select @@gtid_binlog_state;
 
 --echo cluster 2 node 1
 --connection node_4
+--let $wait_condition = SELECT COUNT(*) = 1 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (2, 21, 1);
 select @@gtid_binlog_state;
@@ -85,11 +87,16 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_4
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 2 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 
 --echo cluster 1 node 2
 --connection node_2
+--let $wait_condition = SELECT COUNT(*) = 2 FROM test.t1;
+--source include/wait_condition.inc
+
 select @@gtid_binlog_state;
 insert into t1 values (1, 12, 3);
 select @@gtid_binlog_state;
@@ -99,10 +106,14 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_4
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 3 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 1 node 3
 --connection node_3
+--let $wait_condition = SELECT COUNT(*) = 3 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (1, 13, 4);
 select @@gtid_binlog_state;
@@ -112,10 +123,14 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_4
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 4 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 2 node 2
 --connection node_5
+--let $wait_condition = SELECT COUNT(*) = 4 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (2, 22, 2);
 select @@gtid_binlog_state;
@@ -125,37 +140,55 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_1
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 5 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 2 node 3
 --connection node_6
+--let $wait_condition = SELECT COUNT(*) = 5 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (2, 23, 3);
 select @@gtid_binlog_state;
 
 --echo #wait for sync  cluster 2 and 1
 --connection node_4
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 --source include/save_master_gtid.inc
 --connection node_1
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo # check other nodes are consistent
 --connection node_2
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 --connection node_3
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 --connection node_5
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 --connection node_6
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 1 node 1
 --connection node_1
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 drop table t1;
 stop slave;
@@ -250,6 +283,8 @@ select @@gtid_binlog_state;
 --sleep 2
 --echo cluster 2 node 1
 --connection node_4
+--let $wait_condition = SELECT COUNT(*) = 1 FROM test.t1;
+--source include/wait_condition.inc
 insert into t1 values (2, 21, 1);
 select @@gtid_binlog_state;
 
@@ -258,11 +293,16 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_4
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 2 FROM test.t1;
+--source include/wait_condition.inc
+
 select * from t1 order by 1, 2, 3;
 
 
 --echo cluster 1 node 2
 --connection node_2
+--let $wait_condition = SELECT COUNT(*) = 2 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (1, 12, 3);
 select @@gtid_binlog_state;
@@ -272,10 +312,14 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_4
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 3 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 1 node 3
 --connection node_3
+--let $wait_condition = SELECT COUNT(*) = 3 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (1, 13, 4);
 select @@gtid_binlog_state;
@@ -285,10 +329,14 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_4
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 4 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 2 node 2
 --connection node_5
+--let $wait_condition = SELECT COUNT(*) = 4 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (2, 22, 2);
 select @@gtid_binlog_state;
@@ -298,10 +346,14 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_1
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 5 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 2 node 3
 --connection node_6
+--let $wait_condition = SELECT COUNT(*) = 5 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 insert into t1 values (2, 23, 3);
 select @@gtid_binlog_state;
@@ -311,24 +363,36 @@ select @@gtid_binlog_state;
 --source include/save_master_gtid.inc
 --connection node_1
 --source include/sync_with_master_gtid.inc
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select * from t1 order by 1, 2, 3;
 
 --echo # check other nodes are consistent
 --connection node_2
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 --connection node_3
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 --connection node_5
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 --connection node_6
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 select * from t1 order by 1, 2, 3;
 
 --echo cluster 1 node 1
 --connection node_1
+--let $wait_condition = SELECT COUNT(*) = 6 FROM test.t1;
+--source include/wait_condition.inc
 select @@gtid_binlog_state;
 drop table t1;
 stop slave;