diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 06a030c6d3a..10b8e84184a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -676,11 +676,12 @@ sub command_line_setup () {
   # number as early as possible
   #
 
-  # Look for the client binaries
+  # Look for the client binaries directory
   $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
 				       "$glob_basedir/client_debug",
 				       vs_config_dirs('client', ''),
-				       "$glob_basedir/client");
+				       "$glob_basedir/client",
+				       "$glob_basedir/bin/");
 
   $exe_mysqld=         mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),
 				       "$glob_basedir/sql/mysqld",