diff --git a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test
index a5e00cb0387..e772089ce7a 100644
--- a/mysql-test/t/log_state.test
+++ b/mysql-test/t/log_state.test
@@ -132,3 +132,8 @@ select * from mysql.general_log;
 # Cleanup (must be done last to avoid delayed 'Quit' message in general log)
 #
 disconnect con1;
+
+# Remove the log files that was created in the "default location"
+# i.e var/run
+--remove_file $MYSQLTEST_VARDIR/run/master.log
+--remove_file $MYSQLTEST_VARDIR/run/master-slow.log
diff --git a/sql/log.cc b/sql/log.cc
index deb77890f35..b44283f220e 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -68,7 +68,7 @@ char *make_default_log_name(char *buff,const char* log_ext)
 {
   strmake(buff, pidfile_name, FN_REFLEN-5);
   return fn_format(buff, buff, mysql_data_home, log_ext,
-                   MYF(MY_UNPACK_FILENAME|MY_APPEND_EXT));
+                   MYF(MY_UNPACK_FILENAME|MY_REPLACE_EXT));
 }
 
 /*