diff --git a/pree2e.sh b/pree2e.sh
index 39c5f1297..e61bceb1f 100755
--- a/pree2e.sh
+++ b/pree2e.sh
@@ -2,4 +2,3 @@ node_modules/selenium-standalone/bin/selenium-standalone install
 export TALK_PORT=3011
 export TALK_MONGO_URL='mongodb://localhost/talk_test'
 npm start &
-wait 2
diff --git a/tests/e2e/tests/EmbedStreamTests.js b/tests/e2e/tests/EmbedStreamTests.js
index c974927e0..f4ed374da 100644
--- a/tests/e2e/tests/EmbedStreamTests.js
+++ b/tests/e2e/tests/EmbedStreamTests.js
@@ -4,12 +4,15 @@ module.exports = {
   '@tags': ['embed-stream', 'post'],
   'User posts a comment': client => {
     client.resizeWindow(1200, 800)
-    .url(`${client.globals.baseUrl}`)
+    .url(client.globals.baseUrl)
     .frame('coralStreamIframe')
     .waitForElementVisible('#commentBox', 1000)
     .setValue('#commentBox .coral-plugin-commentbox-textarea', comment)
     .click('#commentBox .coral-plugin-commentbox-button')
     .waitForElementVisible('.comment', 1000)
     .expect.element('.coral-plugin-comment').to.equal(comment);
+  },
+  after: client => {
+    client.end();
   }
 };