diff --git a/qms-tests/sanity/tests/model/documents/document-comments-page.ts b/qms-tests/sanity/tests/model/documents/document-comments-page.ts
index f13c0e3a74..b792ff6495 100644
--- a/qms-tests/sanity/tests/model/documents/document-comments-page.ts
+++ b/qms-tests/sanity/tests/model/documents/document-comments-page.ts
@@ -79,12 +79,12 @@ export class DocumentCommentsPage extends DocumentCommonPage {
       .locator('div.popup div.root div.header > div > span:first-child', { hasText: String(commentId) })
       .locator('xpath=../../../..')
     // check header
-    await expect(comment.locator('div.header > div:first-child')).toContainText(header)
+    await expect(comment.locator('div.root > div.header > div:first-child')).toContainText(header)
     // can be resolved
     await comment.locator('div.header div.tools button').hover()
     await expect(comment.locator('div.header div.tools button')).toBeEnabled()
     // check author
-    await expect(comment.locator('div.root div.header > a span[class*="label"]').first()).toHaveText(author)
+    await expect(comment.locator('div.root div.header > div.username span.ap-label').first()).toHaveText(author)
     // check message
     await expect(
       comment.locator('div.activityMessage div.flex-col div.clear-mins div.text-markup-view > p').first()
@@ -106,12 +106,12 @@ export class DocumentCommentsPage extends DocumentCommonPage {
       .locator('div.box div.root div.header > div > span:first-child', { hasText: String(commentId) })
       .locator('xpath=../../../..')
     // check header
-    await expect(comment.locator('div.header > div:first-child')).toContainText(header)
+    await expect(comment.locator('div.root > div.header > div:first-child')).toContainText(header)
     // can be resolved
     await comment.locator('div.header > div > span:last-child').hover()
     await expect(comment.locator('div.header div.tools button')).toBeEnabled()
     // check author
-    await expect(comment.locator('div.root div.header > a span[class*="label"]').first()).toHaveText(author)
+    await expect(comment.locator('div.root div.header > div.username span.ap-label').first()).toHaveText(author)
     // check message
     await expect(
       comment.locator('div.activityMessage div.flex-col div.clear-mins div.text-markup-view > p').first()