diff --git a/tests/format/handlebars/block-statement/__snapshots__/jsfmt.spec.js.snap b/tests/format/handlebars/block-statement/__snapshots__/jsfmt.spec.js.snap
index 8894daaed253..9bdfcc4dfc57 100644
--- a/tests/format/handlebars/block-statement/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/format/handlebars/block-statement/__snapshots__/jsfmt.spec.js.snap
@@ -17,6 +17,10 @@ printWidth: 80
   Hello
 {{/block}}
 
+{{#block param param param param param param param param param param param hashKey=hashValue as |blockParam|}}
+  Hello
+{{/block}}
+
 {{#block param param param param param param param hashKey=HashValue hashKey=hashValue}}
   Hello
 {{/block}}
@@ -71,14 +75,7 @@ printWidth: 80
 }}{{/block}}
 
 {{#block
-  param
-  param
-  param
-  param
-  param
-  param
-  param
-  hashKey=hashValue
+  param param param param param param param hashKey=hashValue
   as |blockParam|
 }}
   Hello
@@ -92,26 +89,24 @@ printWidth: 80
   param
   param
   param
-  hashKey=HashValue
+  param
+  param
+  param
+  param
   hashKey=hashValue
+  as |blockParam|
 }}
   Hello
 {{/block}}
 
 {{#block
-  param
-  param
-  param
-  param
-  param
-  param
-  param
-  param
-  param
-  param
-  param
-  param
-  param
+  param param param param param param param hashKey=HashValue hashKey=hashValue
+}}
+  Hello
+{{/block}}
+
+{{#block
+  param param param param param param param param param param param param param
 }}
   Hello
 {{/block}}
@@ -286,12 +281,16 @@ printWidth: 80
   j
 {{/when}}
 
-{{#when abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst as |b|}}
+{{#when abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy as |b|}}
   {{b}}
-{{else when abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnop as |d|}}
+{{else when abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy as |d|}}
+  {{d}}
+{{/when}}
+
+{{#when abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz as |b|}}
+  {{b}}
+{{else when abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz as |d|}}
   {{d}}
-{{else when abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz as |f|}}
-  {{f}}
 {{/when}}
 
 =====================================output=====================================
@@ -415,19 +414,31 @@ printWidth: 80
 {{/when}}
 
 {{#when
-  abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst
+  abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy
   as |b|
 }}
   {{b}}
-{{else when abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnop
+{{else when
+  abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy
   as |d|
 }}
   {{d}}
+{{/when}}
+
+{{#when
+  abcdefghijklmnopqrstuvwxyz
+  abcdefghijklmnopqrstuvwxyz
+  abcdefghijklmnopqrstuvwxyz
+  as |b|
+}}
+  {{b}}
 {{else when
-  abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-  as |f|
+  abcdefghijklmnopqrstuvwxyz
+  abcdefghijklmnopqrstuvwxyz
+  abcdefghijklmnopqrstuvwxyz
+  as |d|
 }}
-  {{f}}
+  {{d}}
 {{/when}}
 ================================================================================
 `;
diff --git a/tests/format/handlebars/block-statement/block-statement.hbs b/tests/format/handlebars/block-statement/block-statement.hbs
index 78b7e47d7cc5..b050884afd40 100644
--- a/tests/format/handlebars/block-statement/block-statement.hbs
+++ b/tests/format/handlebars/block-statement/block-statement.hbs
@@ -9,6 +9,10 @@
   Hello
 {{/block}}
 
+{{#block param param param param param param param param param param param hashKey=hashValue as |blockParam|}}
+  Hello
+{{/block}}
+
 {{#block param param param param param param param hashKey=HashValue hashKey=hashValue}}
   Hello
 {{/block}}
diff --git a/tests/format/handlebars/block-statement/custom-else.hbs b/tests/format/handlebars/block-statement/custom-else.hbs
index 72580285e949..4462cba112f0 100644
--- a/tests/format/handlebars/block-statement/custom-else.hbs
+++ b/tests/format/handlebars/block-statement/custom-else.hbs
@@ -119,10 +119,14 @@
   j
 {{/when}}
 
-{{#when abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst as |b|}}
+{{#when abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy as |b|}}
   {{b}}
-{{else when abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnop as |d|}}
+{{else when abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy abcdefghijklmnopqrstuvwxy as |d|}}
+  {{d}}
+{{/when}}
+
+{{#when abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz as |b|}}
+  {{b}}
+{{else when abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz as |d|}}
   {{d}}
-{{else when abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz as |f|}}
-  {{f}}
 {{/when}}