diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 7a45d10791bc..908f0b5eefd3 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1493,7 +1493,6 @@ function template_preprocess_feed_icon(&$variables) {
     '#height' => 16,
     '#alt' => $text,
   );
-  $variables['attributes']['class'] = array('feed-icon');
   // Stripping tags because that's what l() used to do.
   $variables['attributes']['title'] = strip_tags($text);
 }
diff --git a/core/modules/system/templates/feed-icon.html.twig b/core/modules/system/templates/feed-icon.html.twig
index a9e0f03c18a3..b3c10d1c749d 100644
--- a/core/modules/system/templates/feed-icon.html.twig
+++ b/core/modules/system/templates/feed-icon.html.twig
@@ -15,4 +15,4 @@
  * @ingroup themeable
  */
 #}
-<a href="{{ url }}"{{ attributes }}>{{ icon }}</a>
+<a href="{{ url }}"{{ attributes.addClass('feed-icon') }}>{{ icon }}</a>
diff --git a/core/modules/system/templates/status-messages.html.twig b/core/modules/system/templates/status-messages.html.twig
index 505eb2098602..f3fa61bd63f2 100644
--- a/core/modules/system/templates/status-messages.html.twig
+++ b/core/modules/system/templates/status-messages.html.twig
@@ -24,7 +24,13 @@
  */
 #}
 {% for type, messages in message_list %}
-  <div class="messages messages--{{ type }}" role="contentinfo" aria-label="{{ status_headings[type] }}">
+  {%
+    set classes = [
+      'messages',
+      'messages--' ~ type,
+    ]
+  %}
+  <div class="{{ attributes.addClass(classes).class }}" role="contentinfo" aria-label="{{ status_headings[type] }}">
     {% if type == 'error' %}
       <div role="alert">
     {% endif %}