diff --git a/mysql-test/suite/multi_source/multisource_for_channel.result b/mysql-test/suite/multi_source/multisource_for_channel.result
index 26544224e76..af4ed7a265f 100644
--- a/mysql-test/suite/multi_source/multisource_for_channel.result
+++ b/mysql-test/suite/multi_source/multisource_for_channel.result
@@ -228,16 +228,6 @@ mysqld-relay-bin.000002	#	Gtid	#	#	BEGIN GTID #-#-#
 mysqld-relay-bin.000002	#	Intvar	#	#	INSERT_ID=1
 mysqld-relay-bin.000002	#	Query	#	#	use `db2`; insert into t1 (f1) values (1),(2)
 mysqld-relay-bin.000002	#	Xid	#	#	COMMIT /* XID */
-disconnect slave;
-connect  slave,127.0.0.1,root,,,$SERVER_MYPORT_3;
-stop slave io_thread;
-show status like 'Slave_running';
-Variable_name	Value
-Slave_running	OFF
-set default_master_connection = 'master1';
-show status like 'Slave_running';
-Variable_name	Value
-Slave_running	ON
 
 #
 # syntax compatible test 
@@ -248,7 +238,7 @@ Slave_running	ON
 #
 SHOW RELAYLOG EVENTS for channel 'master1';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-mysqld-relay-bin-master1.000003	4	Format_desc	3	256	Server ver: 10.6.4-MariaDB-debug-log, Binlog ver: 4
+mysqld-relay-bin-master1.000003	4	Format_desc	3	256	SERVER_VERSION, BINLOG_VERSION
 mysqld-relay-bin-master1.000003	256	Rotate	1	1358	master-bin.000002;pos=4
 mysqld-relay-bin-master1.000003	304	Rotate	3	366	mysqld-relay-bin-master1.000004;pos=4
 
@@ -281,7 +271,7 @@ START SLAVE for channel 'master1';
 show slave status for channel 'master1'
 Master_Port = 'MYPORT_1'
 Relay_Log_File = 'mysqld-relay-bin-master1.000004'
-Slave_IO_Running = 'Yes'
+Slave_IO_Running = 'Preparing'
 Slave_SQL_Running = 'Yes'
 Last_Errno = '0'
 Last_SQL_Errno = '0'
@@ -346,6 +336,16 @@ SHOW RELAYLOG 'master1' EVENTS for channel 'master2';
 ERROR HY000: Incorrect arguments to CONNECTION_NAME AND FOR CHANNEL CAN NOT BE SPECIFIED AT THE SAME TIME)
 SHOW SLAVE 'master1' STATUS for channel 'master2';
 ERROR HY000: Incorrect arguments to CONNECTION_NAME AND FOR CHANNEL CAN NOT BE SPECIFIED AT THE SAME TIME)
+disconnect slave;
+connect  slave,127.0.0.1,root,,,$SERVER_MYPORT_3;
+stop slave io_thread;
+show status like 'Slave_running';
+Variable_name	Value
+Slave_running	OFF
+set default_master_connection = 'master1';
+show status like 'Slave_running';
+Variable_name	Value
+Slave_running	OFF
 
 drop database db1;
 drop database db2;
diff --git a/mysql-test/suite/rpl/include/multisource_for_channel.inc b/mysql-test/suite/rpl/include/multisource_for_channel.inc
index c9fe154dfc0..53d53b75173 100644
--- a/mysql-test/suite/rpl/include/multisource_for_channel.inc
+++ b/mysql-test/suite/rpl/include/multisource_for_channel.inc
@@ -290,17 +290,6 @@ source include/show_relaylog_events.inc;
 let binlog_file= mysqld-relay-bin.000002;
 source include/show_relaylog_events.inc;
 
-# Make sure we don't lose control over replication connections
-# after reconnecting to the slave
-
---disconnect slave
---connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3)
-
-stop slave io_thread;
-show status like 'Slave_running';
-set default_master_connection = 'master1';
-show status like 'Slave_running';
-
 --echo 
 --echo #
 --echo # syntax compatible test 
@@ -309,6 +298,7 @@ show status like 'Slave_running';
 --echo #
 --echo # show relaylog events
 --echo #
+--replace_regex /Server ver: [0-9 \. a-z A-Z -]*, Binlog ver: [0-9]*/SERVER_VERSION, BINLOG_VERSION/
 SHOW RELAYLOG EVENTS for channel 'master1';
 
 --echo
@@ -393,6 +383,7 @@ RESET SLAVE for channel 'master1';
 --echo #
 --echo # show relaylog events after reset slave
 --echo #
+--replace_regex /Server ver: [0-9 \. a-z A-Z -]*, Binlog ver: [0-9]*/SERVER_VERSION, BINLOG_VERSION/
 SHOW RELAYLOG EVENTS for channel 'master1';
 
 --let $slave_name= 
@@ -415,6 +406,17 @@ SHOW RELAYLOG 'master1' EVENTS for channel 'master2';
 --error ER_WRONG_ARGUMENTS
 SHOW SLAVE 'master1' STATUS for channel 'master2'; 
 
+# Make sure we don't lose control over replication connections
+# after reconnecting to the slave
+
+--disconnect slave
+--connect (slave,127.0.0.1,root,,,$SERVER_MYPORT_3)
+
+stop slave io_thread;
+show status like 'Slave_running';
+set default_master_connection = 'master1';
+show status like 'Slave_running';
+
 --echo 
 # Cleanup
 drop database db1;