diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index b95fcb3825c..23ae5988465 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -321,7 +321,7 @@ sub parse_disabled {
       chomp;
       next if /^\s*#/ or /^\s*$/;
       mtr_error("Syntax error in $filename line $.")
-        unless /^\s*(?:([-0-9A-Za-z_\/]+)\.)?([-0-9A-Za-z_]+)\s*:\s*(.*?)\s*$/;
+        unless /^\s*(?:([-0-9A-Za-z_\/]+)\.)?([-0-9A-Za-z_#]+)\s*:\s*(.*?)\s*$/;
       mtr_error("Wrong suite name in $filename line $.")
         if defined $1 and defined $suitename and $1 ne $suitename;
       $disabled{($1 || $suitename || '') . ".$2"} = $3;
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 9c38c1296fe..80aad7d4ff3 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -19,3 +19,9 @@ galera_var_auto_inc_control_on : Failing sporadically with content mismatch
 galera_parallel_simple : Failing sporadically
 galera_bf_abort : Failing sporadically
 galera_log_output_csv : Failing sporadically
+galera_as_slave_preordered : wsrep-preordered is not available in MariaDB Galera cluster
+galera_forced_binlog_format : TODO: investigate
+galera_gra_log : TODO: investigate
+galera_as_slave_replication_bundle : TODO: investigate
+galera_ssl_upgrade : TODO: investigate
+mysql-wsrep#90 : TODO: investigate
diff --git a/mysql-test/suite/galera/galera_2nodes_as_slave.cnf b/mysql-test/suite/galera/galera_2nodes_as_slave.cnf
index bcfa560b309..2a4b18da5f8 100644
--- a/mysql-test/suite/galera/galera_2nodes_as_slave.cnf
+++ b/mysql-test/suite/galera/galera_2nodes_as_slave.cnf
@@ -17,6 +17,9 @@ server-id=1
 #ist_port=@OPT.port
 #sst_port=@OPT.port
 
+log-bin
+log-slave-updates
+
 innodb-autoinc-lock-mode=2
 default-storage-engine=innodb
 wsrep-provider=@ENV.WSREP_PROVIDER
@@ -36,6 +39,9 @@ server-id=2
 #ist_port=@OPT.port
 #sst_port=@OPT.port
 
+log-bin
+log-slave-updates
+
 innodb-autoinc-lock-mode=2
 default-storage-engine=innodb
 wsrep-provider=@ENV.WSREP_PROVIDER
diff --git a/mysql-test/suite/galera/r/galera_prepared_statement.result b/mysql-test/suite/galera/r/galera_prepared_statement.result
index 138d4431e3d..de5ac9c760a 100644
--- a/mysql-test/suite/galera/r/galera_prepared_statement.result
+++ b/mysql-test/suite/galera/r/galera_prepared_statement.result
@@ -26,7 +26,7 @@ COUNT(*) = 1
 ALTER TABLE t1 ADD COLUMN f2 INTEGER;
 ALTER TABLE t1 DROP COLUMN f1;
 EXECUTE st1;
-ERROR HY000: Incorrect integer value: 'abc' for column 'f2' at row 1
+ERROR 22007: Incorrect integer value: 'abc' for column 'f2' at row 1
 DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
diff --git a/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.test b/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.test
index df1d72f38c7..460e040c010 100644
--- a/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.test
+++ b/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.test
@@ -5,7 +5,6 @@
 #
 
 --source include/have_innodb.inc
---source include/have_log_bin.inc
 
 # As node #1 is not a Galera node, we connect to node #2 in order to run include/galera_cluster.inc
 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
@@ -13,9 +12,9 @@
 
 --connection node_2
 --disable_query_log
---eval CHANGE MASTER TO  MASTER_HOST='127.0.0.1', MASTER_PORT=$NODE_MYPORT_1;
+--eval CHANGE MASTER TO  MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_1;
 --enable_query_log
-START SLAVE USER='root';
+START SLAVE;
 
 --connection node_1
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
diff --git a/mysql-test/suite/galera/t/galera_prepared_statement.test b/mysql-test/suite/galera/t/galera_prepared_statement.test
index 1d561e3cf87..3bee097ff39 100644
--- a/mysql-test/suite/galera/t/galera_prepared_statement.test
+++ b/mysql-test/suite/galera/t/galera_prepared_statement.test
@@ -6,6 +6,7 @@
 #
 
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 CREATE TABLE t1 (f1 CHAR(5)) ENGINE=InnoDB;
 CREATE TABLE t2 (f1 CHAR(5)) ENGINE=InnoDB;
diff --git a/mysql-test/suite/galera/t/galera_restart_nochanges.test b/mysql-test/suite/galera/t/galera_restart_nochanges.test
index d2fceebb97f..a61332cefd6 100644
--- a/mysql-test/suite/galera/t/galera_restart_nochanges.test
+++ b/mysql-test/suite/galera/t/galera_restart_nochanges.test
@@ -22,7 +22,7 @@ INSERT INTO t1 VALUES (1);
 --let $galera_server_number = 2
 --source include/galera_connect.inc
 --connection node_2a
---source include/galera_wait_ready.inc
+--source include/wait_until_ready.inc
 
 SELECT COUNT(*) = 1 FROM t1;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
diff --git a/mysql-test/suite/galera/t/galera_var_log_bin.cnf b/mysql-test/suite/galera/t/galera_var_log_bin.cnf
index 68bc0a0823f..f7f17e3720a 100644
--- a/mysql-test/suite/galera/t/galera_var_log_bin.cnf
+++ b/mysql-test/suite/galera/t/galera_var_log_bin.cnf
@@ -1,9 +1,5 @@
 !include ../galera_2nodes.cnf
 
-[mysqld.1]
-log-bin=log1
-
-[mysqld.2]
-log-bin=log2
-
+[mysqld]
+log-bin
 
diff --git a/mysql-test/suite/galera/t/galera_var_log_bin.test b/mysql-test/suite/galera/t/galera_var_log_bin.test
index c0ab124dcec..1b1886b996d 100644
--- a/mysql-test/suite/galera/t/galera_var_log_bin.test
+++ b/mysql-test/suite/galera/t/galera_var_log_bin.test
@@ -3,8 +3,8 @@
 # when MySQL's binlog is in effect rather than the Galera 'dummy' implementation.
 #
 
---source include/have_binlog_format_row.inc
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 
 CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
 
diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def
index ec02e73b4a3..fb23a81bfb8 100644
--- a/mysql-test/suite/galera_3nodes/disabled.def
+++ b/mysql-test/suite/galera_3nodes/disabled.def
@@ -1,2 +1,5 @@
 galera_garbd : Fix the test case
 galera_evs_suspect_timeout : TODO: investigate
+galera_innobackupex_backup : TODO: investigate
+galera_slave_options_do :MDEV-8798
+galera_slave_options_ignore : MDEV-8798
diff --git a/mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result b/mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result
index fd617a0c7ec..96a2bec0d7f 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result
@@ -15,6 +15,3 @@ SELECT COUNT(*) = 2 FROM t1;
 COUNT(*) = 2
 1
 DROP TABLE t1;
-CALL mtr.add_suppression("SYNC message from member 1 in non-primary configuration");
-CALL mtr.add_suppression("SYNC message from member 1 in non-primary configuration");
-CALL mtr.add_suppression("SYNC message from member 1 in non-primary configuration");
diff --git a/mysql-test/suite/galera_3nodes/suite.pm b/mysql-test/suite/galera_3nodes/suite.pm
index 1f00e37bdc3..39d5acbcc1b 100644
--- a/mysql-test/suite/galera_3nodes/suite.pm
+++ b/mysql-test/suite/galera_3nodes/suite.pm
@@ -42,6 +42,7 @@ push @::global_suppressions,
      qr|WSREP: Ignoring possible split-brain (allowed by configuration) from view:.*|,
      qr(WSREP: Could not find peer:),
      qr(WSREP: Protocol violation. JOIN message sender .*),
+     qr(WSREP: JOIN message from member [0-9]* in non-primary configuration. Ignored.),
    );