diff --git a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
index e9b22c7..1d83776 100644
--- a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
+++ b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
@@ -25,7 +25,7 @@ class RowEntityRenderersTest extends ViewUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('field', 'filter', 'text', 'node', 'user', 'language', 'entity_reference');
+  public static $modules = array('field', 'filter', 'text', 'node', 'user', 'language', 'entity_reference', 'views_test_language');
 
   /**
    * Views used by this test.
@@ -42,6 +42,13 @@ class RowEntityRenderersTest extends ViewUnitTestBase {
   protected $langcodes;
 
   /**
+   * An array of titles for each node per language.
+   *
+   * @var array
+   */
+  protected $expected;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
@@ -66,13 +73,8 @@ protected function setUp() {
     $node_type = NodeType::create(array('type' => 'test'));
     $node_type->setDisplaySubmitted(FALSE);
     $node_type->save();
-  }
 
-  /**
-   * Tests the entity row renderers.
-   */
-  public function testRenderers() {
-    $values = array();
+    $this->values = array();
     $controller = \Drupal::entityManager()->getStorage('node');
     $langcode_index = 0;
 
@@ -85,24 +87,32 @@ public function testRenderers() {
 
       foreach ($langcodes as $langcode) {
         // Ensure we have a predictable result order.
-        $values[$i][$langcode] = $i . '-' . $langcode . '-' . $this->randomMachineName();
+        $this->values[$i][$langcode] = $i . '-' . $langcode . '-' . $this->randomMachineName();
 
         if ($langcode != $default_langcode) {
-          $node->addTranslation($langcode, array('title' => $values[$i][$langcode]));
+          $node->addTranslation($langcode, array('title' => $this->values[$i][$langcode]));
         }
         else {
-          $node->setTitle($values[$i][$langcode]);
+          $node->setTitle($this->values[$i][$langcode]);
         }
 
         $node->save();
       }
     }
+  }
 
-    // Assert language renderers with a display using entity rows.
-    $this->checkLanguageRenderers('page_1', $values);
+  /**
+   * Tests the entity row renderers.
+   */
+  public function testEntityRenderers() {
+    $this->checkLanguageRenderers('page_1', $this->values);
+  }
 
-    // Assert language renderers with a display using field rows.
-    $this->checkLanguageRenderers('page_2', $values);
+  /**
+   * Tests the field row renderers.
+   */
+  public function testFieldRenderers() {
+    $this->checkLanguageRenderers('page_2', $this->values);
   }
 
   /**
diff --git a/core/modules/views/tests/modules/views_test_language/views_test_language.info.yml b/core/modules/views/tests/modules/views_test_language/views_test_language.info.yml
new file mode 100644
index 0000000..0163ecb
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_language/views_test_language.info.yml
@@ -0,0 +1,9 @@
+name: 'Views Test Language'
+type: module
+description: 'Test module for Views.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - views
+  - language
diff --git a/core/modules/views/tests/modules/views_test_language/views_test_language.views.inc b/core/modules/views/tests/modules/views_test_language/views_test_language.views.inc
new file mode 100644
index 0000000..2ac7c4f
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_language/views_test_language.views.inc
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @file
+ * Provides views data and hooks for views_test_language module.
+ */
+
+/**
+ * Implements hook_views_data_alter().
+ */
+function views_test_language_views_data_alter(array &$data) {
+  // Make node titles use configurable field rendering for this test.
+  $data['node_field_data']['title']['field']['id'] = 'field';
+}