diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index b12f7afb9f1..dc567eeeb50 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -530,7 +530,7 @@ else
    MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"
  fi
  CLIENT_BINDIR="$BASEDIR/bin"
- TESTS_BINDIR="$BASEDIR/tests"
+ TESTS_BINDIR="$BASEDIR/bin"
  MYSQL_TEST="$CLIENT_BINDIR/mysqltest"
  MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"
  MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
diff --git a/mysql-test/t/client_test.test b/mysql-test/t/client_test.test
index 9183740cd02..b56e8038d9b 100644
--- a/mysql-test/t/client_test.test
+++ b/mysql-test/t/client_test.test
@@ -1,2 +1,2 @@
--- disable_result_log
--- // exec $TESTS_BINDIR/client_test --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT
+--disable_result_log
+--exec $TESTS_BINDIR/client_test --testcase --user=root --socket=$MASTER_MYSOCK --port=$MYSQL_TCP_PORT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d0e4627b69..df16ee789a5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,8 @@ EXTRA_DIST =		auto_increment.res auto_increment.tst \
 			pmail.pl mail_to_db.pl table_types.pl \
 			udf_test udf_test.res myisam-big-rows.tst
 
-noinst_PROGRAMS =	insert_test select_test thread_test client_test
+bin_PROGRAMS =		client_test
+noinst_PROGRAMS =	insert_test select_test thread_test
 
 #
 # C Test for 4.1 protocol