diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
index b86a1ea..3c9745f 100644
--- a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
@@ -24,7 +24,7 @@ class DisplayBlockTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('block_test_views', 'test_page_test', 'contextual', 'views_ui');
+  public static $modules = array('node', 'block_test_views', 'test_page_test', 'contextual', 'views_ui');
 
   /**
    * Views used by this test.
diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
index 906e6e7..a715fb4 100644
--- a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
@@ -369,10 +369,9 @@ public static function baseFieldDefinitions($entity_type) {
       ->setDescription(t('The parent comment ID if this is a reply to a comment.'))
       ->setSetting('target_type', 'comment');
 
-    $fields['entity_id'] = FieldDefinition::create('entity_reference')
+    $fields['entity_id'] = FieldDefinition::create('integer')
       ->setLabel(t('Entity ID'))
       ->setDescription(t('The ID of the entity of which this comment is a reply.'))
-      ->setSetting('target_type', 'node')
       ->setRequired(TRUE);
 
     $fields['langcode'] = FieldDefinition::create('language')
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php
index 5bc1e79..9fd5a34 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php
@@ -20,7 +20,7 @@
    *
    * @var array
    */
-  public static $modules = array('node', 'taxonomy');
+  public static $modules = array('taxonomy');
 
   function setUp() {
     parent::setUp();
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
index 1693b9b..b3f5af2 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
@@ -17,7 +17,7 @@ class RelationshipNodeTermDataTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $testViews = array('node', 'test_taxonomy_node_term_data');
+  public static $testViews = array('test_taxonomy_node_term_data');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
index 500fb12..bb22fda 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
@@ -17,7 +17,7 @@ class RelationshipRepresentativeNode extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $testViews = array('node', 'test_groupwise_term');
+  public static $testViews = array('test_groupwise_term');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/taxonomy/taxonomy.info.yml b/core/modules/taxonomy/taxonomy.info.yml
index 2fe12f0..c559074 100644
--- a/core/modules/taxonomy/taxonomy.info.yml
+++ b/core/modules/taxonomy/taxonomy.info.yml
@@ -5,6 +5,7 @@ package: Core
 version: VERSION
 core: 8.x
 dependencies:
+  - node
   - options
   - text
 configure: taxonomy.vocabulary_list
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php
index f4203cd..9d6654a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php
@@ -23,6 +23,13 @@ class FieldDropButtonTest extends HandlerTestBase {
    */
   public static $testViews = array('test_dropbutton');
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node');
+
   public static function getInfo() {
     return array(
       'name' => 'Field: Dropbutton',
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 2006855..cd94718 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -17,14 +17,14 @@ class FilterDateTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('node', 'test_filter_date_between');
+  public static $testViews = array('test_filter_date_between');
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui');
+  public static $modules = array('node', 'views_ui');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
index fe6a344..484734e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
@@ -19,14 +19,14 @@ class DisplayFeedTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('node', 'test_display_feed');
+  public static $testViews = array('test_display_feed');
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui');
+  public static $modules = array('node', 'views_ui');
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
index da2ca14..62961d6 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
@@ -19,7 +19,14 @@ class MiniPagerTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('node', 'test_mini_pager');
+  public static $testViews = array('test_mini_pager');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node');
 
   /**
    * Nodes used by the test.