diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index e13a019..688f98d 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -430,6 +430,8 @@ public function testsNonIntegerIdEntities() {
     $this->drupalGet('entity_test_string_id/structure/entity_test/fields');
     // Ensure field isn't shown for string IDs.
     $this->assertNoOption('edit-fields-add-new-field-type', 'comment');
+    // Ensure a core field type shown.
+    $this->assertOption('edit-fields-add-new-field-type', 'boolean');
 
     // Create a bundle for entity_test_no_id.
     entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test_no_id');
@@ -440,6 +442,8 @@ public function testsNonIntegerIdEntities() {
     $this->drupalGet('entity_test_no_id/structure/entity_test/fields');
     // Ensure field isn't shown for empty IDs.
     $this->assertNoOption('edit-fields-add-new-field-type', 'comment');
+    // Ensure a core field type shown.
+    $this->assertOption('edit-fields-add-new-field-type', 'boolean');
   }
 
 }
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
index 2b31600..876ab8c 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
@@ -33,6 +33,7 @@
  *   links = {
  *     "canonical" = "entity.entity_test.canonical",
  *     "edit-form" = "entity.entity_test_string_id.edit_form",
+ *     "admin-form" = "entity.entity_test_string_id.admin_form",
  *   }
  * )
  */
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
index 9b0aaa3..d01f3b9 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
@@ -95,7 +95,7 @@ public function save(array $form, FormStateInterface $form_state) {
     if ($entity->id()) {
       $entity_type = $entity->getEntityTypeId();
       $form_state->setRedirect(
-        "entity_test.edit_$entity_type",
+        "entity.$entity_type.edit_form",
         array($entity_type => $entity->id())
       );
     }