diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig
index bcd3364..f0c414d 100644
--- a/core/modules/toolbar/templates/toolbar.html.twig
+++ b/core/modules/toolbar/templates/toolbar.html.twig
@@ -22,24 +22,24 @@
  * @ingroup themeable
  */
 #}
-<nav{{ attributes }}>
-  <div{{ toolbar_attributes }}>
+<div{{ attributes }}>
+  <nav{{ toolbar_attributes }}>
     <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
     {% for tab in tabs %}
       <div{{ tab.attributes }}>{{ tab.link }}</div>
     {% endfor %}
-  </div>
+  </nav>
   {% for tray in trays %}
     {% spaceless %}
     <div{{ tray.attributes }}>
-      <div class="toolbar-lining clearfix">
+      <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
         {% if tray.label %}
           <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
         {% endif %}
         {{ tray.links }}
-      </div>
+      </nav>
     </div>
     {% endspaceless %}
   {% endfor %}
   {{ remainder }}
-</nav>
+</div>
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index d91527b..ca01faf 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -77,14 +77,17 @@ function toolbar_element_info() {
       // tests listing which produces a checkbox with attribute id="toolbar"
       'id' => 'toolbar-administration',
       'class' => array('toolbar'),
-      'role' => 'navigation',
+      'role' => 'group',
+      'aria-label' => t('Drupal toolbar'),
     ),
     // Metadata for the administration bar.
     '#bar' => array(
       '#heading' => t('Toolbar items'),
       '#attributes' => array(
         'id' => 'toolbar-bar',
-        'class' => array('toolbar-bar', 'clearfix'),
+        'class' => array('toolbar-bar', 'clearfix',),
+        'role' => 'navigation',
+        'aria-label' => t('Toolbar items'),
       ),
     ),
   );