diff --git a/core/themes/bartik/templates/page-title.html.twig b/core/themes/bartik/templates/page-title.html.twig
index 59d2e64..0e0d862 100644
--- a/core/themes/bartik/templates/page-title.html.twig
+++ b/core/themes/bartik/templates/page-title.html.twig
@@ -1,4 +1,4 @@
-{% extends "@system/page-title.html.twig" %}
+{% extends "@classy/content/page-title.html.twig" %}
 {#
 /**
  * @file
@@ -14,4 +14,4 @@
  * @ingroup themeable
  */
 #}
-{% set title_attributes = title_attributes.addClass('title', 'page-title') %}
+{% set title_attributes = title_attributes.addClass('title') %}
diff --git a/core/themes/seven/templates/page-title.html.twig b/core/themes/classy/templates/content/page-title.html.twig
similarity index 66%
rename from core/themes/seven/templates/page-title.html.twig
rename to core/themes/classy/templates/content/page-title.html.twig
index 75855b6..b9a992e 100644
--- a/core/themes/seven/templates/page-title.html.twig
+++ b/core/themes/classy/templates/content/page-title.html.twig
@@ -1,8 +1,7 @@
-{% extends "@system/page-title.html.twig" %}
 {#
 /**
  * @file
- * Seven's theme implementation for a page title.
+ * Theme override for page titles.
  *
  * Available variables:
  * - title_prefix: Additional output populated by modules, intended to be
@@ -11,7 +10,13 @@
  * - title_suffix: Additional output populated by modules, intended to be
  *   displayed after the main title tag that appears in the template.
  *
+ * @see template_preprocess_page_title()
+ *
  * @ingroup themeable
  */
 #}
-{% set title_attributes = title_attributes.addClass('page-title') %}
+{{ title_prefix }}
+{% if title %}
+  <h1{{ title_attributes.addClass('page-title') }}>{{ title }}</h1>
+{% endif %}
+{{ title_suffix }}