diff --git a/mysql-test/r/binlog_innodb.result b/mysql-test/suite/binlog/r/binlog_innodb.result
similarity index 100%
rename from mysql-test/r/binlog_innodb.result
rename to mysql-test/suite/binlog/r/binlog_innodb.result
diff --git a/mysql-test/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result
similarity index 100%
rename from mysql-test/r/binlog_multi_engine.result
rename to mysql-test/suite/binlog/r/binlog_multi_engine.result
diff --git a/mysql-test/t/binlog_innodb.test b/mysql-test/suite/binlog/t/binlog_innodb.test
similarity index 100%
rename from mysql-test/t/binlog_innodb.test
rename to mysql-test/suite/binlog/t/binlog_innodb.test
diff --git a/mysql-test/t/binlog_multi_engine.test b/mysql-test/suite/binlog/t/binlog_multi_engine.test
similarity index 100%
rename from mysql-test/t/binlog_multi_engine.test
rename to mysql-test/suite/binlog/t/binlog_multi_engine.test
diff --git a/mysql-test/r/rpl_grant.result b/mysql-test/suite/rpl/r/rpl_grant.result
similarity index 100%
rename from mysql-test/r/rpl_grant.result
rename to mysql-test/suite/rpl/r/rpl_grant.result
diff --git a/mysql-test/r/rpl_invoked_features.result b/mysql-test/suite/rpl/r/rpl_invoked_features.result
similarity index 100%
rename from mysql-test/r/rpl_invoked_features.result
rename to mysql-test/suite/rpl/r/rpl_invoked_features.result
diff --git a/mysql-test/r/rpl_loaddata_fatal.result b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
similarity index 100%
rename from mysql-test/r/rpl_loaddata_fatal.result
rename to mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
diff --git a/mysql-test/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result
similarity index 100%
rename from mysql-test/r/rpl_slave_skip.result
rename to mysql-test/suite/rpl/r/rpl_slave_skip.result
diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index 180a700acaf..fda40c30340 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -13,3 +13,4 @@
 rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
 rpl_innodb_mixed_ddl     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
 rpl_innodb_mixed_dml     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
+rpl_invoked_features     : BUG#29020 2007-06-21 Lars Non-deterministic test case
diff --git a/mysql-test/t/rpl_grant.test b/mysql-test/suite/rpl/t/rpl_grant.test
similarity index 100%
rename from mysql-test/t/rpl_grant.test
rename to mysql-test/suite/rpl/t/rpl_grant.test
diff --git a/mysql-test/t/rpl_invoked_features-master.opt b/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
similarity index 100%
rename from mysql-test/t/rpl_invoked_features-master.opt
rename to mysql-test/suite/rpl/t/rpl_invoked_features-master.opt
diff --git a/mysql-test/t/rpl_invoked_features-slave.opt b/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt
similarity index 100%
rename from mysql-test/t/rpl_invoked_features-slave.opt
rename to mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt
diff --git a/mysql-test/t/rpl_invoked_features.test b/mysql-test/suite/rpl/t/rpl_invoked_features.test
similarity index 100%
rename from mysql-test/t/rpl_invoked_features.test
rename to mysql-test/suite/rpl/t/rpl_invoked_features.test
diff --git a/mysql-test/t/rpl_loaddata_fatal-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt
similarity index 100%
rename from mysql-test/t/rpl_loaddata_fatal-slave.opt
rename to mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt
diff --git a/mysql-test/t/rpl_loaddata_fatal.test b/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
similarity index 100%
rename from mysql-test/t/rpl_loaddata_fatal.test
rename to mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
diff --git a/mysql-test/t/rpl_slave_skip.test b/mysql-test/suite/rpl/t/rpl_slave_skip.test
similarity index 100%
rename from mysql-test/t/rpl_slave_skip.test
rename to mysql-test/suite/rpl/t/rpl_slave_skip.test
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 61d81811ec1..5d31a8060e8 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -21,7 +21,6 @@ im_instance_conf         : BUG#28743 Instance manager generates warnings in test
 im_utils                 : BUG#28743 Instance manager generates warnings in test suite
 innodb                   : Disabling test case awaiting reply from Innobase
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
-rpl_invoked_features     : BUG#29020 2007-06-21 Lars Non-deterministic test case
 ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper