diff --git a/scripts/pree2e.sh b/scripts/pree2e.sh
index df093945b..2954fa193 100755
--- a/scripts/pree2e.sh
+++ b/scripts/pree2e.sh
@@ -10,4 +10,4 @@ selenium-standalone install
 { echo moderator@test.com; echo test; echo test; echo Moderator Test User; echo moderator;} | dotenv ./bin/cli-users create
 
 # Creating Commenter Test User
-{ echo commenter@test.com; echo test; echo test; echo Commenter Test User; echo '';} | dotenv ./bin/cli-users create
+{ echo commenter@test.com; echo test; echo test; echo Commenter Test User; echo ;} | dotenv ./bin/cli-users create
diff --git a/tests/e2e/pages/embedStreamPage.js b/tests/e2e/pages/embedStreamPage.js
index ad2c7275a..34bdad460 100644
--- a/tests/e2e/pages/embedStreamPage.js
+++ b/tests/e2e/pages/embedStreamPage.js
@@ -5,7 +5,7 @@ const embedStreamCommands = {
   },
   ready() {
     return this
-      .waitForElementVisible('body', 2000)
+      .waitForElementVisible('body', 4000)
       .waitForElementVisible('iframe#coralStreamIframe')
       .api.frame('coralStreamIframe');
   },
diff --git a/tests/e2e/tests/01_AppTest.js b/tests/e2e/tests/00_AppTest.js
similarity index 84%
rename from tests/e2e/tests/01_AppTest.js
rename to tests/e2e/tests/00_AppTest.js
index 491e952d7..0c2be896a 100644
--- a/tests/e2e/tests/01_AppTest.js
+++ b/tests/e2e/tests/00_AppTest.js
@@ -6,8 +6,5 @@ export default {
       .url(baseUrl)
       .assert.title('Coral Talk')
       .waitForElementPresent('body', 1000);
-  },
-  after: client => {
-    client.end();
   }
 };
diff --git a/tests/e2e/tests/01_EmbedStreamTest.js b/tests/e2e/tests/01_EmbedStreamTest.js
new file mode 100644
index 000000000..3b2a41192
--- /dev/null
+++ b/tests/e2e/tests/01_EmbedStreamTest.js
@@ -0,0 +1,44 @@
+export default {
+  '@tags': ['embedStream'],
+  before: client => {
+    const embedStreamPage = client.page.embedStreamPage();
+    embedStreamPage
+      .navigate()
+      .ready();
+  },
+  'Login as commenter': client => {
+    const embedStreamPage = client.page.embedStreamPage();
+    const {users} = client.globals;
+    embedStreamPage
+      .login(users.commenter);
+  },
+  'Add test comment': client => {
+    const embedStreamPage = client.page.embedStreamPage();
+    embedStreamPage
+      .postComment('Test Comment');
+  },
+  'Logout': client => {
+    const embedStreamPage = client.page.embedStreamPage();
+    embedStreamPage
+      .logout();
+  },
+  'Login as admin': client => {
+    const embedStreamPage = client.page.embedStreamPage();
+    const {users} = client.globals;
+    embedStreamPage
+      .login(users.admin);
+  },
+  'Approve test comment': client => {
+    const adminPage = client.page.adminPage();
+
+    adminPage
+      .navigate()
+      .ready();
+
+    adminPage
+      .approveComment();
+  },
+  after: client => {
+    client.end();
+  }
+};