diff --git a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
index d8daa5135a..96250653fe 100644
--- a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
+++ b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
@@ -23,7 +23,7 @@ transitions:
     to: archived
     weight: 2
   archived_draft:
-    label: 'Restore to Draft'
+    label: 'Restore to draft'
     from:
       - archived
     to: draft
@@ -35,7 +35,7 @@ transitions:
     to: published
     weight: 4
   create_new_draft:
-    label: 'Create New Draft'
+    label: 'Create new draft'
     from:
       - draft
       - published
diff --git a/core/modules/content_moderation/src/EntityTypeInfo.php b/core/modules/content_moderation/src/EntityTypeInfo.php
index eb8a6b7f42..fcd37bbc96 100644
--- a/core/modules/content_moderation/src/EntityTypeInfo.php
+++ b/core/modules/content_moderation/src/EntityTypeInfo.php
@@ -259,11 +259,11 @@ public function entityBaseFieldInfo(EntityTypeInterface $entity_type) {
       ])
       ->setDisplayOptions('form', [
         'type' => 'moderation_state_default',
-        'weight' => 5,
+        'weight' => 100,
         'settings' => [],
       ])
       ->addConstraint('ModerationState', [])
-      ->setDisplayConfigurable('form', FALSE)
+      ->setDisplayConfigurable('form', TRUE)
       ->setDisplayConfigurable('view', FALSE)
       ->setReadOnly(FALSE)
       ->setTranslatable(TRUE);
@@ -320,6 +320,7 @@ public function formAlter(array &$form, FormStateInterface $form_state, $form_id
           $full_message = $this->t('Unable to save this @type_label. <a href="@latest_revision_edit_url">Publish</a> or <a href="@latest_revision_delete_url">delete</a> the latest draft revision to allow all workflow transitions.', $args);
           drupal_set_message($full_message, 'error');
 
+          $form['moderation_state']['#access'] = FALSE;
           $form['actions']['#access'] = FALSE;
           $form['invalid_transitions'] = [
             'label' => [
@@ -344,6 +345,10 @@ public function formAlter(array &$form, FormStateInterface $form_state, $form_id
 
         // Submit handler to redirect to the latest version, if available.
         $form['actions']['submit']['#submit'][] = [EntityTypeInfo::class, 'bundleFormRedirect'];
+        if (isset($form['footer'])) {
+          $form['footer']['moderation_state'] = $form['moderation_state'];
+          unset($form['moderation_state']);
+        }
       }
     }
   }
diff --git a/core/modules/content_moderation/src/Form/EntityModerationForm.php b/core/modules/content_moderation/src/Form/EntityModerationForm.php
index ea2fedd010..66d7b11a2d 100644
--- a/core/modules/content_moderation/src/Form/EntityModerationForm.php
+++ b/core/modules/content_moderation/src/Form/EntityModerationForm.php
@@ -88,7 +88,7 @@ public function buildForm(array $form, FormStateInterface $form_state, ContentEn
     if ($current_state) {
       $form['current'] = [
         '#type' => 'item',
-        '#title' => $this->t('Status'),
+        '#title' => $this->t('Moderation state'),
         '#markup' => $workflow->getState($current_state)->label(),
       ];
     }
@@ -98,7 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state, ContentEn
 
     $form['new_state'] = [
       '#type' => 'select',
-      '#title' => $this->t('Moderate'),
+      '#title' => $this->t('Change to'),
       '#options' => $target_states,
     ];
 
diff --git a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
index 74e305209c..8444e60c4f 100644
--- a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
+++ b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\content_moderation\Plugin\Field\FieldWidget;
 
-use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\content_moderation\Plugin\Field\ModerationStateFieldItemList;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
@@ -75,7 +75,7 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
    * @param \Drupal\content_moderation\ModerationInformation $moderation_information
    *   Moderation information service.
    * @param \Drupal\content_moderation\StateTransitionValidation $validator
-   *   Moderation state transition validation service
+   *   Moderation state transition validation service.
    */
   public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, ModerationInformation $moderation_information, StateTransitionValidation $validator) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $third_party_settings);
