diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
index a4db641..6b5b73f 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
@@ -61,7 +61,7 @@ public function query($group_by = FALSE) {
     // be able to join to filter by the original entity type this join is
     // attached to.
     if ($this->table != 'comment') {
-      $table_info = views_fetch_data($this->table);
+      $table_info = drupal_container()->get('views.views_data')->get($this->table);
       $entity_info = entity_get_info($table_info['table']['entity type']);
 
       $subselect = db_select('comment', 'c');
diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
index 3dc8c4d..4e5e6c4 100644
--- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
+++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
@@ -26,11 +26,11 @@ display:
       row:
         type: fields
       relationships:
-        nid:
-          id: nid
-          table: comment
-          field: nid
+        node:
+          field: node
+          id: node
           required: '1'
+          table: comment
       fields:
         subject:
           id: subject
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php
index 2157b98..b286d1f 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php
@@ -36,6 +36,8 @@ function setUp() {
     // bundles.
     $this->drupalCreateContentType(array('type' => 'article'));
     $this->drupalCreateContentType(array('type' => 'page'));
+    comment_add_default_comment_field('node', 'article');
+    comment_add_default_comment_field('node', 'page');
 
     $admin_user = $this->drupalCreateUser(array('administer languages', 'administer entity translation'));
     $this->drupalLogin($admin_user);
@@ -47,21 +49,21 @@ function setUp() {
   function testSettingsUI() {
     // Test that the translation settings are ignored if the bundle is marked
     // translatable but the entity type is not.
-    $edit = array('settings[comment][comment_node_article][translatable]' => TRUE);
+    $edit = array('settings[comment][comment][translatable]' => TRUE);
     $this->assertSettings('comment', NULL, FALSE, $edit);
 
     // Test that the translation settings are ignored if only a field is marked
     // as translatable and not the related entity type and bundle.
-    $edit = array('settings[comment][comment_node_article][fields][comment_body]' => TRUE);
+    $edit = array('settings[comment][comment][fields][comment_body]' => TRUE);
     $this->assertSettings('comment', NULL, FALSE, $edit);
 
     // Test that the translation settings are not stored if an entity type and
     // bundle are marked as translatable but no field is.
     $edit = array(
       'entity_types[comment]' => TRUE,
-      'settings[comment][comment_node_article][translatable]' => TRUE,
+      'settings[comment][comment][translatable]' => TRUE,
     );
-    $this->assertSettings('comment', 'comment_node_article', FALSE, $edit);
+    $this->assertSettings('comment', 'comment', FALSE, $edit);
     $xpath_err = '//div[@id="messages"]//div[contains(@class, "error")]';
     $this->assertTrue($this->xpath($xpath_err), 'Enabling translation only for entity bundles generates a form error.');
 
@@ -69,29 +71,29 @@ function testSettingsUI() {
     // language is set as default and the language selector is hidden.
     $edit = array(
       'entity_types[comment]' => TRUE,
-      'settings[comment][comment_node_article][settings][language][langcode]' => LANGUAGE_NOT_SPECIFIED,
-      'settings[comment][comment_node_article][settings][language][language_hidden]' => TRUE,
-      'settings[comment][comment_node_article][translatable]' => TRUE,
-      'settings[comment][comment_node_article][fields][comment_body]' => TRUE,
+      'settings[comment][comment][settings][language][langcode]' => LANGUAGE_NOT_SPECIFIED,
+      'settings[comment][comment][settings][language][language_hidden]' => TRUE,
+      'settings[comment][comment][translatable]' => TRUE,
+      'settings[comment][comment][fields][comment_body]' => TRUE,
     );
-    $this->assertSettings('comment', 'comment_node_article', FALSE, $edit);
+    $this->assertSettings('comment', 'comment', FALSE, $edit);
     $this->assertTrue($this->xpath($xpath_err), 'Enabling translation with a fixed non-configurable language generates a form error.');
 
     // Test that a field shared among different bundles can be enabled without
     // needing to make all the related bundles translatable.
     $edit = array(
       'entity_types[comment]' => TRUE,
-      'settings[comment][comment_node_article][settings][language][langcode]' => 'current_interface',
-      'settings[comment][comment_node_article][settings][language][language_hidden]' => FALSE,
-      'settings[comment][comment_node_article][translatable]' => TRUE,
-      'settings[comment][comment_node_article][fields][comment_body]' => TRUE,
+      'settings[comment][comment][settings][language][langcode]' => 'current_interface',
+      'settings[comment][comment][settings][language][language_hidden]' => FALSE,
+      'settings[comment][comment][translatable]' => TRUE,
+      'settings[comment][comment][fields][comment_body]' => TRUE,
     );
-    $this->assertSettings('comment', 'comment_node_article', TRUE, $edit);
+    $this->assertSettings('comment', 'comment', TRUE, $edit);
     $field = field_info_field('comment_body');
     $this->assertTrue($field['translatable'], 'Comment body is translatable.');
 
     // Test that language settings are correctly stored.
-    $language_configuration = language_get_default_configuration('comment', 'comment_node_article');
+    $language_configuration = language_get_default_configuration('comment', 'comment');
     $this->assertEqual($language_configuration['langcode'], 'current_interface', 'The default language for article comments is set to the current interface language.');
     $this->assertFalse($language_configuration['language_hidden'], 'The language selector for article comments is shown.');
   }
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
index b6d7604..807661c 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
@@ -78,7 +78,16 @@ public static function getInfo() {
 
   protected function setUp() {
     parent::setUp();
-    $this->enableModules(array('node', 'comment', 'user', 'filter'));
+    $this->enableModules(array(
+      'entity',
+      'field',
+      'field_sql_storage',
+      'text',
+      'node',
+      'comment',
+      'user',
+      'filter'
+    ));
     comment_add_default_comment_field('node', 'page');
   }