diff --git a/client/cypress/integration/frontend/spellcheck.spec.js b/client/cypress/integration/frontend/spellcheck.spec.js
index e074a988..0d6befde 100644
--- a/client/cypress/integration/frontend/spellcheck.spec.js
+++ b/client/cypress/integration/frontend/spellcheck.spec.js
@@ -145,8 +145,8 @@ describe('Spellcheck', () => {
     cy.fakeLogin('rachel.green', 'test');
     cy.visit('/module/lohn-und-budget/');
 
-    cy.get('.spellcheck__correction').should('have.length', 0);
-    cy.get('.submission-form-container__spellcheck').click();
-    cy.get('.spellcheck__correction').should('have.length', 3);
+    cy.getByDataCy('spellcheck-correction').should('have.length', 0);
+    cy.getByDataCy('spellcheck-button').click();
+    cy.getByDataCy('spellcheck-correction').should('have.length', 3);
   });
 });
diff --git a/client/src/components/content-blocks/assignment/SpellCheck.vue b/client/src/components/content-blocks/assignment/SpellCheck.vue
index db2aec8f..e4b9d6ed 100644
--- a/client/src/components/content-blocks/assignment/SpellCheck.vue
+++ b/client/src/components/content-blocks/assignment/SpellCheck.vue
@@ -40,7 +40,7 @@
             if (part.correct) {
               return `${previous}${part.text}`;
             } else {
-              return `${previous}<span class="spellcheck__correction">${part.text}</span>`;
+              return `${previous}<span data-cy="spellcheck-correction" class="spellcheck__correction">${part.text}</span>`;
             }
           }, '');
       }
diff --git a/client/src/components/content-blocks/assignment/SubmissionForm.vue b/client/src/components/content-blocks/assignment/SubmissionForm.vue
index 46dbe087..3c4dcfc0 100644
--- a/client/src/components/content-blocks/assignment/SubmissionForm.vue
+++ b/client/src/components/content-blocks/assignment/SubmissionForm.vue
@@ -21,6 +21,7 @@
       </button>
       <button
         class="submission-form-container__submit submission-form-container__spellcheck button button--primary button--white-bg"
+        data-cy="spellcheck-button"
         v-if="showSpellcheckButton"
         @click="$emit('spellcheck')"
       >{{ spellcheckText }}