diff --git a/mysql-test/include/get_binlog_dump_thread_id.inc b/mysql-test/include/get_binlog_dump_thread_id.inc
index 680807cc3c6..830a88b5db6 100644
--- a/mysql-test/include/get_binlog_dump_thread_id.inc
+++ b/mysql-test/include/get_binlog_dump_thread_id.inc
@@ -3,9 +3,7 @@
 drop table if exists t999;
 --enable_warnings
 create temporary table t999 (f int);
-### --replace_result $MYSQL_TEST_DIR "."  #failed on solaris etc bug#18906
---disable_query_log
+--replace_result $MYSQLTEST_VARDIR "."
 eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
---enable_query_log
 let $id = `select f from t999`;
 drop table t999;
diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result
index 881504f49d0..12143561854 100644
--- a/mysql-test/r/rpl_temporary.result
+++ b/mysql-test/r/rpl_temporary.result
@@ -93,6 +93,7 @@ create temporary table t4 (f int);
 create table t5 (f int);
 drop table if exists t999;
 create temporary table t999 (f int);
+LOAD DATA INFILE "./tmp/bl_dump_thread_id" into table t999;
 drop table t999;
 insert into t4 values (1);
 kill `select id from information_schema.processlist where command='Binlog Dump'`;