diff --git a/client/cypress/e2e/frontend/survey.spec.ts b/client/cypress/e2e/frontend/survey.spec.ts
index c26ba696..f9d4aa35 100644
--- a/client/cypress/e2e/frontend/survey.spec.ts
+++ b/client/cypress/e2e/frontend/survey.spec.ts
@@ -151,9 +151,9 @@ describe('Survey', () => {
   });
 
   it('should display a matrix correctly', () => {
-    // todo: fix bitbucket hickup and re-enable
-
     cy.visit('/survey/U3VydmV5Tm9kZTox');
+    cy.wait('@SurveyQuery');
+    cy.wait('@ModuleSolutions');
 
     cy.get('h1').should('contain', 'Titel Übung');
 
@@ -168,6 +168,8 @@ describe('Survey', () => {
     });
 
     cy.visit('/survey/U3VydmV5Tm9kZTox');
+    cy.wait('@SurveyQuery');
+    cy.wait('@ModuleSolutions');
     cy.get('#sv-nav-complete > .sv-action__content > .button').scrollIntoView().click();
     cy.get('.survey__panel-title').should('not.exist');
     cy.get('.survey__body > p').should('have.text', 'Sie haben die Übung abgeschlossen.');