diff --git a/mysql-test/suite/binlog/t/binlog_killed_simulate.test b/mysql-test/suite/binlog/t/binlog_killed_simulate.test
index 2bccc2ccb30..79494e2d48d 100644
--- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test
+++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test
@@ -20,9 +20,6 @@ reset master;
 update t1 set a=2 /* will be "killed" after work has been done */;
 
 # a proof the query is binlogged with no error
-#todo: introduce a suite private macro that provides numeric values
-#      for some constants like the offset of the first real event
-#      that is different between severs versions.
 let $MYSQLD_DATADIR= `select @@datadir`;
 --let $binlog_start_point= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos, 1)
 --exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_start_point $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
@@ -48,14 +45,14 @@ reset master;
 --error ER_QUERY_INTERRUPTED
 load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */;
 
-
 # a proof the query is binlogged with an error
 --let $binlog_load_data= query_get_value(SHOW BINLOG EVENTS, Pos, 3)
 --let $binlog_end=       query_get_value(SHOW BINLOG EVENTS, Pos, 4)
 source include/show_binlog_events.inc;
 
---exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_load_data --stop-position=$binlog_end $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 
+--mkdir $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 --force-if-open --start-position=$binlog_load_data --stop-position=$binlog_end $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
@@ -68,6 +65,8 @@ eval select $error_code /* must return 0 to mean the killed query is in */;
 # cleanup for the sub-case
 remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
 
+--remove_files_wildcard $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571 *
+--rmdir $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571
 
 drop table t1,t2;