diff --git a/test/test.js b/test/test.js
index a2eb7d8..1602e7d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -54,7 +54,7 @@ describe('Application life cycle test', function () {
         await waitForElement(By.id('accessKey'));
         await browser.findElement(By.id('accessKey')).sendKeys(accessKey);
         await browser.findElement(By.id('secretKey')).sendKeys(secretKey);
-        await browser.findElement(By.xpath('//button[contains(text(), "Login")]')).click();
+        await browser.findElement(By.xpath('//button[@id="do-login"]')).click();
         await waitForElement(By.xpath('//span[contains(text(), "Buckets")]'));
         await delay(5000);
     }
@@ -68,11 +68,11 @@ describe('Application life cycle test', function () {
 
     async function addBucket() {
         await browser.get(`https://${app.fqdn}/buckets`);
-        await waitForElement(By.xpath('//button/span[text()="Create Bucket"]'));
-        await browser.findElement(By.xpath('//button/span[text()="Create Bucket"]')).click();
+        await waitForElement(By.xpath('//button[@id="create-bucket"]'));
+        await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
         await browser.sleep(2000);
         await browser.findElement(By.xpath('//input[@id="bucket-name"]')).sendKeys(BUCKET);
-        await browser.findElement(By.xpath('//button[text()="Create Bucket"]')).click();
+        await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
         await waitForElement(By.xpath(`//a[contains(text(), "${BUCKET}")]`));
         await delay(5000);
     }