diff --git a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
index ae088e0..50659ae 100644
--- a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
+++ b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
@@ -71,13 +71,13 @@ public function testIntegration() {
     );
     // Setup a watchdog entry with two tokens.
     $entries[] = array(
-      'message' => '@token1 !token2',
+      'message' => '@token1 @token2',
       // Setup a link with a tag which is filtered by
       // \Drupal\Component\Utility\Xss::filterAdmin() in order to make sure
       // that strings which are not marked as safe get filtered.
       'variables' => array(
         '@token1' => $this->randomMachineName(),
-        '!token2' => $this->randomMachineName(),
+        '@token2' => $this->randomMachineName(),
         'link' => '<a href="' . \Drupal::url('<front>') . '"><object>Link</object></a>',
       ),
     );
diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index b723bd3..c9fc0aa 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -237,7 +237,7 @@ public function testUnexpectedFormat() {
     restore_error_handler();
 
     $this->assertEquals(E_USER_ERROR, $this->lastErrorNumber);
-    $this->assertEquals('Invalid placeholder', $this->lastErrorMessage);
+    $this->assertEquals('Invalid placeholder: ~placeholder', $this->lastErrorMessage);
   }
 
   /**