diff -u b/core/modules/node/tests/modules/node_test/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module
--- b/core/modules/node/tests/modules/node_test/node_test.module
+++ b/core/modules/node/tests/modules/node_test/node_test.module
@@ -168,10 +167,0 @@
-
-/**
- * Implements hook_entity_info_alter().
- */
-function node_test_entity_info_alter(&$entity_info) {
-  /** @var $entity_info \Drupal\Core\Entity\EntityTypeInterface[] */
-  if (\Drupal::state()->get('node_test.storage_controller')) {
-    $entity_info['node']->setClass('Drupal\node_test\NodeTest');
-  }
-}
only in patch2:
unchanged:
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
@@ -47,13 +47,14 @@ function setUp() {
   function testContentAdminSort() {
     $this->drupalLogin($this->admin_user);
 
-    // Create nodes that have different node.changed values.
-    $this->container->get('state')->set('node_test.storage_controller', TRUE);
-    \Drupal::moduleHandler()->install(array('node_test'));
     $changed = REQUEST_TIME;
     foreach (array('dd', 'aa', 'DD', 'bb', 'cc', 'CC', 'AA', 'BB') as $prefix) {
       $changed += 1000;
-      $this->drupalCreateNode(array('title' => $prefix . $this->randomName(6), 'changed' => $changed));
+      $node = $this->drupalCreateNode(array('title' => $prefix . $this->randomName(6)));
+      db_update('node_field_data')
+        ->fields(array('changed' => $changed))
+        ->condition('nid', $node->id())
+        ->execute();
     }
 
     // Test that the default sort by node.changed DESC actually fires properly.
only in patch2:
unchanged:
--- a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node_test\NodeTest.
- */
-
-namespace Drupal\node_test;
-
-use Drupal\node\Entity\Node;
-use Drupal\Core\Entity\EntityStorageControllerInterface;
-
-/**
- * Overrides the default node entity class for testing.
- */
-class NodeTest extends Node {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preSave(EntityStorageControllerInterface $storage_controller) {
-    // Allow test nodes to specify their updated ('changed') time.
-  }
-
-}