diff --git a/apps/advanced/backend/tests/acceptance/LoginCept.php b/apps/advanced/backend/tests/acceptance/LoginCept.php
index 873e5ab5ab..fddcf87f09 100644
--- a/apps/advanced/backend/tests/acceptance/LoginCept.php
+++ b/apps/advanced/backend/tests/acceptance/LoginCept.php
@@ -22,10 +22,11 @@ $I->see('Incorrect username or password.', '.help-block');
 $I->amGoingTo('try to login with correct credentials');
 $loginPage->login('erau', 'password_0');
 $I->expectTo('see that user is logged');
-$I->see('Logout (erau)', 'ul.nav li a');
-$I->dontSee('Login', 'ul.nav li a');
-$I->dontSee('Signup', 'ul.nav li a');
-// Uncomment if using WebDriver
-//$I->click('Logout (erau)', 'ul.nav li a');
-//$I->dontSee('Logout (erau)', 'ul.nav li a');
-//$I->see('Login', 'ul.nav li a');
+$I->seeLink('Logout (erau)');
+$I->dontSeeLink('Login');
+$I->dontSeeLink('Signup');
+/** Uncomment if using WebDriver
+ * $I->click('Logout (erau)');
+ * $I->dontSeeLink('Logout (erau)');
+ * $I->seeLink('Login');
+ */
diff --git a/apps/advanced/backend/tests/functional/LoginCept.php b/apps/advanced/backend/tests/functional/LoginCept.php
index 85a9d187e0..3c347b7c43 100644
--- a/apps/advanced/backend/tests/functional/LoginCept.php
+++ b/apps/advanced/backend/tests/functional/LoginCept.php
@@ -22,6 +22,6 @@ $I->see('Incorrect username or password.', '.help-block');
 $I->amGoingTo('try to login with correct credentials');
 $loginPage->login('erau', 'password_0');
 $I->expectTo('see that user is logged');
-$I->see('Logout (erau)', 'ul.nav li a');
-$I->dontSee('Login', 'ul.nav li a');
-$I->dontSee('Signup', 'ul.nav li a');
+$I->seeLink('Logout (erau)');
+$I->dontSeeLink('Login');
+$I->dontSeeLink('Signup');
diff --git a/apps/advanced/frontend/tests/acceptance/LoginCept.php b/apps/advanced/frontend/tests/acceptance/LoginCept.php
index 873e5ab5ab..fddcf87f09 100644
--- a/apps/advanced/frontend/tests/acceptance/LoginCept.php
+++ b/apps/advanced/frontend/tests/acceptance/LoginCept.php
@@ -22,10 +22,11 @@ $I->see('Incorrect username or password.', '.help-block');
 $I->amGoingTo('try to login with correct credentials');
 $loginPage->login('erau', 'password_0');
 $I->expectTo('see that user is logged');
-$I->see('Logout (erau)', 'ul.nav li a');
-$I->dontSee('Login', 'ul.nav li a');
-$I->dontSee('Signup', 'ul.nav li a');
-// Uncomment if using WebDriver
-//$I->click('Logout (erau)', 'ul.nav li a');
-//$I->dontSee('Logout (erau)', 'ul.nav li a');
-//$I->see('Login', 'ul.nav li a');
+$I->seeLink('Logout (erau)');
+$I->dontSeeLink('Login');
+$I->dontSeeLink('Signup');
+/** Uncomment if using WebDriver
+ * $I->click('Logout (erau)');
+ * $I->dontSeeLink('Logout (erau)');
+ * $I->seeLink('Login');
+ */
diff --git a/apps/advanced/frontend/tests/acceptance/SignupCest.php b/apps/advanced/frontend/tests/acceptance/SignupCest.php
index 12a35bbc0c..9de45d80e4 100644
--- a/apps/advanced/frontend/tests/acceptance/SignupCest.php
+++ b/apps/advanced/frontend/tests/acceptance/SignupCest.php
@@ -77,6 +77,6 @@ class SignupCest
 		]);
 
 		$I->expectTo('see that user logged in');
-		$I->see('Logout (tester)', 'ul.nav li a');
+		$I->seeLink('Logout (tester)');
 	}
 }
diff --git a/apps/advanced/frontend/tests/functional/LoginCept.php b/apps/advanced/frontend/tests/functional/LoginCept.php
index 85a9d187e0..3c347b7c43 100644
--- a/apps/advanced/frontend/tests/functional/LoginCept.php
+++ b/apps/advanced/frontend/tests/functional/LoginCept.php
@@ -22,6 +22,6 @@ $I->see('Incorrect username or password.', '.help-block');
 $I->amGoingTo('try to login with correct credentials');
 $loginPage->login('erau', 'password_0');
 $I->expectTo('see that user is logged');
-$I->see('Logout (erau)', 'ul.nav li a');
-$I->dontSee('Login', 'ul.nav li a');
-$I->dontSee('Signup', 'ul.nav li a');
+$I->seeLink('Logout (erau)');
+$I->dontSeeLink('Login');
+$I->dontSeeLink('Signup');
diff --git a/apps/advanced/frontend/tests/functional/SignupCest.php b/apps/advanced/frontend/tests/functional/SignupCest.php
index e7f4d9f100..86efff4d3f 100644
--- a/apps/advanced/frontend/tests/functional/SignupCest.php
+++ b/apps/advanced/frontend/tests/functional/SignupCest.php
@@ -85,6 +85,6 @@ class SignupCest
 		]);
 
 		$I->expectTo('see that user logged in');
-		$I->see('Logout (tester)', 'ul.nav li a');
+		$I->seeLink('Logout (tester)');
 	}
 }