diff --git a/mysql-test/include/sync_with_master_gtid.inc b/mysql-test/include/sync_with_master_gtid.inc
index 0ca2c90784e..fd8e89277e4 100644
--- a/mysql-test/include/sync_with_master_gtid.inc
+++ b/mysql-test/include/sync_with_master_gtid.inc
@@ -42,6 +42,7 @@ if ($_result == -1)
 {
   --let $_current_gtid_pos= `SELECT @@GLOBAL.gtid_slave_pos`
   --echo Timeout in master_gtid_wait('$master_pos', $_slave_timeout), current slave GTID position is: $_current_gtid_pos.
+  --source include/show_rpl_debug_info.inc
   --die Failed to sync with master
 }
 
diff --git a/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result b/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result
index 695ba3a9fe9..07af2e2616a 100644
--- a/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result
+++ b/mysql-test/suite/rpl/r/rpl_perfschema_connect_config.result
@@ -20,7 +20,7 @@ include/assert.inc [Value returned by SSS and PS table for SSL_Verify_Server_Cer
 include/assert.inc [Value returned by SSS and PS table for SSL_Crl_File should be same.]
 include/assert.inc [Value returned by SSS and PS table for SSL_Crl_Path should be same.]
 include/assert.inc [Value returned by SSS and PS table for Connection_Retry_Interval should be same.]
-include/assert.inc [Value returned by PS table for Connection_Retry_Count should be 10.]
+include/assert.inc [Value returned by PS table for Connection_Retry_Count should be 30.]
 
 # Heartbeat_Interval is part of I_S and P_S. We will compare the
 # two to make sure both match.
diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf
index c1e9e82861c..7859829906d 100644
--- a/mysql-test/suite/rpl/rpl_1slave_base.cnf
+++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf
@@ -23,7 +23,7 @@ log-basename=               slave
 
 init-rpl-role=              slave
 log-slave-updates
-master-retry-count=         10
+master-retry-count=         30
 
 # Values reported by slave when it connect to master
 # and shows up in SHOW SLAVE STATUS;
diff --git a/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test b/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test
index e2b974c156a..82917104305 100644
--- a/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test
+++ b/mysql-test/suite/rpl/t/rpl_perfschema_connect_config.test
@@ -132,8 +132,8 @@ let $assert_cond= "$sss_value" = "$ps_value";
 source include/assert.inc;
 
 let $ps_value= query_get_value(select Connection_Retry_Count from performance_schema.replication_connection_configuration, Connection_Retry_Count, 1);
-let $assert_text= Value returned by PS table for Connection_Retry_Count should be 10.; # master-retry-count=10, as part of default my.cnf used by MTR
-let $assert_cond= "$ps_value" = 10;
+let $assert_text= Value returned by PS table for Connection_Retry_Count should be 30.; # master-retry-count=10, as part of default my.cnf used by MTR
+let $assert_cond= "$ps_value" = 30;
 source include/assert.inc;
 
 --echo