diff --git a/test/parser/samples/error-catch-before-closing/error.json b/test/parser/samples/error-catch-before-closing/error.json
index 6bc5ebc7fe..30fbf5fbd5 100644
--- a/test/parser/samples/error-catch-before-closing/error.json
+++ b/test/parser/samples/error-catch-before-closing/error.json
@@ -1,6 +1,6 @@
 {
-	"code": "unclosed-open-tag",
-	"message": "Expect to close {#each} block before {:catch} block",
-	"start": { "line": 3, "column": 9, "character": 44 },
-	"pos": 44
+	"code": "invalid-catch-placement",
+	"message": "Expected to close {#each} block before seeing {:catch} block",
+	"start": { "line": 3, "column": 7, "character": 41 },
+	"pos": 41
 }
diff --git a/test/parser/samples/error-else-before-closing-2/error.json b/test/parser/samples/error-else-before-closing-2/error.json
index c15b47bbb9..d35be1abf5 100644
--- a/test/parser/samples/error-else-before-closing-2/error.json
+++ b/test/parser/samples/error-else-before-closing-2/error.json
@@ -1,6 +1,6 @@
 {
-	"code": "unclosed-open-tag",
-	"message": "Expect to close {#await} block before {:else} block",
-	"start": { "line": 3, "column": 8, "character": 32 },
-	"pos": 32
+	"code": "invalid-else-placement",
+	"message": "Expected to close {#await} block before seeing {:else} block",
+	"start": { "line": 3, "column": 6, "character": 29 },
+	"pos": 29
 }
diff --git a/test/parser/samples/error-else-before-closing/error.json b/test/parser/samples/error-else-before-closing/error.json
index c3a8c74cf0..5b6e490c0f 100644
--- a/test/parser/samples/error-else-before-closing/error.json
+++ b/test/parser/samples/error-else-before-closing/error.json
@@ -1,6 +1,6 @@
 {
-	"code": "unclosed-open-tag",
-	"message": "Expect to close <li> tag before {:else} block",
-	"start": { "line": 3, "column": 8, "character": 26 },
-	"pos": 26
+	"code": "invalid-else-placement",
+	"message": "Expected to close <li> tag before seeing {:else} block",
+	"start": { "line": 3, "column": 6, "character": 23 },
+	"pos": 23
 }
diff --git a/test/parser/samples/error-else-if-before-closing-2/error.json b/test/parser/samples/error-else-if-before-closing-2/error.json
index 717d510442..e55f4f11e5 100644
--- a/test/parser/samples/error-else-if-before-closing-2/error.json
+++ b/test/parser/samples/error-else-if-before-closing-2/error.json
@@ -1,6 +1,6 @@
 {
-	"code": "unclosed-open-tag",
-	"message": "Expect to close <p> tag before {:else if ...} block",
-	"start": { "line": 3, "column": 11, "character": 28 },
-	"pos": 28
+	"code": "invalid-elseif-placement",
+	"message": "Expected to close <p> tag before seeing {:else if ...} block",
+	"start": { "line": 3, "column": 9, "character": 25 },
+	"pos": 25
 }
diff --git a/test/parser/samples/error-else-if-before-closing/error.json b/test/parser/samples/error-else-if-before-closing/error.json
index 3d9120fc0f..21d16c72a4 100644
--- a/test/parser/samples/error-else-if-before-closing/error.json
+++ b/test/parser/samples/error-else-if-before-closing/error.json
@@ -1,6 +1,6 @@
 {
-	"code": "unclosed-open-tag",
-	"message": "Expect to close {#await} block before {:else if ...} block",
-	"start": { "line": 3, "column": 11, "character": 37 },
-	"pos": 37
+	"code": "invalid-elseif-placement",
+	"message": "Expected to close {#await} block before seeing {:else if ...} block",
+	"start": { "line": 3, "column": 9, "character": 34 },
+	"pos": 34
 }
diff --git a/test/parser/samples/error-else-if-without-if/error.json b/test/parser/samples/error-else-if-without-if/error.json
index 1ff8aa45b8..dd69df6772 100644
--- a/test/parser/samples/error-else-if-without-if/error.json
+++ b/test/parser/samples/error-else-if-without-if/error.json
@@ -1,6 +1,6 @@
 {
 	"code": "invalid-elseif-placement",
 	"message": "Cannot have an {:else if ...} block outside an {#if ...} block",
-	"start": { "line": 3, "column": 11, "character": 36 },
-	"pos": 36
+	"start": { "line": 3, "column": 10, "character": 35 },
+	"pos": 35
 }
diff --git a/test/parser/samples/error-then-before-closing/error.json b/test/parser/samples/error-then-before-closing/error.json
index 22e08f2bd6..07310c93fa 100644
--- a/test/parser/samples/error-then-before-closing/error.json
+++ b/test/parser/samples/error-then-before-closing/error.json
@@ -1,6 +1,6 @@
 {
-	"code": "unclosed-open-tag",
-	"message": "Expect to close <li> tag before {:then} block",
-	"start": { "line": 3, "column": 8, "character": 29 },
-	"pos": 29
+	"code": "invalid-then-placement",
+	"message": "Expected to close <li> tag before seeing {:then} block",
+	"start": { "line": 3, "column": 6, "character": 26 },
+	"pos": 26
 }
diff --git a/test/parser/samples/no-error-if-before-closing/output.json b/test/parser/samples/no-error-if-before-closing/output.json
index 283feee4e5..ad8ccd0f91 100644
--- a/test/parser/samples/no-error-if-before-closing/output.json
+++ b/test/parser/samples/no-error-if-before-closing/output.json
@@ -17,7 +17,7 @@
 				},
 				"children": [
 					{
-						"start": 11,
+						"start": 12,
 						"end": 19,
 						"type": "Element",
 						"name": "input",
@@ -52,7 +52,7 @@
 				},
 				"children": [
 					{
-						"start": 46,
+						"start": 47,
 						"end": 51,
 						"type": "Element",
 						"name": "br",
@@ -94,13 +94,13 @@
 					"children": [
 						{
 							"start": 80,
-							"end": 81,
+							"end": 82,
 							"type": "Text",
-							"raw": "\n",
-							"data": "\n"
+							"raw": "\n\t",
+							"data": "\n\t"
 						},
 						{
-							"start": 81,
+							"start": 82,
 							"end": 89,
 							"type": "Element",
 							"name": "input",
@@ -167,13 +167,13 @@
 					"children": [
 						{
 							"start": 123,
-							"end": 124,
+							"end": 125,
 							"type": "Text",
-							"raw": "\n",
-							"data": "\n"
+							"raw": "\n\t",
+							"data": "\n\t"
 						},
 						{
-							"start": 124,
+							"start": 125,
 							"end": 129,
 							"type": "Element",
 							"name": "br",