diff --git a/org/html.go b/org/html.go
index 30aa1c1..66e5deb 100644
--- a/org/html.go
+++ b/org/html.go
@@ -34,7 +34,7 @@ var listTags = map[string][]string{
 func NewHTMLWriter() *HTMLWriter {
 	return &HTMLWriter{
 		HighlightCodeBlock: func(source, lang string) string {
-			return fmt.Sprintf(`<div class="highlight">%s<pre>%s</pre>%s</div>`, "\n", html.EscapeString(source), "\n")
+			return fmt.Sprintf("%s\n<pre>\n%s\n</pre>\n</div>", `<div class="highlight">`, html.EscapeString(source))
 		},
 	}
 }
diff --git a/org/testdata/blocks.html b/org/testdata/blocks.html
index b133760..3e2e69d 100644
--- a/org/testdata/blocks.html
+++ b/org/testdata/blocks.html
@@ -1,19 +1,23 @@
 <div class="captioned">
 <div class="highlight">
-<pre>echo &#34;a bash source block&#34;
+<pre>
+echo &#34;a bash source block&#34;
 
 function hello {
     echo Hello World!
 }
 
-hello</pre>
+hello
+</pre>
 </div>
 <p class="caption">
 block caption
 </p>
 </div>
 <div class="highlight">
-<pre>a source block without a language</pre>
+<pre>
+a source block without a language
+</pre>
 </div>
 <pre class="example">
 an example block with
diff --git a/org/testdata/captions.html b/org/testdata/captions.html
index b42b6bc..138f066 100644
--- a/org/testdata/captions.html
+++ b/org/testdata/captions.html
@@ -3,7 +3,9 @@ Anything can be captioned. Also captions are not real, correct captions but just
 </p>
 <div class="captioned">
 <div class="highlight">
-<pre>echo &#34;i have a caption!&#34;</pre>
+<pre>
+echo &#34;i have a caption!&#34;
+</pre>
 </div>
 <p class="caption">
 captioned soure block
diff --git a/org/testdata/footnotes.html b/org/testdata/footnotes.html
index 8d22415..c1eac09 100644
--- a/org/testdata/footnotes.html
+++ b/org/testdata/footnotes.html
@@ -41,7 +41,9 @@ and other elements
 like blocks
 </p>
 <div class="highlight">
-<pre>other non-plain</pre>
+<pre>
+other non-plain
+</pre>
 </div>
 </li>
 <li>
diff --git a/org/testdata/lists.html b/org/testdata/lists.html
index 7e3a968..c50f03f 100644
--- a/org/testdata/lists.html
+++ b/org/testdata/lists.html
@@ -49,7 +49,9 @@ and some lines of text
 and another subitem
 </p>
 <div class="highlight">
-<pre>echo with a block</pre>
+<pre>
+echo with a block
+</pre>
 </div>
 </li>
 <li>