diff --git a/app/assets/javascripts/components/projects/ProjectBoard.jsx b/app/assets/javascripts/components/projects/ProjectBoard.jsx
index 9a04cba72..a5485c77a 100644
--- a/app/assets/javascripts/components/projects/ProjectBoard.jsx
+++ b/app/assets/javascripts/components/projects/ProjectBoard.jsx
@@ -168,7 +168,6 @@ export const ProjectBoard = ({
 
         <SideBar
           data-id="side-bar"
-          data-testid="sidebar-component"
           reverse={projectBoard.reverse}
           visibleColumns={projectBoard.visibleColumns}
           toggleColumn={toggleColumn}
@@ -179,7 +178,6 @@ export const ProjectBoard = ({
           notifications={notifications}
           onRemove={removeNotification}
           data-id="notifications"
-          data-testid="notifications-component"
         />
 
         <Columns
@@ -209,11 +207,7 @@ export const ProjectBoard = ({
             canClose
           >
             {history.status === historyStatus.LOADED ? (
-              <History
-                history={history.activities}
-                data-id="history"
-                data-testid="history-component"
-              />
+              <History history={history.activities} data-id="history" />
             ) : (
               <ProjectLoading data-id="project-loading" />
             )}
diff --git a/spec/javascripts/components/projects/project_board_spec.js b/spec/javascripts/components/projects/project_board_spec.js
index c28df3368..a27108361 100644
--- a/spec/javascripts/components/projects/project_board_spec.js
+++ b/spec/javascripts/components/projects/project_board_spec.js
@@ -111,7 +111,7 @@ describe('<ProjectBoard />', () => {
     });
 
     it('renders <SideBar />', () => {
-      const { getByTestId } = renderComponent({
+      const { container } = renderComponent({
         projectBoard: {
           isFetched: true,
           search: {
@@ -126,11 +126,11 @@ describe('<ProjectBoard />', () => {
         },
       });
 
-      expect(getByTestId('sidebar-component')).toBeInTheDocument();
+      expect(container.querySelector('.SideBar')).toBeInTheDocument();
     });
 
     it('render <Notifications />', () => {
-      const { getByTestId } = renderComponent({
+      const { container } = renderComponent({
         projectBoard: {
           isFetched: true,
           search: {
@@ -145,7 +145,7 @@ describe('<ProjectBoard />', () => {
         },
       });
 
-      expect(getByTestId('notifications-component')).toBeInTheDocument();
+      expect(container.querySelector('.Notifications')).toBeInTheDocument();
     });
 
     it('render <Columns />', () => {
@@ -198,9 +198,9 @@ describe('<ProjectBoard />', () => {
     });
 
     it('does not render history', () => {
-      const { queryByTestId } = renderComponent(props);
+      const { container } = renderComponent(props);
 
-      expect(queryByTestId('history-component')).not.toBeInTheDocument();
+      expect(container.querySelector('.History')).not.toBeInTheDocument();
     });
 
     it('renders loading', () => {
@@ -242,9 +242,9 @@ describe('<ProjectBoard />', () => {
     });
 
     it('renders history', () => {
-      const { getByTestId } = renderComponent(props);
+      const { container } = renderComponent(props);
 
-      expect(getByTestId('history-component')).toBeInTheDocument();
+      expect(container.querySelector('.History')).toBeInTheDocument();
     });
 
     it('does not render loading', () => {
@@ -286,9 +286,9 @@ describe('<ProjectBoard />', () => {
     });
 
     it('does not render history', () => {
-      const { queryByTestId } = renderComponent(props);
+      const { container } = renderComponent(props);
 
-      expect(queryByTestId('history-component')).not.toBeInTheDocument();
+      expect(container.querySelector('.History')).not.toBeInTheDocument();
     });
 
     it('does not render loading', () => {
@@ -330,9 +330,9 @@ describe('<ProjectBoard />', () => {
     });
 
     it('does not render history', () => {
-      const { queryByTestId } = renderComponent(props);
+      const { container } = renderComponent(props);
 
-      expect(queryByTestId('history-component')).not.toBeInTheDocument();
+      expect(container.querySelector('.History')).not.toBeInTheDocument();
     });
 
     it('renders loading', () => {