diff --git a/src/markup/engine/__tests__/remarkup/quoted-code-block.txt b/src/markup/engine/__tests__/remarkup/quoted-code-block.txt
--- a/src/markup/engine/__tests__/remarkup/quoted-code-block.txt
+++ b/src/markup/engine/__tests__/remarkup/quoted-code-block.txt
@@ -7,8 +7,8 @@
 ~~~~~~~~~~
 <blockquote><p>This should be a code block:</p>
 
-<div class="remarkup-code-block" data-code-lang="php" data-sigil="remarkup-code-block"><pre class="remarkup-code"><span class="o">&lt;?php
-</span><span class="nv">$foo</span> <span class="k">=</span> <span class="s">&#039;bar&#039;</span><span class="k">;</span></pre></div></blockquote>
+<div class="remarkup-code-block" data-code-lang="php" data-sigil="remarkup-code-block"><pre class="remarkup-code"><span class="o">&lt;?php</span>
+<span class="nv">$foo</span> <span class="k">=</span> <span class="s">&#039;bar&#039;</span><span class="k">;</span></pre></div></blockquote>
 ~~~~~~~~~~
 > This should be a code block:
 
diff --git a/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect b/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect
--- a/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect
+++ b/src/markup/syntax/highlighter/__tests__/xhpast/builtin-classname.expect
@@ -1,5 +1,5 @@
-<span class="o">&lt;?php
-</span>
+<span class="o">&lt;?php</span>
+
 <span class="k">class</span> <span data-symbol-name="C" class="nc">C</span> <span class="k">{</span>
   <span class="k">public</span> <span class="k">function</span> <span class="nx">f</span><span class="k">(</span><span class="k">)</span> <span class="k">{</span>
     <span data-symbol-name="D" class="nc">D</span><span class="k">::</span><span data-symbol-context="D" data-symbol-name="X" class="na">X</span><span class="k">;</span>
diff --git a/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect b/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect
--- a/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect
+++ b/src/markup/syntax/highlighter/__tests__/xhpast/multiline-token.expect
@@ -1,5 +1,5 @@
-<span class="o">&lt;?php
-</span>
+<span class="o">&lt;?php</span>
+
 <span class="c">/* this comment
 </span><span class="c">extends across
 </span><span class="c">multiple lines */</span>
diff --git a/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect b/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect
--- a/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect
+++ b/src/markup/syntax/highlighter/__tests__/xhpast/trailing-comment.expect
@@ -1,2 +1,2 @@
-<span class="o">&lt;?php
-</span><span class="c">// xyz</span>
\ No newline at end of file
+<span class="o">&lt;?php</span>
+<span class="c">// xyz</span>
\ No newline at end of file