diff --git a/frontend/test/e2e/admin.test.js b/frontend/test/e2e/admin.test.js
index bfff45f01b3ead2c8d95ea7b9be74a83f8507097..ee203a77f852eac07103358757b6a4a3fd29ef72 100644
--- a/frontend/test/e2e/admin.test.js
+++ b/frontend/test/e2e/admin.test.js
@@ -1,14 +1,11 @@
 module.exports = {
   'Login' : function (browser) {
     const index = browser.page.index();
-    const navbar = index.section.navbar;
     const login = browser.page.login()
-
     index
       .navigate()
       .waitForElementVisible('@loginButton')
       .click("@loginButton")
-
     login
       .waitForElementVisible('@loginButton')
       .click("@loginButton")
@@ -16,10 +13,13 @@ module.exports = {
       .setValue('input[name=username]', browser.globals.adminUsername)
       .setValue('input[name=password]', browser.globals.adminPassword)
       .click('input[name=submit]')
-
     index
       .waitForElementVisible('@logoutButton')
-
+  },
+  'Index page layout after login with admin user' : function (browser) {
+    const index = browser.page.index();
+    const navbar = index.section.navbar;
+    index.navigate()
     navbar
       .assert.elementPresent('@oidc')
       .assert.elementPresent('@users')
diff --git a/frontend/test/e2e/guest.test.js b/frontend/test/e2e/guest.test.js
index 62e6ac479c38d454e3728aad673ac25cfa715589..0eca953acd17e0e3e579b7be5f5c49143ff93a73 100644
--- a/frontend/test/e2e/guest.test.js
+++ b/frontend/test/e2e/guest.test.js
@@ -8,11 +8,10 @@ module.exports = {
       .assert.containsText('@banner', 'Welcome to OpenAppStack')
 
     navbar
-      .assert.containsText('@loginButton', 'Login')
       .assert.containsText('@loginButton', 'Login')
       .end();
   },
-  'Login screen' : function (browser) {
+  'Navigate to login screen' : function (browser) {
     const login = browser.page.login()
     const index = browser.page.index();
     index.navigate()
diff --git a/frontend/test/e2e/user.test.js b/frontend/test/e2e/user.test.js
index a044c851f765212118847512134bc91661b5154a..ba4754a14a39f724514c774befc7a9461f083f8e 100644
--- a/frontend/test/e2e/user.test.js
+++ b/frontend/test/e2e/user.test.js
@@ -1,8 +1,6 @@
 module.exports = {
   'Login' : function (browser) {
     const index = browser.page.index();
-    const navbar = index.section.navbar;
-    const usermenu = navbar.section.usermenu;
     const login = browser.page.login()
     index.navigate()
       .waitForElementVisible('@loginButton')
@@ -18,13 +16,17 @@ module.exports = {
     index
       .waitForElementVisible('@logoutButton')
       .assert.containsText('@logoutButton', 'Logout')
-
+  },
+  'Index page layout after login' : function (browser) {
+    const index = browser.page.index();
+    const navbar = index.section.navbar;
+    const usermenu = navbar.section.usermenu;
+    index.navigate()
     usermenu
       .assert.containsText("@userNameLabel", browser.globals.userUsername)
       .assert.elementNotPresent("@logoutButton")
       .click("@userNameLabel")
       .assert.visible("@logoutButton")
-
     navbar
       .assert.elementPresent('@oidc')
       .assert.elementNotPresent('@users')