diff --git a/modules/node/node.test b/modules/node/node.test
index 0777e11..bdebdd7 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1873,6 +1873,16 @@ class NodeTitleTestCase extends DrupalWebTestCase {
     // Test node title is clickable on teaser list (/node).
     $this->drupalGet('node');
     $this->clickLink($node->title);
+
+    // Test edge case where node title is set to 0.
+    $settings = array(
+      'title' => 0,
+    );
+    $node = $this->drupalCreateNode($settings);
+    $this->drupalGet('node/' . $node->nid);
+    $this->assertTitle(0 . ' | Drupal', 'Page title is equal to 0.', 'Node');
+    // Test that 0 appears in the template <h1>.
+    $this->assertEqual(current($this->xpath('//h1')), 0, 'Node title is displayed as 0.', 'Node');
   }
 }