diff --git a/e2e/integration/menu.e2e.ts b/e2e/integration/menu.e2e.ts
index 1258ac2e..b7413a18 100644
--- a/e2e/integration/menu.e2e.ts
+++ b/e2e/integration/menu.e2e.ts
@@ -14,13 +14,13 @@ describe('Menu', () => {
     cy
       .contains('h1', 'Introduction')
       .scrollIntoView()
-      .get('.menu-item.active:not(.-depth0)')
+      .get('[role=menuitem].active:not(.-depth0)')
       .should('have.text', 'Introduction');
 
     cy
       .contains('h2', 'Add a new pet to the store')
       .scrollIntoView()
-      .get('.menu-item.active:not(.-depth0)')
+      .get('[role=menuitem].active:not(.-depth0)')
       .should('have.length', 2)
       .last()
       .should('have.text', 'Add a new pet to the store')
@@ -29,23 +29,23 @@ describe('Menu', () => {
 
   // for some reason fails in cypress headless. Works fine in all browsers and cypress interactive
   xit('should update URL hash on clicking on menu items', function() {
-    cy.contains('.menu-item.-depth1', 'pet').click({ force: true });
+    cy.contains('[role=menuitem].-depth1', 'pet').click({ force: true });
     cy.location('hash').should('equal', '#tag/pet');
 
-    cy.contains('.menu-item', 'Find pet by ID').click({ force: true });
+    cy.contains('[role=menuitem]', 'Find pet by ID').click({ force: true });
     cy.location('hash').should('equal', '#operation/getPetById');
 
-    cy.contains('.menu-item', 'OpenAPI Specification').click({ force: true });
+    cy.contains('[role=menuitem]', 'OpenAPI Specification').click({ force: true });
     cy.location('hash').should('equal', '#section/OpenAPI-Specification');
   });
 
   it('should deactivate tag when other is activated', function() {
-    const petItem = () => cy.contains('.menu-item.-depth1', 'pet');
+    const petItem = () => cy.contains('[role=menuitem].-depth1', 'pet');
 
     petItem()
       .click({ force: true })
       .should('have.class', 'active');
-    cy.contains('.menu-item.-depth1', 'store').click({ force: true });
+    cy.contains('[role=menuitem].-depth1', 'store').click({ force: true });
     petItem().should('not.have.class', 'active');
   });
 });
diff --git a/src/components/SearchBox/SearchBox.tsx b/src/components/SearchBox/SearchBox.tsx
index 8a6b4a4f..ff5b00ae 100644
--- a/src/components/SearchBox/SearchBox.tsx
+++ b/src/components/SearchBox/SearchBox.tsx
@@ -123,7 +123,7 @@ export class SearchBox extends React.PureComponent<SearchBoxProps, SearchBoxStat
     results.sort((a, b) => b.score - a.score);
 
     return (
-      <SearchWrap>
+      <SearchWrap role="search">
         {this.state.term && <ClearIcon onClick={this.clear}>×</ClearIcon>}
         <SearchIcon />
         <SearchInput
@@ -134,7 +134,7 @@ export class SearchBox extends React.PureComponent<SearchBoxProps, SearchBoxStat
           onChange={this.search}
         />
         {results.length > 0 && (
-          <SearchResultsBox>
+          <SearchResultsBox data-role="search:results">
             {results.map((res, idx) => (
               <MenuItem
                 item={Object.create(res.item, {
@@ -145,6 +145,7 @@ export class SearchBox extends React.PureComponent<SearchBoxProps, SearchBoxStat
                 onActivate={this.props.onActivate}
                 withoutChildren={true}
                 key={res.item.id}
+                data-role="search:result"
               />
             ))}
           </SearchResultsBox>
diff --git a/src/components/SearchBox/elements.tsx b/src/components/SearchBox/elements.tsx
index a14e4607..23de176f 100644
--- a/src/components/SearchBox/elements.tsx
+++ b/src/components/SearchBox/elements.tsx
@@ -46,9 +46,7 @@ export const SearchIcon = styled((props: any) => (
   }
 `;
 
-export const SearchResultsBox = styled.div.attrs({
-  className: 'search-results',
-})`
+export const SearchResultsBox = styled.div`
   padding: ${props => props.theme.spacingUnit / 4}px 0;
   background-color: #ededed;
   min-height: 150px;
diff --git a/src/components/SideMenu/MenuItems.tsx b/src/components/SideMenu/MenuItems.tsx
index 9a004b60..16fa79ea 100644
--- a/src/components/SideMenu/MenuItems.tsx
+++ b/src/components/SideMenu/MenuItems.tsx
@@ -11,15 +11,20 @@ interface MenuItemsProps {
   active?: boolean;
   onActivate?: (item: IMenuItem) => void;
   style?: React.CSSProperties;
+  root?: boolean;
 }
 
 @observer
 export class MenuItems extends React.Component<MenuItemsProps> {
   render() {
-    const { items } = this.props;
+    const { items, root } = this.props;
     const active = this.props.active == null ? true : this.props.active;
     return (
-      <MenuItemUl style={this.props.style} active={active}>
+      <MenuItemUl
+        style={this.props.style}
+        active={active}
+        {...(root ? { role: 'navigation' } : {})}
+      >
         {items.map((item, idx) => (
           <MenuItem key={idx} item={item} onActivate={this.props.onActivate} />
         ))}
diff --git a/src/components/SideMenu/SideMenu.tsx b/src/components/SideMenu/SideMenu.tsx
index 1957484e..169c54f3 100644
--- a/src/components/SideMenu/SideMenu.tsx
+++ b/src/components/SideMenu/SideMenu.tsx
@@ -24,10 +24,11 @@ export class SideMenu extends React.Component<{ menu: MenuStore }> {
               }}
               items={store.items}
               onActivate={this.activate}
+              root={true}
             />
           ) : (
             <PerfectScrollbar updateFn={this.saveScrollUpdate}>
-              <MenuItems items={store.items} onActivate={this.activate} />
+              <MenuItems items={store.items} onActivate={this.activate} root={true} />
             </PerfectScrollbar>
           )
         }
diff --git a/src/components/SideMenu/styled.elements.ts b/src/components/SideMenu/styled.elements.ts
index de816a6f..a99584c6 100644
--- a/src/components/SideMenu/styled.elements.ts
+++ b/src/components/SideMenu/styled.elements.ts
@@ -115,8 +115,9 @@ export const MenuItemLabel = withProps<{
   active: boolean;
   deprecated?: boolean;
 }>(styled.label).attrs({
+  role: 'menuitem',
   className: props =>
-    classnames('menu-item', '-depth' + props.depth, {
+    classnames('-depth' + props.depth, {
       active: props.active,
     }),
 })`
@@ -137,9 +138,7 @@ export const MenuItemLabel = withProps<{
   }
 `;
 
-export const MenuItemTitle = withProps<{ width?: string }>(styled.span).attrs({
-  className: 'menu-item-title',
-})`
+export const MenuItemTitle = withProps<{ width?: string }>(styled.span)`
   display: inline-block;
   vertical-align: middle;
   width: ${props => (props.width ? props.width : 'auto')};