diff --git a/client/cypress/integration/frontend/read-only/assignment-feedback-read-only.teacher.spec.js b/client/cypress/integration/frontend/read-only/assignment-feedback.teacher.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/assignment-feedback-read-only.teacher.spec.js
rename to client/cypress/integration/frontend/read-only/assignment-feedback.teacher.spec.js
diff --git a/client/cypress/integration/frontend/read-only/assignment-read-only.student.spec.js b/client/cypress/integration/frontend/read-only/assignment.student.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/assignment-read-only.student.spec.js
rename to client/cypress/integration/frontend/read-only/assignment.student.spec.js
diff --git a/client/cypress/integration/frontend/read-only/read-only-banner.spec.js b/client/cypress/integration/frontend/read-only/banner.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/read-only-banner.spec.js
rename to client/cypress/integration/frontend/read-only/banner.spec.js
diff --git a/client/cypress/integration/frontend/read-only/read-only-navigation.spec.js b/client/cypress/integration/frontend/read-only/navigation.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/read-only-navigation.spec.js
rename to client/cypress/integration/frontend/read-only/navigation.spec.js
diff --git a/client/cypress/integration/frontend/read-only/news-read-only.spec.js b/client/cypress/integration/frontend/read-only/news.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/news-read-only.spec.js
rename to client/cypress/integration/frontend/read-only/news.spec.js
diff --git a/client/cypress/integration/frontend/read-only/room-read-only.spec.js b/client/cypress/integration/frontend/read-only/room.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/room-read-only.spec.js
rename to client/cypress/integration/frontend/read-only/room.spec.js
diff --git a/client/cypress/integration/frontend/read-only/rooms-read-only.spec.js b/client/cypress/integration/frontend/read-only/rooms.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/rooms-read-only.spec.js
rename to client/cypress/integration/frontend/read-only/rooms.spec.js
diff --git a/client/cypress/integration/frontend/read-only/school-class-team-read-only.spec.js b/client/cypress/integration/frontend/read-only/school-class-team.spec.js
similarity index 100%
rename from client/cypress/integration/frontend/read-only/school-class-team-read-only.spec.js
rename to client/cypress/integration/frontend/read-only/school-class-team.spec.js
diff --git a/client/cypress/integration/frontend/snapshots.spec.js b/client/cypress/integration/frontend/snapshots.spec.js
index a93e8773..d820584d 100644
--- a/client/cypress/integration/frontend/snapshots.spec.js
+++ b/client/cypress/integration/frontend/snapshots.spec.js
@@ -1,12 +1,11 @@
 import getMe from '../../fixtures/me.minimal';
 import module from '../../fixtures/module.minimal';
 import mocks from '../../fixtures/mocks';
+import {getMinimalMe} from '../../support/helpers';
 
 const operations = isTeacher => ({
   operations: {
-    MeQuery: {
-      me: getMe(isTeacher),
-    },
+    MeQuery: getMinimalMe({isTeacher}),
     ModuleDetailsQuery: {
       module,
     },
diff --git a/client/cypress/support/helpers.js b/client/cypress/support/helpers.js
index 0ae46bc3..27532c28 100644
--- a/client/cypress/support/helpers.js
+++ b/client/cypress/support/helpers.js
@@ -1,10 +1,10 @@
 // todo: clean up this file
 
-export const getMinimalMe = ({readOnly, classReadOnly = false}) => ({
+export const getMinimalMe = ({readOnly = false, classReadOnly = false, isTeacher = true}) => ({
   me: {
     onboardingVisited: true,
     readOnly,
-    isTeacher: true,
+    isTeacher,
     selectedClass: {
       id: 'selectedClassId',
       readOnly: classReadOnly,