diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index f84129cf1ee..4f1f83c0951 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -754,6 +754,15 @@ sub collect_one_test_case {
   # ----------------------------------------------------------------------
   process_opts_file($tinfo, "$testdir/$tname-slave.opt", 'slave_opt');
 
+  # ----------------------------------------------------------------------
+  # Check for test specific config file
+  # ----------------------------------------------------------------------
+  my $test_cnf_file= "$testdir/$tname.cnf";
+  if ( -f $test_cnf_file ) {
+    # Specifies the configuration file to use for this test
+    $tinfo->{'template_path'}= $test_cnf_file;
+  }
+
   # ----------------------------------------------------------------------
   # master sh
   # ----------------------------------------------------------------------
diff --git a/mysql-test/suite/rpl/t/rpl_000015-master.opt b/mysql-test/suite/rpl/t/rpl_000015-master.opt
deleted file mode 100644
index 59a8261ba69..00000000000
--- a/mysql-test/suite/rpl/t/rpl_000015-master.opt
+++ /dev/null
@@ -1,2 +0,0 @@
---config-file-template=../rpl_1slave_base.cnf
-
diff --git a/mysql-test/suite/rpl/t/rpl_000015.cnf b/mysql-test/suite/rpl/t/rpl_000015.cnf
new file mode 100644
index 00000000000..46f8af242c2
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_000015.cnf
@@ -0,0 +1,2 @@
+!include ../rpl_1slave_base.cnf
+
diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt b/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt
deleted file mode 100644
index 550212a5297..00000000000
--- a/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt
+++ /dev/null
@@ -1,3 +0,0 @@
--O max_binlog_size=4096
---config-file-template=../rpl_1slave_base.cnf
-
diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf b/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
new file mode 100644
index 00000000000..7e676dc2da8
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
@@ -0,0 +1,6 @@
+!include ../rpl_1slave_base.cnf
+
+[mysqld.1]
+max_binlog_size=4096
+
+