diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 2fd6adaba78da34ee31ab9bf31fa39153c5d662b..deeafa555f0ad6e01c0f7e3409437cedb144f433 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -14,6 +14,85 @@ status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
 user_limits     : Bug#23921 random failure of user_limits.test
-key_buffer_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-rpl_recovery_rank_basic_64  : Bug #36522: Some tests of system variables have diffs on 64bit platorms
-sort_buffer_size_basic_64   : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+binlog_cache_size_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+bulk_insert_buffer_size_basic_32      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+delayed_insert_limit_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+delayed_queue_size_basic_32           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+innodb_concurrency_tickets_basic_32   : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+innodb_max_purge_lag_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+innodb_sync_spin_loops_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+join_buffer_size_basic_32             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_buffer_size_basic_32              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_cache_age_threshold_basic_32      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_cache_block_size_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_cache_division_limit_basic_32     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+log_warnings_basic_32                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_binlog_cache_size_basic_32        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_connect_errors_basic_32           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_heap_table_size_basic_32          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_seeks_for_key_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_tmp_tables_basic_32               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_write_lock_count_basic_32         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+min_examined_row_limit_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+multi_range_count_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+myisam_max_sort_file_size_basic_32    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+myisam_repair_threads_basic_32        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+myisam_sort_buffer_size_basic_32      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+net_retry_count_basic_32              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_alloc_block_size_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_cache_limit_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_cache_min_res_unit_basic_32     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_cache_size_basic_32             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_prealloc_size_basic_32          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+range_alloc_block_size_basic_32       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+rpl_recovery_rank_basic_32            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+server_id_basic_32                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+slave_transaction_retries_basic_32    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+sort_buffer_size_basic_32             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+sync_binlog_basic_32                  : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+timestamp_basic_32                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+tmp_table_size_basic_32               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+transaction_alloc_block_size_basic_32 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+transaction_prealloc_size_basic_32    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+wait_timeout_basic_32                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+binlog_cache_size_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+bulk_insert_buffer_size_basic_64      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+delayed_insert_limit_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+delayed_queue_size_basic_64           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+innodb_concurrency_tickets_basic_64   : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+innodb_max_purge_lag_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+innodb_sync_spin_loops_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+join_buffer_size_basic_64             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_buffer_size_basic_64              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_cache_age_threshold_basic_64      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_cache_block_size_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+key_cache_division_limit_basic_64     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+log_warnings_basic_64                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_binlog_cache_size_basic_64        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_connect_errors_basic_64           : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_heap_table_size_basic_64          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_seeks_for_key_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_tmp_tables_basic_64               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+max_write_lock_count_basic_64         : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+min_examined_row_limit_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+multi_range_count_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+myisam_max_sort_file_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+myisam_repair_threads_basic_64        : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+myisam_sort_buffer_size_basic_64      : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+net_retry_count_basic_64              : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_alloc_block_size_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_cache_limit_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_cache_min_res_unit_basic_64     : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_cache_size_basic_64             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+query_prealloc_size_basic_64          : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+range_alloc_block_size_basic_64       : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+rpl_recovery_rank_basic_64            : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+server_id_basic_64                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+slave_transaction_retries_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+sort_buffer_size_basic_64             : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+sync_binlog_basic_64                  : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+timestamp_basic_64                    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+tmp_table_size_basic_64               : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+transaction_alloc_block_size_basic_64 : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+transaction_prealloc_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms
+wait_timeout_basic_64                 : Bug #36522: Some tests of system variables have diffs on 64bit platorms