diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php
index 97f6738..fc91922 100644
--- a/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/core/modules/node/src/Tests/NodeTypeTest.php
@@ -10,6 +10,7 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\node\Entity\NodeType;
 use Drupal\Core\Url;
+use Drupal\system\Tests\Menu\AssertBreadcrumbTrait;
 
 /**
  * Ensures that node type functions work correctly.
@@ -18,12 +19,14 @@
  */
 class NodeTypeTest extends NodeTestBase {
 
+  use AssertBreadcrumbTrait;
+
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = ['field_ui'];
+  public static $modules = ['field_ui', 'block'];
 
   /**
    * Ensures that node type functions (node_type_get_*) work correctly.
@@ -78,6 +81,7 @@ function testNodeTypeCreation() {
    * Tests editing a node type using the UI.
    */
   function testNodeTypeEditing() {
+    $this->drupalPlaceBlock('system_breadcrumb_block');
     $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types', 'administer node fields'));
     $this->drupalLogin($web_user);
 
@@ -89,23 +93,45 @@ function testNodeTypeEditing() {
     $this->assertRaw('Title', 'Title field was found.');
     $this->assertRaw('Body', 'Body field was found.');
 
+    $front_page_path = Url::fromRoute('<front>')->toString();
+
     // Rename the title field.
     $edit = array(
       'title_label' => 'Foo',
     );
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->assertBreadcrumb('admin/structure/types/manage/page/fields', [
+      $front_page_path => 'Home',
+      'admin/structure/types' => 'Content types',
+      'admin/structure/types/manage/page' => 'Page',
+    ]);
 
     $this->drupalGet('node/add/page');
     $this->assertRaw('Foo', 'New title label was displayed.');
     $this->assertNoRaw('Title', 'Old title label was not displayed.');
 
-    // Change the name, machine name and description.
+    // Change the name and description.
     $edit = array(
       'name' => 'Bar',
-      'type' => 'bar',
       'description' => 'Lorem ipsum.',
     );
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->assertBreadcrumb('admin/structure/types/manage/page/fields', [
+      $front_page_path => 'Home',
+      'admin/structure/types' => 'Content types',
+      'admin/structure/types/manage/page' => 'Bar',
+    ]);
+
+    // Now change the machine name.
+    $edit = [
+      'type' => 'bar',
+    ];
+    $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
+    $this->assertBreadcrumb('admin/structure/types/manage/bar/fields', [
+      $front_page_path => 'Home',
+      'admin/structure/types' => 'Content types',
+      'admin/structure/types/manage/bar' => 'Bar',
+    ]);
 
     $this->drupalGet('node/add');
     $this->assertRaw('Bar', 'New name was displayed.');