diff --git a/core/lib/Drupal/Core/Messenger/SessionMessenger.php b/core/lib/Drupal/Core/Messenger/SessionMessenger.php
index fc858fda51..6b8886bccf 100644
--- a/core/lib/Drupal/Core/Messenger/SessionMessenger.php
+++ b/core/lib/Drupal/Core/Messenger/SessionMessenger.php
@@ -21,7 +21,6 @@ class SessionMessenger implements MessengerInterface {
   /**
    * Constructs a new instance.
    *
-   * @param \Drupal\Core\Session\SessionManagerInterface
    * @param \Drupal\Core\PageCache\ResponsePolicy\KillSwitch $page_cache_kill_switch
    *   The page caching kill switch.
    */
diff --git a/core/tests/Drupal/Tests/Core/Messenger/StaticMessengerTest.php b/core/tests/Drupal/Tests/Core/Messenger/StaticMessengerTest.php
index d315895449..c9b943f98d 100644
--- a/core/tests/Drupal/Tests/Core/Messenger/StaticMessengerTest.php
+++ b/core/tests/Drupal/Tests/Core/Messenger/StaticMessengerTest.php
@@ -4,15 +4,13 @@
 
 use Drupal\Core\Messenger\StaticMessenger;
 use Drupal\Core\PageCache\ResponsePolicy\KillSwitch;
-use Drupal\Tests\RandomGeneratorTrait;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * @coversDefaultClass \Drupal\Core\Messenger\StaticMessenger
  * @group messenger
  */
-class StaticMessengerTest extends \PHPUnit_Framework_TestCase {
-
-  use RandomGeneratorTrait;
+class StaticMessengerTest extends UnitTestCase {
 
   /**
    * The messenger under test.