diff --git a/test/test.js b/test/test.js
index e56364f..ab4e056 100644
--- a/test/test.js
+++ b/test/test.js
@@ -111,9 +111,9 @@ describe('Application life cycle test', function () {
 
     async function addDevice() {
         await browser.get(`https://${app.fqdn}/settings/device`);
-        await waitForElement(By.id(':r3:'));
-        await browser.findElement(By.id(':r3:')).sendKeys(DEVICE_NAME);
-        await browser.findElement(By.id(':r4:')).sendKeys(DEVICE_IDENTIFIER);
+        await waitForElement(By.xpath('//input[@id=":r3:" or @id="«r8»"]'));
+        await browser.findElement(By.xpath('//input[@id=":r3:" or @id="«r8»"]')).sendKeys(DEVICE_NAME);
+        await browser.findElement(By.xpath('//input[@id=":r4:" or @id="«r9»"]')).sendKeys(DEVICE_IDENTIFIER);
         await browser.findElement(By.xpath('//button[text()="Save"]')).click();
         await waitForElement(By.xpath(`//span[text()="${DEVICE_NAME}"]`));
     }