diff --git a/core/modules/node/src/Tests/NodeRevisionsUiTest.php b/core/modules/node/src/Tests/NodeRevisionsUiTest.php
index 6527984..4fdd543 100644
--- a/core/modules/node/src/Tests/NodeRevisionsUiTest.php
+++ b/core/modules/node/src/Tests/NodeRevisionsUiTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests;
 
+use Drupal\Core\Url;
+use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 
 /**
@@ -17,26 +19,30 @@
 class NodeRevisionsUiTest extends NodeTestBase {
 
   /**
+   * @var \Drupal\user\Entity\User
+   */
+  protected $editor;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
 
-    // Create and log in user.
-    $web_user = $this->drupalCreateUser(
-      array(
-        'administer nodes',
-        'edit any page content'
-      )
-    );
-
-    $this->drupalLogin($web_user);
+    // Create users.
+    $this->editor = $this->drupalCreateUser([
+      'administer nodes',
+      'edit any page content',
+      'view page revisions',
+      'access user profiles',
+    ]);
   }
 
   /**
    * Checks that unchecking 'Create new revision' works when editing a node.
    */
   function testNodeFormSaveWithoutRevision() {
+    $this->drupalLogin($this->editor);
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
 
     // Set page revision setting 'create new revision'. This will mean new
@@ -73,6 +79,60 @@ function testNodeFormSaveWithoutRevision() {
     $node_storage->resetCache(array($node->id()));
     $node_revision = $node_storage->load($node->id());
     $this->assertNotEqual($node_revision->getRevisionId(), $node->getRevisionId(), "After an existing node is saved with 'Create new revision' checked, a new revision is created.");
+  }
+
+  /**
+   * Checks HTML double escaping of revision logs.
+   */
+  public function testNodeRevisionDoubleEscapeFix() {
+    $this->drupalLogin($this->editor);
+    $nodes = [];
+
+    // Create the node.
+    $node = $this->drupalCreateNode();
 
+    $username = [
+      '#theme' => 'username',
+      '#account' => $this->editor,
+    ];
+    $editor = \Drupal::service('renderer')->render($username);
+
+    // Get original node.
+    $nodes[] = clone $node;
+
+    // Create revision with a random title and body and update variables.
+    $node->title = $this->randomMachineName();
+    $node->body = [
+      'value' => $this->randomMachineName(32),
+      'format' => filter_default_format(),
+    ];
+    $node->setNewRevision();
+    $revision_log = 'Revision <em>message</em> with markup.';
+    $node->revision_log->value = $revision_log;
+    $node->save();
+    // Make sure we get revision information.
+    $node = Node::load($node->id());
+    $nodes[] = clone $node;
+
+    $this->drupalGet('node/' . $node->id() . '/revisions');
+
+    // Assert the old revision message.
+    $date = format_date($nodes[0]->revision_timestamp->value, 'short');
+    $url = new Url('entity.node.revision', ['node' => $nodes[0]->id(), 'node_revision' => $nodes[0]->getRevisionId()]);
+    $old_revision_message = t('!date by !username', [
+      '!date' => \Drupal::l($date, $url),
+      '!username' => $editor,
+    ]);
+    $this->assertRaw($old_revision_message);
+
+    // Assert the current revision message.
+    $date = format_date($nodes[1]->revision_timestamp->value, 'short');
+    $current_revision_message = t('!date by !username', [
+      '!date' => $nodes[1]->link($date),
+      '!username' => $editor,
+    ]);
+    $current_revision_message .= '<p class="revision-log">' . $revision_log . '</p>';
+    $this->assertRaw($current_revision_message);
   }
+
 }