diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 73a951fff87..44b8a1346d5 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -987,10 +987,10 @@ sub executable_setup () {
                                            # New CMake locations.
                                            "$glob_basedir/client/release",
                                            "$glob_basedir/client/debug");
-      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-max",
-                                           "$path_client_bindir/mysqld-nt",
+      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt",
                                            "$path_client_bindir/mysqld",
                                            "$path_client_bindir/mysqld-debug",
+                                           "$path_client_bindir/mysqld-max",
                                            "$glob_basedir/sql/release/mysqld",
                                            "$glob_basedir/sql/debug/mysqld");
       $path_language=      mtr_path_exists("$glob_basedir/share/english/",
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index a584c384712..83bc8ce8954 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -213,15 +213,10 @@ then
   chown $user $mysql_unix_port_dir
 fi
 
-# Use the mysqld-max binary by default if the user doesn't specify a binary
+# If the user doesn't specify a binary, we assume name "mysqld"
 if test -z "$MYSQLD"
 then
-  if test -x $ledir/mysqld-max
-  then
-    MYSQLD=mysqld-max
-  else
-    MYSQLD=mysqld
-  fi
+  MYSQLD=mysqld
 fi
 
 if test ! -x $ledir/$MYSQLD