diff --git a/test/index.js b/test/index.js
index 0a9e094b..cc7262b7 100644
--- a/test/index.js
+++ b/test/index.js
@@ -324,13 +324,13 @@ function fix(options) {
   // node fix.js
   var dir = __dirname + '/tests';
 
-  // fix unencoded quotes
   fs.readdirSync(dir).filter(function(file) {
     return path.extname(file) === '.html';
   }).forEach(function(file) {
     var file = path.join(dir, file)
       , html = fs.readFileSync(file, 'utf8');
 
+    // fix unencoded quotes
     html = html
       .replace(/='([^\n']*)'(?=[^<>\n]*>)/g, '=&__APOS__;$1&__APOS__;')
       .replace(/="([^\n"]*)"(?=[^<>\n]*>)/g, '=&__QUOT__;$1&__QUOT__;')
@@ -339,6 +339,21 @@ function fix(options) {
       .replace(/&__QUOT__;/g, '"')
       .replace(/&__APOS__;/g, '\'');
 
+    // add heading id's
+    html = html
+      .replace(/<(h[1-6])>([^<]+)<\/\1>/g, function(s, h, text) {
+        var id = text
+          .replace(/&#39;/g, '\'')
+          .replace(/&quot;/g, '"')
+          .replace(/&gt;/g, '>')
+          .replace(/&lt;/g, '<')
+          .replace(/&amp;/g, '&');
+
+        id = id.toLowerCase().replace(/\s/g, '-');
+
+        return '<' + h + ' id="' + id + '">' + text + '</' + h + '>';
+      });
+
     fs.writeFileSync(file, html);
   });
 
diff --git a/test/new/gfm_code_hr_list.html b/test/new/gfm_code_hr_list.html
index 783d84cd..9fbd0fb9 100644
--- a/test/new/gfm_code_hr_list.html
+++ b/test/new/gfm_code_hr_list.html
@@ -1,4 +1,4 @@
-<h2>foo</h2>
+<h2 id="foo">foo</h2>
 <ol>
 <li><p>bar:</p>
 <blockquote>
diff --git a/test/new/main.html b/test/new/main.html
index a1e20f6a..8f78c4d3 100644
--- a/test/new/main.html
+++ b/test/new/main.html
@@ -1,4 +1,4 @@
-<h1>A heading</h1> <p>Just a note, I&#39;ve found that I can&#39;t test my markdown parser vs others. For example, both markdown.js and showdown code blocks in lists wrong. They&#39;re  also completely <a href="http://google.com/" title="Google">inconsistent</a> with regards to paragraphs in list items.</p> <p>A link. Not anymore.</p> <aside>This will make me fail the test because
+<h1 id="a-heading">A heading</h1> <p>Just a note, I&#39;ve found that I can&#39;t test my markdown parser vs others. For example, both markdown.js and showdown code blocks in lists wrong. They&#39;re  also completely <a href="http://google.com/" title="Google">inconsistent</a> with regards to paragraphs in list items.</p> <p>A link. Not anymore.</p> <aside>This will make me fail the test because
 markdown.js doesnt acknowledge arbitrary html blocks =/</aside> <ul><li><p>List Item 1</p></li><li><p>List Item 2 </p><ul><li>New List Item 1 Hi, this is a list item.</li><li>New List Item 2 Another item <pre><code>Code goes here.
-Lots of it...</code></pre></li><li>New List Item 3 The last item</li></ul></li><li><p>List Item 3 The final item.</p></li><li><p>List Item 4 The real final item.</p></li></ul> <p>Paragraph.</p> <blockquote><ul><li>bq Item 1</li><li>bq Item 2 <ul><li>New bq Item 1</li><li>New bq Item 2 Text here</li></ul></li></ul></blockquote> <hr> <blockquote><p> Another blockquote!  I really need to get  more creative with  mockup text..  markdown.js breaks here again</p></blockquote> <h2>Another Heading</h2> <p>Hello <em>world</em>. Here is a <a href="//hello">link</a>. And an image <img src="src" alt="alt">.</p> <pre><code>Code goes here.
+Lots of it...</code></pre></li><li>New List Item 3 The last item</li></ul></li><li><p>List Item 3 The final item.</p></li><li><p>List Item 4 The real final item.</p></li></ul> <p>Paragraph.</p> <blockquote><ul><li>bq Item 1</li><li>bq Item 2 <ul><li>New bq Item 1</li><li>New bq Item 2 Text here</li></ul></li></ul></blockquote> <hr> <blockquote><p> Another blockquote!  I really need to get  more creative with  mockup text..  markdown.js breaks here again</p></blockquote> <h2 id="another-heading">Another Heading</h2> <p>Hello <em>world</em>. Here is a <a href="//hello">link</a>. And an image <img src="src" alt="alt">.</p> <pre><code>Code goes here.
 Lots of it...</code></pre>
diff --git a/test/new/toplevel_paragraphs.html b/test/new/toplevel_paragraphs.html
index 3faf7963..97d715e2 100644
--- a/test/new/toplevel_paragraphs.html
+++ b/test/new/toplevel_paragraphs.html
@@ -9,10 +9,10 @@
 <hr>
 
 <p>hello world</p>
-<h1>how are you</h1>
+<h1 id="how-are-you">how are you</h1>
 
 <p>hello world</p>
-<h1>how are you</h1>
+<h1 id="how-are-you">how are you</h1>
 
 <p>hello world</p>
 <blockquote><p>how are you</p></blockquote>