diff --git a/core/includes/common.inc b/core/includes/common.inc
index 7fc52a5..2dc4fe1 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -2875,7 +2875,7 @@ function drupal_pre_render_html_tag($element) {
 
   // Construct a void element.
   if (in_array($element['#tag'], $void_elements)) {
-    $markup = '<' . $element['#tag'] . $attributes . ">\n";
+    $markup = '<' . $element['#tag'] . $attributes . " />\n";
   }
   // Construct all other elements.
   else {
diff --git a/core/modules/system/src/Tests/Common/CascadingStylesheetsTest.php b/core/modules/system/src/Tests/Common/CascadingStylesheetsTest.php
index 4537019..97b1fc6 100644
--- a/core/modules/system/src/Tests/Common/CascadingStylesheetsTest.php
+++ b/core/modules/system/src/Tests/Common/CascadingStylesheetsTest.php
@@ -78,7 +78,7 @@ function testRenderFile() {
     $this->assertTrue(strpos($styles, $css) > 0, 'Rendered CSS includes the added stylesheet.');
     // Verify that newlines are properly added inside style tags.
     $query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0';
-    $css_processed = '<link rel="stylesheet" href="' . check_plain(file_create_url($css)) . "?" . $query_string . '" media="all">';
+    $css_processed = '<link rel="stylesheet" href="' . check_plain(file_create_url($css)) . "?" . $query_string . '" media="all" />';
     $this->assertEqual(trim($styles), $css_processed, 'Rendered CSS includes newlines inside style tags for JavaScript use.');
   }
 
diff --git a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
index 2a2e6b2..3100410 100644
--- a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
+++ b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
@@ -100,7 +100,7 @@ function testHtmlTag() {
         'name' => 'description',
         'content' => 'Drupal test',
       ),
-    ), '<meta name="description" content="Drupal test">' . "\n", "#type 'html_tag', void element renders properly");
+    ), '<meta name="description" content="Drupal test" />' . "\n", "#type 'html_tag', void element renders properly");
 
     // Test non-void element.
     $this->assertElements(array(
@@ -118,7 +118,7 @@ function testHtmlTag() {
     $this->assertElements(array(
       '#type' => 'html_tag',
       '#tag' => 'link',
-    ), "<link>\n", "#type 'html_tag' empty void element renders properly");
+    ), "<link />\n", "#type 'html_tag' empty void element renders properly");
 
     // Test empty non-void element tag.
     $this->assertElements(array(