diff --git a/client/src/components/Header/components/NavLinks.js b/client/src/components/Header/components/NavLinks.js
index 3ec792a6c3..89397c4520 100644
--- a/client/src/components/Header/components/NavLinks.js
+++ b/client/src/components/Header/components/NavLinks.js
@@ -10,21 +10,18 @@ const propTypes = {
 function NavLinks({ displayMenu }) {
   return (
     <div className='main-nav-group'>
-      <ul
-        className={'nav-list' + (displayMenu ? ' display-flex' : '')}
-        role='menu'
-      >
-        <li className='nav-news' role='menuitem'>
+      <ul className={'nav-list' + (displayMenu ? ' display-flex' : '')}>
+        <li className='nav-news'>
           <Link external={true} sameTab={true} to='/news'>
             /news
           </Link>
         </li>
-        <li className='nav-forum' role='menuitem'>
+        <li className='nav-forum'>
           <Link external={true} sameTab={true} to='/forum'>
             /forum
           </Link>
         </li>
-        <li className='nav-projects' role='menuitem'>
+        <li className='nav-projects'>
           <Link to='/learn'>/learn</Link>
         </li>
       </ul>
diff --git a/client/src/components/search/searchBar/NoHitsSuggestion.js b/client/src/components/search/searchBar/NoHitsSuggestion.js
index 89a034edf5..67bee0e7aa 100644
--- a/client/src/components/search/searchBar/NoHitsSuggestion.js
+++ b/client/src/components/search/searchBar/NoHitsSuggestion.js
@@ -7,6 +7,7 @@ const NoHitsSuggestion = ({ title, handleMouseEnter, handleMouseLeave }) => {
       className={'no-hits-footer fcc_suggestion_item'}
       onMouseEnter={handleMouseEnter}
       onMouseLeave={handleMouseLeave}
+      role='region'
     >
       <span className='hit-name'>{title}</span>
     </div>
diff --git a/client/src/components/settings/DeleteModal.js b/client/src/components/settings/DeleteModal.js
index ec1335e12b..be55d0d279 100644
--- a/client/src/components/settings/DeleteModal.js
+++ b/client/src/components/settings/DeleteModal.js
@@ -17,7 +17,6 @@ function DeleteModal(props) {
   return (
     <Modal
       aria-labelledby='modal-title'
-      autoFocus={true}
       backdrop={true}
       bsSize='lg'
       className='text-center'
diff --git a/client/src/components/settings/ResetModal.js b/client/src/components/settings/ResetModal.js
index 6058224635..6f4ff5c5fe 100644
--- a/client/src/components/settings/ResetModal.js
+++ b/client/src/components/settings/ResetModal.js
@@ -15,7 +15,6 @@ function ResetModal(props) {
   return (
     <Modal
       aria-labelledby='modal-title'
-      autoFocus={true}
       backdrop={true}
       bsSize='lg'
       className='text-center'
diff --git a/client/src/templates/Challenges/components/Test-Suite.js b/client/src/templates/Challenges/components/Test-Suite.js
index feb6bd7c17..bf6a8bb0cb 100644
--- a/client/src/templates/Challenges/components/Test-Suite.js
+++ b/client/src/templates/Challenges/components/Test-Suite.js
@@ -37,7 +37,6 @@ function TestSuite({ tests }) {
             aria-label={getAccessibleText(err, pass, text)}
             className='test-result'
             key={text.slice(-6) + index}
-            tabIndex='0'
           >
             <div className='test-status-icon'>
               {isInitial ? <Initial /> : statusIcon}