diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentService.java
index 04eac2cc15..4759e2c9f3 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentService.java
@@ -29,7 +29,7 @@ public interface AlarmCommentService {
 
     AlarmCommentOperationResult deleteAlarmComment(TenantId tenantId, AlarmCommentId alarmCommentId);
 
-    PageData<AlarmCommentInfo>findAlarmComments(TenantId tenantId, AlarmId alarmId, PageLink pageLink);
+    PageData<AlarmCommentInfo> findAlarmComments(TenantId tenantId, AlarmId alarmId, PageLink pageLink);
 
     ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId);
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
index ccdbd08e98..7d9b258ba6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
@@ -64,6 +64,8 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
         user.setAuthority(Authority.TENANT_ADMIN);
         user.setTenantId(tenantId);
         user.setEmail("tenant@thingsboard.org");
+        user.setFirstName("John");
+        user.setLastName("Brown");
         user = userService.saveUser(user);
     }
 
@@ -98,7 +100,7 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
         PageData<AlarmCommentInfo> alarmComments = alarmCommentService.findAlarmComments(tenantId, alarm.getId(), new PageLink(10, 0));
         Assert.assertNotNull(alarmComments.getData());
         Assert.assertEquals(1, alarmComments.getData().size());
-        Assert.assertEquals(createdComment, alarmComments.getData().get(0));
+        Assert.assertEquals(createdComment, new AlarmComment(alarmComments.getData().get(0)));
     }
 
     @Test
@@ -134,7 +136,7 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
         PageData<AlarmCommentInfo> alarmComments = alarmCommentService.findAlarmComments(tenantId, alarm.getId(), new PageLink(10, 0));
         Assert.assertNotNull(alarmComments.getData());
         Assert.assertEquals(1, alarmComments.getData().size());
-        Assert.assertEquals(new AlarmCommentInfo(updatedComment), alarmComments.getData().get(0));
+        Assert.assertEquals(updatedComment, new AlarmComment(alarmComments.getData().get(0)));
     }
 
     @Test