diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run
index 865839aecda..5edb64e8088 100755
--- a/mysql-test/mysql-test-run
+++ b/mysql-test/mysql-test-run
@@ -321,7 +321,7 @@ start_master()
     	    --server-id=1 \
             --basedir=$MY_BASEDIR \
 	    --port=$MASTER_MYPORT \
-	    --core-file \
+	    --exit-info=256 \
             --datadir=$MASTER_MYDDIR \
 	    --pid-file=$MASTER_MYPID \
 	    --socket=$MASTER_MYSOCK \
@@ -347,7 +347,8 @@ start_slave()
 	    --master-connect-retry=1 \
 	    --master-host=127.0.0.1 \
 	    --master-port=$MASTER_MYPORT \
-	    --core-file --log-bin --log-slave-updates \
+	    --exit-info=256 \
+	    --log-bin --log-slave-updates \
             --basedir=$MY_BASEDIR \
             --datadir=$SLAVE_MYDDIR \
 	    --pid-file=$SLAVE_MYPID \