.../Drupal/KernelTests/Core/Entity/EntityDeriverTest.php     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php
index 91cf850bfa..c3f3818fbc 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDeriverTest.php
@@ -28,7 +28,7 @@ class EntityDeriverTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = ['system', 'field', 'user', 'node', 'comment'];
+  public static $modules = ['system', 'field', 'user', 'node', 'comment', 'entity_test'];
 
   /**
    * {@inheritdoc}
@@ -47,6 +47,8 @@ protected function setUp() {
       'name' => 'Default comment',
       'target_entity_type_id' => 'node',
     ])->save();
+    entity_test_create_bundle('foo', NULL, 'entity_test_no_bundle');
+    entity_test_create_bundle('entity_test_no_bundle', NULL, 'entity_test_no_bundle');
     $this->typedDataManager = $this->container->get('typed_data_manager');
   }
 
@@ -78,6 +80,14 @@ public function derivativesProvider() {
         'entity:comment:comment',
         FALSE,
       ],
+      'unbundleable entity type with entity_test_entity_bundle_info()-generated bundle type' => [
+        'entity:entity_test_no_bundle:foo',
+        FALSE,
+      ],
+      'unbundleable entity type with entity_test_entity_bundle_info-generated bundle type with matching name' => [
+        'entity:entity_test_no_bundle:entity_test_no_bundle',
+        FALSE,
+      ],
     ];
   }