diff --git a/mysql-test/suite/encryption/disabled.def b/mysql-test/suite/encryption/disabled.def
index 8c263c6a458..952057751c8 100644
--- a/mysql-test/suite/encryption/disabled.def
+++ b/mysql-test/suite/encryption/disabled.def
@@ -13,3 +13,5 @@
 innodb_scrub            : MDEV-8139 scrubbing does not work reliably
 innodb_scrub_background : MDEV-8139 scrubbing does not work reliably
 innodb_encryption-page-compression : MDEV-11420
+innodb_lotoftables	: versioning branch
+
diff --git a/mysql-test/suite/handler/disabled.def b/mysql-test/suite/handler/disabled.def
index 888298bbb09..1f648e74b06 100644
--- a/mysql-test/suite/handler/disabled.def
+++ b/mysql-test/suite/handler/disabled.def
@@ -9,3 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
+
+wl6501_1: versioning branch
+wl6501_crash_3: versioning branch
diff --git a/storage/tokudb/mysql-test/tokudb/disabled.def b/storage/tokudb/mysql-test/tokudb/disabled.def
index ddefceb432e..1f5ed441254 100644
--- a/storage/tokudb/mysql-test/tokudb/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb/disabled.def
@@ -29,3 +29,6 @@ cluster_key_part: engine options on partitioned tables
 i_s_tokudb_lock_waits_released: unstable, race conditions
 i_s_tokudb_locks_released: unstable, race conditions
 row_format: n/a
+
+rows-32m-rand-insert: versioning branch
+rows-32m-seq-insert: versioning branch
\ No newline at end of file
diff --git a/storage/tokudb/mysql-test/tokudb_parts/disabled.def b/storage/tokudb/mysql-test/tokudb_parts/disabled.def
index 3252a463176..41fe1df15c0 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/disabled.def
+++ b/storage/tokudb/mysql-test/tokudb_parts/disabled.def
@@ -7,3 +7,15 @@ partition_max_sub_parts_key_list_tokudb: 5.6 test not merged yet
 partition_max_sub_parts_key_range_tokudb: 5.6 test not merged yet
 partition_max_sub_parts_list_tokudb: 5.6 test not merged yet
 partition_max_sub_parts_range_tokudb: 5.6 test not merged yet
+
+partition_alter1_1_2_tokudb: versioning branch
+partition_alter1_1_tokudb: versioning branch
+partition_alter1_2_tokudb: versioning branch
+partition_alter2_1_1_tokudb: versioning branch
+partition_alter2_1_2_tokudb: versioning branch
+partition_alter2_2_1_tokudb: versioning branch
+partition_alter2_2_2_tokudb: versioning branch
+partition_alter4_tokudb: versioning branch
+partition_basic_tokudb: versioning branch
+partition_debug_tokudb: versioning branch
+part_supported_sql_func_tokudb: versioning branch
\ No newline at end of file