diff --git a/test/test.js b/test/test.js
index e0d6b77..691f1a5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -29,7 +29,6 @@ describe('Application life cycle test', function () {
     }
 
     async function login(accessKey, secretKey, acceptLicense = false) {
-        await clearCache();
         await goto(`https://${app.fqdn}/login`, 'css=#accessKey');
         await sendKeys('css=#accessKey', accessKey);
         await sendKeys('css=#secretKey', secretKey);
@@ -37,17 +36,11 @@ describe('Application life cycle test', function () {
 
         if (acceptLicense) await confirmLicense();
 
-        await waitFor('xpath=//button[contains(., "Create Bucket")]');
-    }
-
-    async function logout() {
-        await waitFor('xpath=//button[contains(., "Create Bucket")]');
-        await click('css=#sign-out');
-        await waitFor('css=#accessKey');
+        await waitFor('Create Bucket');
     }
 
     async function addBucket() {
-        await click('xpath=//button[contains(., "Create Bucket")]');
+        await click('Create Bucket');
         await sendKeys('css=#bucket-name', BUCKET);
         await click('css=#create-bucket');
         await waitFor(`xpath=//h1[contains(text(), "${BUCKET}")]`);
@@ -81,7 +74,7 @@ describe('Application life cycle test', function () {
 
     it('can admin login', login.bind(null, 'minioadmin', 'minioadmin', true));
     it('can add bucket', addBucket);
-    it('can logout', logout);
+    it('can logout', clearCache);
     it('does redirect', checkRedirect);
     it('check api', checkApi);
 
@@ -91,7 +84,7 @@ describe('Application life cycle test', function () {
 
     it('can admin login', login.bind(null, 'minioakey', 'minioskey', false));
     it('has bucket', checkBucket);
-    it('can logout', logout);
+    it('can logout', clearCache);
     it('does redirect', checkRedirect);
     it('check api', checkApi);
 
@@ -100,7 +93,7 @@ describe('Application life cycle test', function () {
 
     it('can admin login', login.bind(null, 'minioakey', 'minioskey', false));
     it('has bucket', checkBucket);
-    it('can logout', logout);
+    it('can logout', clearCache);
 
     it('does redirect', checkRedirect);
     it('check api', checkApi);
@@ -109,7 +102,7 @@ describe('Application life cycle test', function () {
 
     it('can admin login', login.bind(null, 'minioakey', 'minioskey', true));
     it('has bucket', checkBucket);
-    it('can logout', logout);
+    it('can logout', clearCache);
 
     it('does redirect', checkRedirect);
     it('check api', checkApi);