diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-del-0.result b/mysql-test/suite/tokudb/r/hotindex-del-0.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-del-0.result
rename to mysql-test/suite/tokudb/r/hotindex-del-0.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-del-1.result b/mysql-test/suite/tokudb/r/hotindex-del-1.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-del-1.result
rename to mysql-test/suite/tokudb/r/hotindex-del-1.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/del-fast.result b/mysql-test/suite/tokudb/r/hotindex-del-fast.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/del-fast.result
rename to mysql-test/suite/tokudb/r/hotindex-del-fast.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/del-slow.result b/mysql-test/suite/tokudb/r/hotindex-del-slow.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/del-slow.result
rename to mysql-test/suite/tokudb/r/hotindex-del-slow.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-insert-0.result b/mysql-test/suite/tokudb/r/hotindex-insert-0.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-insert-0.result
rename to mysql-test/suite/tokudb/r/hotindex-insert-0.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-insert-1.result b/mysql-test/suite/tokudb/r/hotindex-insert-1.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-insert-1.result
rename to mysql-test/suite/tokudb/r/hotindex-insert-1.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-insert-2.result b/mysql-test/suite/tokudb/r/hotindex-insert-2.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-insert-2.result
rename to mysql-test/suite/tokudb/r/hotindex-insert-2.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-insert-bigchar.result b/mysql-test/suite/tokudb/r/hotindex-insert-bigchar.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-insert-bigchar.result
rename to mysql-test/suite/tokudb/r/hotindex-insert-bigchar.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-update-0.result b/mysql-test/suite/tokudb/r/hotindex-update-0.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-update-0.result
rename to mysql-test/suite/tokudb/r/hotindex-update-0.result
diff --git a/mysql-test/suite/tokudb.hotindex/r/hotindex-update-1.result b/mysql-test/suite/tokudb/r/hotindex-update-1.result
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/r/hotindex-update-1.result
rename to mysql-test/suite/tokudb/r/hotindex-update-1.result
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-del-0.test b/mysql-test/suite/tokudb/t/hotindex-del-0.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-del-0.test
rename to mysql-test/suite/tokudb/t/hotindex-del-0.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-del-1.test b/mysql-test/suite/tokudb/t/hotindex-del-1.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-del-1.test
rename to mysql-test/suite/tokudb/t/hotindex-del-1.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/del-fast.test b/mysql-test/suite/tokudb/t/hotindex-del-fast.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/del-fast.test
rename to mysql-test/suite/tokudb/t/hotindex-del-fast.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/del-slow.test b/mysql-test/suite/tokudb/t/hotindex-del-slow.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/del-slow.test
rename to mysql-test/suite/tokudb/t/hotindex-del-slow.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-insert-0.test b/mysql-test/suite/tokudb/t/hotindex-insert-0.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-insert-0.test
rename to mysql-test/suite/tokudb/t/hotindex-insert-0.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-insert-1.test b/mysql-test/suite/tokudb/t/hotindex-insert-1.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-insert-1.test
rename to mysql-test/suite/tokudb/t/hotindex-insert-1.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-insert-2.test b/mysql-test/suite/tokudb/t/hotindex-insert-2.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-insert-2.test
rename to mysql-test/suite/tokudb/t/hotindex-insert-2.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-insert-bigchar.test b/mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-insert-bigchar.test
rename to mysql-test/suite/tokudb/t/hotindex-insert-bigchar.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-update-0.test b/mysql-test/suite/tokudb/t/hotindex-update-0.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-update-0.test
rename to mysql-test/suite/tokudb/t/hotindex-update-0.test
diff --git a/mysql-test/suite/tokudb.hotindex/t/hotindex-update-1.test b/mysql-test/suite/tokudb/t/hotindex-update-1.test
similarity index 100%
rename from mysql-test/suite/tokudb.hotindex/t/hotindex-update-1.test
rename to mysql-test/suite/tokudb/t/hotindex-update-1.test