diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_token.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_token.yml
new file mode 100644
index 0000000..86163fc
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_token.yml
@@ -0,0 +1,34 @@
+langcode: und
+status: true
+dependencies:
+  module:
+    - node
+id: test_field_token
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      pager:
+        type: none
+        options:
+          offset: 0
+      row:
+        type: fields
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          entity_type: node
+          entity_field: title
+          plugin_id: field
\ No newline at end of file
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldTokenEscapeTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldTokenEscapeTest.php
new file mode 100644
index 0000000..1ee300f
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldTokenEscapeTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\Core\Render\RenderContext;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests Drupal\views\Plugin\views\field\EntityField handler token escaping.
+ *
+ * @group views
+ */
+class FieldTokenEscapeTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'user'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_field_token'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+
+    NodeType::create(['type' => 'article', 'label' => 'Article'])->save();
+
+    Node::create([
+        'title' => 'Tegan & Sara',
+        'type' => 'article',
+      ])->save();
+  }
+
+  /**
+   *
+   */
+   public function testTheBloodyTokens() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('test_field_token');
+    $view->initHandlers();
+    $this->executeView($view);
+    $row = $view->result[0];
+    $title_field = $view->field['title'];
+    $title_field->options['alter']['text'] = '<p>{{ title__value }}</p>';
+    $title_field->options['alter']['alter_text'] = TRUE;
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($title_field, $row) {
+      return $title_field->theme($row);
+    });
+    $this->assertEquals($output, '<p>Tegan &amp; Sara</p>');
+   }
+
+}