diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 96664335a..7688b51c3 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -119,9 +119,9 @@ When(/^I confirm the reporting dialog .*:$/, message => {
 })
 
 Given('somebody reported the following posts:', table => {
-  table.hashes().forEach(({ resourceId, reasonCategory, reasonDescription }) => {
+  table.hashes().forEach(({ submitterEmail, resourceId, reasonCategory, reasonDescription }) => {
     const submitter = {
-      email: `submitter${resourceId}@example.org`,
+      email: submitterEmail,
       password: '1234'
     }
     cy.factory()
diff --git a/cypress/integration/moderation/ReportContent.feature b/cypress/integration/moderation/ReportContent.feature
index 1d334325e..5701841cf 100644
--- a/cypress/integration/moderation/ReportContent.feature
+++ b/cypress/integration/moderation/ReportContent.feature
@@ -50,8 +50,8 @@ Feature: Report and Moderate
 
   Scenario: Review reported content
     Given somebody reported the following posts:
-      | resourceId | reasonCategory     | reasonDescription |
-      | p1         | discrimination-etc | Offensive content |
+      | submitterEmail           | resourceId | reasonCategory     | reasonDescription |
+      | p1.submitter@example.org | p1         | discrimination-etc | Offensive content |
     And I am logged in with a "moderator" role
     When I click on the avatar menu in the top right corner
     And I click on "Moderation"
@@ -60,8 +60,8 @@ Feature: Report and Moderate
 
   Scenario: Review reported posts of a user who's blocked a moderator
     Given somebody reported the following posts:
-      | resourceId | reasonCategory | reasonDescription |
-      | p2         | other          | Offensive content |
+      | submitterEmail           | resourceId | reasonCategory | reasonDescription |
+      | p2.submitter@example.org | p2         | other          | Offensive content |
     And my user account has the role "moderator"
     And there is an annoying user who has blocked me
     And I am logged in