diff --git a/modules/node/node.test b/modules/node/node.test
index 3ff600f386..5f29e344bb 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1663,6 +1663,18 @@ class NodeTypeTestCase extends DrupalWebTestCase {
       'The content type is available for deletion.'
     );
     $this->assertText(t('This action cannot be undone.'), 'The node type deletion confirmation form is available.');
+
+    // Delete the content type.
+    $this->drupalPost('admin/structure/types/manage/' . $type->name . '/delete', NULL, t('Delete'));
+    $this->assertRaw(t('The content type %type has been deleted.', array('%type' => $type->name)), 'The content type has been deleted.');
+
+    // Attempt to delete the same content type multiple times should not trigger
+    // error messages.
+    module_enable(array('comment'));
+    node_type_cache_reset();
+    $this->drupalGet('admin/structure/types/manage/' . $type->name . '/delete');
+    $this->assertResponse(404, 'Correctly returned 404 response for a non-existent content type.');
+    node_type_delete($type->name);
   }
 
 }