diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 1fd4e5db2e..cdd81b2ad7 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -41,7 +41,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 	foreach ( $menu as $key => $item ) {
 		$admin_is_parent = false;
 		$class = array();
-		$aria_attributes = 'tabindex="1" role="menuitem"';
+		$aria_attributes = 'tabindex="1"';
 
 		if ( $first ) {
 			$class[] = 'wp-first-item';
@@ -104,14 +104,14 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 		}
 
 		if ( ! empty( $submenu_items ) ) {
-			echo "\n\t<div class='wp-submenu' role='menu'><div class='wp-submenu-wrap'>";
+			echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
 			echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
 			$first = true;
 			foreach ( $submenu_items as $sub_key => $sub_item ) {
 				if ( ! current_user_can( $sub_item[1] ) )
 					continue;
 
-				$aria_attributes = 'tabindex="1" role="menuitem"';
+				$aria_attributes = 'tabindex="1"';
 				$class = array();
 				if ( $first ) {
 					$class[] = 'wp-first-item';
@@ -173,9 +173,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 ?>
 
 <div id="adminmenuback"></div>
-<div id="adminmenuwrap" role="navigation">
+<div id="adminmenuwrap">
 <div id="adminmenushadow"></div>
-<ul id="adminmenu" role="menu">
+<ul id="adminmenu" role="navigation">
 
 <?php
 
diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index 93e3299805..5eed3b4a01 100644
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -226,7 +226,7 @@ class WP_Admin_Bar {
 
 		?>
 		<div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
-			<div class="quicklinks" role="menubar">
+			<div class="quicklinks">
 				<?php foreach ( $this->get_node( 'root' )->children as $group ) {
 					$this->_render_group( $group, 'ab-top-menu' );
 				} ?>
@@ -263,7 +263,7 @@ class WP_Admin_Bar {
 			if ( ! empty( $node->meta['class'] ) )
 				$class .= ' ' . $node->meta['class'];
 
-			?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>" role="menu"><?php
+			?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>"><?php
 				foreach ( $node->children as $item ) {
 					$this->_render_item( $item );
 				}
@@ -271,7 +271,7 @@ class WP_Admin_Bar {
 
 		// Wrap the subgroups in a div and render each individual subgroup.
 		elseif ( ! $is_single_group ) :
-			?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container" role="menu"><?php
+			?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container"><?php
 				foreach ( $groups as $group ) {
 					$this->_render_group( $group, $class );
 				}
@@ -289,7 +289,7 @@ class WP_Admin_Bar {
 		$tabindex = isset( $node->meta['tabindex'] ) ? (int) $node->meta['tabindex'] : 10;
 
 		$menuclass = '';
-		$aria_attributes = 'tabindex="' . $tabindex . '" role="menuitem"';
+		$aria_attributes = 'tabindex="' . $tabindex . '"';
 
 		if ( $is_parent ) {
 			$menuclass = 'menupop';