diff --git a/mysql-test/include/rpl_diff.inc b/mysql-test/include/rpl_diff.inc
index c0919a2..e3a5d18 100644
--- a/mysql-test/include/rpl_diff.inc
+++ b/mysql-test/include/rpl_diff.inc
@@ -113,7 +113,7 @@ while ($_rpl_diff_servers)
 
   # Execute statement
   --let $_rpl_diff_file= $MYSQLTEST_VARDIR/tmp/_rpl_diff_server-$_rpl_diff_server_i.tmp
-  --exec $MYSQL $_rpl_diff_database < $_rpl_diff_statement_file > $_rpl_diff_file
+  --exec $MYSQL --defaults-group-suffix=.$_rpl_diff_server_i $_rpl_diff_database < $_rpl_diff_statement_file > $_rpl_diff_file
 
   # Compare
   if (!$_rpl_diff_first)
@@ -129,7 +129,7 @@ while ($_rpl_diff_servers)
   --let $_rpl_diff_first= 0
 }
 --remove_file $_rpl_diff_prev_file
-
+--remove_file $_rpl_diff_statement_file
 
 --let $include_filename= rpl_diff.inc
 --source include/end_include_file.inc