diff --git a/mysql-test/suite/binlog/r/binlog_index.result b/mysql-test/suite/binlog/r/binlog_index.result
index a3a20662df4..c3eabb14f59 100644
--- a/mysql-test/suite/binlog/r/binlog_index.result
+++ b/mysql-test/suite/binlog/r/binlog_index.result
@@ -9,7 +9,7 @@ master-bin.000003	#
 master-bin.000004	#
 purge binary logs TO 'master-bin.000004';
 Warnings:
-Warning	1612	Being purged log ./master-bin.000001 was not found
+Warning	1612	Being purged log master-bin.000001 was not found
 *** must show a list starting from the 'TO' argument of PURGE ***
 show binary logs;
 Log_name	File_size
@@ -20,7 +20,7 @@ flush logs;
 flush logs;
 *** must be a warning master-bin.000001 was not found ***
 Warnings:
-Warning	1612	Being purged log ./master-bin.000001 was not found
+Warning	1612	Being purged log master-bin.000001 was not found
 *** must show one record, of the active binlog, left in the index file after PURGE ***
 show binary logs;
 Log_name	File_size
@@ -33,7 +33,7 @@ purge binary logs TO 'master-bin.000002';
 ERROR HY000: Fatal error during log purge
 show warnings;
 Level	Code	Message
-Error	1377	a problem with deleting ./master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files
+Error	1377	a problem with deleting master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files
 Error	1377	Fatal error during log purge
 reset master;
 End of tests
diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test
index ef465a13e12..13287465b88 100644
--- a/mysql-test/suite/binlog/t/binlog_index.test
+++ b/mysql-test/suite/binlog/t/binlog_index.test
@@ -13,11 +13,11 @@ flush logs;
 flush logs;
 
 source include/show_binary_logs.inc;
-
 let $MYSQLD_DATADIR= `select @@datadir`;
 remove_file $MYSQLD_DATADIR/master-bin.000001;
 
 # there must be a warning with file names
+replace_regex /\.[\\\/]master/master/;
 purge binary logs TO 'master-bin.000004';
 
 --echo *** must show a list starting from the 'TO' argument of PURGE ***
@@ -37,6 +37,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001;
 --echo *** must be a warning master-bin.000001 was not found ***
 let $date=`select NOW()  +  INTERVAL 1 MINUTE`;
 --disable_query_log
+replace_regex /\.[\\\/]master/master/;
 eval purge binary logs BEFORE '$date';
 --enable_query_log
 
@@ -59,6 +60,7 @@ mkdir $MYSQLD_DATADIR/master-bin.000001;
 
 --error ER_BINLOG_PURGE_FATAL_ERR
 purge binary logs TO 'master-bin.000002';
+replace_regex /\.[\\\/]master/master/;
 show warnings;
 rmdir $MYSQLD_DATADIR/master-bin.000001;
 --disable_warnings