diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php
index 6cfc32f..d49cb90 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php
@@ -71,9 +71,23 @@ function testNodeTypeCreation() {
       'title_label' => 'title for foo',
       'type' => 'foo',
     );
+
     $this->drupalPostForm('admin/structure/types/add', $edit, t('Save and manage fields'));
     $type_exists = (bool) entity_load('node_type', 'foo');
     $this->assertTrue($type_exists, 'The new content type has been created in the database.');
+
+    // Create a content type with the same machine name as one provided by a
+    // disabled module.
+    $edit = array(
+      'name' => $this->randomName(),
+      'type' => 'node_type_test',
+    );
+    $this->drupalPost('admin/structure/types/add', $edit, t('Save content type'));
+
+    // Enable the module with the conflicting content type name.
+    module_enable(array('node_type_test'));
+    $entity_info = entity_get_info('node');
+    $this->assertEqual($entity_info['bundles']['node_type_test']['label'], t('Test node type'), 'The module-defined content type was installed.');
   }
 
   /**
diff --git a/core/modules/node/tests/modules/node_type_test/node_type_test.info b/core/modules/node/tests/modules/node_type_test/node_type_test.info
new file mode 100644
index 0000000..4aeff3d
--- /dev/null
+++ b/core/modules/node/tests/modules/node_type_test/node_type_test.info
@@ -0,0 +1,6 @@
+name = Node type tests
+description = Support module for node type related testing.
+package = Testing
+version = VERSION
+core = 8.x
+hidden = TRUE
diff --git a/core/modules/node/tests/modules/node_type_test/node_type_test.module b/core/modules/node/tests/modules/node_type_test/node_type_test.module
new file mode 100644
index 0000000..f83885c
--- /dev/null
+++ b/core/modules/node/tests/modules/node_type_test/node_type_test.module
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * A dummy module for testing node type functionality.
+ */
+
+/**
+ * Implements hook_node_info().
+ */
+function node_type_test_node_info() {
+  return array(
+    'node_type_test' => array(
+      'name' => t('Test node type'),
+      'base' => 'node_type_test',
+      'description' => t('Test node type'),
+    ),
+  );
+}