diff --git a/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result b/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result
index e2c52ee6fa1..e997cc49f12 100644
--- a/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_parallel_mode_basic.result
@@ -4,7 +4,11 @@ SELECT @@slave_parallel_mode;
 @@slave_parallel_mode
 domain
 SELECT @@m1.slave_parallel_mode;
-ERROR HY000: There is no master connection 'm1'
+@@m1.slave_parallel_mode
+NULL
+Warnings:
+Warning	1617	There is no master connection 'm1'
+Warning	1617	There is no master connection 'm1'
 CHANGE MASTER TO master_host='127.0.0.1', master_port=3310, master_user='root';
 SELECT @@``.slave_parallel_mode;
 @@``.slave_parallel_mode
@@ -14,9 +18,14 @@ SELECT @@slave_parallel_mode;
 domain
 Parallel_Mode = 'domain'
 SELECT @@m2.slave_parallel_mode;
-ERROR HY000: There is no master connection 'm2'
+@@m2.slave_parallel_mode
+NULL
+Warnings:
+Warning	1617	There is no master connection 'm2'
+Warning	1617	There is no master connection 'm2'
 SET GLOBAL m2.slave_parallel_mode = '';
-ERROR HY000: There is no master connection 'm2'
+Warnings:
+Warning	1617	There is no master connection 'm2'
 CHANGE MASTER 'm1' TO master_host='127.0.0.1', master_port=3311, master_user='root';
 SELECT @@m1.slave_parallel_mode;
 @@m1.slave_parallel_mode
diff --git a/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic.test b/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic.test
index 7cc2d1f25dc..6e82345b8da 100644
--- a/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic.test
+++ b/mysql-test/suite/sys_vars/t/slave_parallel_mode_basic.test
@@ -6,7 +6,6 @@
 SET SESSION slave_parallel_mode= '';
 
 SELECT @@slave_parallel_mode;
---error WARN_NO_MASTER_INFO
 SELECT @@m1.slave_parallel_mode;
 
 CHANGE MASTER TO master_host='127.0.0.1', master_port=3310, master_user='root';
@@ -15,9 +14,7 @@ SELECT @@slave_parallel_mode;
 --let $status_items= Parallel_Mode
 --source include/show_slave_status.inc
 
---error WARN_NO_MASTER_INFO
 SELECT @@m2.slave_parallel_mode;
---error WARN_NO_MASTER_INFO
 SET GLOBAL m2.slave_parallel_mode = '';
 
 CHANGE MASTER 'm1' TO master_host='127.0.0.1', master_port=3311, master_user='root';
@@ -33,6 +30,5 @@ SELECT @@slave_parallel_mode;
 SET default_master_connection= '';
 SELECT @@slave_parallel_mode;
 
-
 RESET SLAVE ALL;
 RESET SLAVE 'm1' ALL;