diff --git a/mysql-test/suite/tokudb.bugs/r/bf_create_select_hash_part.result b/mysql-test/suite/tokudb/r/bf_create_select_hash_part.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_create_select_hash_part.result
rename to mysql-test/suite/tokudb/r/bf_create_select_hash_part.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bf_create_select_nonpart.result b/mysql-test/suite/tokudb/r/bf_create_select_nonpart.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_create_select_nonpart.result
rename to mysql-test/suite/tokudb/r/bf_create_select_nonpart.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bf_create_select_range_part.result b/mysql-test/suite/tokudb/r/bf_create_select_range_part.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_create_select_range_part.result
rename to mysql-test/suite/tokudb/r/bf_create_select_range_part.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bf_create_temp_select_nonpart.result b/mysql-test/suite/tokudb/r/bf_create_temp_select_nonpart.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_create_temp_select_nonpart.result
rename to mysql-test/suite/tokudb/r/bf_create_temp_select_nonpart.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bf_insert_select_dup_key_nonpart.result b/mysql-test/suite/tokudb/r/bf_insert_select_dup_key_nonpart.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_insert_select_dup_key_nonpart.result
rename to mysql-test/suite/tokudb/r/bf_insert_select_dup_key_nonpart.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bf_insert_select_nonpart.result b/mysql-test/suite/tokudb/r/bf_insert_select_nonpart.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_insert_select_nonpart.result
rename to mysql-test/suite/tokudb/r/bf_insert_select_nonpart.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bf_replace_select_nonpart.result b/mysql-test/suite/tokudb/r/bf_replace_select_nonpart.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_replace_select_nonpart.result
rename to mysql-test/suite/tokudb/r/bf_replace_select_nonpart.result
diff --git a/mysql-test/suite/tokudb.bugs/r/bf_select_part.result b/mysql-test/suite/tokudb/r/bf_select_part.result
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/r/bf_select_part.result
rename to mysql-test/suite/tokudb/r/bf_select_part.result
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_create_select_hash_part.test b/mysql-test/suite/tokudb/t/bf_create_select_hash_part.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_create_select_hash_part.test
rename to mysql-test/suite/tokudb/t/bf_create_select_hash_part.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_create_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_create_select_nonpart.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_create_select_nonpart.test
rename to mysql-test/suite/tokudb/t/bf_create_select_nonpart.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_create_select_range_part.test b/mysql-test/suite/tokudb/t/bf_create_select_range_part.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_create_select_range_part.test
rename to mysql-test/suite/tokudb/t/bf_create_select_range_part.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_create_temp_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_create_temp_select_nonpart.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_create_temp_select_nonpart.test
rename to mysql-test/suite/tokudb/t/bf_create_temp_select_nonpart.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_insert_select_dup_key_nonpart.test b/mysql-test/suite/tokudb/t/bf_insert_select_dup_key_nonpart.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_insert_select_dup_key_nonpart.test
rename to mysql-test/suite/tokudb/t/bf_insert_select_dup_key_nonpart.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_insert_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_insert_select_nonpart.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_insert_select_nonpart.test
rename to mysql-test/suite/tokudb/t/bf_insert_select_nonpart.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_replace_select_nonpart.test b/mysql-test/suite/tokudb/t/bf_replace_select_nonpart.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_replace_select_nonpart.test
rename to mysql-test/suite/tokudb/t/bf_replace_select_nonpart.test
diff --git a/mysql-test/suite/tokudb.bugs/t/bf_select_part.test b/mysql-test/suite/tokudb/t/bf_select_part.test
similarity index 100%
rename from mysql-test/suite/tokudb.bugs/t/bf_select_part.test
rename to mysql-test/suite/tokudb/t/bf_select_part.test