diff --git a/mysql-test/r/innodb-autoinc-optimize.result b/mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
similarity index 100%
rename from mysql-test/r/innodb-autoinc-optimize.result
rename to mysql-test/suite/innodb/r/innodb-autoinc-optimize.result
diff --git a/mysql-test/r/innodb-ucs2.result b/mysql-test/suite/innodb/r/innodb-ucs2.result
similarity index 100%
rename from mysql-test/r/innodb-ucs2.result
rename to mysql-test/suite/innodb/r/innodb-ucs2.result
diff --git a/mysql-test/r/innodb_autoinc_lock_mode_zero.result b/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
similarity index 100%
rename from mysql-test/r/innodb_autoinc_lock_mode_zero.result
rename to mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
diff --git a/mysql-test/r/innodb_bug30919.result b/mysql-test/suite/innodb/r/innodb_bug30919.result
similarity index 100%
rename from mysql-test/r/innodb_bug30919.result
rename to mysql-test/suite/innodb/r/innodb_bug30919.result
diff --git a/mysql-test/r/innodb_bug42419.result b/mysql-test/suite/innodb/r/innodb_bug42419.result
similarity index 100%
rename from mysql-test/r/innodb_bug42419.result
rename to mysql-test/suite/innodb/r/innodb_bug42419.result
diff --git a/mysql-test/r/innodb_gis.result b/mysql-test/suite/innodb/r/innodb_gis.result
similarity index 100%
rename from mysql-test/r/innodb_gis.result
rename to mysql-test/suite/innodb/r/innodb_gis.result
diff --git a/mysql-test/r/innodb_lock_wait_timeout_1.result b/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
similarity index 100%
rename from mysql-test/r/innodb_lock_wait_timeout_1.result
rename to mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
similarity index 100%
rename from mysql-test/r/innodb_mysql.result
rename to mysql-test/suite/innodb/r/innodb_mysql.result
diff --git a/mysql-test/r/innodb_mysql_rbk.result b/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
similarity index 100%
rename from mysql-test/r/innodb_mysql_rbk.result
rename to mysql-test/suite/innodb/r/innodb_mysql_rbk.result
diff --git a/mysql-test/r/innodb_notembedded.result b/mysql-test/suite/innodb/r/innodb_notembedded.result
similarity index 100%
rename from mysql-test/r/innodb_notembedded.result
rename to mysql-test/suite/innodb/r/innodb_notembedded.result
diff --git a/mysql-test/r/innodb_timeout_rollback.result b/mysql-test/suite/innodb/r/innodb_timeout_rollback.result
similarity index 100%
rename from mysql-test/r/innodb_timeout_rollback.result
rename to mysql-test/suite/innodb/r/innodb_timeout_rollback.result
diff --git a/mysql-test/t/innodb-autoinc-optimize.test b/mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
similarity index 100%
rename from mysql-test/t/innodb-autoinc-optimize.test
rename to mysql-test/suite/innodb/t/innodb-autoinc-optimize.test
diff --git a/mysql-test/t/innodb-ucs2.test b/mysql-test/suite/innodb/t/innodb-ucs2.test
similarity index 100%
rename from mysql-test/t/innodb-ucs2.test
rename to mysql-test/suite/innodb/t/innodb-ucs2.test
diff --git a/mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt b/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
similarity index 100%
rename from mysql-test/t/innodb_autoinc_lock_mode_zero-master.opt
rename to mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
diff --git a/mysql-test/t/innodb_autoinc_lock_mode_zero.test b/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
similarity index 100%
rename from mysql-test/t/innodb_autoinc_lock_mode_zero.test
rename to mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
diff --git a/mysql-test/t/innodb_bug30919-master.opt b/mysql-test/suite/innodb/t/innodb_bug30919-master.opt
similarity index 100%
rename from mysql-test/t/innodb_bug30919-master.opt
rename to mysql-test/suite/innodb/t/innodb_bug30919-master.opt
diff --git a/mysql-test/t/innodb_bug30919.test b/mysql-test/suite/innodb/t/innodb_bug30919.test
similarity index 100%
rename from mysql-test/t/innodb_bug30919.test
rename to mysql-test/suite/innodb/t/innodb_bug30919.test
diff --git a/mysql-test/t/innodb_bug42419.test b/mysql-test/suite/innodb/t/innodb_bug42419.test
similarity index 100%
rename from mysql-test/t/innodb_bug42419.test
rename to mysql-test/suite/innodb/t/innodb_bug42419.test
diff --git a/mysql-test/t/innodb_gis.test b/mysql-test/suite/innodb/t/innodb_gis.test
similarity index 100%
rename from mysql-test/t/innodb_gis.test
rename to mysql-test/suite/innodb/t/innodb_gis.test
diff --git a/mysql-test/t/innodb_lock_wait_timeout_1-master.opt b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
similarity index 100%
rename from mysql-test/t/innodb_lock_wait_timeout_1-master.opt
rename to mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
diff --git a/mysql-test/t/innodb_lock_wait_timeout_1.test b/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
similarity index 100%
rename from mysql-test/t/innodb_lock_wait_timeout_1.test
rename to mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
diff --git a/mysql-test/t/innodb_mysql-master.opt b/mysql-test/suite/innodb/t/innodb_mysql-master.opt
similarity index 100%
rename from mysql-test/t/innodb_mysql-master.opt
rename to mysql-test/suite/innodb/t/innodb_mysql-master.opt
diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/suite/innodb/t/innodb_mysql.test
similarity index 100%
rename from mysql-test/t/innodb_mysql.test
rename to mysql-test/suite/innodb/t/innodb_mysql.test
diff --git a/mysql-test/t/innodb_mysql_rbk-master.opt b/mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
similarity index 100%
rename from mysql-test/t/innodb_mysql_rbk-master.opt
rename to mysql-test/suite/innodb/t/innodb_mysql_rbk-master.opt
diff --git a/mysql-test/t/innodb_mysql_rbk.test b/mysql-test/suite/innodb/t/innodb_mysql_rbk.test
similarity index 100%
rename from mysql-test/t/innodb_mysql_rbk.test
rename to mysql-test/suite/innodb/t/innodb_mysql_rbk.test
diff --git a/mysql-test/t/innodb_notembedded.test b/mysql-test/suite/innodb/t/innodb_notembedded.test
similarity index 100%
rename from mysql-test/t/innodb_notembedded.test
rename to mysql-test/suite/innodb/t/innodb_notembedded.test
diff --git a/mysql-test/t/innodb_timeout_rollback-master.opt b/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
similarity index 100%
rename from mysql-test/t/innodb_timeout_rollback-master.opt
rename to mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
diff --git a/mysql-test/t/innodb_timeout_rollback.test b/mysql-test/suite/innodb/t/innodb_timeout_rollback.test
similarity index 100%
rename from mysql-test/t/innodb_timeout_rollback.test
rename to mysql-test/suite/innodb/t/innodb_timeout_rollback.test