@@ -106,7 +106,7 @@ public static function create(ContainerInterface $container, array $configuratio
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    /** @var ContentEntityInterface $entity */
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $items->getEntity();
 
     /* @var \Drupal\Core\Config\Entity\ConfigEntityInterface $bundle_entity */
@@ -121,95 +121,62 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     /** @var \Drupal\workflows\Transition[] $transitions */
     $transitions = $this->validator->getValidTransitions($entity, $this->currentUser);
 
-    $target_states = [];
+    $transition_labels = [];
+    $default_value = NULL;
     foreach ($transitions as $transition) {
-      $target_states[$transition->to()->id()] = $transition->label();
+      $transition_to_state = $transition->to();
+      if ($transition_to_state->id() === $default->id() && !$entity->isNew()) {
+        $default_value = $transition_to_state->id();
+        // Add the default transition to the top of the list.
+        $transition_labels = [
+          $transition_to_state->id() => $this->t('Keep @state', ['@state' => $transition_to_state->label()]),
+        ] + $transition_labels;
+      }
+      else {
+        $transition_labels[$transition_to_state->id()] = $transition->label();
+      }
     }
 
-    // @todo https://www.drupal.org/node/2779933 write a test for this.
     $element += [
-      '#access' => FALSE,
-      '#type' => 'select',
-      '#options' => $target_states,
-      '#default_value' => $default->id(),
-      '#published' => $default->isPublishedState(),
-      '#key_column' => $this->column,
+      '#type' => 'container',
+      'current' => [
+        '#type' => 'item',
+        '#title' => $this->t('Current state'),
+        '#markup' => $default->label(),
+        '#access' => !$entity->isNew(),
+        '#wrapper_attributes' => [
+          'class' => ['container-inline'],
+        ],
+      ],
+      'state' => [
+        '#type' => 'select',
+        '#title' => $this->t('On save'),
+        '#key_column' => $this->column,
+        '#options' => $transition_labels,
+        '#default_value' => $default_value,
+        '#access' => !empty($transition_labels),
+        '#wrapper_attributes' => [
+          'class' => ['container-inline'],
+        ],
+      ],
     ];
     $element['#element_validate'][] = [get_class($this), 'validateElement'];
 
-    // Use the dropbutton.
-    $element['#process'][] = [get_called_class(), 'processActions'];
     return $element;
   }
 
   /**
-   * Entity builder updating the node moderation state with the submitted value.
-   *
-   * @param string $entity_type_id
-   *   The entity type identifier.
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity updated with the submitted values.
-   * @param array $form
-   *   The complete form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public static function updateStatus($entity_type_id, ContentEntityInterface $entity, array $form, FormStateInterface $form_state) {
-    $element = $form_state->getTriggeringElement();
-    if (isset($element['#moderation_state'])) {
-      $entity->moderation_state->value = $element['#moderation_state'];
-    }
-  }
-
-  /**
-   * Process callback to alter action buttons.
+   * {@inheritdoc}
    */
-  public static function processActions($element, FormStateInterface $form_state, array &$form) {
-
-    // We'll steal most of the button configuration from the default submit
-    // button. However, NodeForm also hides that button for admins (as it adds
-    // its own, too), so we have to restore it.
-    $default_button = $form['actions']['submit'];
-    $default_button['#access'] = TRUE;
-
-    // Add a custom button for each transition we're allowing. The #dropbutton
-    // property tells FAPI to cluster them all together into a single widget.
-    $options = $element['#options'];
-
-    $entity = $form_state->getFormObject()->getEntity();
-    $translatable = !$entity->isNew() && $entity->isTranslatable();
-    foreach ($options as $id => $label) {
-      $button = [
-        '#dropbutton' => 'save',
-        '#moderation_state' => $id,
-        '#weight' => -10,
-      ];
-
-      $button['#value'] = $translatable
-        ? t('Save and @transition (this translation)', ['@transition' => $label])
-        : t('Save and @transition', ['@transition' => $label]);
-
-      $form['actions']['moderation_state_' . $id] = $button + $default_button;
-    }
-
-    // Hide the default buttons, including the specialty ones added by
-    // NodeForm.
-    foreach (['publish', 'unpublish', 'submit'] as $key) {
-      $form['actions'][$key]['#access'] = FALSE;
-      unset($form['actions'][$key]['#dropbutton']);
-    }
-
-    // Setup a callback to translate the button selection back into field
-    // widget, so that it will get saved properly.
-    $form['#entity_builders']['update_moderation_state'] = [get_called_class(), 'updateStatus'];
-    return $element;
+  public static function validateElement(array $element, FormStateInterface $form_state) {
+    $form_state->setValueForElement($element, [$element['state']['#key_column'] => $element['state']['#value']]);
   }
 
   /**
    * {@inheritdoc}
    */
   public static function isApplicable(FieldDefinitionInterface $field_definition) {
-    return $field_definition->getName() === 'moderation_state';
+    return is_a($field_definition->getClass(), ModerationStateFieldItemList::class, TRUE);
   }
 
 }
