diff --git a/tests/features/bootstrap/VarbaseContext.php b/tests/features/bootstrap/VarbaseContext.php
index 99b9d151ebfea169efdefdb29c6775fd73a1a19d..416831d3eee1c40036a242cfae420942ecbb872a 100644
--- a/tests/features/bootstrap/VarbaseContext.php
+++ b/tests/features/bootstrap/VarbaseContext.php
@@ -84,8 +84,10 @@ class VarbaseContext extends RawDrupalContext implements SnippetAcceptingContext
         $this->logout();
       }
 
+      $this->getSession()->visit('/user/login');
       $page = $this->getSession()->getPage();
-      $this->getSession()->visit($this->locatePath('/user/login'));
+      $page->findField('edit-name');
+      $page->findField('edit-pass');
       $page->fillField('edit-name', $username);
       $page->fillField('edit-pass', $password);
       $submit = $page->findButton('op');
@@ -112,8 +114,10 @@ class VarbaseContext extends RawDrupalContext implements SnippetAcceptingContext
     }
 
     // Login with the.
+    $this->getSession()->visit('/user/login');
     $page = $this->getSession()->getPage();
-    $this->getSession()->visit($this->locatePath('/user/login'));
+    $page->findField('edit-name');
+    $page->findField('edit-pass');
     $page->fillField('edit-name', $username);
     $page->fillField('edit-pass', $password);
     $submit = $page->findButton('op');