diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 69f916b92d5..ab90b0697ef 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -23,21 +23,21 @@ partition_03ndb         : Bug#16385
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
 #rpl_bit_npk             : Bug#13418
 rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
-rpl_ndb_2innodb         : Bugs#17400: delete & update of rows in table without pk fails
-rpl_ndb_2myisam         : Bugs#17400: delete & update of rows in table without pk fails
+rpl_ndb_2innodb         : Assert failure in ha_partition::extra()
+rpl_ndb_2myisam         : Assert failure in ha_partition::extra()
 rpl_ndb_auto_inc        : Bug#17086
 #rpl_ndb_basic           : Bug#16228 [IN REVIEW]
 rpl_ndb_blob            : interferes with following tests, causing hang
 rpl_ndb_blob2           : interferes with following tests, causing hang
-rpl_ndb_ddl             : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_innodb2ndb      : Bugs#17400: delete & update of rows in table without pk fails
+rpl_ndb_ddl             : master hangs
+#rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
+rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
 rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
-rpl_ndb_myisam2ndb      : Bugs#17400: delete & update of rows in table without pk fails
+rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails
 #rpl_ndb_log             : result not deterministic
 rpl_ndb_relay_space     : Bug#16993
 rpl_ndb_multi_update2   : BUG#17738 In progress
-rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails
+#rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails
 rpl_ndb_sp007           : Bug #17290
 rpl_row_inexist_tbl     : Disabled since patch makes this test wait forever
 rpl_sp                  : Bug#16456