diff --git a/test/e2e/specs/01_install.js b/test/e2e/specs/01_install.js
index 929fb5d45..684ad7a30 100644
--- a/test/e2e/specs/01_install.js
+++ b/test/e2e/specs/01_install.js
@@ -12,6 +12,10 @@ module.exports = {
     done();
   },
 
+  after: (client) => {
+    client.end();
+  },
+
   'User goes to install': (client) => {
     const install = client.page.install();
 
@@ -86,7 +90,4 @@ module.exports = {
     install
       .expect.section('@step5').to.be.present;
   },
-  after: (client) => {
-    client.end();
-  }
 };
diff --git a/test/e2e/specs/02_admin.js b/test/e2e/specs/02_admin.js
index 5751ea1b9..5c921eab9 100644
--- a/test/e2e/specs/02_admin.js
+++ b/test/e2e/specs/02_admin.js
@@ -12,6 +12,10 @@ module.exports = {
     done();
   },
 
+  after: (client) => {
+    client.end();
+  },
+
   'Admin logs in': (client) => {
     const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;
@@ -36,8 +40,4 @@ module.exports = {
       .openDrawer()
         .goToCommunity();
   },
-
-  after: (client) => {
-    client.end();
-  }
 };
diff --git a/test/e2e/specs/03_embedStream.js b/test/e2e/specs/03_embedStream.js
index e29e063cf..567596dd2 100644
--- a/test/e2e/specs/03_embedStream.js
+++ b/test/e2e/specs/03_embedStream.js
@@ -12,6 +12,10 @@ module.exports = {
     done();
   },
 
+  after: (client) => {
+    client.end();
+  },
+
   'creates a new asset': (client) => {
     const asset = 'newAssetTest';
     const embedStream = client.page.embedStream();
@@ -105,7 +109,4 @@ module.exports = {
     profile
       .assert.visible('@notLoggedIn');
   },
-  after: (client) => {
-    client.end();
-  }
 };
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index e2234ec59..33454f3b9 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -11,6 +11,10 @@ module.exports = {
     done();
   },
 
+  after: (client) => {
+    client.end();
+  },
+
   'admin logs in': (client) => {
     const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;
@@ -105,7 +109,7 @@ module.exports = {
       .setValue('@suspendedAccountInput', `${user.username}_alternative`)
       .waitForElementVisible('@suspendedAccountSubmitButton')
       .click('@suspendedAccountSubmitButton')
-      .waitForElementVisible('@suspendedAccountInput');
+      .waitForElementNotPresent('@suspendedAccountInput');
   },
   'user should not be able to comment': (client) => {
     const embedStream = client.page.embedStream();
@@ -115,7 +119,4 @@ module.exports = {
       .waitForElementNotPresent('@commentBoxTextarea')
       .waitForElementNotPresent('@commentBoxPostButton');
   },
-  after: (client) => {
-    client.end();
-  }
 };
diff --git a/test/e2e/specs/05_banUser.js b/test/e2e/specs/05_banUser.js
index a9715c4bb..029957a48 100644
--- a/test/e2e/specs/05_banUser.js
+++ b/test/e2e/specs/05_banUser.js
@@ -11,6 +11,10 @@ module.exports = {
     done();
   },
 
+  after: (client) => {
+    client.end();
+  },
+
   'admin logs in': (client) => {
     const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;