diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
index be137079c7a..e704ada657b 100644
--- a/mysql-test/r/rpl_loaddata.result
+++ b/mysql-test/r/rpl_loaddata.result
@@ -77,7 +77,8 @@ load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
 ERROR 23000: Duplicate entry '2003-03-22' for key 1
-drop table t2;
+set @@global.sql_slave_skip_counter=1;
+start slave;
 drop table t2;
 drop table t1;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
diff --git a/mysql-test/r/rpl_slave_status.result b/mysql-test/r/rpl_slave_status.result
index 9a4ec4131b0..641a65f5ed7 100644
--- a/mysql-test/r/rpl_slave_status.result
+++ b/mysql-test/r/rpl_slave_status.result
@@ -53,3 +53,4 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	NULL
 drop table t1;
+drop table t1;
diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test
index a4781ed4faa..ee80bdfde45 100644
--- a/mysql-test/t/rpl_loaddata.test
+++ b/mysql-test/t/rpl_loaddata.test
@@ -147,12 +147,20 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
 connection slave;
 wait_for_slave_to_stop;
-drop table t2;
+
+# cleanup:
+
+set @@global.sql_slave_skip_counter=1;
+start slave;
+
 connection master;
 drop table t2;
 drop table t1;
 
+sync_slave_with_master;
+
 # BUG#17233 LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed
+connection master;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
 
 --error 1062
@@ -160,5 +168,6 @@ LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1;
 
 DROP TABLE t1;
 
-sync_with_master;
+sync_slave_with_master;
+
 # End of 4.1 tests
diff --git a/mysql-test/t/rpl_skip_error.test b/mysql-test/t/rpl_skip_error.test
index baa7a88b8bb..0e3fd5d9e0d 100644
--- a/mysql-test/t/rpl_skip_error.test
+++ b/mysql-test/t/rpl_skip_error.test
@@ -15,12 +15,13 @@ select * from t1;
 
 connection master;
 drop table t1;
-sync_with_master;
+sync_slave_with_master;
 # End of 4.1 tests
 
 #
 # #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists
 #
+connection master;
 create table t1(a int primary key);
 insert into t1 values (1),(2);
 delete from t1 where @@server_id=1;
@@ -36,5 +37,5 @@ select * from t1;
 show slave status;
 connection master;
 drop table t1;
-sync_with_master;
+sync_slave_with_master;
 # End of 5.0 tests
diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test
index b97b769d181..527e230854a 100644
--- a/mysql-test/t/rpl_slave_status.test
+++ b/mysql-test/t/rpl_slave_status.test
@@ -29,8 +29,12 @@ start slave;
 --vertical_results
 show slave status;
 
+# cleanup: slave io thread has been stopped "irrecoverably"
+# so we clean up mess manually
+
 connection master;
 drop table t1;
-sync_with_master;
+connection slave;
+drop table t1;
 
 # end of 4.1 tests
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index a7a15aebe7a..516f3a026c9 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -130,7 +130,7 @@ drop table t1,t2;
 # don't get any memory leaks for this
 
 create temporary table t3 (f int);
-sync_with_master;
+sync_slave_with_master;
 
 # The server will now close done
 
@@ -141,7 +141,8 @@ sync_with_master;
 connection master;
 create temporary table t4 (f int);
 create table t5 (f int);
-sync_with_master;
+sync_slave_with_master;
+connection master;
 # find dumper's $id
 source include/get_binlog_dump_thread_id.inc;
 insert into t4 values (1);