diff --git a/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php b/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
new file mode 100644
index 00000000000..ee018ae7f63
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\Core\Theme;
+
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Confirms that certain Classy templates have identical equivalents in Stable.
+ *
+ * @group Theme
+ */
+class ClassyTemplatesIdenticalToStableTest extends UnitTestCase {
+
+  /**
+   * Confirms that certain Classy templates have equivalents in Stable.
+   *
+   * @dataProvider providerTestStableTemplatesIdenticalToClassy
+   *
+   * @param string $template
+   *   The template file to test.
+   */
+  public function testStableTemplatesIdenticalToClassy($template) {
+    $stable_template = $this->root . '/core/themes/stable/templates' . $template;
+    $classy_template = $this->root . '/core/themes/classy/templates' . $template;
+    $this->assertFileExists($stable_template);
+    $this->assertFileExists($classy_template);
+    $this->assertSame(md5_file($stable_template), md5_file($classy_template), 'The templates should have the same checksums.');
+  }
+
+  /**
+   * A list of the Classy templates that have identical copies in Stable.
+   */
+  public function providerTestStableTemplatesIdenticalToClassy() {
+    return [
+      ['/content-edit/file-upload-help.html.twig'],
+      ['/content-edit/file-widget-multiple.html.twig'],
+      ['/field/image-formatter.html.twig'],
+      ['/field/image-style.html.twig'],
+      ['/form/checkboxes.html.twig'],
+      ['/form/confirm-form.html.twig'],
+      ['/form/container.html.twig'],
+      ['/form/dropbutton-wrapper.html.twig'],
+      ['/form/field-multiple-value-form.html.twig'],
+      ['/form/form.html.twig'],
+      ['/form/form-element-label.html.twig'],
+      ['/form/input.html.twig'],
+      ['/form/select.html.twig'],
+      ['/navigation/links.html.twig'],
+      ['/navigation/menu-local-action.html.twig'],
+      ['/navigation/pager.html.twig'],
+      ['/navigation/vertical-tabs.html.twig'],
+      ['/views/views-view-grid.html.twig'],
+      ['/views/views-view-list.html.twig'],
+      ['/views/views-view-mapping-test.html.twig'],
+      ['/views/views-view-opml.html.twig'],
+      ['/views/views-view-row-opml.html.twig'],
+      ['/views/views-view-rss.html.twig'],
+      ['/views/views-view-unformatted.html.twig'],
+    ];
+  }
+
+}
diff --git a/core/themes/classy/templates/field/image-formatter.html.twig b/core/themes/classy/templates/field/image-formatter.html.twig
index 465118eec97..512d7588e0f 100644
--- a/core/themes/classy/templates/field/image-formatter.html.twig
+++ b/core/themes/classy/templates/field/image-formatter.html.twig
@@ -6,7 +6,6 @@
  * Available variables:
  * - image: A collection of image data.
  * - image_style: An optional image style.
- * - path: An optional array containing the link 'path' and link 'options'.
  * - url: An optional URL the image can be linked to.
  *
  * @see template_preprocess_image_formatter()
diff --git a/core/themes/stable/templates/form/field-multiple-value-form.html.twig b/core/themes/stable/templates/form/field-multiple-value-form.html.twig
index b82324c7afb..246ac41bfdc 100644
--- a/core/themes/stable/templates/form/field-multiple-value-form.html.twig
+++ b/core/themes/stable/templates/form/field-multiple-value-form.html.twig
@@ -19,7 +19,6 @@
  * @see template_preprocess_field_multiple_value_form()
  */
 #}
-
 {% if multiple %}
   {%
     set classes = [
diff --git a/core/themes/stable/templates/form/select.html.twig b/core/themes/stable/templates/form/select.html.twig
index 28c355b3cd6..9c8a97c0589 100644
--- a/core/themes/stable/templates/form/select.html.twig
+++ b/core/themes/stable/templates/form/select.html.twig
@@ -4,8 +4,8 @@
  * Theme override for a select element.
  *
  * Available variables:
- * - attributes: HTML attributes for the select tag.
- * - options: The option element children.
+ * - attributes: HTML attributes for the <select> tag.
+ * - options: The <option> element children.
  *
  * @see template_preprocess_select()
  */