diff --git a/packages/stream_chat_persistence/test/src/dao/message_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/message_dao_test.dart
index 85e0a795..f2440ae1 100644
--- a/packages/stream_chat_persistence/test/src/dao/message_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/message_dao_test.dart
@@ -284,10 +284,13 @@ void main() {
 
   test('getMessagesByCid along with pagination', () async {
     const cid = 'testCid';
+    const limit = 15;
+    const lessThan = 'testMessageId${cid}25';
+    const greaterThanOrEqual = 'testMessageId${cid}5';
     const pagination = PaginationParams(
-      limit: 15,
-      lessThan: 'testMessageId${cid}25',
-      greaterThanOrEqual: 'testMessageId${cid}5',
+      limit: limit,
+      lessThan: lessThan,
+      greaterThanOrEqual: greaterThanOrEqual,
     );
 
     // Should be empty initially
@@ -306,7 +309,9 @@ void main() {
       cid,
       messagePagination: pagination,
     );
-    expect(fetchedMessages.length, 15);
+    expect(fetchedMessages.length, limit);
+    expect(fetchedMessages.first.id, greaterThanOrEqual);
+    expect(fetchedMessages.last.id != lessThan, true);
   });
 
   test('updateMessages', () async {
diff --git a/packages/stream_chat_persistence/test/src/dao/pinned_message_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/pinned_message_dao_test.dart
index 26c652db..de7c8976 100644
--- a/packages/stream_chat_persistence/test/src/dao/pinned_message_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/pinned_message_dao_test.dart
@@ -285,10 +285,13 @@ void main() {
 
   test('getMessagesByCid along with pagination', () async {
     const cid = 'testCid';
+    const limit = 15;
+    const lessThan = 'testMessageId${cid}25';
+    const greaterThanOrEqual = 'testMessageId${cid}5';
     const pagination = PaginationParams(
-      limit: 15,
-      lessThan: 'testMessageId${cid}25',
-      greaterThanOrEqual: 'testMessageId${cid}5',
+      limit: limit,
+      lessThan: lessThan,
+      greaterThanOrEqual: greaterThanOrEqual,
     );
 
     // Should be empty initially
@@ -307,7 +310,9 @@ void main() {
       cid,
       messagePagination: pagination,
     );
-    expect(fetchedMessages.length, 15);
+    expect(fetchedMessages.length, limit);
+    expect(fetchedMessages.first.id, greaterThanOrEqual);
+    expect(fetchedMessages.last.id != lessThan, true);
   });
 
   test('updateMessages', () async {