diff --git a/mysql-test/suite/binlog/t/binlog_xa_recover.test b/mysql-test/suite/binlog/t/binlog_xa_recover.test
index e46857b265c..d3914e60b10 100644
--- a/mysql-test/suite/binlog/t/binlog_xa_recover.test
+++ b/mysql-test/suite/binlog/t/binlog_xa_recover.test
@@ -111,6 +111,7 @@ PURGE BINARY LOGS TO "master-bin.000006";
 --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 wait-binlog_xa_recover.test
 EOF
+--error 0,2006,2013
 SET DEBUG_SYNC= "now SIGNAL con4_cont";
 connection con4;
 --error 2006,2013
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf
new file mode 100644
index 00000000000..c7247a80c0c
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf
@@ -0,0 +1,5 @@
+!include ../my.cnf
+
+[mysqld.2]
+# Needed because depending on load on test machine the master restart can take long.
+master_retry_count = 120
diff --git a/mysql-test/suite/sys_vars/t/gtid_pos_basic.test b/mysql-test/suite/sys_vars/t/gtid_pos_basic.test
index 32cb27b0fa9..929fdebed20 100644
--- a/mysql-test/suite/sys_vars/t/gtid_pos_basic.test
+++ b/mysql-test/suite/sys_vars/t/gtid_pos_basic.test
@@ -1,3 +1,5 @@
+--source include/not_embedded.inc
+
 SET @old_gtid_pos= @@gtid_pos;
 
 SET GLOBAL gtid_pos= '';