diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/SortedSetWithCustomComparatorEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/SortedSetWithCustomComparatorEntityTest.java
index ab5bea4101..5ee4a107e8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/SortedSetWithCustomComparatorEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/SortedSetWithCustomComparatorEntityTest.java
@@ -146,7 +146,7 @@ public class SortedSetWithCustomComparatorEntityTest extends AbstractEntityTest
     }
 
     @Test
-    @FailureExpected(message = "Envers doesn't support custom comparators yet", jiraKey = "UPDATE_THAT")
+    @FailureExpected(message = "Envers doesn't support custom comparators yet", jiraKey = "HHH-6176")
     public void testHistoryOfEntity1() throws Exception {
         SortedSetEntity entity1 = getAuditReader().find(SortedSetEntity.class, 1, 1);
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sortedSet/SortedSetWithCustomComparatorSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sortedSet/SortedSetWithCustomComparatorSessionTest.java
index 85b6274b8a..f27573347d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sortedSet/SortedSetWithCustomComparatorSessionTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sortedSet/SortedSetWithCustomComparatorSessionTest.java
@@ -121,7 +121,7 @@ public class SortedSetWithCustomComparatorSessionTest extends AbstractOneSession
     }
 
     @Test
-    @FailureExpected(message = "Envers doesn't support custom comparators yet", jiraKey = "UPDATE_THAT")
+    @FailureExpected(message = "Envers doesn't support custom comparators yet", jiraKey = "HHH-6176")
     public void testHistoryOfEntity1() throws Exception {
         NotAnnotatedSortedSetEntity entity1 = getAuditReader().find(NotAnnotatedSortedSetEntity.class, 1, 1);