diff --git a/tests/modules/devel_entity_test/devel_entity_test.routing.yml b/tests/modules/devel_entity_test/devel_entity_test.routing.yml
deleted file mode 100644
index 59eec6307f9998f39f42fdbe5371735db6549e0a..0000000000000000000000000000000000000000
--- a/tests/modules/devel_entity_test/devel_entity_test.routing.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-route_callbacks:
-  - '\Drupal\devel_entity_test\Routing\DevelEntityTestRoutes::routes'
diff --git a/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php b/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php
index bc84cd7fe886993ce706b240cfb627b39820f514..0747e11d4f6db1bcfd2df2ab1a64b4cdf024e27e 100644
--- a/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php
+++ b/tests/modules/devel_entity_test/src/Entity/DevelEntityTestCanonical.php
@@ -23,6 +23,9 @@ use Drupal\entity_test\Entity\EntityTest;
  *       "default" = "Drupal\entity_test\EntityTestForm",
  *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
  *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
  *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
  *     "views_data" = "Drupal\entity_test\EntityTestViewsData"
  *   },
diff --git a/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php b/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php
index ad6fd3621e1d3f7d5c45510987bbfc000400addc..2f43069a74cbc19b570fc9cc0b7b117a0bdd7733 100644
--- a/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php
+++ b/tests/modules/devel_entity_test/src/Entity/DevelEntityTestEdit.php
@@ -23,6 +23,9 @@ use Drupal\entity_test\Entity\EntityTest;
  *       "default" = "Drupal\entity_test\EntityTestForm",
  *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
  *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
  *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
  *     "views_data" = "Drupal\entity_test\EntityTestViewsData"
  *   },
diff --git a/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php b/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php
index 2e7369cd893305881bb16f3e756f13f45678d105..011ac53799bc0f7d93a53007cc37a697e7d5ebcc 100644
--- a/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php
+++ b/tests/modules/devel_entity_test/src/Entity/DevelEntityTestNoLinks.php
@@ -23,6 +23,9 @@ use Drupal\entity_test\Entity\EntityTest;
  *       "default" = "Drupal\entity_test\EntityTestForm",
  *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
  *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
  *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
  *     "views_data" = "Drupal\entity_test\EntityTestViewsData"
  *   },
diff --git a/tests/modules/devel_entity_test/src/Routing/DevelEntityTestRoutes.php b/tests/modules/devel_entity_test/src/Routing/DevelEntityTestRoutes.php
deleted file mode 100644
index d1cd89e6afdec57303af067e3b8c72f3249106cd..0000000000000000000000000000000000000000
--- a/tests/modules/devel_entity_test/src/Routing/DevelEntityTestRoutes.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\devel_entity_test\Routing\RouteSubscriber.
- */
-
-namespace Drupal\devel_entity_test\Routing;
-
-use Symfony\Component\Routing\Route;
-
-/**
- * Subscriber for Entity Test routes.
- */
-class DevelEntityTestRoutes {
-
-  /**
-   * Returns an array of route objects.
-   *
-   * @return \Symfony\Component\Routing\Route[]
-   *   An array of route objects.
-   */
-  public function routes() {
-    $routes = array();
-
-    $routes["entity.devel_entity_test_canonical.canonical"] = new Route(
-      'devel_entity_test_canonical/{devel_entity_test_canonical}',
-      array('_entity_view' => 'devel_entity_test_canonical.full', '_title' => 'Test full view mode'),
-      array('_access' => 'TRUE')
-    );
-
-    $routes["entity.devel_entity_test_edit.edit_form"] = new Route(
-      'devel_entity_test_edit/manage/{devel_entity_test_edit}',
-      array('_controller' => '\Drupal\entity_test\Controller\EntityTestController::testEdit', 'entity_type_id' => 'devel_entity_test_edit'),
-      array('_permission' => 'administer entity_test content'),
-      array('parameters' => array(
-        'devel_entity_test_edit' => array('type' => 'entity:' . 'devel_entity_test_edit'),
-      ))
-    );
-
-    return $routes;
-  }
-
-}