diff --git a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
index 144f86cceba..609d35d7ef6 100644
--- a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
+++ b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
@@ -3,5 +3,5 @@
 --source include/not_windows.inc
 --source include/have_binlog_format_mixed.inc
 
---source suite/rpl/include/rpl_binlog_max_cache_size.test
+--source suite/rpl/include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test b/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.inc
similarity index 100%
rename from mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test
rename to mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.inc
diff --git a/mysql-test/suite/rpl/include/rpl_charset.test b/mysql-test/suite/rpl/include/rpl_charset.inc
similarity index 100%
rename from mysql-test/suite/rpl/include/rpl_charset.test
rename to mysql-test/suite/rpl/include/rpl_charset.inc
diff --git a/mysql-test/suite/rpl/include/rpl_extra_col_master.test b/mysql-test/suite/rpl/include/rpl_extra_col_master.inc
similarity index 100%
rename from mysql-test/suite/rpl/include/rpl_extra_col_master.test
rename to mysql-test/suite/rpl/include/rpl_extra_col_master.inc
diff --git a/mysql-test/suite/rpl/t/rpl_charset.test b/mysql-test/suite/rpl/t/rpl_charset.test
index 31ea2bc8f07..13737854d31 100644
--- a/mysql-test/suite/rpl/t/rpl_charset.test
+++ b/mysql-test/suite/rpl/t/rpl_charset.test
@@ -1,2 +1,2 @@
 let $engine_type=myisam;
-source include/rpl_charset.test;
+source include/rpl_charset.inc;
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
index 63ae0fce9ba..f0820c7d6e7 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
@@ -6,6 +6,6 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'InnoDB';
---source include/rpl_extra_col_master.test
+--source include/rpl_extra_col_master.inc
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
index 72a35992fe5..51242ab93b5 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
@@ -5,6 +5,6 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'MyISAM';
---source include/rpl_extra_col_master.test
+--source include/rpl_extra_col_master.inc
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
index c4c89d9048b..cc104996852 100644
--- a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_mixed.inc
 --source include/master-slave.inc
 
---source include/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
index a4db32cf46e..8ea43a096fc 100644
--- a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
---source include/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
index f893f9090e4..9c815d23f8d 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
---source include/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.inc
 --source include/rpl_end.inc