diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php
index 476898c..d692eab 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php
@@ -72,12 +72,16 @@ function testNodeTypeCreation() {
       'type' => 'foo',
     );
     $this->drupalPost('admin/structure/types/add', $edit, t('Save content type'));
-    $type_exists = db_query('SELECT 1 FROM {node_type} WHERE type = :type', array(':type' => 'foo'))->fetchField();
+    $type_exists = db_query('SELECT 1 FROM {node_type} WHERE type = :type', array(':type' => 'custom_foo'))->fetchField();
     $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.
-    $this->drupalCreateContentType(array('type' => 'node_type_test'));
+    $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'));