diff --git a/mysql-test/include/restart_mysqld.inc b/mysql-test/include/restart_mysqld.inc
index a0447280ff564..940e081c43165 100644
--- a/mysql-test/include/restart_mysqld.inc
+++ b/mysql-test/include/restart_mysqld.inc
@@ -50,9 +50,6 @@ if (!$restart_parameters)
 # Call script that will poll the server waiting for it to be back online again
 --source include/wait_until_connected_again.inc
 
-# Wait for wsrep
---source include/wait_wsrep_ready.inc
-
 # Turn off reconnect again
 --disable_reconnect
 
diff --git a/mysql-test/include/start_mysqld.inc b/mysql-test/include/start_mysqld.inc
index 04dff714d497b..e31f26aad8c85 100644
--- a/mysql-test/include/start_mysqld.inc
+++ b/mysql-test/include/start_mysqld.inc
@@ -16,9 +16,6 @@ if (!$restart_parameters)
 # Call script that will poll the server waiting for it to be back online again
 --source include/wait_until_connected_again.inc
 
-# Wait for wsrep
---source include/wait_wsrep_ready.inc
-
 # Turn off reconnect again
 --disable_reconnect
 
diff --git a/mysql-test/include/wait_until_connected_again.inc b/mysql-test/include/wait_until_connected_again.inc
index 6f64ef454400e..265f110fe7205 100644
--- a/mysql-test/include/wait_until_connected_again.inc
+++ b/mysql-test/include/wait_until_connected_again.inc
@@ -14,7 +14,7 @@ while ($mysql_errno)
   # Strangely enough, the server might return "Too many connections"
   # while being shutdown, thus 1040 is an "allowed" error
   # See BUG#36228
-  --error 0,1040,1053,2002,2003,2005,2006,2013,1927
+  --error 0,1040,1053,1205,2002,2003,2005,2006,2013,1927
   show status;
 
   dec $counter;
@@ -26,3 +26,9 @@ while ($mysql_errno)
 }
 --enable_query_log
 --enable_result_log
+
+# WSREP: SHOW STATUS queries are allowed even if wsrep
+#        is not ready. Make sure wsrep is ready before
+#        returning from this script
+
+--source include/wait_wsrep_ready.inc