diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 99e393cec..3cb6bd4fd 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -54,15 +54,19 @@ module.exports = {
     moderateNav: '.talk-admin-nav-moderate',
     settingsButton: '.talk-admin-header-settings-button',
     signOutButton: '.talk-admin-header-sign-out',
-    suspendUserDialog: '.talk-admin-suspend-user-dialog',
-    suspendUserDialogStep0: '.talk-admin-suspend-user-dialog-step-0',
-    suspendUserDialogStep1: '.talk-admin-suspend-user-dialog-step-1',
-    suspendUserConfirmButton: '.talk-admin-suspend-user-dialog-confirm',
-    supendUserSendButton: '.talk-admin-suspend-user-dialog-send',
     toast: '.toastify',
     toastClose: '.toastify__close',
   },
   sections: {
+    suspendUserDialog: {
+      selector: '.talk-admin-suspend-user-dialog',
+      elements: {
+        step0: '.talk-admin-suspend-user-dialog-step-0',
+        step1: '.talk-admin-suspend-user-dialog-step-1',
+        confirmButton: '.talk-admin-suspend-user-dialog-confirm',
+        sendButton: '.talk-admin-suspend-user-dialog-send',
+      }
+    },
     usernameDialog: {
       selector: '.talk-admin-reject-username-dialog',
       elements: {
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index b9491a6bb..dcba97a51 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -83,7 +83,7 @@ module.exports = {
   },
   'admin suspends user': (client) => {
     const adminPage = client.page.admin();
-    const {moderate, userDetailDrawer} = adminPage.section;
+    const {moderate, userDetailDrawer, suspendUserDialog} = adminPage.section;
 
     adminPage
       .navigate()
@@ -101,14 +101,13 @@ module.exports = {
       .waitForElementVisible('@actionItemSuspendUser')
       .click('@actionItemSuspendUser');
 
-    adminPage
-      .waitForElementVisible('@suspendUserDialog')
-      .waitForElementVisible('@suspendUserDialogStep0')
-      .waitForElementVisible('@suspendUserConfirmButton')
-      .click('@suspendUserConfirmButton')
-      .waitForElementVisible('@suspendUserDialogStep1')
-      .waitForElementVisible('@supendUserSendButton')
-      .click('@supendUserSendButton');
+    suspendUserDialog
+      .waitForElementVisible('@step0')
+      .waitForElementVisible('@confirmButton')
+      .click('@confirmButton')
+      .waitForElementVisible('@step1')
+      .waitForElementVisible('@sendButton')
+      .click('@sendButton');
 
     adminPage
       .waitForElementVisible('@toast')