diff --git a/client/src/components/SolutionViewer/project-modal.tsx b/client/src/components/SolutionViewer/project-modal.tsx
index a0ef853da1d..169bb9f2326 100644
--- a/client/src/components/SolutionViewer/project-modal.tsx
+++ b/client/src/components/SolutionViewer/project-modal.tsx
@@ -38,7 +38,12 @@ const ProjectModal = ({
         <SolutionViewer challengeFiles={challengeFiles} solution={solution} />
       </Modal.Body>
       <Modal.Footer>
-        <Button onClick={handleSolutionModalHide}>{t('buttons.close')}</Button>
+        <Button
+          data-cy='solution-viewer-close-btn'
+          onClick={handleSolutionModalHide}
+        >
+          {t('buttons.close')}
+        </Button>
       </Modal.Footer>
     </Modal>
   );
diff --git a/cypress/e2e/default/learn/challenges/projects.ts b/cypress/e2e/default/learn/challenges/projects.ts
index 61d258ca1bb..9b6c6efb217 100644
--- a/cypress/e2e/default/learn/challenges/projects.ts
+++ b/cypress/e2e/default/learn/challenges/projects.ts
@@ -147,7 +147,7 @@ describe('project submission', () => {
             // TODO: if we write a test to check that the solution is visible
             // before reloading, we should include that here.
             cy.contains('Solution for');
-            cy.contains('Close').click();
+            cy.get(`[data-cy="solution-viewer-close-btn"]`).click();
           });
 
           // Claim and view solutions on certification page