diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java
index 25b3aff7e1..ee89e5053d 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageHelper.java
@@ -119,6 +119,7 @@ public class CustomerPageHelper extends CustomerPageElements {
 
     public void createCustomersUser() {
         plusBtn().click();
+        addUserEmailField().click();
         addUserEmailField().sendKeys(getRandomNumber() + "@gmail.com");
         addBtnC().click();
         activateWindowOkBtn().click();
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AbstractDeviceTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AbstractDeviceTest.java
index ecacc25ba7..3cd46fefc9 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AbstractDeviceTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AbstractDeviceTest.java
@@ -21,19 +21,19 @@ import org.testng.annotations.BeforeClass;
 import org.thingsboard.server.msa.ui.base.AbstractDriverBaseTest;
 import org.thingsboard.server.msa.ui.pages.DevicePageHelper;
 import org.thingsboard.server.msa.ui.pages.LoginPageHelper;
-import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements;
+import org.thingsboard.server.msa.ui.pages.SideBarMenuViewHelper;
 
 @Epic("Device smoke tests")
 abstract public class AbstractDeviceTest extends AbstractDriverBaseTest {
 
-    protected SideBarMenuViewElements sideBarMenuView;
+    protected SideBarMenuViewHelper sideBarMenuView;
     protected DevicePageHelper devicePage;
     protected String deviceName;
 
     @BeforeClass
     public void login() {
         new LoginPageHelper(driver).authorizationTenant();
-        sideBarMenuView = new SideBarMenuViewElements(driver);
+        sideBarMenuView = new SideBarMenuViewHelper(driver);
         devicePage = new DevicePageHelper(driver);
     }
 
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/CreateDeviceTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/CreateDeviceTest.java
index a6dd31d2b7..3e4ab48f5d 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/CreateDeviceTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/CreateDeviceTest.java
@@ -37,7 +37,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     public void createDevice() {
         deviceName = ENTITY_NAME + random();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.addBtnC().click();
@@ -51,7 +51,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     public void createDeviceWithDescription() {
         deviceName = ENTITY_NAME + random();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.enterDescription(deviceName);
@@ -68,7 +68,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     @Test(groups = "smoke")
     @Description("Add device without the name")
     public void createDeviceWithoutName() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.nameField().click();
         devicePage.addBtnC().click();
@@ -80,7 +80,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     @Test(groups = "smoke")
     @Description("Create device only with spase in name")
     public void createDeviceWithOnlySpace() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(" ");
         devicePage.addBtnC().click();
@@ -96,7 +96,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
         Device device = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME));
         deviceName = device.getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.addBtnC().click();
@@ -111,7 +111,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     public void createDeviceWithoutRefresh() {
         deviceName = ENTITY_NAME + random();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.addBtnC().click();
@@ -124,7 +124,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     public void createDeviceWithoutDeviceProfile() {
         deviceName = ENTITY_NAME + random();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.clearProfileFieldBtn().click();
@@ -140,7 +140,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     public void createDeviceWithEnableGateway() {
         deviceName = ENTITY_NAME + random();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.checkboxGatewayCreate().click();
@@ -155,7 +155,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     public void createDeviceWithEnableOverwriteActivityTimeForConnected() {
         deviceName = ENTITY_NAME + random();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.checkboxGatewayCreate().click();
@@ -173,7 +173,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
         deviceName = ENTITY_NAME + random();
         String deviceLabel = "device label " + random();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.enterLabel(deviceLabel);
@@ -189,7 +189,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
         deviceName = ENTITY_NAME + random();
         String customer = "Customer A";
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.openCreateDeviceView();
         devicePage.enterName(deviceName);
         devicePage.assignOnCustomer(customer);
@@ -205,7 +205,7 @@ public class CreateDeviceTest extends AbstractDeviceTest {
     public void documentation() {
         String urlPath = "docs/user-guide/ui/devices/";
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity("Thermostat T1").click();
         devicePage.goToHelpPage();
 
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteDeviceTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteDeviceTest.java
index 348fee2f09..76028f0bc0 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteDeviceTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteDeviceTest.java
@@ -36,7 +36,7 @@ public class DeleteDeviceTest extends AbstractDeviceTest {
     @Test(groups = "smoke")
     @Description("Remove the device by clicking on the trash icon in the right side of device")
     public void deleteDeviceByRightSideBtn() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.deleteDeviceByRightSideBtn(deviceName);
         devicePage.refreshBtn().click();
 
@@ -46,7 +46,7 @@ public class DeleteDeviceTest extends AbstractDeviceTest {
     @Test(groups = "smoke")
     @Description("Remove device by mark in the checkbox and then click on the trash can icon in the menu that appears at the top")
     public void deleteSelectedDevice() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.deleteSelected(deviceName);
         devicePage.refreshBtn().click();
 
@@ -56,7 +56,7 @@ public class DeleteDeviceTest extends AbstractDeviceTest {
     @Test(groups = "smoke")
     @Description("Remove the device by clicking on the 'Delete device' btn in the entity view")
     public void deleteDeviceFromDetailsTab() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.deleteDeviceFromDetailsTab();
         devicePage.refreshBtn();
@@ -67,7 +67,7 @@ public class DeleteDeviceTest extends AbstractDeviceTest {
     @Test(groups = "smoke")
     @Description("Remove the device by clicking on the trash icon in the right side of device without refresh")
     public void deleteDeviceWithoutRefresh() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.deleteDeviceByRightSideBtn(deviceName);
 
         devicePage.assertEntityIsNotPresent(deviceName);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteSeveralDevicesTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteSeveralDevicesTest.java
index 5890b6a3e0..48df384c63 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteSeveralDevicesTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeleteSeveralDevicesTest.java
@@ -50,7 +50,7 @@ public class DeleteSeveralDevicesTest extends AbstractDeviceTest {
     @Description("Remove several devices by mark in the checkbox and then click on the trash can icon in the menu " +
             "that appears at the top")
     public void deleteSeveralDevicesByTopBtn() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.deleteSelected(2);
         devicePage.refreshBtn().click();
 
@@ -62,7 +62,7 @@ public class DeleteSeveralDevicesTest extends AbstractDeviceTest {
     @Description("Remove several devices by mark all the devices on the page by clicking in the topmost checkbox" +
             " and then clicking on the trash icon in the menu that appears")
     public void selectAllDevices() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.selectAllCheckBox().click();
         devicePage.deleteSelectedBtn().click();
 
@@ -75,7 +75,7 @@ public class DeleteSeveralDevicesTest extends AbstractDeviceTest {
     @Description("Remove several devices by mark in the checkbox and then click on the trash can icon in the menu " +
             "that appears at the top without refresh")
     public void deleteSeveralWithoutRefresh() {
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.deleteSelected(2);
 
         devicePage.assertEntityIsNotPresent(deviceName1);
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/EditDeviceTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/EditDeviceTest.java
index 3de708c55c..77bb209485 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/EditDeviceTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/EditDeviceTest.java
@@ -35,7 +35,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
         String newDeviceName = "Changed" + getRandomNumber();
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.setHeaderName();
         String nameBefore = devicePage.getHeaderName();
@@ -55,7 +55,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
     public void deleteName() {
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.changeNameEditMenu("");
@@ -68,7 +68,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
     public void saveOnlyWithSpace() {
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.changeNameEditMenu(" ");
@@ -83,7 +83,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
     public void editDescription(String description, String newDescription, String finalDescription) {
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME, description)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.descriptionEntityView().sendKeys(newDescription);
@@ -98,7 +98,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
     public void isGateway(boolean isGateway) {
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME, isGateway)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.checkboxGatewayEdit().click();
@@ -119,7 +119,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
         deviceName = testRestClient.postDevice("",
                 EntityPrototypes.defaultDevicePrototype(ENTITY_NAME, true, isOverwriteActivityTimeForConnected)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.checkboxOverwriteActivityTimeEdit().click();
@@ -139,7 +139,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
     public void changeDeviceProfile() {
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.changeDeviceProfile("DEFAULT");
@@ -154,7 +154,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
     public void saveWithoutDeviceProfile() {
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.clearProfileFieldBtn().click();
@@ -167,7 +167,7 @@ public class EditDeviceTest extends AbstractDeviceTest {
     public void editLabel(String label, String newLabel, String finalLabel) {
         deviceName = testRestClient.postDevice("", EntityPrototypes.defaultDevicePrototype(ENTITY_NAME, "", label)).getName();
 
-        sideBarMenuView.devicesBtn().click();
+        sideBarMenuView.goToDevicesPage();
         devicePage.entity(deviceName).click();
         devicePage.editPencilBtn().click();
         devicePage.deviceLabelEditField().sendKeys(newLabel);
diff --git a/msa/black-box-tests/src/test/resources/all.xml b/msa/black-box-tests/src/test/resources/all.xml
index 155aac38e1..95248a6fe6 100644
--- a/msa/black-box-tests/src/test/resources/all.xml
+++ b/msa/black-box-tests/src/test/resources/all.xml
@@ -67,4 +67,14 @@
             <package name="org.thingsboard.server.msa.ui.tests.assetProfileSmoke"/>
         </packages>
     </test>
+    <test name="Smoke devices tests">
+        <groups>
+            <run>
+                <exclude name="broken"/>
+            </run>
+        </groups>
+        <packages>
+            <package name="org.thingsboard.server.msa.ui.tests.devicessmoke"/>
+        </packages>
+    </test>
 </suite>
\ No newline at end of file
diff --git a/msa/black-box-tests/src/test/resources/uiTests.xml b/msa/black-box-tests/src/test/resources/uiTests.xml
index 9dbf8dfc0c..9de384d15c 100644
--- a/msa/black-box-tests/src/test/resources/uiTests.xml
+++ b/msa/black-box-tests/src/test/resources/uiTests.xml
@@ -62,4 +62,14 @@
             <package name="org.thingsboard.server.msa.ui.tests.assetProfileSmoke"/>
         </packages>
     </test>
+    <test name="Smoke devices tests">
+        <groups>
+            <run>
+                <exclude name="broken"/>
+            </run>
+        </groups>
+        <packages>
+            <package name="org.thingsboard.server.msa.ui.tests.devicessmoke"/>
+        </packages>
+    </test>
 </suite>
\ No newline at end of file