diff --git a/core/includes/form.inc b/core/includes/form.inc
index 638f56c2573366add9827710af84cfdf89ef4327..886745683ce886717570b0147d0c812a71e249f0 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -2680,16 +2680,16 @@ function form_pre_render_color($element) {
 }
 
 /**
- * Returns HTML for a form.
+ * Prepares variables for form templates.
+ *
+ * Default template: form.html.twig.
  *
  * @param $variables
  *   An associative array containing:
  *   - element: An associative array containing the properties of the element.
  *     Properties used: #action, #method, #attributes, #children
- *
- * @ingroup themeable
  */
-function theme_form($variables) {
+function template_preprocess_form(&$variables) {
   $element = $variables['element'];
   if (isset($element['#action'])) {
     $element['#attributes']['action'] = UrlHelper::stripDangerousProtocols($element['#action']);
@@ -2698,8 +2698,8 @@ function theme_form($variables) {
   if (empty($element['#attributes']['accept-charset'])) {
     $element['#attributes']['accept-charset'] = "UTF-8";
   }
-  // Anonymous DIV to satisfy XHTML compliance.
-  return '<form' . new Attribute($element['#attributes']) . '><div>' . $element['#children'] . '</div></form>';
+  $variables['attributes'] = $element['#attributes'];
+  $variables['children'] = $element['#children'];
 }
 
 /**
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index cf9b88038a83cfc7ee62f25c105e14550ddba722..0787de70f8bd276614bd10910489c3b61ebd2e15 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2608,6 +2608,7 @@ function drupal_common_theme() {
     ),
     'form' => array(
       'render element' => 'element',
+      'template' => 'form',
     ),
     'textarea' => array(
       'render element' => 'element',
diff --git a/core/modules/system/templates/form.html.twig b/core/modules/system/templates/form.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..b95fe71313c4625af05d9726c2aced8b00131b3b
--- /dev/null
+++ b/core/modules/system/templates/form.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a 'form' element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The child elements of the form.
+ *
+ * @see template_preprocess_form()
+ *
+ * @ingroup themeable
+ */
+#}
+<form{{ attributes }}><div>{{ children }}</div></form>