diff --git a/markdown/markdown_test.go b/markdown/markdown_test.go
index 2478084..51ab081 100644
--- a/markdown/markdown_test.go
+++ b/markdown/markdown_test.go
@@ -66,7 +66,7 @@ func TestCompileMarkdownDropH1(t *testing.T) {
 
 	test := assert.New(t)
 
-	testcases, err := filepath.Glob("testdata/*.md")
+        testcases, err := filepath.Glob("testdata/*.md")
 	if err != nil {
 		panic(err)
 	}
@@ -76,7 +76,14 @@ func TestCompileMarkdownDropH1(t *testing.T) {
 		if err != nil {
 			panic(err)
 		}
-		markdown, htmlname, html := loadData(t, filename, "-droph1")
+		var variant string
+		switch filename {
+		case "testdata/quotes.md", "testdata/header.md":
+			variant = "-droph1"
+		default:
+			variant = ""
+		}
+		markdown, htmlname, html := loadData(t, filename, variant)
 		actual, _ := CompileMarkdown(markdown, lib, filename, "", 1.0, true, false)
 		test.EqualValues(string(html), actual, filename+" vs "+htmlname)
 	}
@@ -92,7 +99,7 @@ func TestCompileMarkdownStripNewlines(t *testing.T) {
 
 	test := assert.New(t)
 
-	testcases, err := filepath.Glob("testdata/*.md")
+        testcases, err := filepath.Glob("testdata/*.md")
 	if err != nil {
 		panic(err)
 	}
@@ -102,7 +109,15 @@ func TestCompileMarkdownStripNewlines(t *testing.T) {
 		if err != nil {
 			panic(err)
 		}
-		markdown, htmlname, html := loadData(t, filename, "-stripnewlines")
+		var variant string
+                switch filename {
+                case "testdata/quotes.md", "testdata/codes.md", "testdata/newlines.md", "testdata/macro-include.md":
+                        variant = "-stripnewlines"
+                default:
+                        variant = ""
+                }
+
+		markdown, htmlname, html := loadData(t, filename, variant)
 		actual, _ := CompileMarkdown(markdown, lib, filename, "", 1.0, false, true)
 		test.EqualValues(string(html), actual, filename+" vs "+htmlname)
 	}
diff --git a/testdata/codes-droph1.html b/testdata/codes-droph1.html
deleted file mode 100644
index 733410b..0000000
--- a/testdata/codes-droph1.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<p><code>inline</code></p>
-<ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[some code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code bash]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[with a newline
-]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code]]></ac:plain-text-body></ac:structured-macro><p>text
-text 2</p>
-<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code 2]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">sh</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[no-collapse-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[collapse-and-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">c</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:plain-text-body><![CDATA[collapse-no-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">nested</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code
-``` more code ```
-even more code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[indented code block
-with multiple lines]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="cloudscript-confluence-mermaid"><ac:parameter ac:name="showSource">true</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[graph TD;
-    A-->B;
-    A-->C;
-    B-->D;
-    C-->D;]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="cloudscript-confluence-mermaid"><ac:parameter ac:name="showSource">true</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">my mermaid graph</ac:parameter><ac:plain-text-body><![CDATA[graph TD;
-    A-->B;
-    A-->C;
-    B-->D;
-    C-->D;]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="cloudscript-confluence-mermaid"><ac:parameter ac:name="showSource">true</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">my mermaid graph</ac:parameter><ac:plain-text-body><![CDATA[graph TD;
-    A-->B;
-    A-->C;
-    B-->D;
-    C-->D;]]></ac:plain-text-body></ac:structured-macro>
\ No newline at end of file
diff --git a/testdata/header-stripnewlines.html b/testdata/header-stripnewlines.html
deleted file mode 100644
index 566c4ae..0000000
--- a/testdata/header-stripnewlines.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1 id="a">a</h1>
-<h2 id="b">b</h2>
-<h3 id="c">c</h3>
-<h4 id="d">d</h4>
-<h5 id="e">e</h5>
-<h1 id="f">f</h1>
-<h2 id="g">g</h2>
diff --git a/testdata/issue-64-broken-link-droph1.html b/testdata/issue-64-broken-link-droph1.html
deleted file mode 100644
index 0d39ce8..0000000
--- a/testdata/issue-64-broken-link-droph1.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a></p>
diff --git a/testdata/issue-64-broken-link-stripnewlines.html b/testdata/issue-64-broken-link-stripnewlines.html
deleted file mode 100644
index 0d39ce8..0000000
--- a/testdata/issue-64-broken-link-stripnewlines.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a></p>
diff --git a/testdata/links-droph1.html b/testdata/links-droph1.html
deleted file mode 100644
index d9ca603..0000000
--- a/testdata/links-droph1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<p>Use <a href="https://example.com">https://example.com</a></p>
-<p>Use <ac:rich-text-body>aaa</ac:rich-text-body></p>
-<p>Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link></p>
-<p><ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image></p>
-<p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
-<p><ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link></p>
-<p><ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link></p>
-<p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
-<p>Use <a href="foo">Link [Text]</a></p>
-<div class="footnotes" role="doc-endnotes">
-<hr />
-<ol>
-<li id="fn:1">
-<p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
-</li>
-</ol>
-</div>
diff --git a/testdata/links-stripnewlines.html b/testdata/links-stripnewlines.html
deleted file mode 100644
index d9ca603..0000000
--- a/testdata/links-stripnewlines.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<p>Use <a href="https://example.com">https://example.com</a></p>
-<p>Use <ac:rich-text-body>aaa</ac:rich-text-body></p>
-<p>Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
-<p>Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link></p>
-<p><ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image></p>
-<p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
-<p><ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link></p>
-<p><ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link></p>
-<p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
-<p>Use <a href="foo">Link [Text]</a></p>
-<div class="footnotes" role="doc-endnotes">
-<hr />
-<ol>
-<li id="fn:1">
-<p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
-</li>
-</ol>
-</div>
diff --git a/testdata/lists-droph1.html b/testdata/lists-droph1.html
deleted file mode 100644
index af27c54..0000000
--- a/testdata/lists-droph1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<ul>
-<li>dash 1-1</li>
-<li>dash 1-2</li>
-<li>dash 1-3
-<ul>
-<li>dash 1-3-1</li>
-<li>dash 1-3-2</li>
-<li>dash 1-3-3
-<ul>
-<li>dash 1-3-3-1</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<p>text</p>
-<ul>
-<li>a</li>
-<li>b</li>
-<li>c</li>
-</ul>
diff --git a/testdata/lists-stripnewlines.html b/testdata/lists-stripnewlines.html
deleted file mode 100644
index af27c54..0000000
--- a/testdata/lists-stripnewlines.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<ul>
-<li>dash 1-1</li>
-<li>dash 1-2</li>
-<li>dash 1-3
-<ul>
-<li>dash 1-3-1</li>
-<li>dash 1-3-2</li>
-<li>dash 1-3-3
-<ul>
-<li>dash 1-3-3-1</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<p>text</p>
-<ul>
-<li>a</li>
-<li>b</li>
-<li>c</li>
-</ul>
diff --git a/testdata/macro-include-droph1.html b/testdata/macro-include-droph1.html
deleted file mode 100644
index ccf5127..0000000
--- a/testdata/macro-include-droph1.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<foo>bar</foo>
-<ac:structured-macro ac:name="info">
-<ac:parameter ac:name="icon">true</ac:parameter>
-<ac:parameter ac:name="title">Attention</ac:parameter>
-<ac:rich-text-body>This is an info!</ac:rich-text-body>
-</ac:structured-macro>
-<ac:structured-macro ac:name="info">
-<ac:parameter ac:name="icon">true</ac:parameter>
-<ac:parameter ac:name="title">Attention</ac:parameter>
-<ac:rich-text-body>
-<table>
-<thead>
-<tr>
-<th>Header 1</th>
-<th>Header 2</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Cell A</td>
-<td>Cell B</td>
-</tr>
-</tbody>
-</table>
-</ac:rich-text-body>
-</ac:structured-macro>
diff --git a/testdata/newlines-droph1.html b/testdata/newlines-droph1.html
deleted file mode 100644
index b97e510..0000000
--- a/testdata/newlines-droph1.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<p>one-1
-one-2</p>
-<p>two-1</p>
-<p>two-2</p>
-<p>three-1</p>
-<p>three-2</p>
-<p>space-1
-space-2</p>
-<p>2space-1<br />
-2space-2</p>
diff --git a/testdata/pagelayout-droph1.html b/testdata/pagelayout-droph1.html
deleted file mode 100644
index a244202..0000000
--- a/testdata/pagelayout-droph1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<ac:layout>
-<ac:layout-section ac:type="three_with_sidebars">
-<ac:layout-cell>
-<p>More Content</p>
-</ac:layout-cell>
-<ac:layout-cell>
-<p>More Content</p>
-</ac:layout-cell>
-<ac:layout-cell>
-<p>Even More Content</p>
-</ac:layout-cell>
-</ac:layout-section>
-<ac:layout-section ac:type="single">
-<ac:layout-cell>
-<p>Still More Content</p>
-</ac:layout-cell>
-</ac:layout-section>
-</ac:layout>
diff --git a/testdata/pagelayout-stripnewlines.html b/testdata/pagelayout-stripnewlines.html
deleted file mode 100644
index a244202..0000000
--- a/testdata/pagelayout-stripnewlines.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<ac:layout>
-<ac:layout-section ac:type="three_with_sidebars">
-<ac:layout-cell>
-<p>More Content</p>
-</ac:layout-cell>
-<ac:layout-cell>
-<p>More Content</p>
-</ac:layout-cell>
-<ac:layout-cell>
-<p>Even More Content</p>
-</ac:layout-cell>
-</ac:layout-section>
-<ac:layout-section ac:type="single">
-<ac:layout-cell>
-<p>Still More Content</p>
-</ac:layout-cell>
-</ac:layout-section>
-</ac:layout>
diff --git a/testdata/table-droph1.html b/testdata/table-droph1.html
deleted file mode 100644
index 615d12e..0000000
--- a/testdata/table-droph1.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<table>
-<thead>
-<tr>
-<th>HEADER1</th>
-<th>HEADER2</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>row1</td>
-<td>row2</td>
-</tr>
-</tbody>
-</table>
-<table>
-<thead>
-<tr>
-<th style="text-align:center">HEADER1</th>
-<th style="text-align:right">HEADER2</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td style="text-align:center">row1</td>
-<td style="text-align:right">row2</td>
-</tr>
-</tbody>
-</table>
diff --git a/testdata/table-stripnewlines.html b/testdata/table-stripnewlines.html
deleted file mode 100644
index 615d12e..0000000
--- a/testdata/table-stripnewlines.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<table>
-<thead>
-<tr>
-<th>HEADER1</th>
-<th>HEADER2</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>row1</td>
-<td>row2</td>
-</tr>
-</tbody>
-</table>
-<table>
-<thead>
-<tr>
-<th style="text-align:center">HEADER1</th>
-<th style="text-align:right">HEADER2</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td style="text-align:center">row1</td>
-<td style="text-align:right">row2</td>
-</tr>
-</tbody>
-</table>
diff --git a/testdata/tags-droph1.html b/testdata/tags-droph1.html
deleted file mode 100644
index 7fd51c0..0000000
--- a/testdata/tags-droph1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<b>bold</b>
-<p><strong>bold</strong></p>
-<i>vitalik</i>
-<p><em>vitalik</em></p>
-<s>strikethrough</s>
-<p><del>strikethrough</del></p>
diff --git a/testdata/tags-stripnewlines.html b/testdata/tags-stripnewlines.html
deleted file mode 100644
index 7fd51c0..0000000
--- a/testdata/tags-stripnewlines.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<b>bold</b>
-<p><strong>bold</strong></p>
-<i>vitalik</i>
-<p><em>vitalik</em></p>
-<s>strikethrough</s>
-<p><del>strikethrough</del></p>