diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index f46c0165e27..3ac286811a2 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -748,6 +748,16 @@ sub collect_one_test_case {
   # Add slave opts, list of extra option only for slave
   # ----------------------------------------------------------------------
   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_ndb/r/rpl_ndb_circular_2ch.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
index 5ad36e6f251..53130343aa0 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result
@@ -97,5 +97,6 @@ COUNT(*)	SUM(a)	b
 100	64100	master1
 100	64000	slave
 
-DELETE FROM t1;
+DROP TABLE t1;
+DROP TABLE t1;