diff --git a/package.json b/package.json
index 4e1f97827..cb7d96920 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "events": "^1.0.2",
     "events-light": "^1.0.0",
     "he": "^1.1.0",
-    "htmljs-parser": "^2.3.1",
+    "htmljs-parser": "^2.3.2",
     "lasso-caching-fs": "^1.0.1",
     "lasso-modules-client": "^2.0.3",
     "lasso-package-root": "^1.0.1",
diff --git a/test/autotests/api/renderToString-callback-async/test.js b/test/autotests/api/renderToString-callback-async/test.js
index 0b0bf051d..1a3abff5e 100644
--- a/test/autotests/api/renderToString-callback-async/test.js
+++ b/test/autotests/api/renderToString-callback-async/test.js
@@ -3,8 +3,8 @@ var nodePath = require('path');
 exports.check = function(marko, markoCompiler, expect, done) {
     var template = marko.load(nodePath.join(__dirname, 'template.marko'));
     template.renderToString({ name: 'John' }, function(err, html) {
-        expect(html).to.equal('Hello John! [async]');
+        expect(html).to.equal('Hello John![async]');
         done();
     });
 
-};
\ No newline at end of file
+};
diff --git a/test/autotests/async-fragments-deprecated/async-fragment-timeout/expected.html b/test/autotests/async-fragments-deprecated/async-fragment-timeout/expected.html
index 8eb9990c8..162426696 100644
--- a/test/autotests/async-fragments-deprecated/async-fragment-timeout/expected.html
+++ b/test/autotests/async-fragments-deprecated/async-fragment-timeout/expected.html
@@ -1 +1 @@
-BEFORE 1-A timeout has occurred!2-A timeout has occurred!3-A timeout has occurred!4-A timeout has occurred! AFTER
\ No newline at end of file
+BEFORE1-A timeout has occurred!2-A timeout has occurred!3-A timeout has occurred!4-A timeout has occurred! AFTER
\ No newline at end of file
diff --git a/test/autotests/async-render/await-timeout/expected.html b/test/autotests/async-render/await-timeout/expected.html
index 8eb9990c8..162426696 100644
--- a/test/autotests/async-render/await-timeout/expected.html
+++ b/test/autotests/async-render/await-timeout/expected.html
@@ -1 +1 @@
-BEFORE 1-A timeout has occurred!2-A timeout has occurred!3-A timeout has occurred!4-A timeout has occurred! AFTER
\ No newline at end of file
+BEFORE1-A timeout has occurred!2-A timeout has occurred!3-A timeout has occurred!4-A timeout has occurred! AFTER
\ No newline at end of file
diff --git a/test/autotests/parser/scriptlet/expected.json b/test/autotests/parser/scriptlet/expected.json
index 9dbc01421..1267cae5d 100644
--- a/test/autotests/parser/scriptlet/expected.json
+++ b/test/autotests/parser/scriptlet/expected.json
@@ -1,53 +1,46 @@
 {
-  "type": "TemplateRoot",
-  "body": [
-    {
-      "type": "Scriptlet",
-      "code": " if (true) { ",
-      "tag": true
-    },
-    {
-      "type": "Text",
-      "argument": {
-        "type": "Literal",
-        "value": "\n    HELLO\n"
-      }
-    },
-    {
-      "type": "Scriptlet",
-      "code": " } ",
-      "tag": true
-    },
-    {
-      "type": "Text",
-      "argument": {
-        "type": "Literal",
-        "value": "\n"
-      }
-    },
-    {
-      "type": "Scriptlet",
-      "code": " if (false) { ",
-      "tag": true
-    },
-    {
-      "type": "Text",
-      "argument": {
-        "type": "Literal",
-        "value": "\n    WORLD\n"
-      }
-    },
-    {
-      "type": "Scriptlet",
-      "code": " } ",
-      "tag": true
-    },
-    {
-      "type": "Text",
-      "argument": {
-        "type": "Literal",
-        "value": "\n"
-      }
-    }
-  ]
-}
+    "type": "TemplateRoot",
+    "body": [
+        {
+            "type": "Scriptlet",
+            "code": " if (true) { ",
+            "tag": true
+        },
+        {
+            "type": "Text",
+            "argument": {
+                "type": "Literal",
+                "value": "\n    HELLO\n"
+            }
+        },
+        {
+            "type": "Scriptlet",
+            "code": " } ",
+            "tag": true
+        },
+        {
+            "type": "Text",
+            "argument": {
+                "type": "Literal",
+                "value": "\n"
+            }
+        },
+        {
+            "type": "Scriptlet",
+            "code": " if (false) { ",
+            "tag": true
+        },
+        {
+            "type": "Text",
+            "argument": {
+                "type": "Literal",
+                "value": "\n    WORLD\n"
+            }
+        },
+        {
+            "type": "Scriptlet",
+            "code": " } ",
+            "tag": true
+        }
+    ]
+}
\ No newline at end of file
diff --git a/test/autotests/render/circular-renderer/expected.html b/test/autotests/render/circular-renderer/expected.html
index 54d975a00..1dfdc54fb 100644
--- a/test/autotests/render/circular-renderer/expected.html
+++ b/test/autotests/render/circular-renderer/expected.html
@@ -1 +1 @@
-test-circular-renderer-a test-circular-renderer-b
\ No newline at end of file
+test-circular-renderer-atest-circular-renderer-b
\ No newline at end of file
diff --git a/test/autotests/render/circular-template/expected.html b/test/autotests/render/circular-template/expected.html
index aa3d40f06..e91928f1b 100644
--- a/test/autotests/render/circular-template/expected.html
+++ b/test/autotests/render/circular-template/expected.html
@@ -1 +1 @@
-test-circular-template-a test-circular-template-b
\ No newline at end of file
+test-circular-template-atest-circular-template-b
\ No newline at end of file
diff --git a/test/autotests/render/syntax-concise/expected.html b/test/autotests/render/syntax-concise/expected.html
index 196a01a53..ce75fcac2 100644
--- a/test/autotests/render/syntax-concise/expected.html
+++ b/test/autotests/render/syntax-concise/expected.html
@@ -1,4 +1,3 @@
 <!DOCTYPE html><html lang="en"><head><title>Marko Templating Engine</title></head><body><h1>Marko Templating Engine</h1><p>Marko is a <i>fast</i> and lightweight templating engine that compiles templates to CommonJS modules and supports streaming, async rendering and custom tags. It supports both a familiar HTML syntax and a concise, indentation-based syntax.</p><ul class="features"><li>async</li><li>streaming</li><li>custom-tags</li><li>readable</li><li>modules</li></ul><div>No colors!</div><div class="tabs"><ul><li>Tab 1</li><li>Tab 2</li></ul><div class="tab-content"><div class="tab">Body content for Tab 1</div><div class="tab">Body content for Tab 2</div></div></div><script type="text/javascript">if (foo) {
     alert('Marko is awesome!');
-}
-</script><ul><li><a class="nav-link active" href="/">Home</a></li><li><a class="nav-link" href="/docs">Docs</a></li><li><a class="nav-link" href="/blog">Blog</a></li></ul></body></html>
\ No newline at end of file
+}</script><ul><li><a class="nav-link active" href="/">Home</a></li><li><a class="nav-link" href="/docs">Docs</a></li><li><a class="nav-link" href="/blog">Blog</a></li></ul></body></html>
\ No newline at end of file