diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
index 246c8d2c86..fad0feea51 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
@@ -73,9 +73,9 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
         Mockito.reset(tbClusterService, auditLogService);
     }
 
-    protected void testNotifyEntityOneManyTimeMsgToEdgeServiceNever(HasName entity, HasName originator,
-                                                                    TenantId tenantId, CustomerId customerId, UserId userId, String userName,
-                                                                    ActionType actionType, int cntTime, Object... additionalInfo) {
+    protected void testNotifyEntityManyTimeMsgToEdgeServiceNever(HasName entity, HasName originator,
+                                                                 TenantId tenantId, CustomerId customerId, UserId userId, String userName,
+                                                                 ActionType actionType, int cntTime, Object... additionalInfo) {
         EntityId entityId = createEntityId_NULL_UUID(entity);
         EntityId originatorId = createEntityId_NULL_UUID(originator);
         testNotificationMsgToEdgeServiceNever(entityId);
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java
index 65ce87a996..7bd3de792d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java
@@ -213,8 +213,6 @@ public abstract class BaseCustomerControllerTest extends AbstractControllerTest
         Assert.assertNotNull(foundCustomer);
         Assert.assertEquals(savedCustomer, foundCustomer);
 
-        Mockito.reset(tbClusterService, auditLogService);
-
         doDelete("/api/customer/" + savedCustomer.getId().getId().toString())
                 .andExpect(status().isOk());
     }
@@ -275,6 +273,9 @@ public abstract class BaseCustomerControllerTest extends AbstractControllerTest
         TenantId tenantId = savedTenant.getId();
 
         int cntTime = 135;
+
+        Mockito.reset(tbClusterService, auditLogService);
+
         List<ListenableFuture<Customer>> futures = new ArrayList<>(cntTime);
         for (int i = 0; i < cntTime; i++) {
             Customer customer = new Customer();
@@ -285,7 +286,7 @@ public abstract class BaseCustomerControllerTest extends AbstractControllerTest
         }
         List<Customer> customers = Futures.allAsList(futures).get(TIMEOUT, TimeUnit.SECONDS);
 
-        testNotifyEntityOneManyTimeMsgToEdgeServiceNever(new Customer(), new Customer(),
+        testNotifyEntityManyTimeMsgToEdgeServiceNever(new Customer(), new Customer(),
                 tenantId, tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
                 ActionType.ADDED, cntTime);