diff --git a/tests/e2e/pages/embedStreamPage.js b/tests/e2e/pages/embedStreamPage.js
index 34bdad460..57309c80c 100644
--- a/tests/e2e/pages/embedStreamPage.js
+++ b/tests/e2e/pages/embedStreamPage.js
@@ -54,7 +54,6 @@ const embedStreamCommands = {
   likeComment() {
     return this
       .waitForElementVisible('@likeButton')
-      .waitForElementVisible('@likesCount')
       .click('@likeButton');
   },
   flagComment() {
diff --git a/tests/e2e/tests/Commenter/LikeCommentTest.js b/tests/e2e/tests/Commenter/LikeCommentTest.js
index bdc429e8f..59e964969 100644
--- a/tests/e2e/tests/Commenter/LikeCommentTest.js
+++ b/tests/e2e/tests/Commenter/LikeCommentTest.js
@@ -16,6 +16,7 @@ module.exports = {
 
     embedStreamPage
       .likeComment()
+      .waitForElementVisible('@likesCount', 2000)
       .expect.element('@likeText').text.to.equal('Liked');
 
   },
diff --git a/tests/e2e/tests/Visitor/SignUpTest.js b/tests/e2e/tests/Visitor/SignUpTest.js
index c33ec4e5c..f980c40e4 100644
--- a/tests/e2e/tests/Visitor/SignUpTest.js
+++ b/tests/e2e/tests/Visitor/SignUpTest.js
@@ -9,10 +9,11 @@ export default {
   },
   'Visitor signs up': client => {
     const embedStreamPage = client.page.embedStreamPage();
+    const hash = Math.floor(Math.random() * (999 - 0));
 
     embedStreamPage
       .signUp({
-        email: 'visitor@test.com',
+        email: `visitor_${hash}@test.com`,
         displayName: 'Visitor',
         pass: 'testtest'
       });