diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 453bdf1..f4fae07 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -201,7 +201,7 @@ function entity_test_entity_bundle_info() {
   $bundles = array();
   $entity_types = \Drupal::entityManager()->getDefinitions();
   foreach ($entity_types as $entity_type_id => $entity_type) {
-    if ($entity_type->getProvider() == 'entity_test' && $entity_type_id != 'entity_test_with_bundle') {
+    if ($entity_type->getProvider() == 'entity_test' && $entity_type_id != 'entity_test_with_bundle' && $entity_type_id != 'entity_test_rev_with_bundle') {
       $bundles[$entity_type_id] = \Drupal::state()->get($entity_type_id . '.bundles') ?: array($entity_type_id => array('label' => 'Entity Test Bundle'));
     }
   }
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevBundle.php
index d0566db..145abae 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevBundle.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevBundle.php
@@ -10,7 +10,7 @@
  *
  * @ConfigEntityType(
  *   id = "entity_test_rev_bundle",
- *   label = @Translation("Test entity bundle"),
+ *   label = @Translation("Test entity rev bundle"),
  *   handlers = {
  *     "access" = "\Drupal\Core\Entity\EntityAccessControlHandler",
  *     "form" = {
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevWithBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevWithBundle.php
index 3a5443d..b787d1d 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevWithBundle.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRevWithBundle.php
@@ -32,7 +32,6 @@
  *     "id" = "id",
  *     "uuid" = "uuid",
  *     "revision" = "revision_id",
- *     "bundle" = "type",
  *     "label" = "name",
  *     "langcode" = "langcode",
  *     "bundle" = "type",
@@ -40,7 +39,8 @@
  *   },
  *   bundle_entity_type = "entity_test_rev_bundle",
  *   links = {
- *     "add-form" = "/entity_test_rev_with_bundle/add",
+ *     "add-page" = "/entity_test_rev_with_bundle/add",
+ *     "add-form" = "/entity_test_rev_with_bundle/add/{entity_test_rev_bundle}",
  *     "canonical" = "/entity_test_rev_with_bundle/manage/{entity_test_rev_with_bundle}",
  *     "delete-form" = "/entity_test/delete/entity_test_rev_with_bundle/{entity_test_rev_with_bundle}",
  *     "edit-form" = "/entity_test_rev_with_bundle/manage/{entity_test_rev_with_bundle}/edit",