diff --git a/client/src/components/Header/Header.test.js b/client/src/components/Header/Header.test.js
index d08b48b5ad..fb6ce97f0c 100644
--- a/client/src/components/Header/Header.test.js
+++ b/client/src/components/Header/Header.test.js
@@ -184,34 +184,37 @@ describe('<AuthOrProfile />', () => {
   });
 });
 
-const navigationLinks = (component, navItem) => {
-  return component.props.children[navItem].props;
+const navigationLinks = (component, key) => {
+  const target = component.props.children.find(
+    child => child && child.key === key
+  );
+  return target.props;
 };
 
 const profileNavItem = component => component.props.children;
 
 const hasDonateNavItem = component => {
-  const { children, to } = navigationLinks(component, 0);
+  const { children, to } = navigationLinks(component, 'donate');
   return children === 'buttons.donate' && to === '/donate';
 };
 
 const hasThanksForDonating = component => {
-  const { children } = navigationLinks(component, 0);
+  const { children } = navigationLinks(component, 'donate');
   return children[0].props.children === 'donate.thanks';
 };
 
 const hasSignInNavItem = component => {
-  const { children } = navigationLinks(component, 1);
+  const { children } = navigationLinks(component, 'signin');
   return children === 'buttons.sign-in';
 };
 
 const hasCurriculumNavItem = component => {
-  const { children, to } = navigationLinks(component, 2);
+  const { children, to } = navigationLinks(component, 'learn');
   return children === 'buttons.curriculum' && to === '/learn';
 };
 
 const hasProfileAndSettingsNavItems = (component, username) => {
-  const fragment = navigationLinks(component, 3);
+  const fragment = navigationLinks(component, 'profile-settings');
 
   const profile = fragment.children[0].props;
   const settings = fragment.children[1].props;
@@ -225,7 +228,7 @@ const hasProfileAndSettingsNavItems = (component, username) => {
 };
 
 const hasForumNavItem = component => {
-  const { children, to } = navigationLinks(component, 5);
+  const { children, to } = navigationLinks(component, 'forum');
   return (
     children[0].props.children === 'buttons.forum' &&
     to === 'https://forum.freecodecamp.org/'
@@ -233,7 +236,7 @@ const hasForumNavItem = component => {
 };
 
 const hasNewsNavItem = component => {
-  const { children, to } = navigationLinks(component, 6);
+  const { children, to } = navigationLinks(component, 'news');
   return (
     children[0].props.children === 'buttons.news' &&
     to === 'https://www.freecodecamp.org/news'
@@ -241,7 +244,7 @@ const hasNewsNavItem = component => {
 };
 
 const hasRadioNavItem = component => {
-  const { children, to } = navigationLinks(component, 7);
+  const { children, to } = navigationLinks(component, 'radio');
   return (
     children[0].props.children === 'buttons.radio' &&
     to === 'https://coderadio.freecodecamp.org'
@@ -249,7 +252,7 @@ const hasRadioNavItem = component => {
 };
 
 const hasSignOutNavItem = component => {
-  const { children } = navigationLinks(component, 12);
+  const { children } = navigationLinks(component, 'signout-frag');
   const signOutProps = children[1].props;
 
   return (
diff --git a/client/src/components/Header/components/NavLinks.js b/client/src/components/Header/components/NavLinks.js
index 9f2bcc224e..a288569be7 100644
--- a/client/src/components/Header/components/NavLinks.js
+++ b/client/src/components/Header/components/NavLinks.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
@@ -86,7 +86,7 @@ export class NavLinks extends Component {
           {t('buttons.curriculum')}
         </Link>
         {username && (
-          <>
+          <Fragment key='profile-settings'>
             <Link
               className='nav-link'
               key='profile'
@@ -103,7 +103,7 @@ export class NavLinks extends Component {
             >
               {t('buttons.settings')}
             </Link>
-          </>
+          </Fragment>
         )}
         <hr className='nav-line' />
         <Link
@@ -188,12 +188,16 @@ export class NavLinks extends Component {
           )
         )}
         {username && (
-          <>
+          <Fragment key='signout-frag'>
             <hr className='nav-line-2' />
-            <a className='nav-link' href={`${apiLocation}/signout`}>
+            <a
+              className='nav-link'
+              href={`${apiLocation}/signout`}
+              key='sign-out'
+            >
               {t('buttons.sign-out')}
             </a>
-          </>
+          </Fragment>
         )}
       </div>
     );