diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d4555e8ac00..29acd25138f 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1417,13 +1417,14 @@ sub executable_setup () {
   if ( $glob_use_embedded_server )
   {
     $exe_mysql_client_test=
-      mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded",
-		     "$path_client_bindir/mysql_client_test_embedded");
+      mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded");
   }
   else
   {
     $exe_mysql_client_test=
-      mtr_exe_exists("$path_client_bindir/mysql_client_test");
+      mtr_exe_exists("$glob_basedir/tests/mysql_client_test",
+		     "$glob_basedir/tests/release/mysql_client_test"
+		     "$glob_basedir/tests/debug/mysql_client_test");
   }
 }