diff --git a/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php b/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php
index 9d89253..69410b1 100644
--- a/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php
+++ b/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityHandlerInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -30,9 +31,33 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * {@inheritdoc}
    */
   public function onPresave(ContentEntityInterface $entity, $default_revision, $published_state) {
-    // This is probably not necessary if configuration is setup correctly.
-    $entity->setNewRevision(TRUE);
-    $entity->isDefaultRevision($default_revision);
+    if ($this->shouldModerate($entity, $published_state)) {
+      // This is probably not necessary if configuration is setup correctly.
+      $entity->setNewRevision(TRUE);
+      $entity->isDefaultRevision($default_revision);
+
+      if ($entity instanceof EntityPublishedInterface) {
+        $entity->{$published_state ? 'setPublished' : 'setUnpublished'}();
+      }
+    }
+  }
+
+  /**
+   * Check if an entity's default revision and/or state needs adjusting.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity to check.
+   * @param bool $published_state
+   *   Whether the state being transitioned to is a published state or not.
+   *
+   * @return bool
+   *   TRUE when either the default revision or the state needs to be updated.
+   */
+  protected function shouldModerate(ContentEntityInterface $entity, $published_state) {
+    // @todo clarify the first condition, https://www.drupal.org/node/2834953.
+    // First condition is needed so you can add a translation.
+    // Second condition checks to see if the published status has changed.
+    return $entity->isDefaultTranslation() || (!($entity instanceof EntityPublishedInterface) || $entity->isPublished() !== $published_state);
   }
 
   /**
diff --git a/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php b/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php
index 247d352..28accc0 100644
--- a/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php
+++ b/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php
@@ -42,18 +42,6 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
   /**
    * {@inheritdoc}
    */
