diff --git a/mysql-test/suite/galera/r/GCF-360.result b/mysql-test/suite/galera/r/GCF-360.result
deleted file mode 100644
index 8c1ba193c1f95..0000000000000
--- a/mysql-test/suite/galera/r/GCF-360.result
+++ /dev/null
@@ -1,24 +0,0 @@
-connection node_2;
-connection node_1;
-connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
-connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4;
-connection node_1;
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-expect_4
-4
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
-connection node_2;
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-expect_4
-4
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
-connection node_3;
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-expect_4
-4
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
-connection node_4;
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-expect_4
-4
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
diff --git a/mysql-test/suite/galera/t/GCF-360.test b/mysql-test/suite/galera/t/GCF-360.test
deleted file mode 100644
index f1a511177f699..0000000000000
--- a/mysql-test/suite/galera/t/GCF-360.test
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# GCF-360 Inconsistency voting: node goes non-prim on DDL that fails everywhere
-#
-# We issue 400 DDLs in total to make this test more stressful#
-#
-
---source include/galera_cluster.inc
-
---let $count = 100
-
---connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
---connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4
-
---disable_query_log
---disable_result_log
-while ($count)
-{
-        --connection node_1
-        --send DROP TABLE nonexisting_table;
-
-        --connection node_2
-        --send DROP TABLE nonexisting_table;
-
-        --connection node_3
-        --send DROP TABLE nonexisting_table;
-
-        --connection node_4
-        --send DROP TABLE nonexisting_table;
-
-        --connection node_1
-        --error ER_BAD_TABLE_ERROR
-        --reap
-
-        --connection node_2
-        --error ER_BAD_TABLE_ERROR
-        --reap
-
-        --connection node_3
-        --error ER_BAD_TABLE_ERROR
-        --reap
-
-        --connection node_4
-        --error ER_BAD_TABLE_ERROR
-        --reap
-
-        --dec $count
-}
---enable_result_log
---enable_query_log
-
---connection node_1
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
-
---connection node_2
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
-
---connection node_3
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
-
---connection node_4
-SELECT VARIABLE_VALUE AS expect_4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-360.result b/mysql-test/suite/galera_3nodes/r/GCF-360.result
new file mode 100644
index 0000000000000..293007514cd41
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/r/GCF-360.result
@@ -0,0 +1,21 @@
+connection node_2;
+connection node_1;
+connection node_1;
+connection node_2;
+connection node_3;
+connection node_1;
+connection node_1;
+SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+expect_3
+3
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
+connection node_2;
+SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+expect_3
+3
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
+connection node_3;
+SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+expect_3
+3
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
diff --git a/mysql-test/suite/galera/t/GCF-360.cnf b/mysql-test/suite/galera_3nodes/t/GCF-360.cnf
similarity index 69%
rename from mysql-test/suite/galera/t/GCF-360.cnf
rename to mysql-test/suite/galera_3nodes/t/GCF-360.cnf
index 28e51f87e8e89..afa9ce663a77c 100644
--- a/mysql-test/suite/galera/t/GCF-360.cnf
+++ b/mysql-test/suite/galera_3nodes/t/GCF-360.cnf
@@ -1,17 +1,16 @@
-!include ../galera_4nodes.cnf
+!include ../galera_3nodes.cnf
 
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port'
 wsrep_ignore_apply_errors=0
+wsrep_slave_threads=3
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port'
 wsrep_ignore_apply_errors=0
+wsrep_slave_threads=3
 
 [mysqld.3]
 wsrep_provider_options='base_port=@mysqld.3.#galera_port'
 wsrep_ignore_apply_errors=0
-
-[mysqld.4]
-wsrep_provider_options='base_port=@mysqld.4.#galera_port'
-wsrep_ignore_apply_errors=0
+wsrep_slave_threads=3
diff --git a/mysql-test/suite/galera_3nodes/t/GCF-360.test b/mysql-test/suite/galera_3nodes/t/GCF-360.test
new file mode 100644
index 0000000000000..57c92e22b1a5a
--- /dev/null
+++ b/mysql-test/suite/galera_3nodes/t/GCF-360.test
@@ -0,0 +1,81 @@
+#
+# GCF-360 Inconsistency voting: node goes non-prim on DDL that fails everywhere
+#
+# We issue 400 DDLs in total to make this test more stressful#
+#
+
+--source include/galera_cluster.inc
+
+--let $galera_connection_name = node_3
+--let $galera_server_number = 3
+--source include/galera_connect.inc
+
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--let $node_3=node_3
+--source ../galera/include/auto_increment_offset_save.inc
+
+--connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
+--let $count = 400
+--disable_query_log
+--disable_result_log
+while ($count)
+{
+        --connection node_1
+        --send DROP TABLE nonexisting_table;
+
+        --connection node_2
+        --send DROP TABLE nonexisting_table_2;
+
+        --connection node_3
+        --send DROP TABLE nonexisting_table_3;
+
+        --connection node_1
+        --error ER_BAD_TABLE_ERROR
+        --reap
+
+        --connection node_2
+        --error ER_BAD_TABLE_ERROR
+        --reap
+
+        --connection node_3
+        --error ER_BAD_TABLE_ERROR
+        --reap
+
+        --dec $count
+}
+--enable_result_log
+--enable_query_log
+
+--connection node_1
+#
+# Wait until inconsistency voting has ended and all nodes are back to cluster
+#
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'
+--source include/wait_condition.inc
+SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
+
+--connection node_2
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'
+--source include/wait_condition.inc
+SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
+
+--connection node_3
+--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'
+--source include/wait_condition.inc
+SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+CALL mtr.add_suppression("Slave SQL: Error 'Unknown table");
+
+--source ../galera/include/auto_increment_offset_restore.inc