diff --git a/test/data/legacy-hints/3.0.29/09be0db9-3264-4615-8765-3401a89d050f-1699312935941-1.crc32 b/test/data/legacy-hints/3.0.29/09be0db9-3264-4615-8765-3401a89d050f-1699312935941-1.crc32
deleted file mode 100644
index c2e6c3fec5..0000000000
--- a/test/data/legacy-hints/3.0.29/09be0db9-3264-4615-8765-3401a89d050f-1699312935941-1.crc32
+++ /dev/null
@@ -1 +0,0 @@
-57d105c2
\ No newline at end of file
diff --git a/test/data/legacy-hints/3.0.29/09be0db9-3264-4615-8765-3401a89d050f-1699312935941-1.hints b/test/data/legacy-hints/3.0.29/09be0db9-3264-4615-8765-3401a89d050f-1699312935941-1.hints
deleted file mode 100644
index 126cedcbe2..0000000000
Binary files a/test/data/legacy-hints/3.0.29/09be0db9-3264-4615-8765-3401a89d050f-1699312935941-1.hints and /dev/null differ
diff --git a/test/data/legacy-hints/3.0.29/23b9a46b-e21a-4a8d-b171-3f1886fa537d-1700232964563-1.crc32 b/test/data/legacy-hints/3.0.29/23b9a46b-e21a-4a8d-b171-3f1886fa537d-1700232964563-1.crc32
new file mode 100644
index 0000000000..e4635e4474
--- /dev/null
+++ b/test/data/legacy-hints/3.0.29/23b9a46b-e21a-4a8d-b171-3f1886fa537d-1700232964563-1.crc32
@@ -0,0 +1 @@
+644e777b
\ No newline at end of file
diff --git a/test/data/legacy-hints/3.0.29/23b9a46b-e21a-4a8d-b171-3f1886fa537d-1700232964563-1.hints b/test/data/legacy-hints/3.0.29/23b9a46b-e21a-4a8d-b171-3f1886fa537d-1700232964563-1.hints
new file mode 100644
index 0000000000..d54f1192a6
Binary files /dev/null and b/test/data/legacy-hints/3.0.29/23b9a46b-e21a-4a8d-b171-3f1886fa537d-1700232964563-1.hints differ
diff --git a/test/data/legacy-hints/3.0.29/hash.txt b/test/data/legacy-hints/3.0.29/hash.txt
index c21bfd32c4..cca793fe35 100644
--- a/test/data/legacy-hints/3.0.29/hash.txt
+++ b/test/data/legacy-hints/3.0.29/hash.txt
@@ -1,7 +1,7 @@
-#Hints, version 3.0.30-SNAPSHOT
-#Tue Nov 07 00:22:19 CET 2023
-descriptorTimestamp=1699312935941
-cells=3014
-hash=-2121230191
-cfid=531ba420-7cfb-11ee-824a-01f39c3f61a3
-hostId=09be0db9-3264-4615-8765-3401a89d050f
+#Hints, version 3.0.28-SNAPSHOT
+#Fri Nov 17 15:56:12 CET 2023
+descriptorTimestamp=1700232964563
+cells=2996
+hash=1893573886
+cfid=6f55edb0-8559-11ee-a403-a931264ebdbf
+hostId=23b9a46b-e21a-4a8d-b171-3f1886fa537d
diff --git a/test/data/legacy-hints/4.1.3/088a61e7-e1b5-46a9-a83d-2ce5a636d531-1699365476115-2.crc32 b/test/data/legacy-hints/4.1.3/088a61e7-e1b5-46a9-a83d-2ce5a636d531-1699365476115-2.crc32
deleted file mode 100644
index d2358dcd41..0000000000
--- a/test/data/legacy-hints/4.1.3/088a61e7-e1b5-46a9-a83d-2ce5a636d531-1699365476115-2.crc32
+++ /dev/null
@@ -1 +0,0 @@
-9068a8dd
\ No newline at end of file
diff --git a/test/data/legacy-hints/4.1.3/088a61e7-e1b5-46a9-a83d-2ce5a636d531-1699365476115-2.hints b/test/data/legacy-hints/4.1.3/088a61e7-e1b5-46a9-a83d-2ce5a636d531-1699365476115-2.hints
deleted file mode 100644
index da4f13691d..0000000000
Binary files a/test/data/legacy-hints/4.1.3/088a61e7-e1b5-46a9-a83d-2ce5a636d531-1699365476115-2.hints and /dev/null differ
diff --git a/test/data/legacy-hints/4.1.3/8d0a4af4-4c94-4cb5-915f-08c0f1c7ab85-1700233917885-2.crc32 b/test/data/legacy-hints/4.1.3/8d0a4af4-4c94-4cb5-915f-08c0f1c7ab85-1700233917885-2.crc32
new file mode 100644
index 0000000000..02a1887418
--- /dev/null
+++ b/test/data/legacy-hints/4.1.3/8d0a4af4-4c94-4cb5-915f-08c0f1c7ab85-1700233917885-2.crc32
@@ -0,0 +1 @@
+76c58ef6
\ No newline at end of file
diff --git a/test/data/legacy-hints/4.1.3/8d0a4af4-4c94-4cb5-915f-08c0f1c7ab85-1700233917885-2.hints b/test/data/legacy-hints/4.1.3/8d0a4af4-4c94-4cb5-915f-08c0f1c7ab85-1700233917885-2.hints
new file mode 100644
index 0000000000..fcb5e64fdc
Binary files /dev/null and b/test/data/legacy-hints/4.1.3/8d0a4af4-4c94-4cb5-915f-08c0f1c7ab85-1700233917885-2.hints differ
diff --git a/test/data/legacy-hints/4.1.3/hash.txt b/test/data/legacy-hints/4.1.3/hash.txt
index 9aae65aeaf..22b6552f59 100644
--- a/test/data/legacy-hints/4.1.3/hash.txt
+++ b/test/data/legacy-hints/4.1.3/hash.txt
@@ -1,7 +1,7 @@
 #Hints, version 4.1.4-SNAPSHOT
-#Tue Nov 07 14:57:58 CET 2023
-descriptorTimestamp=1699365476115
-cells=3066
-hash=-1205488531
-cfid=a84e1840-7d75-11ee-98b4-9b56646d896a
-hostId=088a61e7-e1b5-46a9-a83d-2ce5a636d531
+#Fri Nov 17 16:12:05 CET 2023
+descriptorTimestamp=1700233917885
+cells=3049
+hash=429137970
+cfid=aa718ab0-855b-11ee-89ad-6d3be2679d52
+hostId=8d0a4af4-4c94-4cb5-915f-08c0f1c7ab85
diff --git a/test/unit/org/apache/cassandra/hints/HintsMaker.java b/test/unit/org/apache/cassandra/hints/HintsMaker.java
index fa50b118e4..f2eb5f4cb4 100644
--- a/test/unit/org/apache/cassandra/hints/HintsMaker.java
+++ b/test/unit/org/apache/cassandra/hints/HintsMaker.java
@@ -189,7 +189,7 @@ public class HintsMaker
                 {
                     while (session.position() < maxLength && mutationIterator.hasNext())
                     {
-                        Hint hint = Hint.create(mutationIterator.next(), System.currentTimeMillis());
+                        Hint hint = Hint.create(mutationIterator.next(), System.currentTimeMillis(), Integer.MAX_VALUE);
                         session.append(hint);
                     }