diff --git a/tests/features/bootstrap/VarbaseContext.php b/tests/features/bootstrap/VarbaseContext.php
index 87e9de76367b7a7bc2d143d81642cf8854524b66..78c749e5e8cf039a89c12e37b624f62d6b90d8cd 100644
--- a/tests/features/bootstrap/VarbaseContext.php
+++ b/tests/features/bootstrap/VarbaseContext.php
@@ -224,7 +224,7 @@ class VarbaseContext extends RawDrupalContext implements SnippetAcceptingContext
    * @throws \WebDriver\Exception
    *   If timeout is reached.
    */
-  public function iWaitMaxOfSecondsForThePageToBeReadyAndLoaded($time = 20000) {
+  public function iWaitMaxOfSecondsForThePageToBeReadyAndLoaded($time = 30000) {
     if (!$this->getSession()->getDriver() instanceof Selenium2Driver) {
       return;
     }
@@ -237,10 +237,14 @@ class VarbaseContext extends RawDrupalContext implements SnippetAcceptingContext
     "typeof $ != 'undefined'",
     // No ajax request is active.
     "!$.active",
+    // Page title
+    "$('.page-title').css('display') == 'block'",
+    // Page is displayed (no progress bar)
+    "$('.page').css('display') == 'block'",
     // Page is displayed (no progress bar)
     "$('#page').css('display') == 'block'",
     // Page is displayed (no progress bar)
-    "$('.main-container').css('display') == 'block'",
+    "$('#main-content').css('display') == 'block'",
     // Page is not loading (no black mask loading page)
     "$('.loading-mask').css('display') == 'none'",
     // Jstree has finished loading.
@@ -248,7 +252,7 @@ class VarbaseContext extends RawDrupalContext implements SnippetAcceptingContext
    ];
     $condition = implode(' && ', $conditions);
     // Make sure the AJAX calls are fired up before checking the condition.
-    $this->getSession()->wait(200, FALSE);
+    $this->getSession()->wait(10000, FALSE);
     $this->getSession()->wait($time, $condition);
     // Check if we reached the timeout unless the condition is false to explicitly wait the specified time.
     if ($condition !== FALSE && microtime(TRUE) > $end) {