diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index f498d272f..aa3b58ab5 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -58,6 +58,7 @@ module.exports = {
     suspendUserConfirmButton: '.talk-admin-suspend-user-dialog-confirm',
     supendUserSendButton: '.talk-admin-suspend-user-dialog-send',
     toast: '.toastify',
+    toastClose: '.toastify__close',
   },
   sections: {
     moderate: {
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index e70881c83..20f38c2c2 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -104,22 +104,27 @@ module.exports = {
       .waitForElementVisible('@supendUserSendButton')
       .click('@supendUserSendButton');
 
-    // Wating for animation to be over.
     adminPage
       .waitForElementVisible('@toast')
-      .waitForElementVisible('@settingsButton', 8000);
+      .waitForElementVisible('@toastClose')
+      .click('@toastClose');
 
   },
   'admin logs out': (client) => {
-    const comments = client.page.embedStream().section.comments;
+    const adminPage = client.page.admin();
 
-    comments
+    adminPage
       .logout();
   },
   'user logs in (2)': (client) => {
     const {testData: {user}} = client.globals;
+    const embedStream = client.page.embedStream();
     const comments = client.page.embedStream().section.comments;
 
+    embedStream
+      .navigate()
+      .ready();
+
     comments
       .openLoginPopup((popup) => popup.login(user));
   },