diff --git a/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php b/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
index e2955b0485..2cf18da2a1 100644
--- a/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
+++ b/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
@@ -122,19 +122,40 @@ protected function computeModerationFieldItemList() {
    * {@inheritdoc}
    */
   public function onChange($delta) {
+    $this->updateModeratedEntity($this->list[$delta]->value);
+
+    parent::onChange($delta);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setValue($values, $notify = TRUE) {
+    parent::setValue($values, $notify);
+
+    if (!empty($this->list)) {
+      $this->updateModeratedEntity($this->list[0]->value);
+    }
+  }
+
+  /**
+   * Updates the default revision flag and the publishing status of the entity.
+   *
+   * @param string $moderation_state_id
+   *   The ID of the new moderation state.
+   */
+  protected function updateModeratedEntity($moderation_state_id) {
     $entity = $this->getEntity();
 
     /** @var \Drupal\content_moderation\ModerationInformationInterface $content_moderation_info */
     $content_moderation_info = \Drupal::service('content_moderation.moderation_information');
     $workflow = $content_moderation_info->getWorkflowForEntity($entity);
 
-    $current_state_id = $this->list[0]->value;
-
     // Change the entity's default revision flag and the publishing status only
     // if the new workflow state is a valid one.
-    if ($workflow->hasState($current_state_id)) {
+    if ($workflow->hasState($moderation_state_id)) {
       /** @var \Drupal\content_moderation\ContentModerationState $current_state */
-      $current_state = $workflow->getState($current_state_id);
+      $current_state = $workflow->getState($moderation_state_id);
 
       // This entity is default if it is new, a new translation, the default
       // revision state, or the default revision is not published.
@@ -151,8 +172,6 @@ public function onChange($delta) {
         $published_state ? $entity->setPublished() : $entity->setUnpublished();
       }
     }
-
-    parent::onChange($delta);
   }
 
 }
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
index 7aab0d46c3..a7d73308b2 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
@@ -48,7 +48,8 @@ public function testModerationForm() {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'Some moderated content',
       'body[0][value]' => 'First version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     $node = $this->drupalGetNodeByTitle('Some moderated content');
     $canonical_path = sprintf('node/%d', $node->id());
@@ -71,7 +72,8 @@ public function testModerationForm() {
     // Update the draft.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Second version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // The canonical view should have a moderation form, because it is not the
     // live revision.
@@ -87,7 +89,8 @@ public function testModerationForm() {
     // Publish the draft.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Third version of the content.',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     // The published view should not have a moderation form, because it is the
     // live revision.
@@ -103,7 +106,8 @@ public function testModerationForm() {
     // Make a forward revision.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Fourth version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // The published view should not have a moderation form, because it is the
     // live revision.
@@ -139,7 +143,7 @@ public function testNonBundleModerationForm() {
     $workflow->save();
 
     // Create new moderated content in draft.
-    $this->drupalPostForm('entity_test_mulrevpub/add', [], t('Save and Create New Draft'));
+    $this->drupalPostForm('entity_test_mulrevpub/add', ['moderation_state[0][state]' => 'draft'], t('Save'));
 
     // The latest version page should not show, because there is no forward
     // revision.
@@ -147,7 +151,7 @@ public function testNonBundleModerationForm() {
     $this->assertResponse(403);
 
     // Update the draft.
-    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Create New Draft'));
+    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save'));
 
     // The latest version page should not show, because there is still no
     // forward revision.
@@ -155,7 +159,7 @@ public function testNonBundleModerationForm() {
     $this->assertResponse(403);
 
     // Publish the draft.
-    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Publish'));
+    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'published'], t('Save'));
 
     // The published view should not have a moderation form, because it is the
     // default revision.
@@ -169,7 +173,7 @@ public function testNonBundleModerationForm() {
     $this->assertResponse(403);
 
     // Make a forward revision.
-    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', [], t('Save and Create New Draft'));
+    $this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save'));
 
     // The published view should not have a moderation form, because it is the
     // default revision.
@@ -181,7 +185,7 @@ public function testNonBundleModerationForm() {
     // status, because the forward revision is in "Draft".
     $this->drupalGet('entity_test_mulrevpub/manage/1/latest');
     $this->assertResponse(200);
-    $this->assertText('Status', 'Form text found on the latest-version page.');
+    $this->assertText('Moderation state', 'Form text found on the latest-version page.');
     $this->assertText('Draft', 'Correct status found on the latest-version page.');
 
     // Submit the moderation form to change status to published.
@@ -246,7 +250,8 @@ public function testContentTranslationNodeForm() {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'Some moderated content',
       'body[0][value]' => 'First version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertTrue($this->xpath('//ul[@class="entity-moderation-form"]'));
 
     $node = $this->drupalGetNodeByTitle('Some moderated content');
@@ -262,12 +267,13 @@ public function testContentTranslationNodeForm() {
 
     // Add french translation (revision 2).
     $this->drupalGet($translate_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
     $this->drupalPostForm(NULL, [
       'body[0][value]' => 'Second version of the content.',
-    ], t('Save and Publish (this translation)'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
 
     $this->drupalGet($latest_version_path, ['language' => $french]);
     $this->assertSession()->statusCodeEquals('403');
@@ -275,21 +281,20 @@ public function testContentTranslationNodeForm() {
 
     // Add french forward revision (revision 3).
     $this->drupalGet($edit_path, ['language' => $french]);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
     $this->drupalPostForm(NULL, [
       'body[0][value]' => 'Third version of the content.',
-    ], t('Save and Create New Draft (this translation)'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
 
     $this->drupalGet($latest_version_path, ['language' => $french]);
     $this->assertTrue($this->xpath('//ul[@class="entity-moderation-form"]'));
 
     // It should not be possible to add a new english revision.
     $this->drupalGet($edit_path);
-    $this->assertFalse($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->fieldNotExists('moderation_state[0][state]');
     $this->assertSession()->pageTextContains('Unable to save this Moderated content.');
 
     $this->clickLink('Publish');
@@ -304,51 +309,52 @@ public function testContentTranslationNodeForm() {
 
     // Publish the french forward revision (revision 4).
     $this->drupalGet($edit_path, ['language' => $french]);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
     $this->drupalPostForm(NULL, [
       'body[0][value]' => 'Fifth version of the content.',
-    ], t('Save and Publish (this translation)'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
 
     $this->drupalGet($latest_version_path, ['language' => $french]);
     $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
 
     // Now we can publish the english (revision 5).
     $this->drupalGet($edit_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
     $this->drupalPostForm(NULL, [
       'body[0][value]' => 'Sixth version of the content.',
-    ], t('Save and Publish (this translation)'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
 
     $this->drupalGet($latest_version_path);
     $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
 
     // Make sure we're allowed to create a forward french revision.
     $this->drupalGet($edit_path, ['language' => $french]);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
 
     // Add a english forward revision (revision 6).
     $this->drupalGet($edit_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
     $this->drupalPostForm(NULL, [
       'body[0][value]' => 'Seventh version of the content.',
-    ], t('Save and Create New Draft (this translation)'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
 
     $this->drupalGet($latest_version_path);
     $this->assertTrue($this->xpath('//ul[@class="entity-moderation-form"]'));
 
     // Make sure we're not allowed to create a forward french revision.
     $this->drupalGet($edit_path, ['language' => $french]);
-    $this->assertFalse($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->fieldNotExists('moderation_state[0][state]');
     $this->assertSession()->pageTextContains('Unable to save this Moderated content.');
 
     $this->drupalGet($latest_version_path, ['language' => $french]);
@@ -356,33 +362,35 @@ public function testContentTranslationNodeForm() {
 
     // We should be able to publish the english forward revision (revision 7)
     $this->drupalGet($edit_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
     $this->drupalPostForm(NULL, [
       'body[0][value]' => 'Eighth version of the content.',
-    ], t('Save and Publish (this translation)'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
 
     $this->drupalGet($latest_version_path);
     $this->assertFalse($this->xpath('//ul[@class="entity-moderation-form"]'));
 
     // Make sure we're allowed to create a forward french revision.
     $this->drupalGet($edit_path, ['language' => $french]);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
 
     // Make sure we're allowed to create a forward english revision.
     $this->drupalGet($edit_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
 
     // Create new moderated content. (revision 1).
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'Second moderated content',
       'body[0][value]' => 'First version of the content.',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     $node = $this->drupalGetNodeByTitle('Second moderated content');
     $this->assertTrue($node->language(), 'en');
@@ -391,24 +399,24 @@ public function testContentTranslationNodeForm() {
 
     // Add a forward revision (revision 2).
     $this->drupalGet($edit_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
     $this->drupalPostForm(NULL, [
       'body[0][value]' => 'Second version of the content.',
-    ], t('Save and Create New Draft (this translation)'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // It shouldn't be possible to translate as we have a forward revision.
     $this->drupalGet($translate_path);
-    $this->assertFalse($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->fieldNotExists('moderation_state[0][state]');
     $this->assertSession()->pageTextContains('Unable to save this Moderated content.');
 
     // Create new moderated content (revision 1).
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'Third moderated content',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     $node = $this->drupalGetNodeByTitle('Third moderated content');
     $this->assertTrue($node->language(), 'en');
@@ -417,38 +425,44 @@ public function testContentTranslationNodeForm() {
 
     // Translate it, without updating data (revision 2).
     $this->drupalGet($translate_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
-    $this->drupalPostForm(NULL, [], t('Save and Create New Draft (this translation)'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
 
     // Add another draft for the translation (revision 3).
     $this->drupalGet($edit_path, ['language' => $french]);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
-    $this->drupalPostForm(NULL, [], t('Save and Create New Draft (this translation)'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
 
     // Editing the original translation should not be possible.
     $this->drupalGet($edit_path);
-    $this->assertFalse($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
+    $this->assertSession()->fieldNotExists('moderation_state[0][state]');
     $this->assertSession()->pageTextContains('Unable to save this Moderated content.');
 
     // Updating and publishing the french translation is still possible.
     $this->drupalGet($edit_path, ['language' => $french]);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertFalse($this->xpath('//input[@value="Save and Archive (this translation)"]'));
-    $this->drupalPostForm(NULL, [], t('Save and Publish (this translation)'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionNotExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
 
     // Now the french translation is published, an english draft can be added.
     $this->drupalGet($edit_path);
-    $this->assertTrue($this->xpath('//input[@value="Save and Create New Draft (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Publish (this translation)"]'));
-    $this->assertTrue($this->xpath('//input[@value="Save and Archive (this translation)"]'));
-    $this->drupalPostForm(NULL, [], t('Save and Create New Draft (this translation)'));
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'published');
+    $this->assertSession()->optionExists('moderation_state[0][state]', 'archived');
+    $this->drupalPostForm(NULL, [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save (this translation)'));
   }
 
 }
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
index 8516e87871..3104450fce 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
@@ -53,8 +53,9 @@ public function testTranslateModeratedContent() {
     $edit = [
       'title[0][value]' => 'Published English node',
       'langcode[0][value]' => 'en',
+      'moderation_state[0][state]' => 'published',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and Publish'));
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertText(t('Article Published English node has been created.'));
     $english_node = $this->drupalGetNodeByTitle('Published English node');
 
@@ -63,8 +64,9 @@ public function testTranslateModeratedContent() {
     $this->clickLink(t('Add'));
     $edit = [
       'title[0][value]' => 'French node Draft',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
     // Here the error has occurred "The website encountered an unexpected error.
     // Please try again later."
     // If the translation has got lost.
@@ -74,8 +76,9 @@ public function testTranslateModeratedContent() {
     $edit = [
       'title[0][value]' => 'English node',
       'langcode[0][value]' => 'en',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertText(t('Article English node has been created.'));
     $english_node = $this->drupalGetNodeByTitle('English node');
 
@@ -84,14 +87,17 @@ public function testTranslateModeratedContent() {
     $this->clickLink(t('Add'));
     $edit = [
       'title[0][value]' => 'French node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
     $this->assertText(t('Article French node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('English node', TRUE);
 
     // Publish the English article and check that the translation stays
     // unpublished.
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
+    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article English node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('English node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -106,8 +112,9 @@ public function testTranslateModeratedContent() {
     // the translation first.
     $edit = [
       'title[0][value]' => 'Another node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertText(t('Article Another node has been created.'));
     $english_node = $this->drupalGetNodeByTitle('Another node');
 
@@ -116,14 +123,17 @@ public function testTranslateModeratedContent() {
     $this->clickLink(t('Add'));
     $edit = [
       'title[0][value]' => 'Translated node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
     $this->assertText(t('Article Translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
 
     // Publish the translation and check that the source language version stays
     // unpublished.
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article Translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -135,8 +145,9 @@ public function testTranslateModeratedContent() {
     // Now check that we can create a new draft of the translation.
     $edit = [
       'title[0][value]' => 'New draft of translated node',
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and Create New Draft (this translation)'));
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save (this translation)'));
     $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -145,7 +156,9 @@ public function testTranslateModeratedContent() {
     $this->assertEqual($french_node->getTitle(), 'Translated node', 'The default revision of the published translation remains the same.');
 
     // Publish the French article before testing the archive transition.
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
@@ -154,15 +167,21 @@ public function testTranslateModeratedContent() {
     $this->assertEqual($french_node->getTitle(), 'New draft of translated node', 'The draft has replaced the published revision.');
 
     // Publish the English article before testing the archive transition.
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
+    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article Another node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $this->assertEqual($english_node->moderation_state->value, 'published');
 
     // Archive the node and its translation.
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)'));
+    $this->drupalPostForm('node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'archived',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article Another node has been updated.'));
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)'));
+    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [
+      'moderation_state[0][state]' => 'archived',
+    ], t('Save (this translation)'));
     $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php
index 7dac15667f..c054d9d92e 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationRevisionRevertTest.php
@@ -55,10 +55,16 @@ public function setUp() {
    */
   public function testEditingAfterRevertRevision() {
     // Create a draft.
-    $this->drupalPostForm('node/add/moderated_bundle', ['title[0][value]' => 'First draft node'], t('Save and Create New Draft'));
+    $this->drupalPostForm('node/add/moderated_bundle', [
+      'title[0][value]' => 'First draft node',
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // Now make it published.
-    $this->drupalPostForm('node/1/edit', ['title[0][value]' => 'Published node'], t('Save and Publish'));
+    $this->drupalPostForm('node/1/edit', [
+      'title[0][value]' => 'Published node',
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     // Check the editing form that show the published title.
     $this->drupalGet('node/1/edit');
@@ -76,7 +82,9 @@ public function testEditingAfterRevertRevision() {
     $this->assertSession()
       ->pageTextContains('First draft node');
     // Try to save the node.
-    $this->click('.moderation-state-draft > input');
+    $this->drupalPostForm('node/1/edit', [
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     // Check if the submission passed the EntityChangedConstraintValidator.
     $this->assertSession()
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
index 1a8f78c504..3b0cffbe88 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateBlockTest.php
@@ -59,9 +59,10 @@ public function testCustomBlockModeration() {
     $body = 'Body of moderated block';
     $edit = [
       'info[0][value]' => 'Moderated block',
+      'moderation_state[0][state]' => 'draft',
       'body[0][value]' => $body,
     ];
-    $this->drupalPostForm('block/add', $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('block/add', $edit, t('Save'));
     $this->assertText(t('basic Moderated block has been created.'));
 
     // Place the block in the Sidebar First region.
@@ -83,8 +84,9 @@ public function testCustomBlockModeration() {
     $updated_body = 'This is the new body value';
     $edit = [
       'body[0][value]' => $updated_body,
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save'));
     $this->assertText(t('basic Moderated block has been updated.'));
 
     // Navigate to the home page and check that the block shows the updated
@@ -94,14 +96,17 @@ public function testCustomBlockModeration() {
     $this->assertText($updated_body);
 
     // Publish the block so we can create a forward revision.
-    $this->drupalPostForm('block/' . $block->id(), [], t('Save and Publish'));
+    $this->drupalPostForm('block/' . $block->id(), [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     // Create a forward revision.
     $forward_revision_body = 'This is the forward revision body value';
     $edit = [
       'body[0][value]' => $forward_revision_body,
+      'moderation_state[0][state]' => 'draft',
     ];
-    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft'));
+    $this->drupalPostForm('block/' . $block->id(), $edit, t('Save'));
     $this->assertText(t('basic Moderated block has been updated.'));
 
     // Navigate to home page and check that the forward revision doesn't show,
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
index 277acdfadd..82695bdf49 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTest.php
@@ -28,7 +28,8 @@ protected function setUp() {
   public function testCreatingContent() {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'moderated content',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $node = $this->getNodeByTitle('moderated content');
     if (!$node) {
       $this->fail('Test node was not saved correctly.');
@@ -37,7 +38,9 @@ public function testCreatingContent() {
 
     $path = 'node/' . $node->id() . '/edit';
     // Set up published revision.
-    $this->drupalPostForm($path, [], t('Save and Publish'));
+    $this->drupalPostForm($path, [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
     \Drupal::entityTypeManager()->getStorage('node')->resetCache([$node->id()]);
     /* @var \Drupal\node\NodeInterface $node */
     $node = \Drupal::entityTypeManager()->getStorage('node')->load($node->id());
@@ -79,7 +82,8 @@ public function testFormSaveDestination() {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'Some moderated content',
       'body[0][value]' => 'First version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     $node = $this->drupalGetNodeByTitle('Some moderated content');
     $edit_path = sprintf('node/%d/edit', $node->id());
@@ -93,7 +97,8 @@ public function testFormSaveDestination() {
     // URL, but viewing the second revision.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Second version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()]));
     $this->assertText('Second version of the content.');
 
@@ -101,7 +106,8 @@ public function testFormSaveDestination() {
     // canonical URL.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Third version of the content.',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()]));
     $this->assertText('Third version of the content.');
 
@@ -109,7 +115,8 @@ public function testFormSaveDestination() {
     // version" tab.
     $this->drupalPostForm($edit_path, [
       'body[0][value]' => 'Fourth version of the content.',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.node.latest_version', ['node' => $node->id()]));
     $this->assertText('Fourth version of the content.');
   }
@@ -137,4 +144,45 @@ public function testPagers() {
     $this->assertEqual(0, $query['page']);
   }
 
+  /**
+   * Tests the workflow is a user has no Content Moderation permissions.
+   */
+  public function testNoContentModerationPermissions() {
+    // Create a user with quite advanced node permissions but no content
+    // moderation permissions.
+    $limited_user = $this->createUser([
+      'administer nodes',
+      'bypass node access',
+    ]);
+    $this->drupalLogin($limited_user);
+
+    // Check the user can add content, but can't see the moderation state
+    // select.
+    $this->drupalGet('node/add/moderated_content');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertFalse($this->xpath('//select[@name="moderation_state[0][state]"]'));
+    $this->drupalPostForm(NULL, [
+      'title[0][value]' => 'moderated content',
+    ], t('Save'));
+
+    // Manually move the content to archived because the user doesn't have
+    // permission to do this.
+    $node = $this->getNodeByTitle('moderated content');
+    $node->moderation_state->value = 'archived';
+    $node->save();
+
+    // Check the user can see the current state but not the select.
+    $this->drupalGet('node/' . $node->id() . '/edit');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextContains('Archived');
+    $this->assertTrue($this->xpath('//label[@for="edit-moderation-state-0-current"]'));
+    $this->assertFalse($this->xpath('//select[@name="moderation_state[0][state]"]'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    // When saving they should still be on the edit form, and see the validation
+    // error message.
+    $this->assertSession()->pageTextContains('Edit Moderated content moderated content');
+    $this->assertSession()->pageTextContains('Invalid state transition from Archived to Archived');
+  }
+
 }
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
index 055512095f..e57df8cf03 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
@@ -72,14 +72,14 @@ public function testEnablingOnExistingContent() {
     $this->assertLinkByHref('node/' . $node->id() . '/edit');
     $this->drupalGet('node/' . $node->id() . '/edit');
     $this->assertResponse(200);
-    $this->assertRaw('Save and Create New Draft');
-    $this->assertNoRaw('Save and Publish');
+    $this->assertRaw('Create new draft');
+    $this->assertNoRaw('Keep Published');
 
     $this->drupalLogin($editor_with_publish);
     $this->drupalGet('node/' . $node->id() . '/edit');
     $this->assertResponse(200);
-    $this->assertRaw('Save and Create New Draft');
-    $this->assertRaw('Save and Publish');
+    $this->assertRaw('Create new draft');
+    $this->assertRaw('Keep Published');
   }
 
 }
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
index 8a3a2d0cea..fe3c1d1c7f 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
@@ -38,6 +38,9 @@
     'access content overview',
     'use editorial transition create_new_draft',
     'use editorial transition publish',
+    'use editorial transition archive',
+    'use editorial transition archived_draft',
+    'use editorial transition archived_published',
   ];
 
   /**
diff --git a/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
index eeac1cea93..223dbbe40a 100644
--- a/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
@@ -75,7 +75,8 @@ public function testPageAccess() {
     // Create a node to test with.
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'moderated content',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $node = $this->getNodeByTitle('moderated content');
     if (!$node) {
       $this->fail('Test node was not saved correctly.');
@@ -103,7 +104,9 @@ public function testPageAccess() {
 
     // Publish the node.
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm($edit_path, [], t('Save and Publish'));
+    $this->drupalPostForm($edit_path, [
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
 
     // Ensure access works correctly for anonymous users.
     $this->drupalLogout();
@@ -120,7 +123,8 @@ public function testPageAccess() {
     $this->drupalLogin($this->adminUser);
     $this->drupalPostForm($edit_path, [
       'title[0][value]' => 'moderated content revised',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
 
     $this->drupalLogin($user);
 
diff --git a/core/modules/path/tests/src/Functional/PathContentModerationTest.php b/core/modules/path/tests/src/Functional/PathContentModerationTest.php
index 2bb413aa0b..0f0a6318f1 100644
--- a/core/modules/path/tests/src/Functional/PathContentModerationTest.php
+++ b/core/modules/path/tests/src/Functional/PathContentModerationTest.php
@@ -49,7 +49,8 @@ public function testNodePathAlias() {
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'moderated content',
       'path[0][alias]' => '/moderated-content',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
     $node = $this->getNodeByTitle('moderated content');
 
     // Add a forward revision with the same alias.
@@ -58,7 +59,8 @@ public function testNodePathAlias() {
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'forward revision',
       'path[0][alias]' => '/moderated-content',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertSession()->pageTextNotContains('You can only change the URL alias for the published version of this content.');
 
     // Create some moderated content with no path alias.
@@ -67,7 +69,8 @@ public function testNodePathAlias() {
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'moderated content 2',
       'path[0][alias]' => '',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
     $node = $this->getNodeByTitle('moderated content 2');
 
     // Add a forward revision with a new alias.
@@ -76,7 +79,8 @@ public function testNodePathAlias() {
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'forward revision',
       'path[0][alias]' => '/forward-revision',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertSession()->pageTextContains('You can only change the URL alias for the published version of this content.');
 
     // Create some moderated content with no path alias.
@@ -85,7 +89,8 @@ public function testNodePathAlias() {
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'moderated content 3',
       'path[0][alias]' => '',
-    ], t('Save and Publish'));
+      'moderation_state[0][state]' => 'published',
+    ], t('Save'));
     $node = $this->getNodeByTitle('moderated content 3');
 
     // Add a forward revision with no path alias.
@@ -94,7 +99,8 @@ public function testNodePathAlias() {
     $this->drupalPostForm(NULL, [
       'title[0][value]' => 'forward revision',
       'path[0][alias]' => '',
-    ], t('Save and Create New Draft'));
+      'moderation_state[0][state]' => 'draft',
+    ], t('Save'));
     $this->assertSession()->pageTextNotContains('You can only change the URL alias for the published version of this content.');
   }