diff --git a/mysql-test/r/rpl_set_charset.result b/mysql-test/r/rpl_set_charset.result
index b2bfa3678a9..7297d80865b 100644
--- a/mysql-test/r/rpl_set_charset.result
+++ b/mysql-test/r/rpl_set_charset.result
@@ -49,3 +49,4 @@ D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF	D0
 E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF	E0
 F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF	F0
 drop table t1;
+drop database mysqltest1;
diff --git a/mysql-test/t/rpl_set_charset.test b/mysql-test/t/rpl_set_charset.test
index 6aa864b1008..dcfc11bf25e 100644
--- a/mysql-test/t/rpl_set_charset.test
+++ b/mysql-test/t/rpl_set_charset.test
@@ -38,3 +38,5 @@ drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;
+connection master;
+drop database mysqltest1;