diff --git a/mysql-test/suite/sphinx/suite.pm b/mysql-test/suite/sphinx/suite.pm
index 199e59e26d7..0dd1da9fa5a 100644
--- a/mysql-test/suite/sphinx/suite.pm
+++ b/mysql-test/suite/sphinx/suite.pm
@@ -29,8 +29,18 @@ return "No SphinxSE" unless $ENV{HA_SPHINX_SO} or
 
 {
   local $_ = `"$exe_sphinx_searchd" --help`;
+  print "tool: $exe_sphinx_searchd\n";
   my $ver = sprintf "%04d.%04d.%04d", (/([0-9]+)\.([0-9]+)\.([0-9]+)/);
-  return "Sphinx 0.9.9 or later is needed" unless $ver ge '0000.0009.0009';
+  print $ver;
+  if ($ver eq "0000.0000.0000")
+  {
+     $ver = sprintf "%04d.%04d", (/([0-9]+)\.([0-9]+)-(alpha|beta|gamma|RC)/);
+     return "Sphinx 0.9.9 or later is needed" unless $ver ge '0001.0010';
+  }
+  else
+  {
+    return "Sphinx 0.9.9 or later is needed" unless $ver ge '0000.0009.0009';
+  }
 }
 
 ############# action methods ######################
diff --git a/storage/maria/unittest/ma_test_all-t b/storage/maria/unittest/ma_test_all-t
index 868d8c858e5..f07b7d0a554 100755
--- a/storage/maria/unittest/ma_test_all-t
+++ b/storage/maria/unittest/ma_test_all-t
@@ -497,10 +497,10 @@ sub run_tests_on_clrs
 
   my @t= ($NEW_TEST,
           "$maria_exe_path/ma_test2$suffix -h$tmpdir -s -L -K -W -P -M -T -c -b -t2 -A1",
-          "cp $tmpdir/maria_log_control $tmpdir/maria_log_control.backup",
+          "cp $tmpdir/aria_log_control $tmpdir/aria_log_control.backup",
           "$maria_exe_path/aria_read_log$suffix -a -s -h$tmpdir",
           "$maria_exe_path/aria_chk$suffix -h$tmpdir -s -e $tmpdir/test2",
-          "mv $tmpdir/maria_log_control.backup $tmpdir/maria_log_control",
+          "mv $tmpdir/aria_log_control.backup $tmpdir/aria_log_control",
           "rm $tmpdir/test2.MA?",
           "$maria_exe_path/aria_read_log$suffix -a -s -h$tmpdir",
           "$maria_exe_path/aria_chk$suffix -h$tmpdir -s -e $tmpdir/test2",