diff --git a/cypress/integration/03.TagsAndCategories.feature b/cypress/integration/administration/TagsAndCategories.feature
similarity index 100%
rename from cypress/integration/03.TagsAndCategories.feature
rename to cypress/integration/administration/TagsAndCategories.feature
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index e3d3f3975..a35e638e0 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -39,10 +39,10 @@ Given('I am logged in with a {string} role', role => {
   })
 })
 
-When('I click on "Report Post" from the triple dot menu of the post', () => {
+When('I click on "Report Post" from the content menu of the post', () => {
   cy.contains('.ds-card', davidIrvingPostTitle)
     .find('.content-menu-trigger')
-    .click()
+    .click({force: true})
 
   cy.get('.popover .ds-menu-item-link')
     .contains('Report Post')
@@ -50,7 +50,7 @@ When('I click on "Report Post" from the triple dot menu of the post', () => {
 })
 
 When(
-  'I click on "Report User" from the triple dot menu in the user info box',
+  'I click on "Report User" from the content menu in the user info box',
   () => {
     cy.contains('.ds-card', davidIrvingName)
       .find('.content-menu-trigger')
diff --git a/cypress/integration/moderation/ReportContent.feature b/cypress/integration/moderation/ReportContent.feature
index 92271cbcb..52f7218d4 100644
--- a/cypress/integration/moderation/ReportContent.feature
+++ b/cypress/integration/moderation/ReportContent.feature
@@ -15,7 +15,7 @@ Feature: Report and Moderate
   Scenario Outline: Report a post from various pages
     Given I am logged in with a "user" role
     When I see David Irving's post on the <Page>
-    And I click on "Report Post" from the triple dot menu of the post
+    And I click on "Report Post" from the content menu of the post
     And I confirm the reporting dialog because it is a criminal act under German law:
     """
     Do you really want to report the contribution "The Truth about the Holocaust"?
@@ -33,7 +33,7 @@ Feature: Report and Moderate
     Given I am logged in with a "user" role
     And I see David Irving's post on the post page
     When I click on the author
-    And I click on "Report User" from the triple dot menu in the user info box
+    And I click on "Report User" from the content menu in the user info box
     And I confirm the reporting dialog because he is a holocaust denier:
     """
     Do you really want to report the user "David Irving"?