diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index 05b90e24c49..3558bd0c4db 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -416,7 +416,7 @@ sub post_fix_mysql_cluster_section {
 
   # Add a [mysl_cluster.<suffix>] section for each
   # defined [cluster_config.<suffix>] section
-  foreach my $group ( $config->like('cluster_config.[0-9]') )
+  foreach my $group ( $config->like('cluster_config\.\w*') )
   {
     my @urls;
     # Generate ndb_connectstring for this cluster
@@ -497,7 +497,7 @@ sub run_generate_sections_from_cluster_config {
   my @options= ('ndb_mgmd', 'ndbd',
 		'mysqld', 'ndbapi');
 
-  foreach my $group ( $config->like('cluster_config.[0-9]') ) {
+  foreach my $group ( $config->like('cluster_config\.\w*') ) {
 
     # Keep track of current index per process type
     my %idxes;
@@ -580,7 +580,7 @@ sub new_config {
 
 
   $self->run_section_rules($config,
-			   'cluster_config.[0-9]',
+			   'cluster_config\.\w*',
 			   @cluster_config_rules);
   $self->run_generate_sections_from_cluster_config($config);
 
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 31ce064402f..8a275fbe99b 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -722,6 +722,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/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index 4375a2a8aa5..e6c8e701c0f 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -15,3 +15,6 @@ rpl_innodb_bug28430      : Bug #32247 2007-11-27 mats Test reports wrong value o
 rpl_view                   : Bug#32654: rpl_view.test fails randomly
 rpl_ndb_multi              : Bug#30751: rpl_ndb_multi missing row in output
 rpl_log_pos                : Bug#8693 Test 'rpl_log_pos' fails sometimes
+rpl_circular_for_4_hosts  : Needs updated config
+rpl_ndb_circular_2ch : Needs updated config
+
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
+
+