diff --git a/client/cypress/integration/current-module.spec.js b/client/cypress/integration/current-module.spec.js
index 75592e8a..73c77c5b 100644
--- a/client/cypress/integration/current-module.spec.js
+++ b/client/cypress/integration/current-module.spec.js
@@ -2,6 +2,8 @@ describe('Current Module', () => {
   it('is set correctly', () => {
     // cy.route('POST', '/api/graphql/').as('graphQL');
     cy.startGraphQLCapture();
+    cy.viewport('macbook-15');
+
     cy.login('nico.zickgraf', 'test');
     cy.visit('/module/lohn-und-budget');
 
diff --git a/client/cypress/integration/solutions.spec.js b/client/cypress/integration/solutions.spec.js
index 8d5e475b..bf6d9c97 100644
--- a/client/cypress/integration/solutions.spec.js
+++ b/client/cypress/integration/solutions.spec.js
@@ -19,6 +19,7 @@ describe('Solutions', () => {
     //   cy.wait('@graphQL');
     // });
     // cy.logout();
+    cy.viewport('macbook-15');
 
     cy.login('rahel.cueni', 'test');
     cy.visit('/module/lohn-und-budget');
diff --git a/client/src/components/HeaderBar.vue b/client/src/components/HeaderBar.vue
index 87cdd0cc..acafbe8d 100644
--- a/client/src/components/HeaderBar.vue
+++ b/client/src/components/HeaderBar.vue
@@ -1,7 +1,7 @@
 <template>
   <header class="header-bar">
     <top-navigation></top-navigation>
-    <router-link to="/" class="header-bar__logo"><logo></logo></router-link>
+    <router-link to="/" class="header-bar__logo" data-cy="home-link"><logo></logo></router-link>
     <div class="user-header">
       <user-widget v-bind="me"></user-widget>
       <logout-widget></logout-widget>
diff --git a/client/src/components/MobileHeader.vue b/client/src/components/MobileHeader.vue
index c4834894..46c1aeb0 100644
--- a/client/src/components/MobileHeader.vue
+++ b/client/src/components/MobileHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mobile-header">
-    <router-link to="/" data-cy="home-link">
+    <router-link to="/" data-cy="mobile-home-link">
       <logo></logo>
     </router-link>