diff --git a/mysql-test/suite/tokudb.type/r/ctype_ascii.result b/mysql-test/suite/tokudb/r/ctype_ascii.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/ctype_ascii.result
rename to mysql-test/suite/tokudb/r/ctype_ascii.result
diff --git a/mysql-test/suite/tokudb.type/r/ctype_collate.result b/mysql-test/suite/tokudb/r/ctype_collate.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/ctype_collate.result
rename to mysql-test/suite/tokudb/r/ctype_collate.result
diff --git a/mysql-test/suite/tokudb.type/r/ctype_cp1250_ch.result b/mysql-test/suite/tokudb/r/ctype_cp1250_ch.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/ctype_cp1250_ch.result
rename to mysql-test/suite/tokudb/r/ctype_cp1250_ch.result
diff --git a/mysql-test/suite/tokudb.type/r/ctype_cp1251.result b/mysql-test/suite/tokudb/r/ctype_cp1251.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/ctype_cp1251.result
rename to mysql-test/suite/tokudb/r/ctype_cp1251.result
diff --git a/mysql-test/suite/tokudb.type/r/type_binary.result b/mysql-test/suite/tokudb/r/type_binary.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_binary.result
rename to mysql-test/suite/tokudb/r/type_binary.result
diff --git a/mysql-test/suite/tokudb.type/r/type_bit.result b/mysql-test/suite/tokudb/r/type_bit.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_bit.result
rename to mysql-test/suite/tokudb/r/type_bit.result
diff --git a/mysql-test/suite/tokudb.type/r/type_blob.result b/mysql-test/suite/tokudb/r/type_blob.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_blob.result
rename to mysql-test/suite/tokudb/r/type_blob.result
diff --git a/mysql-test/suite/tokudb.type/r/type_date.result b/mysql-test/suite/tokudb/r/type_date.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_date.result
rename to mysql-test/suite/tokudb/r/type_date.result
diff --git a/mysql-test/suite/tokudb.type/r/type_datetime.result b/mysql-test/suite/tokudb/r/type_datetime.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_datetime.result
rename to mysql-test/suite/tokudb/r/type_datetime.result
diff --git a/mysql-test/suite/tokudb.type/r/type_decimal.result b/mysql-test/suite/tokudb/r/type_decimal.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_decimal.result
rename to mysql-test/suite/tokudb/r/type_decimal.result
diff --git a/mysql-test/suite/tokudb.type/r/type_enum.result b/mysql-test/suite/tokudb/r/type_enum.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_enum.result
rename to mysql-test/suite/tokudb/r/type_enum.result
diff --git a/mysql-test/suite/tokudb.type/r/type_float.result b/mysql-test/suite/tokudb/r/type_float.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_float.result
rename to mysql-test/suite/tokudb/r/type_float.result
diff --git a/mysql-test/suite/tokudb.type/r/type_nchar.result b/mysql-test/suite/tokudb/r/type_nchar.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_nchar.result
rename to mysql-test/suite/tokudb/r/type_nchar.result
diff --git a/mysql-test/suite/tokudb.type/r/type_newdecimal.result b/mysql-test/suite/tokudb/r/type_newdecimal.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_newdecimal.result
rename to mysql-test/suite/tokudb/r/type_newdecimal.result
diff --git a/mysql-test/suite/tokudb.type/r/type_set.result b/mysql-test/suite/tokudb/r/type_set.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_set.result
rename to mysql-test/suite/tokudb/r/type_set.result
diff --git a/mysql-test/suite/tokudb.type/r/type_time.result b/mysql-test/suite/tokudb/r/type_time.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_time.result
rename to mysql-test/suite/tokudb/r/type_time.result
diff --git a/mysql-test/suite/tokudb.type/r/type_timestamp.result b/mysql-test/suite/tokudb/r/type_timestamp.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_timestamp.result
rename to mysql-test/suite/tokudb/r/type_timestamp.result
diff --git a/mysql-test/suite/tokudb.type/r/type_uint.result b/mysql-test/suite/tokudb/r/type_uint.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_uint.result
rename to mysql-test/suite/tokudb/r/type_uint.result
diff --git a/mysql-test/suite/tokudb.type/r/type_varchar.result b/mysql-test/suite/tokudb/r/type_varchar.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_varchar.result
rename to mysql-test/suite/tokudb/r/type_varchar.result
diff --git a/mysql-test/suite/tokudb.type/r/type_year.result b/mysql-test/suite/tokudb/r/type_year.result
similarity index 100%
rename from mysql-test/suite/tokudb.type/r/type_year.result
rename to mysql-test/suite/tokudb/r/type_year.result
diff --git a/mysql-test/suite/tokudb.type/t/ctype_ascii.test b/mysql-test/suite/tokudb/t/ctype_ascii.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/ctype_ascii.test
rename to mysql-test/suite/tokudb/t/ctype_ascii.test
diff --git a/mysql-test/suite/tokudb.type/t/ctype_collate.test b/mysql-test/suite/tokudb/t/ctype_collate.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/ctype_collate.test
rename to mysql-test/suite/tokudb/t/ctype_collate.test
diff --git a/mysql-test/suite/tokudb.type/t/ctype_cp1250_ch.test b/mysql-test/suite/tokudb/t/ctype_cp1250_ch.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/ctype_cp1250_ch.test
rename to mysql-test/suite/tokudb/t/ctype_cp1250_ch.test
diff --git a/mysql-test/suite/tokudb.type/t/ctype_cp1251.test b/mysql-test/suite/tokudb/t/ctype_cp1251.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/ctype_cp1251.test
rename to mysql-test/suite/tokudb/t/ctype_cp1251.test
diff --git a/mysql-test/suite/tokudb.type/t/type_binary.test b/mysql-test/suite/tokudb/t/type_binary.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_binary.test
rename to mysql-test/suite/tokudb/t/type_binary.test
diff --git a/mysql-test/suite/tokudb.type/t/type_bit.test b/mysql-test/suite/tokudb/t/type_bit.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_bit.test
rename to mysql-test/suite/tokudb/t/type_bit.test
diff --git a/mysql-test/suite/tokudb.type/t/type_blob.test b/mysql-test/suite/tokudb/t/type_blob.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_blob.test
rename to mysql-test/suite/tokudb/t/type_blob.test
diff --git a/mysql-test/suite/tokudb.type/t/type_date.test b/mysql-test/suite/tokudb/t/type_date.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_date.test
rename to mysql-test/suite/tokudb/t/type_date.test
diff --git a/mysql-test/suite/tokudb.type/t/type_datetime.test b/mysql-test/suite/tokudb/t/type_datetime.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_datetime.test
rename to mysql-test/suite/tokudb/t/type_datetime.test
diff --git a/mysql-test/suite/tokudb.type/t/type_decimal.test b/mysql-test/suite/tokudb/t/type_decimal.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_decimal.test
rename to mysql-test/suite/tokudb/t/type_decimal.test
diff --git a/mysql-test/suite/tokudb.type/t/type_enum.test b/mysql-test/suite/tokudb/t/type_enum.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_enum.test
rename to mysql-test/suite/tokudb/t/type_enum.test
diff --git a/mysql-test/suite/tokudb.type/t/type_float.test b/mysql-test/suite/tokudb/t/type_float.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_float.test
rename to mysql-test/suite/tokudb/t/type_float.test
diff --git a/mysql-test/suite/tokudb.type/t/type_nchar.test b/mysql-test/suite/tokudb/t/type_nchar.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_nchar.test
rename to mysql-test/suite/tokudb/t/type_nchar.test
diff --git a/mysql-test/suite/tokudb.type/t/type_newdecimal.test b/mysql-test/suite/tokudb/t/type_newdecimal.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_newdecimal.test
rename to mysql-test/suite/tokudb/t/type_newdecimal.test
diff --git a/mysql-test/suite/tokudb.type/t/type_set.test b/mysql-test/suite/tokudb/t/type_set.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_set.test
rename to mysql-test/suite/tokudb/t/type_set.test
diff --git a/mysql-test/suite/tokudb.type/t/type_time.test b/mysql-test/suite/tokudb/t/type_time.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_time.test
rename to mysql-test/suite/tokudb/t/type_time.test
diff --git a/mysql-test/suite/tokudb.type/t/type_timestamp.test b/mysql-test/suite/tokudb/t/type_timestamp.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_timestamp.test
rename to mysql-test/suite/tokudb/t/type_timestamp.test
diff --git a/mysql-test/suite/tokudb.type/t/type_uint.test b/mysql-test/suite/tokudb/t/type_uint.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_uint.test
rename to mysql-test/suite/tokudb/t/type_uint.test
diff --git a/mysql-test/suite/tokudb.type/t/type_varchar.test b/mysql-test/suite/tokudb/t/type_varchar.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_varchar.test
rename to mysql-test/suite/tokudb/t/type_varchar.test
diff --git a/mysql-test/suite/tokudb.type/t/type_year.test b/mysql-test/suite/tokudb/t/type_year.test
similarity index 100%
rename from mysql-test/suite/tokudb.type/t/type_year.test
rename to mysql-test/suite/tokudb/t/type_year.test