diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result
index 99e30788488..3abc861f3d0 100644
--- a/mysql-test/suite/wsrep/r/variables.result
+++ b/mysql-test/suite/wsrep/r/variables.result
@@ -111,6 +111,9 @@ SELECT @@global.wsrep_slave_threads;
 SELECT @@global.wsrep_cluster_address;
 @@global.wsrep_cluster_address
 
+SELECT @@global.wsrep_on;
+@@global.wsrep_on
+1
 SHOW STATUS LIKE 'threads_connected';
 Variable_name	Value
 Threads_connected	1
@@ -124,6 +127,9 @@ libgalera_smm.so
 SELECT @@global.wsrep_cluster_address;
 @@global.wsrep_cluster_address
 
+SELECT @@global.wsrep_on;
+@@global.wsrep_on
+1
 SHOW STATUS LIKE 'threads_connected';
 Variable_name	Value
 Threads_connected	1
@@ -150,6 +156,9 @@ libgalera_smm.so
 SELECT @@global.wsrep_cluster_address;
 @@global.wsrep_cluster_address
 gcomm://
+SELECT @@global.wsrep_on;
+@@global.wsrep_on
+1
 SHOW STATUS LIKE 'threads_connected';
 Variable_name	Value
 Threads_connected	1
diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test
index e01ba3e3a8b..5336fae17b6 100644
--- a/mysql-test/suite/wsrep/t/variables.test
+++ b/mysql-test/suite/wsrep/t/variables.test
@@ -84,6 +84,7 @@ eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
 SELECT @@global.wsrep_provider;
 SELECT @@global.wsrep_slave_threads;
 SELECT @@global.wsrep_cluster_address;
+SELECT @@global.wsrep_on;
 SHOW STATUS LIKE 'threads_connected';
 SHOW STATUS LIKE 'wsrep_thread_count';
 --echo
@@ -95,6 +96,7 @@ eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
 --replace_regex /.*libgalera_smm.*/libgalera_smm.so/
 SELECT @@global.wsrep_provider;
 SELECT @@global.wsrep_cluster_address;
+SELECT @@global.wsrep_on;
 SHOW STATUS LIKE 'threads_connected';
 SHOW STATUS LIKE 'wsrep_thread_count';
 --echo
@@ -107,6 +109,8 @@ SET GLOBAL wsrep_cluster_address= 'gcomm://';
 --let $wait_timeout=600
 --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count';
 --source include/wait_condition.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_rollbacker_thread_count';
+--source include/wait_condition.inc
 
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count';
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_rollbacker_thread_count';
@@ -115,6 +119,7 @@ SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME
 --replace_regex /.*libgalera_smm.*/libgalera_smm.so/
 SELECT @@global.wsrep_provider;
 SELECT @@global.wsrep_cluster_address;
+SELECT @@global.wsrep_on;
 SHOW STATUS LIKE 'threads_connected';
 SHOW STATUS LIKE 'wsrep_thread_count';
 --echo
@@ -137,6 +142,7 @@ SHOW STATUS LIKE 'threads_connected';
 #
 set wsrep_on=0;
 set wsrep_on=1;
+--source include/wait_until_connected_again.inc
 create user test@localhost;
 connect con1,localhost,test;
 set auto_increment_increment=10;