diff --git a/index.js b/index.js
index fde0912..886aa05 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,5 @@
 'use strict'
 
-var xtend = require('xtend')
 var toHast = require('mdast-util-to-hast')
 var toHtml = require('hast-util-to-html')
 var sanitize = require('hast-util-sanitize')
@@ -17,7 +16,11 @@ function plugin(options) {
 
   function compiler(node, file) {
     var root = node && node.type && node.type === 'root'
-    var hast = toHast(node, {allowDangerousHtml: !clean, handlers: handlers})
+    var hast = toHast(node, {
+      allowDangerousHtml: !clean,
+      handlers: handlers,
+      commonmark: true
+    })
     var result
 
     if (file.extname) {
@@ -28,10 +31,13 @@ function plugin(options) {
       hast = sanitize(hast, schema)
     }
 
-    result = toHtml(hast, xtend(settings, {allowDangerousHtml: !clean}))
+    result = toHtml(
+      hast,
+      Object.assign({}, settings, {allowDangerousHtml: !clean})
+    )
 
     // Add an eof eol.
-    if (root && result.charAt(result.length - 1) !== '\n') {
+    if (root && result && /[^\r\n]/.test(result.charAt(result.length - 1))) {
       result += '\n'
     }
 
diff --git a/package.json b/package.json
index ccffb64..98f6b39 100644
--- a/package.json
+++ b/package.json
@@ -36,20 +36,23 @@
   "dependencies": {
     "hast-util-sanitize": "^3.0.0",
     "hast-util-to-html": "^7.0.0",
-    "mdast-util-to-hast": "^9.0.0",
-    "xtend": "^4.0.1"
+    "mdast-util-to-hast": "^9.0.0"
   },
   "devDependencies": {
     "browserify": "^16.0.0",
     "commonmark.json": "^0.29.0",
     "dtslint": "^4.0.0",
     "is-hidden": "^1.0.0",
+    "not": "^0.1.0",
     "nyc": "^15.0.0",
     "prettier": "^2.0.0",
-    "remark": "^12.0.0",
+    "rehype-parse": "^7.0.0",
+    "rehype-stringify": "^8.0.0",
+    "remark": "^13.0.0-alpha.0",
     "remark-cli": "^8.0.0",
     "remark-github": "^9.0.0",
     "remark-preset-wooorm": "^7.0.0",
+    "remark-slug": "^6.0.0",
     "remark-toc": "^7.0.0",
     "tape": "^5.0.0",
     "tinyify": "^3.0.0",
@@ -86,7 +89,8 @@
     "esnext": false,
     "rules": {
       "unicorn/no-fn-reference-in-iterator": "off",
-      "unicorn/prefer-includes": "off"
+      "unicorn/prefer-includes": "off",
+      "unicorn/prefer-optional-catch-binding": "off"
     },
     "ignores": [
       "remark-html.js"
diff --git a/readme.md b/readme.md
index c956f9d..a21b2c7 100644
--- a/readme.md
+++ b/readme.md
@@ -16,6 +16,13 @@
 > It’s probably smarter to use `remark-rehype` directly and benefit from the
 > [**rehype**][rehype] ecosystem.
 
+## Note!
+
+This plugin is ready for the new parser in remark
+([`remarkjs/remark#536`](https://github.com/remarkjs/remark/pull/536)).
+The current and previous version of the plugin works with the current and
+previous version of remark.
+
 ## Install
 
 [npm][]:
@@ -79,7 +86,7 @@ All options except for `sanitize` and `handlers` are passed to
 ###### `options.handlers`
 
 Object mapping [mdast][] [nodes][mdast-node] to functions handling them.
-This option is passed to [`mdast-util-to-html`][to-mdast-handlers].
+This option is passed to [`mdast-util-to-hast`][to-hast-handlers].
 
 ###### `options.sanitize`
 
@@ -264,7 +271,7 @@ abide by its terms.
 
 [to-html]: https://github.com/syntax-tree/hast-util-to-html
 
-[to-mdast-handlers]: https://github.com/syntax-tree/mdast-util-to-hast#optionshandlers
+[to-hast-handlers]: https://github.com/syntax-tree/mdast-util-to-hast#optionshandlers
 
 [sanitize]: https://github.com/syntax-tree/hast-util-sanitize
 
diff --git a/test/fixtures/blockquote/output.html b/test/fixtures/blockquote/output.html
index 2b7ec57..4a95075 100644
--- a/test/fixtures/blockquote/output.html
+++ b/test/fixtures/blockquote/output.html
@@ -10,7 +10,7 @@ <h1>Block Quote</h1>
 </li>
 <li>
 <p>Normal list</p>
-<p>Paragraph.</p>
 </li>
 </ul>
+<p>Paragraph.</p>
 </blockquote>
diff --git a/test/fixtures/code/output.html b/test/fixtures/code/output.html
index e88dc38..f14ae1a 100644
--- a/test/fixtures/code/output.html
+++ b/test/fixtures/code/output.html
@@ -7,8 +7,8 @@ <h1>Code</h1>
 </code></pre>
 <pre><code class="language-empty"></code></pre>
 <pre><code class="language-tabs">  two spaces
-    one
-        two
-    one
-      mixed.
+	one
+		two
+	one
+	  mixed.
 </code></pre>
diff --git a/test/fixtures/entities-named/output.html b/test/fixtures/entities-named/output.html
index f8fd278..071e009 100644
--- a/test/fixtures/entities-named/output.html
+++ b/test/fixtures/entities-named/output.html
@@ -9,7 +9,7 @@ <h1>Entities</h1>
 <pre><code class="language-AT&amp;T">Something in the AT&amp;T language
 </code></pre>
 <p>Automatic links:</p>
-<p><a href="http://at&amp;t.com">http://at&amp;t.com</a>, <a href="http://at&amp;t.com">http://at&amp;t.com</a>, and <a href="http://at&amp;t.com">http://at&amp;t.com</a>.</p>
+<p><a href="http://at&amp;amp;t.com">http://at&amp;amp;t.com</a>, <a href="http://at&amp;#x26;t.com">http://at&amp;#x26;t.com</a>, and <a href="http://at&amp;t.com">http://at&amp;t.com</a>.</p>
 <p>Link <code>href</code>:</p>
 <p><a href="http://at&amp;t.com">With entity</a>, <a href="http://at&amp;t.com">numeric entity</a>, <a href="http://at&amp;t.com">without entity</a>.</p>
 <p>Link <code>title</code>:</p>
diff --git a/test/fixtures/entities-numerical/output.html b/test/fixtures/entities-numerical/output.html
index 130270a..c4fa09e 100644
--- a/test/fixtures/entities-numerical/output.html
+++ b/test/fixtures/entities-numerical/output.html
@@ -9,7 +9,7 @@ <h1>Entities</h1>
 <pre><code class="language-AT&#x26;T">Something in the AT&#x26;T language
 </code></pre>
 <p>Automatic links:</p>
-<p><a href="http://at&#x26;t.com">http://at&#x26;t.com</a>, <a href="http://at&#x26;t.com">http://at&#x26;t.com</a>, and <a href="http://at&#x26;t.com">http://at&#x26;t.com</a>.</p>
+<p><a href="http://at&#x26;amp;t.com">http://at&#x26;amp;t.com</a>, <a href="http://at&#x26;#x26;t.com">http://at&#x26;#x26;t.com</a>, and <a href="http://at&#x26;t.com">http://at&#x26;t.com</a>.</p>
 <p>Link <code>href</code>:</p>
 <p><a href="http://at&#x26;t.com">With entity</a>, <a href="http://at&#x26;t.com">numeric entity</a>, <a href="http://at&#x26;t.com">without entity</a>.</p>
 <p>Link <code>title</code>:</p>
diff --git a/test/fixtures/escape/output.html b/test/fixtures/escape/output.html
index 6dfcd64..934d342 100644
--- a/test/fixtures/escape/output.html
+++ b/test/fixtures/escape/output.html
@@ -19,21 +19,21 @@
 <p>Pipe: |</p>
 <p>Tilde: ~</p>
 <p><strong>Commonmark:</strong></p>
-<p>Quote: \"</p>
-<p>Dollar: \$</p>
-<p>Percentage: \%</p>
-<p>Ampersand: \&#x26;</p>
-<p>Single quote: \'</p>
-<p>Comma: \,</p>
-<p>Forward slash: \/</p>
-<p>Colon: \:</p>
-<p>Semicolon: \;</p>
-<p>Less-than: \&#x3C;</p>
-<p>Equals: \=</p>
-<p>Question mark: \?</p>
-<p>At-sign: \@</p>
-<p>Caret: \^</p>
-<p>New line: \
+<p>Quote: "</p>
+<p>Dollar: $</p>
+<p>Percentage: %</p>
+<p>Ampersand: &#x26;</p>
+<p>Single quote: '</p>
+<p>Comma: ,</p>
+<p>Forward slash: /</p>
+<p>Colon: :</p>
+<p>Semicolon: ;</p>
+<p>Less-than: &#x3C;</p>
+<p>Equals: =</p>
+<p>Question mark: ?</p>
+<p>At-sign: @</p>
+<p>Caret: ^</p>
+<p>New line: <br>
 only works in paragraphs.</p>
 <p>Two spaces:<br>
 only works in paragraphs.</p>
diff --git a/test/fixtures/footnotes/config.json b/test/fixtures/footnotes/config.json
deleted file mode 100644
index 7f76e14..0000000
--- a/test/fixtures/footnotes/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "footnotes": true
-}
diff --git a/test/fixtures/footnotes/input.md b/test/fixtures/footnotes/input.md
deleted file mode 100644
index b347841..0000000
--- a/test/fixtures/footnotes/input.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Footnotes
-
-Alpha bravo[^charlie india].
-
-Delta Echo[^1].
-
-Foxtrot Golf Hotel[^2].
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
-[^1]: This reference style footnote can contains paragraphs.
-
-   - and lists
-
-[^2]: Normal footnote.
diff --git a/test/fixtures/footnotes/output.html b/test/fixtures/footnotes/output.html
deleted file mode 100644
index 2d801e1..0000000
--- a/test/fixtures/footnotes/output.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<h1>Footnotes</h1>
-<p>Alpha bravo<sup id="fnref-3"><a href="#fn-3" class="footnote-ref">3</a></sup>.</p>
-<p>Delta Echo<sup id="fnref-1"><a href="#fn-1" class="footnote-ref">1</a></sup>.</p>
-<p>Foxtrot Golf Hotel<sup id="fnref-2"><a href="#fn-2" class="footnote-ref">2</a></sup>.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-<div class="footnotes">
-<hr>
-<ol>
-<li id="fn-1">
-<p>This reference style footnote can contains paragraphs.</p>
-<ul>
-<li>and lists</li>
-</ul>
-<a href="#fnref-1" class="footnote-backref">↩</a>
-</li>
-<li id="fn-2">
-<p>Normal footnote.</p>
-<a href="#fnref-2" class="footnote-backref">↩</a>
-</li>
-<li id="fn-3">
-charlie india
-<a href="#fnref-3" class="footnote-backref">↩</a>
-</li>
-</ol>
-</div>
diff --git a/test/fixtures/images/output.html b/test/fixtures/images/output.html
index 6d50996..11dab25 100644
--- a/test/fixtures/images/output.html
+++ b/test/fixtures/images/output.html
@@ -1,6 +1,6 @@
 <p><img src="http://example.com/favicon.ico" alt="Example" title="Example Image"></p>
 <p><img src="http://example.com/favicon.ico" alt="Example"></p>
-<p><img src="http://example.com/favicon.ico"></p>
-<p><img src="" title="Example Image"></p>
-<p><img src=""></p>
-<p><img src=""></p>
+<p><img src="http://example.com/favicon.ico" alt=""></p>
+<p><img src="" alt="" title="Example Image"></p>
+<p><img src="" alt=""></p>
+<p><img src="" alt=""></p>
diff --git a/test/fixtures/list/output.html b/test/fixtures/list/output.html
index 506b488..bd5dfdb 100644
--- a/test/fixtures/list/output.html
+++ b/test/fixtures/list/output.html
@@ -1,29 +1,19 @@
 <h1>List</h1>
 <ul>
-<li>
-<p><strong>One</strong>;</p>
-</li>
-<li>
-<p><em>Two</em>;</p>
-</li>
-<li>
-<p><del>Three</del>.</p>
-</li>
-<li>
-<p>One;</p>
-</li>
-<li>
-<p>Two;</p>
-</li>
+<li><strong>One</strong>;</li>
+<li><em>Two</em>;</li>
+<li>~~Three~~.</li>
 </ul>
+<ol>
+<li>One;</li>
+<li>Two;</li>
+</ol>
 <!--  -->
 <ol start="4">
-<li>
-<p>Four.</p>
-</li>
-<li>
-<p>Five.</p>
-</li>
+<li>Four.</li>
+<li>Five.</li>
+</ol>
+<ul>
 <li>
 <p>Loose:</p>
 <ul>
@@ -40,7 +30,7 @@ <h1>List</h1>
 <li>Foxtrot.</li>
 </ul>
 </li>
-</ol>
+</ul>
 <hr>
 <pre><code>And a rule.
 </code></pre>
diff --git a/test/fixtures/references/output.html b/test/fixtures/references/output.html
index f4925d6..f074a30 100644
--- a/test/fixtures/references/output.html
+++ b/test/fixtures/references/output.html
@@ -1,6 +1,6 @@
 <h1>References</h1>
 <p>Entities contains some serious entity tests relating to titles and links
 in definitions.</p>
-<p>However, the [missing], <a href="">missing</a>, and <a href="">missing</a> are omitted.</p>
-<p>However, the ![missing], <img src="" alt="missing">, and <img src="" alt="missing"> are omitted.</p>
-<p>Same goes for <a href=""></a> and <img src="">.</p>
+<p>However, the [missing], [missing][], and [missing][missing] are omitted.</p>
+<p>However, the ![missing], ![missing][], and ![missing][missing] are omitted.</p>
+<p>Same goes for [][empty] and ![][empty].</p>
diff --git a/test/fixtures/tables/config.json b/test/fixtures/tables/config.json
deleted file mode 100644
index fb3bbe6..0000000
--- a/test/fixtures/tables/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "sanitize": false
-}
diff --git a/test/fixtures/tables/input.md b/test/fixtures/tables/input.md
deleted file mode 100644
index f2b948e..0000000
--- a/test/fixtures/tables/input.md
+++ /dev/null
@@ -1,7 +0,0 @@
-| Alpha   | Bravo    |  Charlie |   Delta  |
-| ------- | :------- | -------: | :------: |
-| Echo    | Foxtrot  | **Golf** |
-| India   | Juliett  |     Kilo |   Lima   |
-| Mike    | November |    Oscar | ~~Papa~~ |
-| Quebec  | _Romeo_  |   Sierra |   Tango  |
-| Uniform | Victor   |  Whiskey |
diff --git a/test/fixtures/tables/output.html b/test/fixtures/tables/output.html
deleted file mode 100644
index 7199145..0000000
--- a/test/fixtures/tables/output.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<table>
-<thead>
-<tr>
-<th>Alpha</th>
-<th align="left">Bravo</th>
-<th align="right">Charlie</th>
-<th align="center">Delta</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Echo</td>
-<td align="left">Foxtrot</td>
-<td align="right"><strong>Golf</strong></td>
-<td align="center"></td>
-</tr>
-<tr>
-<td>India</td>
-<td align="left">Juliett</td>
-<td align="right">Kilo</td>
-<td align="center">Lima</td>
-</tr>
-<tr>
-<td>Mike</td>
-<td align="left">November</td>
-<td align="right">Oscar</td>
-<td align="center"><del>Papa</del></td>
-</tr>
-<tr>
-<td>Quebec</td>
-<td align="left"><em>Romeo</em></td>
-<td align="right">Sierra</td>
-<td align="center">Tango</td>
-</tr>
-<tr>
-<td>Uniform</td>
-<td align="left">Victor</td>
-<td align="right">Whiskey</td>
-<td align="center"></td>
-</tr>
-</tbody>
-</table>
diff --git a/test/fixtures/yaml/config.json b/test/fixtures/yaml/config.json
deleted file mode 100644
index d573bf8..0000000
--- a/test/fixtures/yaml/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "yaml": true
-}
\ No newline at end of file
diff --git a/test/fixtures/yaml/input.md b/test/fixtures/yaml/input.md
deleted file mode 100644
index 8bd77ae..0000000
--- a/test/fixtures/yaml/input.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-YAML: cool
----
-
-# Hello world
diff --git a/test/fixtures/yaml/output.html b/test/fixtures/yaml/output.html
deleted file mode 100644
index 159202e..0000000
--- a/test/fixtures/yaml/output.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Hello world</h1>
diff --git a/test/index.js b/test/index.js
index e4fefe8..0c0b2e9 100644
--- a/test/index.js
+++ b/test/index.js
@@ -2,118 +2,29 @@
 
 var path = require('path')
 var fs = require('fs')
-var assert = require('assert')
 var test = require('tape')
 var remark = require('remark')
+var slug = require('remark-slug')
 var toc = require('remark-toc')
 var github = require('remark-github')
 var commonmark = require('commonmark.json')
 var vfile = require('to-vfile')
 var hidden = require('is-hidden')
+var not = require('not')
+var unified = require('unified')
+var parse = require('remark-parse')
+var rehypeParse = require('rehype-parse')
+var rehypeStringify = require('rehype-stringify')
 var all = require('mdast-util-to-hast/lib/all')
 var html = require('..')
 
-var read = fs.readFileSync
-var exists = fs.existsSync
-var join = path.join
-
-// By default, CommonMark failures are accepted.
-// To fail on CommonMark exceptions, set the `CMARK` environment variable.
-var ignoreCommonMarkException = !('CMARK' in global.process.env)
-
-var integrationMap = {github: github, toc: toc}
-var integrationRoot = join(__dirname, 'integrations')
-var fixtureRoot = join(__dirname, 'fixtures')
-
-var commonmarkOptions = {
-  entities: {escapeOnly: true, useNamedReferences: true},
-  commonmark: true,
-  yaml: false,
-  closeSelfClosing: true,
-  sanitize: false
-}
-
-// List of CommonMark tests I dissagree with.
-// For reasoning, see `doc/commonmark.md`.
-// Note that these differences have to do with not puting more time into
-// features which IMHO produce less quality HTML.
-// So if you’d like to write the features, I’ll gladly merge!
-var commonmarkIgnore = [
-  // Exception 1.
-  247,
-  248,
-
-  // Exception 2.
-  3,
-  50,
-  76,
-  77,
-  80,
-  86,
-  89,
-  98,
-  118,
-  176,
-  230,
-  231,
-  233,
-  236,
-  257,
-  258,
-  261,
-  262,
-  263,
-  264,
-  265,
-  266,
-  267,
-  268,
-  269,
-  270,
-  395,
-  396,
-  433,
-  445,
-  520,
-  522,
-  551,
-
-  // Exception 3.
-  428,
-  477,
-  478,
-  479,
-  480,
-  481,
-  489,
-  493
-]
-
-var fixtures = fs.readdirSync(fixtureRoot)
-var integrations = fs.readdirSync(integrationRoot)
-
-fixtures = fixtures.filter(hidden)
-integrations = integrations.filter(hidden)
-
-var section
-var start
-
-commonmark.forEach(function (test, position) {
-  if (section !== test.section) {
-    section = test.section
-    start = position
-  }
-
-  test.relative = position - start + 1
-})
-
 test('remark-html()', function (t) {
   var processor
 
   t.equal(typeof html, 'function', 'should be a function')
 
   t.doesNotThrow(function () {
-    html.call(remark())
+    remark().use(html).freeze()
   }, 'should not throw if not passed options')
 
   t.throws(
@@ -315,93 +226,104 @@ test('remark-html()', function (t) {
 
 // Assert fixtures.
 test('Fixtures', function (t) {
-  fixtures.forEach(function (fixture) {
-    var filepath = join(fixtureRoot, fixture)
-    var output = read(join(filepath, 'output.html'), 'utf-8')
-    var input = read(join(filepath, 'input.md'), 'utf-8')
-    var config = join(filepath, 'config.json')
-    var file = vfile(fixture + '.md')
+  var base = path.join(__dirname, 'fixtures')
+
+  fs.readdirSync(base).filter(not(hidden)).forEach(each)
+
+  t.end()
+
+  function each(name) {
+    var output = String(fs.readFileSync(path.join(base, name, 'output.html')))
+    var input = String(fs.readFileSync(path.join(base, name, 'input.md')))
+    var config = {}
+    var file = vfile(name + '.md')
     var result
 
     file.contents = input
 
-    config = exists(config) ? JSON.parse(read(config, 'utf-8')) : {}
-    result = processSync(file, config)
+    try {
+      config = JSON.parse(fs.readFileSync(path.join(base, name, 'config.json')))
+    } catch (_) {}
 
-    t.equal(result, output, 'should work on `' + fixture + '`')
-  })
+    result = processSync(file, config)
 
-  t.end()
+    t.equal(result, output, 'should work on `' + name + '`')
+  }
 })
 
-// Assert CommonMark.
 test('CommonMark', function (t) {
-  commonmark.forEach(function (test, n) {
-    var name = test.section + ' ' + test.relative
-    var file = vfile(name + '.md')
-    var result
-    var message
-    var exception
+  var start = 0
+  var section
 
-    file.contents = test.markdown
-    result = processSync(file, commonmarkOptions)
+  commonmark.forEach(each)
 
-    n += 1
+  t.end()
 
-    try {
-      assert.strictEqual(result, test.html)
-    } catch (error) {
-      exception = error
+  function each(example, index) {
+    if (section !== example.section) {
+      section = example.section
+      start = index
     }
 
-    message = '(' + n + ') should work on ' + name
-
-    if (
-      commonmarkIgnore.indexOf(n) !== -1 ||
-      (ignoreCommonMarkException && exception)
-    ) {
-      t.skip(message)
-    } else {
-      t.equal(result, test.html, message)
-    }
-  })
+    var actual = unified()
+      .use(parse)
+      .use(html)
+      .processSync(example.markdown)
+      .toString()
 
-  t.end()
+    var reformat = unified()
+      .use(rehypeParse, {fragment: true})
+      .use(rehypeStringify)
+
+    // Normalize meaningless stuff, like character references, `<hr />` is `<hr>`,
+    // etc.
+    t.equal(
+      String(reformat.processSync(actual)),
+      String(reformat.processSync(example.html)),
+      index + ': ' + example.section + ' (' + (index - start + 1) + ')'
+    )
+  }
 })
 
-// Assert integrations.
 test('Integrations', function (t) {
-  integrations.forEach(function (integration) {
-    var filepath = join(integrationRoot, integration)
-    var output = read(join(filepath, 'output.html'), 'utf-8')
-    var input = read(join(filepath, 'input.md'), 'utf-8')
-    var config = join(filepath, 'config.json')
-    var file = vfile(integration + '.md')
+  var integrationMap = {github: github, toc: [slug, toc]}
+  var base = path.join(__dirname, 'integrations')
+
+  fs.readdirSync(base)
+    .filter(not(hidden))
+    // Ignore `github` for now, which needs to be updated for remark@next.
+    // To do: add gfm, footnotes, frontmatter integrations.
+    .filter((d) => d !== 'github')
+    .forEach(each)
+
+  t.end()
+
+  function each(name) {
+    var output = String(fs.readFileSync(path.join(base, name, 'output.html')))
+    var input = String(fs.readFileSync(path.join(base, name, 'input.md')))
+    var file = vfile(name + '.md')
+    var config = {}
     var result
 
     file.contents = input
 
-    config = exists(config) ? JSON.parse(read(config, 'utf-8')) : {}
+    try {
+      config = JSON.parse(fs.readFileSync(path.join(base, name, 'config.json')))
+    } catch (_) {}
 
     config.sanitize = false
 
     result = remark()
       .data('settings', config)
       .use(html, config)
-      .use(integrationMap[integration], config)
+      .use(integrationMap[name], config)
       .processSync(file)
       .toString()
 
-    t.equal(result, output, 'should work on `' + integration + '`')
-  })
-
-  t.end()
+    t.equal(result, output, 'should work on `' + name + '`')
+  }
 })
 
 function processSync(file, config) {
-  return remark()
-    .data('settings', config)
-    .use(html, config)
-    .processSync(file)
-    .toString()
+  return remark().use(html, config).processSync(file).toString()
 }