diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 52cf45d5cf..bb9a77b9c1 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -111,7 +111,6 @@ public static function preRenderHtmlTag($element) {
     else {
       $suffix = $close_tag . "\n";
       @trigger_error('Addition of newline to HTML tags is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Set #suffix to "\\n" to keep the existing behaviour. See https://www.drupal.org/node/2742955', E_USER_DEPRECATED);
-
     }
     if (!empty($element['#noscript'])) {
       $prefix = '<noscript>' . $prefix;
diff --git a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
index 8d9432cdd0..5a79342762 100644
--- a/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
@@ -37,6 +37,23 @@ public function testPreRenderHtmlTag($element, $expected) {
     $this->assertEquals($expected, (string) $this->renderer->renderRoot($result));
   }
 
+  /**
+   * @covers ::preRenderHtmlTag
+   * @group legacy
+   */
+  public function testPreRenderHtmlTagNewLine() {
+    $element = [
+      '#tag' => 'br',
+      '#suffix' => '',
+    ];
+    $expected = '<br />';
+    $this->testPreRenderHtmlTag($element, $expected);
+    $this->expectDeprecation('Addition of newline to HTML tags is deprecated in drupal:10.2.0 and is removed from drupal:11.0.0. Set #suffix to "\\n" to keep the existing behaviour. See https://www.drupal.org/node/2742955');
+    unset($element['#suffix']);
+    $expected .= "\n";
+    $this->testPreRenderHtmlTag($element, $expected);
+  }
+
   /**
    * Data provider for preRenderHtmlTag test.
    */
@@ -47,6 +64,7 @@ public function providerPreRenderHtmlTag() {
     $element = [
       '#value' => 'value',
       '#tag' => 'p',
+      '#suffix' => "\n",
     ];
     $tags['value'] = [$element, '<p>value</p>' . "\n"];
 
@@ -54,24 +72,23 @@ public function providerPreRenderHtmlTag() {
     $element = [
       '#tag' => 'p',
       '#value' => NULL,
+      '#suffix' => "\n",
     ];
     $tags['no-value'] = [$element, "<p></p>\n"];
 
     // A void element.
     $element = [
       '#tag' => 'br',
+      '#suffix' => "\n",
     ];
     $tags['void-element'] = [$element, "<br />\n"];
 
-    // No new line option.
-    $element['#suffix'] = '';
-    $tags['void-element-nonewline'] = [$element, '<br />'];
-
     // Attributes.
     $element = [
       '#tag' => 'div',
       '#attributes' => ['class' => 'test', 'id' => 'id'],
       '#value' => 'value',
+      '#suffix' => "\n",
     ];
     $tags['attributes'] = [$element, '<div class="test" id="id">value</div>' . "\n"];
 
@@ -79,14 +96,11 @@ public function providerPreRenderHtmlTag() {
     $element['#noscript'] = TRUE;
     $tags['noscript'] = [$element, '<noscript><div class="test" id="id">value</div>' . "\n" . '</noscript>'];
 
-    // Combined with no new line option.
-    $element['#suffix'] = '';
-    $tags['noscript-nonewline'] = [$element, '<noscript><div class="test" id="id">value</div></noscript>'];
-
     // Ensure that #tag is sanitized.
     $element = [
       '#tag' => 'p><script>alert()</script><p',
       '#value' => 'value',
+      '#suffix' => "\n",
     ];
     $tags['sanitized-tag'] = [$element, "<p&gt;&lt;script&gt;alert()&lt;/script&gt;&lt;p>value</p&gt;&lt;script&gt;alert()&lt;/script&gt;&lt;p>\n"];
 
@@ -94,6 +108,7 @@ public function providerPreRenderHtmlTag() {
     $element = [
       '#tag' => 'p',
       '#value' => Markup::create('<script>value</script>'),
+      '#suffix' => "\n",
     ];
     $tags['value-safe'] = [$element, "<p><script>value</script></p>\n"];
 
@@ -101,6 +116,7 @@ public function providerPreRenderHtmlTag() {
     $element = [
       '#tag' => 'p',
       '#value' => '<script>value</script>',
+      '#suffix' => "\n",
     ];
     $tags['value-not-safe'] = [$element, "<p>value</p>\n"];
 
@@ -112,6 +128,7 @@ public function providerPreRenderHtmlTag() {
         ['#markup' => '<b>value1</b>'],
         ['#markup' => '<b>value2</b>'],
       ],
+      '#suffix' => "\n",
     ];
     $tags['nested'] = [$element, "<p><b>value1</b><b>value2</b></p>\n"];
 
@@ -124,6 +141,7 @@ public function providerPreRenderHtmlTag() {
         'x' => 5,
         'y' => 10,
       ],
+      '#suffix' => "\n",
     ];
     $tags['rect'] = [$element, '<rect width="25" height="25" x="5" y="10" />' . "\n"];
 
@@ -134,6 +152,7 @@ public function providerPreRenderHtmlTag() {
         'cy' => 100,
         'r' => 100,
       ],
+      '#suffix' => "\n",
     ];
     $tags['circle'] = [$element, '<circle cx="100" cy="100" r="100" />' . "\n"];
 
@@ -142,6 +161,7 @@ public function providerPreRenderHtmlTag() {
       '#attributes' => [
         'points' => '60,20 100,40 100,80 60,100 20,80 20,40',
       ],
+      '#suffix' => "\n",
     ];
     $tags['polygon'] = [$element, '<polygon points="60,20 100,40 100,80 60,100 20,80 20,40" />' . "\n"];
 
@@ -153,6 +173,7 @@ public function providerPreRenderHtmlTag() {
         'rx' => 50,
         'ry' => 25,
       ],
+      '#suffix' => "\n",
     ];
     $tags['ellipse'] = [$element, '<ellipse cx="60" cy="60" rx="50" ry="25" />' . "\n"];
 
@@ -164,6 +185,7 @@ public function providerPreRenderHtmlTag() {
         'width' => 50,
         'height' => 50,
       ],
+      '#suffix' => "\n",
     ];
     $tags['use'] = [$element, '<use x="50" y="10" width="50" height="50" />' . "\n"];
 
@@ -175,6 +197,7 @@ public function providerPreRenderHtmlTag() {
         'stroke' => 'black',
         'stroke-width' => 3,
       ],
+      '#suffix' => "\n",
     ];
     $tags['path'] = [$element, '<path d="M 100 100 L 300 100 L 200 300 z" fill="orange" stroke="black" stroke-width="3" />' . "\n"];
 
@@ -184,6 +207,7 @@ public function providerPreRenderHtmlTag() {
         'offset' => '5%',
         'stop-color' => '#F60',
       ],
+      '#suffix' => "\n",
     ];
     $tags['stop'] = [$element, '<stop offset="5%" stop-color="#F60" />' . "\n"];
 
@@ -198,6 +222,7 @@ public function providerPreRenderHtmlTag() {
           'offset' => '5%',
           'stop-color' => '#F60',
         ],
+        '#suffix' => "\n",
       ],
       [
         '#tag' => 'stop',
@@ -206,13 +231,16 @@ public function providerPreRenderHtmlTag() {
           'offset' => '95%',
           'stop-color' => '#FF6',
         ],
+        '#suffix' => "\n",
       ],
+      '#suffix' => "\n",
     ];
     $tags['linearGradient'] = [$element, '<linearGradient><stop offset="5%" stop-color="#F60" />' . "\n" . '<stop offset="95%" stop-color="#FF6" />' . "\n" . '</linearGradient>' . "\n"];
 
     // Simple link.
     $element = [
       '#tag' => 'link',
+      '#suffix' => "\n",
     ];
     $tags['link'] = [$element, '<link />' . "\n"];