diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 25f4c6e35..4bfc3c240 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -44,7 +44,7 @@ Given('I am logged in with a {string} role', role => {
 
 When('I click on "Report Post" from the content menu of the post', () => {
   cy.contains('.ds-card', davidIrvingPostTitle)
-    .find('.content-menu-trigger')
+    .find('.content-menu .base-button')
     .click({force: true})
 
   cy.get('.popover .ds-menu-item-link')
@@ -54,7 +54,7 @@ When('I click on "Report Post" from the content menu of the post', () => {
 
 When('I click on "Report User" from the content menu in the user info box', () => {
   cy.contains('.ds-card', davidIrvingPostTitle)
-    .get('.user-content-menu .content-menu-trigger')
+    .get('.user-content-menu .base-button')
     .click({ force: true })
 
   cy.get('.popover .ds-menu-item-link')
diff --git a/cypress/integration/common/settings.js b/cypress/integration/common/settings.js
index 563d6a733..e8e968a5e 100644
--- a/cypress/integration/common/settings.js
+++ b/cypress/integration/common/settings.js
@@ -119,7 +119,7 @@ Then('they should be able to see my social media links', () => {
 })
 
 When('I delete a social media link', () => {
-  cy.get("a[name='delete']")
+  cy.get(".base-button[title='Delete']")
     .click()
 })
 
@@ -129,7 +129,7 @@ Then('it gets deleted successfully', () => {
 })
 
 When('I start editing a social media link', () => {
-  cy.get("a[name='edit']")
+  cy.get(".base-button[title='Edit']")
     .click()
 })
 
diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js
index c51c863d1..8e08be2cf 100644
--- a/cypress/integration/common/steps.js
+++ b/cypress/integration/common/steps.js
@@ -243,7 +243,7 @@ When("I type in the following text:", text => {
 });
 
 Then("I select a category", () => {
-  cy.get("span")
+  cy.get(".base-button")
     .contains("Just for Fun")
     .click();
 });
@@ -449,7 +449,7 @@ When("I ", name => {
 When(
   "I click on {string} from the content menu in the user info box",
   button => {
-    cy.get(".user-content-menu .content-menu-trigger").click();
+    cy.get(".user-content-menu .base-button").click();
     cy.get(".popover .ds-menu-item-link")
       .contains(button)
       .click({