diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php
index 0387b01..c218f41 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php
@@ -83,7 +83,7 @@ public function testAddRemoveMessages() {
     // Test adding multiple messages at once.
     // @see processMessages()
     $this->clickLink('Show Multiple');
-    $this->waitForMessageElement('default', 'context-9');
+    $this->waitForMessageElement('status', 'context-9');
 
     $current_messages = [];
     for ($i = 0; $i < 10; $i++) {
@@ -116,12 +116,13 @@ protected function clickAllRemoveLinksExcept($exclude_context, $exclude_type) {
    * @param array $expected_messages
    *   Expected messages.
    */
-  private function assertCurrentMessages($expected_messages) {
+  protected function assertCurrentMessages(array $expected_messages) {
     $current_messages = [];
-    $message_divs = $this->getSession()->getPage()->findAll('css', '.messages');
-    foreach ($message_divs as $message_div) {
-      /** @var \Behat\Mink\Element\NodeElement $message_div */
-      $current_messages[] = $message_div->getText();
+    if ($message_divs = $this->getSession()->getPage()->findAll('css', '.messages')) {
+      foreach ($message_divs as $message_div) {
+        /** @var \Behat\Mink\Element\NodeElement $message_div */
+        $current_messages[] = $message_div->getText();
+      }
     }
     $this->assertEquals($expected_messages, $current_messages);
   }