diff --git a/tests/e2e/pages/embedStreamPage.js b/tests/e2e/pages/embedStreamPage.js
index 1eea4473d..0b0ec225c 100644
--- a/tests/e2e/pages/embedStreamPage.js
+++ b/tests/e2e/pages/embedStreamPage.js
@@ -43,32 +43,12 @@ const embedStreamCommands = {
   flagComment() {
     return this
       .waitForElementVisible('@flagButton')
-      .click('@flagButton')
-      .waitForElementVisible('@flagPopUp')
-      .waitForElementVisible('@flagCommentOption')
-      .click('@flagCommentOption')
-      .waitForElementVisible('@flagDoneButton')
-      .click('@flagDoneButton')
-      .waitForElementVisible('@flagOtherOption')
-      .click('@flagOtherOption')
-      .waitForElementVisible('@flagDoneButton')
-      .click('@flagDoneButton')
-      .click('@flagDoneButton');
+      .click('@flagButton');
   },
   flagUsername() {
     return this
       .waitForElementVisible('@flagButton')
-      .click('@flagButton')
-      .waitForElementVisible('@flagPopUp')
-      .waitForElementVisible('@flagUsernameOption')
-      .click('@flagUsernameOption')
-      .waitForElementVisible('@flagDoneButton')
-      .click('@flagDoneButton')
-      .waitForElementVisible('@flagOtherOption')
-      .click('@flagOtherOption')
-      .waitForElementVisible('@flagDoneButton')
-      .click('@flagDoneButton')
-      .click('@flagDoneButton');
+      .click('@flagButton');
   },
   getPermalink(fn) {
     return this
diff --git a/tests/e2e/tests/Commenter/FlagCommentTest.js b/tests/e2e/tests/Commenter/FlagCommentTest.js
index 4dc044e2f..0c93b22d1 100644
--- a/tests/e2e/tests/Commenter/FlagCommentTest.js
+++ b/tests/e2e/tests/Commenter/FlagCommentTest.js
@@ -16,6 +16,16 @@ export default {
 
     embedStreamPage
       .flagComment()
+      .waitForElementVisible('@flagPopUp')
+      .waitForElementVisible('@flagCommentOption')
+      .click('@flagCommentOption')
+      .waitForElementVisible('@flagDoneButton')
+      .click('@flagDoneButton')
+      .waitForElementVisible('@flagOtherOption')
+      .click('@flagOtherOption')
+      .waitForElementVisible('@flagDoneButton')
+      .click('@flagDoneButton')
+      .click('@flagDoneButton')
       .expect.element('@flagButtonText').text.to.equal('Reported');
   },
   after: client => {
diff --git a/tests/e2e/tests/Commenter/FlagUsernameTest.js b/tests/e2e/tests/Commenter/FlagUsernameTest.js
index b2d4343cd..c99bd772a 100644
--- a/tests/e2e/tests/Commenter/FlagUsernameTest.js
+++ b/tests/e2e/tests/Commenter/FlagUsernameTest.js
@@ -15,7 +15,17 @@ export default {
     const embedStreamPage = client.page.embedStreamPage();
 
     embedStreamPage
-      .flagUsername();
+      .flagUsername()
+      .waitForElementVisible('@flagPopUp')
+      .waitForElementVisible('@flagUsernameOption')
+      .click('@flagUsernameOption')
+      .waitForElementVisible('@flagDoneButton')
+      .click('@flagDoneButton')
+      .waitForElementVisible('@flagOtherOption')
+      .click('@flagOtherOption')
+      .waitForElementVisible('@flagDoneButton')
+      .click('@flagDoneButton')
+      .click('@flagDoneButton');
   },
   after: client => {
     client.end();
diff --git a/tests/e2e/tests/Commenter/SignUpTest.js b/tests/e2e/tests/Commenter/SignUpTest.js
deleted file mode 100644
index f8d74fec6..000000000
--- a/tests/e2e/tests/Commenter/SignUpTest.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  '@tags': ['sign-up'],
-  'Commenter Sign Up': () => {
-  }
-};