-  public function onPresave(ContentEntityInterface $entity, $default_revision, $published_state) {
-    if ($this->shouldModerate($entity, $published_state)) {
-      parent::onPresave($entity, $default_revision, $published_state);
-      // Only nodes have a concept of published.
-      /** @var \Drupal\node\NodeInterface $entity */
-      $entity->setPublished($published_state);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function enforceRevisionsEntityFormAlter(array &$form, FormStateInterface $form_state, $form_id) {
     $form['revision']['#disabled'] = TRUE;
     $form['revision']['#default_value'] = TRUE;
@@ -74,22 +62,4 @@ public function enforceRevisionsBundleFormAlter(array &$form, FormStateInterface
     }
   }
 
-  /**
-   * Check if an entity's default revision and/or state needs adjusting.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to check.
-   * @param bool $published_state
-   *   Whether the state being transitioned to is a published state or not.
-   *
-   * @return bool
-   *   TRUE when either the default revision or the state needs to be updated.
-   */
-  protected function shouldModerate(ContentEntityInterface $entity, $published_state) {
-    // @todo clarify the first condition.
-    // First condition is needed so you can add a translation.
-    // Second condition checks to see if the published status has changed.
-    return $entity->isDefaultTranslation() || $entity->isPublished() !== $published_state;
-  }
-
 }
diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
index b5b5a75..d087db2 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
@@ -3,13 +3,14 @@
 namespace Drupal\Tests\content_moderation\Kernel;
 
 use Drupal\content_moderation\Entity\ContentModerationState;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\entity_test\Entity\EntityTestBundle;
 use Drupal\entity_test\Entity\EntityTestWithBundle;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\node\NodeInterface;
 use Drupal\workflows\Entity\Workflow;
 
 /**
@@ -35,6 +36,11 @@ class ContentModerationStateTest extends KernelTestBase {
   ];
 
   /**
+   * @var \Drupal\Core\Entity\EntityTypeManager
+   */
+  protected $entityTypeManager;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
@@ -46,34 +52,47 @@ protected function setUp() {
     $this->installEntitySchema('entity_test_with_bundle');
     $this->installEntitySchema('content_moderation_state');
     $this->installConfig('content_moderation');
+
+    $this->entityTypeManager = $this->container->get('entity_type.manager');
   }
 
   /**
    * Tests basic monolingual content moderation through the API.
+   *
+   * @dataProvider basicModerationTestCases
    */
-  public function testBasicModeration() {
-    $node_type = NodeType::create([
-      'type' => 'example',
+  public function testBasicModeration($entity_type_id) {
+    // Make the 'entity_test_with_bundle' entity type revisionable.
+    $this->setEntityTestWithBundleKeys(['revision' => 'revision_id']);
+
+    $bundle_entity_type_id = $this->entityTypeManager->getDefinition($entity_type_id)->getBundleEntityType();
+    $bundle_entity_type_definition = $this->entityTypeManager->getDefinition($bundle_entity_type_id);
+    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+    $entity_type_storage = $this->entityTypeManager->getStorage($bundle_entity_type_id);
+
+    $entity_type = $entity_type_storage->create([
+      $bundle_entity_type_definition->getKey('id') => 'example',
     ]);
-    $node_type->save();
+    $entity_type->save();
 
     $workflow = Workflow::load('editorial');
-    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, 'example');
     $workflow->save();
 
-    $node = Node::create([
+    $entity = $entity_storage->create([
       'type' => 'example',
       'title' => 'Test title',
+      $this->entityTypeManager->getDefinition($entity_type_id)->getKey('bundle') => 'example',
     ]);
-    $node->save();
-    $node = $this->reloadNode($node);
-    $this->assertEquals('draft', $node->moderation_state->value);
+    $entity->save();
+    $entity = $this->reloadEntity($entity);
+    $this->assertEquals('draft', $entity->moderation_state->value);
 
-    $node->moderation_state->value = 'published';
-    $node->save();
+    $entity->moderation_state->value = 'published';
+    $entity->save();
 
-    $node = $this->reloadNode($node);
-    $this->assertEquals('published', $node->moderation_state->value);
+    $entity = $this->reloadEntity($entity);
+    $this->assertEquals('published', $entity->moderation_state->value);
 
     // Change the state without saving the node.
     $content_moderation_state = ContentModerationState::load(1);
@@ -81,26 +100,48 @@ public function testBasicModeration() {
     $content_moderation_state->setNewRevision(TRUE);
     $content_moderation_state->save();
 
-    $node = $this->reloadNode($node, 3);
-    $this->assertEquals('draft', $node->moderation_state->value);
-    $this->assertFalse($node->isPublished());
+    $entity = $this->reloadEntity($entity, 3);
+    $this->assertEquals('draft', $entity->moderation_state->value);
+    if ($entity instanceof EntityPublishedInterface) {
+      $this->assertFalse($entity->isPublished());
+    }
 
     // Get the default revision.
-    $node = $this->reloadNode($node);
-    $this->assertTrue($node->isPublished());
-    $this->assertEquals(2, $node->getRevisionId());
+    $entity = $this->reloadEntity($entity);
+    if ($entity instanceof EntityPublishedInterface) {
+      $this->assertTrue((bool) $entity->isPublished());
+    }
+    $this->assertEquals(2, $entity->getRevisionId());
 
-    $node->moderation_state->value = 'published';
-    $node->save();
+    $entity->moderation_state->value = 'published';
+    $entity->save();
 
-    $node = $this->reloadNode($node, 4);
-    $this->assertEquals('published', $node->moderation_state->value);
+    $entity = $this->reloadEntity($entity, 4);
+    $this->assertEquals('published', $entity->moderation_state->value);
 
     // Get the default revision.
-    $node = $this->reloadNode($node);
-    $this->assertTrue($node->isPublished());
-    $this->assertEquals(4, $node->getRevisionId());
+    $entity = $this->reloadEntity($entity);
+    if ($entity instanceof EntityPublishedInterface) {
+      $this->assertTrue((bool) $entity->isPublished());
+    }
+    $this->assertEquals(4, $entity->getRevisionId());
+  }
 
+  /**
+   * Test cases for basic moderation test.
+   */
+  public function basicModerationTestCases() {
+    return [
+      'Nodes' => [
+        'node',
+      ],
+      'Test Entity with Bundle' => [
+        'entity_test_with_bundle',
+      ],
+      'Publishable Test Entity with Bundle' => [
+        'entity_test_publish_with_bundle',
+      ],
+    ];
   }
 
   /**
@@ -124,37 +165,37 @@ public function testMultilingualModeration() {
     ]);
     // Revision 1 (en).
     $english_node
-      ->setPublished(FALSE)
+      ->setUnpublished()
       ->save();
     $this->assertEquals('draft', $english_node->moderation_state->value);
     $this->assertFalse($english_node->isPublished());
 
     // Create a French translation.
     $french_node = $english_node->addTranslation('fr', ['title' => 'French title']);
-    $french_node->setPublished(FALSE);
+    $french_node->setUnpublished();
     // Revision 1 (fr).
     $french_node->save();
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
     $this->assertEquals('draft', $french_node->moderation_state->value);
     $this->assertFalse($french_node->isPublished());
 
     // Move English node to create another draft.
-    $english_node = $this->reloadNode($english_node);
+    $english_node = $this->reloadEntity($english_node);
     $english_node->moderation_state->value = 'draft';
     // Revision 2 (en, fr).
     $english_node->save();
-    $english_node = $this->reloadNode($english_node);
+    $english_node = $this->reloadEntity($english_node);
     $this->assertEquals('draft', $english_node->moderation_state->value);
 
     // French node should still be in draft.
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
     $this->assertEquals('draft', $french_node->moderation_state->value);
 
     // Publish the French node.
     $french_node->moderation_state->value = 'published';
     // Revision 3 (en, fr).
     $french_node->save();
-    $french_node = $this->reloadNode($french_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($french_node)->getTranslation('fr');
     $this->assertTrue($french_node->isPublished());
     $this->assertEquals('published', $french_node->moderation_state->value);
     $this->assertTrue($french_node->isPublished());
@@ -165,16 +206,16 @@ public function testMultilingualModeration() {
     $english_node->moderation_state->value = 'published';
     // Revision 4 (en, fr).
     $english_node->save();
-    $english_node = $this->reloadNode($english_node);
+    $english_node = $this->reloadEntity($english_node);
     $this->assertTrue($english_node->isPublished());
 
     // Move the French node back to draft.
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
     $this->assertTrue($french_node->isPublished());
     $french_node->moderation_state->value = 'draft';
     // Revision 5 (en, fr).
     $french_node->save();
-    $french_node = $this->reloadNode($english_node, 5)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node, 5)->getTranslation('fr');
     $this->assertFalse($french_node->isPublished());
     $this->assertTrue($french_node->getTranslation('en')->isPublished());
 
@@ -182,7 +223,7 @@ public function testMultilingualModeration() {
     $french_node->moderation_state->value = 'published';
     // Revision 6 (en, fr).
     $french_node->save();
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
     $this->assertTrue($french_node->isPublished());
 
     // Change the EN state without saving the node.
@@ -191,10 +232,10 @@ public function testMultilingualModeration() {
     $content_moderation_state->setNewRevision(TRUE);
     // Revision 7 (en, fr).
     $content_moderation_state->save();
-    $english_node = $this->reloadNode($french_node, $french_node->getRevisionId() + 1);
+    $english_node = $this->reloadEntity($french_node, $french_node->getRevisionId() + 1);
 
     $this->assertEquals('draft', $english_node->moderation_state->value);
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
     $this->assertEquals('published', $french_node->moderation_state->value);
 
     // This should unpublish the French node.
@@ -205,16 +246,16 @@ public function testMultilingualModeration() {
     // Revision 8 (en, fr).
     $content_moderation_state->save();
 
-    $english_node = $this->reloadNode($english_node, $english_node->getRevisionId());
+    $english_node = $this->reloadEntity($english_node, $english_node->getRevisionId());
     $this->assertEquals('draft', $english_node->moderation_state->value);
-    $french_node = $this->reloadNode($english_node, '8')->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node, '8')->getTranslation('fr');
     $this->assertEquals('draft', $french_node->moderation_state->value);
     // Switching the moderation state to an unpublished state should update the
     // entity.
     $this->assertFalse($french_node->isPublished());
 
     // Get the default english node.
-    $english_node = $this->reloadNode($english_node);
+    $english_node = $this->reloadEntity($english_node);
     $this->assertTrue($english_node->isPublished());
     $this->assertEquals(6, $english_node->getRevisionId());
   }
@@ -224,12 +265,7 @@ public function testMultilingualModeration() {
    */
   public function testNonTranslatableEntityTypeModeration() {
     // Make the 'entity_test_with_bundle' entity type revisionable.
-    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
-    $keys = $entity_type->getKeys();
-    $keys['revision'] = 'revision_id';
-    $entity_type->set('entity_keys', $keys);
-    \Drupal::state()->set('entity_test_with_bundle.entity_type', $entity_type);
-    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+    $this->setEntityTestWithBundleKeys(['revision' => 'revision_id']);
 
     // Create a test bundle.
     $entity_test_bundle = EntityTestBundle::create([
@@ -265,13 +301,7 @@ public function testNonTranslatableEntityTypeModeration() {
   public function testNonLangcodeEntityTypeModeration() {
     // Make the 'entity_test_with_bundle' entity type revisionable and unset
     // the langcode entity key.
-    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
-    $keys = $entity_type->getKeys();
-    $keys['revision'] = 'revision_id';
-    unset($keys['langcode']);
-    $entity_type->set('entity_keys', $keys);
-    \Drupal::state()->set('entity_test_with_bundle.entity_type', $entity_type);
-    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+    $this->setEntityTestWithBundleKeys(['revision' => 'revision_id'], ['langcode']);
 
     // Create a test bundle.
     $entity_test_bundle = EntityTestBundle::create([
@@ -301,24 +331,43 @@ public function testNonLangcodeEntityTypeModeration() {
   }
 
   /**
-   * Reloads the node after clearing the static cache.
+   * Set the keys on the test entity type.
+   *
+   * @param array $keys
+   *   The entity keys to override
+   * @param array $remove_keys
+   *   Keys to remove.
+   */
+  protected function setEntityTestWithBundleKeys($keys, $remove_keys = []) {
+    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
+    $original_keys = $entity_type->getKeys();
+    foreach ($remove_keys as $remove_key) {
+      unset($original_keys[$remove_key]);
+    }
+    $entity_type->set('entity_keys', $keys + $original_keys);
+    \Drupal::state()->set('entity_test_with_bundle.entity_type', $entity_type);
+    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+  }
+
+  /**
+   * Reloads the entity after clearing the static cache.
    *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node to reload.
+   * @param \Drupal\Core\Entity\EntityInterface
+   *   The entity to reload.
    * @param int|false $revision_id
    *   The specific revision ID to load. Defaults FALSE and just loads the
    *   default revision.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The reloaded node.
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The reloaded entity.
    */
-  protected function reloadNode(NodeInterface $node, $revision_id = FALSE) {
-    $storage = \Drupal::entityTypeManager()->getStorage('node');
-    $storage->resetCache([$node->id()]);
+  protected function reloadEntity(EntityInterface $entity, $revision_id = FALSE) {
+    $storage = \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId());
+    $storage->resetCache([$entity->id()]);
     if ($revision_id) {
       return $storage->loadRevision($revision_id);
     }
-    return $storage->load($node->id());
+    return $storage->load($entity->id());
   }
 
 }
diff --git a/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml b/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
index d34d949..bb84c24 100644
--- a/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
+++ b/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
@@ -27,3 +27,17 @@ entity_test.entity_test_bundle.*:
     description:
       type: text
       label: 'Description'
+
+entity_test.entity_test_publish_bundle.*:
+  type: config_entity
+  label: 'Publishale entity test bundle'
+  mapping:
+    label:
+      type: label
+      label: 'Label'
+    id:
+      type: string
+      label: 'Machine-readable name'
+    description:
+      type: text
+      label: 'Description'
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestPublishBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestPublishBundle.php
new file mode 100644
index 0000000..0ca1a86
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestPublishBundle.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
+use Drupal\Core\Entity\EntityDescriptionInterface;
+
+/**
+ * Defines the Publishable test entity bundle configuration entity.
+ *
+ * @ConfigEntityType(
+ *   id = "entity_test_publish_bundle",
+ *   label = @Translation("Publishable test entity bundle"),
+ *   handlers = {
+ *     "access" = "\Drupal\Core\Entity\EntityAccessControlHandler",
+ *     "form" = {
+ *       "default" = "\Drupal\Core\Entity\BundleEntityFormBase",
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
+ *   },
+ *   admin_permission = "administer entity_test_publish_bundle content",
+ *   config_prefix = "entity_test_publish_bundle",
+ *   bundle_of = "entity_test_publish_with_bundle",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label"
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "label",
+ *     "description",
+ *   },
+ *   links = {
+ *     "add-form" = "/entity_test_publish_bundle/add",
+ *   }
+ * )
+ */
+class EntityTestPublishBundle extends ConfigEntityBundleBase implements EntityDescriptionInterface {
+
+  /**
+   * The machine name.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The human-readable name.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The description.
+   *
+   * @var string
+   */
+  protected $description;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return $this->description;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setDescription($description) {
+    $this->description = $description;
+    return $this;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestPublishWithBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestPublishWithBundle.php
new file mode 100644
index 0000000..2173547
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestPublishWithBundle.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\Core\Entity\EntityPublishedTrait;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+
+/**
+ * Defines the Publishable test entity with bundle entity class.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_publish_with_bundle",
+ *   label = @Translation("Publishable test entity with bundle"),
+ *   handlers = {
+ *     "list_builder" = "Drupal\entity_test\EntityTestListBuilder",
+ *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
+ *     "access" = "Drupal\entity_test\EntityTestAccessControlHandler",
+ *     "form" = {
+ *       "default" = "\Drupal\Core\Entity\ContentEntityForm",
+ *       "delete" = "\Drupal\Core\Entity\EntityDeleteForm"
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
+ *   },
+ *   base_table = "entity_test_publish_with_bundle",
+ *   data_table = "entity_test_publish_with_bundle_field_data",
+ *   revision_table = "entity_test_publish_with_bundle_revision",
+ *   revision_data_table = "entity_test_publish_with_bundle_field_revision",
+ *   admin_permission = "administer entity_test_publish_with_bundle content",
+ *   persistent_cache = FALSE,
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *     "bundle" = "type",
+ *     "label" = "name",
+ *     "langcode" = "langcode",
+ *     "published" = "status",
+ *     "revision" = "revision_id",
+ *   },
+ *   bundle_entity_type = "entity_test_publish_bundle",
+ *   links = {
+ *     "canonical" = "/entity_test_publish_with_bundle/{entity_test_publish_with_bundle}",
+ *     "add-page" = "/entity_test_publish_with_bundle/add",
+ *     "add-form" = "/entity_test_publish_with_bundle/add/{entity_test_bundle}",
+ *     "edit-form" = "/entity_test_publish_with_bundle/{entity_test_publish_with_bundle}/edit",
+ *     "delete-form" = "/entity_test_publish_with_bundle/{entity_test_publish_with_bundle}/delete",
+ *   },
+ * )
+ */
+class EntityTestPublishWithBundle extends ContentEntityBase implements EntityPublishedInterface {
+  
+  use EntityPublishedTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type) + EntityPublishedTrait::publishedBaseFieldDefinitions($entity_type);
+
+    $fields['name'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Name'))
+      ->setDescription(t('The name of the test entity.'))
+      ->setTranslatable(TRUE)
+      ->setSetting('max_length', 32)
+      ->setDisplayOptions('view', [
+        'label' => 'hidden',
+        'type' => 'string',
+        'weight' => -5,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'string_textfield',
+        'weight' => -5,
+      ]);
+    return $fields;
+  }
+
+}