diff --git a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php b/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php
index d5dda7ae418f..b31decb5d054 100644
--- a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php
+++ b/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php
@@ -56,7 +56,7 @@ class BulkFormTest extends WebTestBase {
     $this->drupalGet('test_bulk_form');
 
     // Test that the views edit header appears first.
-    $first_form_element = $this->xpath('//form/div/div[1][@id = :id]', array(':id' => 'edit-header'));
+    $first_form_element = $this->xpath('//form/div[1][@id = :id]', array(':id' => 'edit-header'));
     $this->assertTrue($first_form_element, 'The views form edit header appears first.');
 
     $this->assertFieldById('edit-action', NULL, 'The action select field appears.');
diff --git a/core/modules/system/templates/form.html.twig b/core/modules/system/templates/form.html.twig
index b95fe71313c4..2cd1e95f2852 100644
--- a/core/modules/system/templates/form.html.twig
+++ b/core/modules/system/templates/form.html.twig
@@ -12,4 +12,6 @@
  * @ingroup themeable
  */
 #}
-<form{{ attributes }}><div>{{ children }}</div></form>
+<form{{ attributes }}>
+  {{ children }}
+</form>