diff --git a/mysql-test/include/maria_make_snapshot_for_comparison.inc b/mysql-test/include/maria_make_snapshot_for_comparison.inc
index cb756f60527..0c71bd10408 100644
--- a/mysql-test/include/maria_make_snapshot_for_comparison.inc
+++ b/mysql-test/include/maria_make_snapshot_for_comparison.inc
@@ -8,6 +8,7 @@
 # cover tables mysqltest.$mms_tname1,...$mms_tnameN
 
 connection admin;
+--source include/wait_until_connected_again.inc
 
 let $mms_table_to_use=$mms_tables;
 let $mms_purpose=comparison;
diff --git a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
index c204409de4d..8a2a99c28eb 100644
--- a/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
+++ b/mysql-test/include/maria_make_snapshot_for_feeding_recovery.inc
@@ -11,6 +11,7 @@
 
 
 connection admin;
+--source include/wait_until_connected_again.inc
 
 let $mms_table_to_use=$mms_tables;
 let $mms_purpose=feeding_recovery;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0bf0245325a..f10f5e4fcba 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1697,7 +1697,7 @@ sub collect_mysqld_features {
   my $args;
   mtr_init_args(\$args);
   mtr_add_arg($args, "--no-defaults");
-  mtr_add_arg($args, "--datadir=%s/tmp", $opt_vardir);
+  mtr_add_arg($args, "--datadir=.");
   mtr_add_arg($args, "--basedir=%s", $basedir);
   mtr_add_arg($args, "--language=%s", $path_language);
   mtr_add_arg($args, "--skip-grant-tables");