diff --git a/ci/release/template/man/d2.1 b/ci/release/template/man/d2.1
index 1f86ecb6a..8cf1ce5e2 100644
--- a/ci/release/template/man/d2.1
+++ b/ci/release/template/man/d2.1
@@ -9,8 +9,8 @@
 .Op Fl -watch Ar false
 .Op Fl -theme Em 0
 .Ar file.d2
-.Op Ar file.svg 
-| 
+.Op Ar file.svg
+|
 .Op Ar file.png
 .Nm d2
 .Op Fl -watch Ar false
diff --git a/d2parser/parse_test.go b/d2parser/parse_test.go
index 0232cd28d..9c820e83e 100644
--- a/d2parser/parse_test.go
+++ b/d2parser/parse_test.go
@@ -158,17 +158,17 @@ meow.(x -> y -> z)[3].shape: "all hail corn"
 		{
 			name: "errs",
 			text: `
---: meow]]] 
-meow][: ok 
-ok: "dmsadmakls"    dsamkldkmsa   
- 
-s.shape: orochimaru       
-x.shape: dasdasdas       
+--: meow]]] ` + `
+meow][: ok ` + `
+ok: "dmsadmakls"    dsamkldkmsa   ` + `
+ ` + `
+s.shape: orochimaru       ` + `
+x.shape: dasdasdas       ` + `
 
 wow:
 
-: 
- 
+: ` + `
+ ` + `
 []
 
   {}
@@ -214,7 +214,7 @@ meow
 		{
 			name: "trailing_whitespace",
 			text: `
-s.shape: orochimaru       
+s.shape: orochimaru       ` + `
 `,
 		},
 		{
@@ -334,16 +334,16 @@ a: |   hello  |
 			name: "block_trailing_space",
 			text: `
 x: |
-	meow   
+	meow   ` + `
 |
-"""   hello    
+"""   hello    ` + `
 """
 `,
 		},
 		{
 			name: "block_edge_case",
 			text: `
-x: | meow   
+x: | meow   ` + `
   hello
 yes
 |
diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go
index 3c109f416..3b7661e20 100644
--- a/e2etests/stable_test.go
+++ b/e2etests/stable_test.go
@@ -932,7 +932,7 @@ x -> y: {
 			script: `
 markdown: {
   md: |md
-Lorem ipsum dolor sit amet, consectetur adipiscing elit,  
+Lorem ipsum dolor sit amet, consectetur adipiscing elit,  ` + `
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 |
 }