diff --git a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php b/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php
new file mode 100644
index 0000000..5051840
--- /dev/null
+++ b/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node_test\NodeTest.
+ */
+
+namespace Drupal\node_test;
+
+use Drupal\node\Plugin\Core\Entity\Node;
+use Drupal\Core\Entity\EntityStorageControllerInterface;
+
+/**
+ * Provides a test storage controller for nodes.
+ */
+class NodeTest extends Node {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageControllerInterface $storage_controller) {
+    // Allow test nodes to specify their updated ('changed') time.
+  }
+
+}
diff --git a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTestStorageController.php b/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTestStorageController.php
deleted file mode 100644
index 3e58980..0000000
--- a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTestStorageController.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node_test\NodeTestStorageController.
- */
-
-namespace Drupal\node_test;
-
-use Drupal\node\NodeStorageController;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides a test storage controller for nodes.
- */
-class NodeTestStorageController extends NodeStorageController {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function preSave(EntityInterface $node) {
-    // Allow test nodes to specify their updated ('changed') time.
-  }
-
-}
diff --git a/core/modules/node/tests/modules/node_test/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module
index e65f9bc..12e0eed 100644
--- a/core/modules/node/tests/modules/node_test/node_test.module
+++ b/core/modules/node/tests/modules/node_test/node_test.module
@@ -186,6 +186,6 @@ function node_test_node_insert(EntityInterface $node) {
  */
 function node_test_entity_info_alter(&$entity_info) {
   if (Drupal::state()->get('node_test.storage_controller')) {
-    $entity_info['node']['controllers']['storage'] = 'Drupal\node_test\NodeTestStorageController';
+    $entity_info['node']['class'] = 'Drupal\node_test\NodeTest';
   }
 }