diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
index 9ca8902..8a88497 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
@@ -33,9 +33,8 @@ class SpecialAttributesRouteSubscriberTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->specialAttributesRouteSubscriber = new SpecialAttributesRouteSubscriber();
     $messenger = $this->getMock('\Drupal\Core\Messenger\MessengerInterface');
-    $this->specialAttributesRouteSubscriber->setMessenger($messenger);
+    $this->specialAttributesRouteSubscriber = new SpecialAttributesRouteSubscriber($messenger);
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Messenger/MessengerTest.php b/core/tests/Drupal/Tests/Core/Messenger/MessengerTest.php
index 1a042bc..ccdd46d 100644
--- a/core/tests/Drupal/Tests/Core/Messenger/MessengerTest.php
+++ b/core/tests/Drupal/Tests/Core/Messenger/MessengerTest.php
@@ -81,14 +81,30 @@ public function testMessenger() {
     $this->messenger->addMessage($message_a, $type_a, TRUE);
     $this->messenger->addMessage($message_b, $type_b, TRUE);
     $this->assertEquals($this->messenger->getMessages(), array(
-      $type_a => array($message_a, $message_a),
-      $type_b => array($message_b),
-    ));
+        $type_a => array(
+          array(
+            'safe' => FALSE,
+            'message' => $message_a,
+          ),
+          array(
+            'safe' => FALSE,
+            'message' => $message_a,
+          ),
+          array(
+            'safe' => FALSE,
+            'message' => $message_a,
+          ),
+        ),
+        $type_b => array(
+          array('safe' => FALSE, 'message' => $message_b),
+        ),
+      )
+    );
 
     // Test deleting messages of a certain type.
     $this->assertEquals($this->messenger->deleteMessagesByType($type_a), $this->messenger);
     $this->assertEquals($this->messenger->getMessages(), array(
-      $type_b => array($message_b),
+      $type_b => array(array('safe' => FALSE, 'message' => $message_b)),
     ));
 
     // Test deleting all messages.