diff --git a/scripts/pree2e.sh b/scripts/pree2e.sh
index 4e12d7e9b..17da70f87 100755
--- a/scripts/pree2e.sh
+++ b/scripts/pree2e.sh
@@ -10,6 +10,6 @@ selenium-standalone install
 ./bin/cli-users create --flag_mode --email "moderator@test.com" --password "testtest" --name "ModeratorTestUser" --role "moderator"
 
 # Creating Commenter Test User
-./bin/cli-users create --flag_mode --email "commenter@test.com" --password "testtest" --name "commenter@test.com"
+./bin/cli-users create --flag_mode --email "commenter@test.com" --password "testtest" --name "CommenterTestUser"
 
 ./bin/cli -c .env-e2e serve --jobs &
diff --git a/tests/e2e/globals.js b/tests/e2e/globals.js
index 22ad3cb4b..0f73e1d4a 100644
--- a/tests/e2e/globals.js
+++ b/tests/e2e/globals.js
@@ -4,15 +4,15 @@ module.exports = {
   users: {
     admin: {
       email: 'admin@test.com',
-      pass: 'test'
+      pass: 'testtest'
     },
     moderator: {
       email: 'moderator@test.com',
-      pass: 'test'
+      pass: 'testtest'
     },
     commenter: {
       email: 'commenter@test.com',
-      pass: 'test'
+      pass: 'testtest'
     }
   },
 };
diff --git a/tests/e2e/tests/EmbedStreamTests.js b/tests/e2e/tests/EmbedStreamTests.js
index d572c2695..78c78680e 100644
--- a/tests/e2e/tests/EmbedStreamTests.js
+++ b/tests/e2e/tests/EmbedStreamTests.js
@@ -5,8 +5,8 @@ const mockComment = 'This is a test comment.';
 const mockReply = 'This is a test reply';
 const mockUser = {
   email: `${new Date().getTime()}@test.com`,
-  name: 'Test User',
-  pw: 'testtesttest'
+  name: 'testuser',
+  pw: 'testtest'
 };
 
 module.exports = {
diff --git a/tests/e2e/tests/Visitor/SignUpTest.js b/tests/e2e/tests/Visitor/SignUpTest.js
index 9399b47ca..d37823ebf 100644
--- a/tests/e2e/tests/Visitor/SignUpTest.js
+++ b/tests/e2e/tests/Visitor/SignUpTest.js
@@ -1,5 +1,3 @@
-const uuid = require('uuid');
-
 module.exports = {
   '@tags': ['signup', 'visitor'],
   before: client => {
@@ -14,8 +12,8 @@ module.exports = {
 
     embedStreamPage
       .signUp({
-        email: `visitor_${uuid.v4()}@test.com`,
-        displayName: 'Visitor',
+        email: `visitor_${Date.now()}@test.com`,
+        displayName: 'visitor',
         pass: 'testtest'
       });
   },