diff --git a/modules/node/node.test b/modules/node/node.test
index 4ffc88e..81269e2 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1943,6 +1943,20 @@ 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>.
+    $xpath = '//h1[@id="page-title"]';
+    $this->assertEqual(trim(current($this->xpath($xpath))),
+      '0',
+      'Node title is displayed as 0.',
+      'Node');
   }
 }