diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index cee9f2b6ed6..c568f8dc48c 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -40,7 +40,7 @@ BEGIN
   eval 'sub USE_NETPING { $use_netping }';
 }
   
-sub sleep_until_file_created ($$$$);
+sub sleep_until_file_created ($$$$$);
 sub mtr_ping_port ($);
 
 sub mtr_ping_port ($) {
@@ -102,8 +102,9 @@ sub mtr_ping_port ($) {
 
 # FIXME check that the pidfile contains the expected pid!
 
-sub sleep_until_file_created ($$$$) {
+sub sleep_until_file_created ($$$$$) {
   my $pidfile= shift;
+  my $expectfile = shift;
   my $timeout= shift;
   my $proc=     shift;
   my $warn_seconds = shift;
@@ -122,6 +123,7 @@ sub sleep_until_file_created ($$$$) {
     # Check if it died after the fork() was successful
     if ( defined $proc and ! $proc->wait_one(0) )
     {
+      return 1 if -r $expectfile;
       mtr_warning("Process $proc died after mysql-test-run waited $seconds " .
 		  "seconds for $pidfile to be created.");
       return 0;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index a91bdc0b751..29aaebd44b0 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2845,11 +2845,11 @@ sub mysql_server_start($) {
 
 sub mysql_server_wait {
   my ($mysqld, $tinfo) = @_;
+  my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect";
 
-  if (!sleep_until_file_created($mysqld->value('pid-file'),
-                                      $opt_start_timeout,
-                                      $mysqld->{'proc'},
-                                      $warn_seconds))
+  if (!sleep_until_file_created($mysqld->value('pid-file'), $expect_file,
+                                $opt_start_timeout, $mysqld->{'proc'},
+                                $warn_seconds))
   {
     $tinfo->{comment}= "Failed to start ".$mysqld->name() . "\n";
     return 1;
@@ -5123,7 +5123,8 @@ sub mysqld_start ($$) {
 
   $mysqld->{'started_opts'}= $extra_opts;
 
-  return sleep_until_file_created($mysqld->value('pid-file'),
+  my $expect_file= "$opt_vardir/tmp/".$mysqld->name().".expect";
+  return sleep_until_file_created($mysqld->value('pid-file'), $expect_file,
            $opt_start_timeout, $mysqld->{'proc'}, $warn_seconds);
 }