diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DevicePageHelper.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DevicePageHelper.java
index e49c20da39..3239bb5484 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DevicePageHelper.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/DevicePageHelper.java
@@ -85,10 +85,20 @@ public class DevicePageHelper extends DevicePageElements {
         warningPopUpYesBtn().click();
     }
 
-    public void assignMarkedDevices(String... deviceNames) {
+    public void selectDevices(String... deviceNames) {
         for (String deviceName : deviceNames) {
             checkBox(deviceName).click();
         }
+    }
+
+    public void assignSelectedDevices(String... deviceNames) {
+        selectDevices(deviceNames);
         assignMarkedDeviceBtn().click();
     }
+
+    public void deleteSelectedDevices(String... deviceNames) {
+        selectDevices(deviceNames);
+        deleteSelectedBtn().click();
+        warningPopUpYesBtn().click();
+    }
 }
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AssignToCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AssignToCustomerTest.java
index 1d1c686d45..8c0a45aa03 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AssignToCustomerTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/AssignToCustomerTest.java
@@ -107,7 +107,7 @@ public class AssignToCustomerTest extends AbstractDeviceTest {
     @Description("Assign marked device by btn on the top")
     public void assignToCustomerMarkedDevice() {
         sideBarMenuView.goToDevicesPage();
-        devicePage.assignMarkedDevices(deviceName);
+        devicePage.assignSelectedDevices(deviceName);
         assignDeviceTab.assignOnCustomer(customerName);
         assertIsDisplayed(devicePage.deviceCustomerOnPage(deviceName));
         assertThat(devicePage.deviceCustomerOnPage(deviceName).getText())
@@ -177,7 +177,7 @@ public class AssignToCustomerTest extends AbstractDeviceTest {
     @Description("Assign several devices by btn on the top")
     public void assignSeveralDevices() {
         sideBarMenuView.goToDevicesPage();
-        devicePage.assignMarkedDevices(deviceName, device1.getName());
+        devicePage.assignSelectedDevices(deviceName, device1.getName());
         assignDeviceTab.assignOnCustomer(customerName);
         assertIsDisplayed(devicePage.deviceCustomerOnPage(deviceName));
         assertThat(devicePage.deviceCustomerOnPage(deviceName).getText())
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 48df384c63..48b1921d0d 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
@@ -23,6 +23,8 @@ import org.testng.annotations.Test;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.msa.ui.utils.EntityPrototypes;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME;
 
@@ -51,11 +53,11 @@ public class DeleteSeveralDevicesTest extends AbstractDeviceTest {
             "that appears at the top")
     public void deleteSeveralDevicesByTopBtn() {
         sideBarMenuView.goToDevicesPage();
-        devicePage.deleteSelected(2);
+        devicePage.deleteSelectedDevices(deviceName1, deviceName2);
         devicePage.refreshBtn().click();
 
-        devicePage.assertEntityIsNotPresent(deviceName1);
-        devicePage.assertEntityIsNotPresent(deviceName2);
+        List.of(deviceName1, deviceName2)
+                .forEach(d -> devicePage.assertEntityIsNotPresent(d));
     }
 
     @Test(groups = "smoke")
@@ -76,9 +78,9 @@ public class DeleteSeveralDevicesTest extends AbstractDeviceTest {
             "that appears at the top without refresh")
     public void deleteSeveralWithoutRefresh() {
         sideBarMenuView.goToDevicesPage();
-        devicePage.deleteSelected(2);
+        devicePage.deleteSelectedDevices(deviceName1, deviceName2);
 
-        devicePage.assertEntityIsNotPresent(deviceName1);
-        devicePage.assertEntityIsNotPresent(deviceName2);
+        List.of(deviceName1, deviceName2)
+                .forEach(d -> devicePage.assertEntityIsNotPresent(d));
     }
 }