diff --git a/.github/workflows/stream_flutter_workflow.yml b/.github/workflows/stream_flutter_workflow.yml
index 2e81d732..28063c18 100644
--- a/.github/workflows/stream_flutter_workflow.yml
+++ b/.github/workflows/stream_flutter_workflow.yml
@@ -2,7 +2,7 @@ name: stream_flutter_workflow
 
 env:
   ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-  flutter_version: "2.5.0"
+  flutter_version: "2.5.1"
 
 on:
   pull_request:
diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 07c926c2..dae7b360 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -7,6 +7,7 @@
 🐞 Fixed
 
 - [[#710]](https://github.com/GetStream/stream-chat-flutter/issues/710) Fixed JWT requiring using `String` as id.
+- Fixed expired CDN attachment links not updating correctly.
 
 ## 3.0.0
 
diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 0c6b0ed1..2fd4bea9 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1497,7 +1497,7 @@ class ChannelClientState {
     }
   }
 
-  void _checkExpiredAttachmentMessages(ChannelState channelState) {
+  void _checkExpiredAttachmentMessages(ChannelState channelState) async {
     final expiredAttachmentMessagesId = channelState.messages
         .where((m) =>
             !_updatedMessagesIds.contains(m.id) &&
@@ -1508,20 +1508,24 @@ class ChannelClientState {
                     return false;
                   }
                   final uri = Uri.parse(url);
-                  if (uri.host != 'stream-io-cdn.com' ||
+                  if (!uri.host.endsWith('stream-io-cdn.com') ||
                       uri.queryParameters['Expires'] == null) {
                     return false;
                   }
-                  final expiration =
-                      DateTime.parse(uri.queryParameters['Expires']!);
+                  final secondsFromEpoch =
+                      int.parse(uri.queryParameters['Expires']!);
+                  final expiration = DateTime.fromMillisecondsSinceEpoch(
+                      secondsFromEpoch * 1000);
                   return expiration.isBefore(DateTime.now());
                 }) ==
                 true)
         .map((e) => e.id)
         .toList();
+
     if (expiredAttachmentMessagesId.isNotEmpty == true) {
-      _channel.getMessagesById(expiredAttachmentMessagesId);
+      await _channel._initializedCompleter.future;
       _updatedMessagesIds.addAll(expiredAttachmentMessagesId);
+      _channel.getMessagesById(expiredAttachmentMessagesId);
     }
   }
 
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index dd394c1e..81657659 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -30,4 +30,6 @@ dev_dependencies:
   freezed: ^0.14.1+3
   json_serializable: ^4.1.0
   mocktail: ^0.1.1
-  test: ^1.17.7
\ No newline at end of file
+  # Remove fixed version once the below issue is fixed
+  # https://github.com/flutter/flutter/issues/91059
+  test: 1.17.12
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 35ce4094..9e4f2744 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Upcoming
 
+🐞 Fixed
+
+-[[#687]](https://github.com/GetStream/stream-chat-flutter/issues/687): Fix Users losing their place in the conversation after replying in threads.
+- Fixed floating date stream subscription causing "Bad state: stream has already been listened.” error.
+
 ✅ Added
 
 - Added `MessageInput.customOverlays` property to add custom overlays to the message input.
diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index 4f76a3bf..42285475 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -293,7 +293,6 @@ class _MessageListViewState extends State<MessageListView> {
   void Function(Message)? _onThreadTap;
   bool _showScrollToBottom = false;
   late final ItemPositionsListener _itemPositionListener;
-  late final Stream<Iterable<ItemPosition>> _itemPositionStream;
   int? _messageListLength;
   StreamChannelState? streamChannel;
   late StreamChatThemeData _streamTheme;
@@ -665,7 +664,8 @@ class _MessageListViewState extends State<MessageListView> {
         right: 0,
         child: BetterStreamBuilder<Iterable<ItemPosition>>(
           initialData: _itemPositionListener.itemPositions.value,
-          stream: _itemPositionStream,
+          stream: _valueListenableToStreamAdapter(
+              _itemPositionListener.itemPositions),
           comparator: (a, b) {
             if (a == null || b == null) {
               return false;
@@ -1194,8 +1194,6 @@ class _MessageListViewState extends State<MessageListView> {
     _scrollController = widget.scrollController ?? ItemScrollController();
     _itemPositionListener =
         widget.itemPositionListener ?? ItemPositionsListener.create();
-    _itemPositionStream =
-        _valueListenableToStreamAdapter(_itemPositionListener.itemPositions);
 
     _getOnThreadTap();
     super.initState();
@@ -1227,8 +1225,9 @@ class _MessageListViewState extends State<MessageListView> {
           _bottomPaginationActive = false;
           _topPaginationActive = false;
         }
-        if (event.message!.user!.id ==
-            streamChannel!.channel.client.state.currentUser!.id) {
+        if (event.message?.parentId == widget.parentMessage?.id &&
+            event.message!.user!.id ==
+                streamChannel!.channel.client.state.currentUser!.id) {
           WidgetsBinding.instance!.addPostFrameCallback((_) {
             _scrollController?.jumpTo(
               index: 0,
diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
index 4f3ab8e9..f6409fa2 100644
--- a/packages/stream_chat_persistence/pubspec.yaml
+++ b/packages/stream_chat_persistence/pubspec.yaml
@@ -22,7 +22,8 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.0.1
+  flutter_test:
+    sdk: flutter
   mocktail: ^0.1.1
   moor_generator: ^4.2.1
   pedantic: ^1.11.0
-  test: ^1.17.7
diff --git a/packages/stream_chat_persistence/test/src/converter/list_coverter_test.dart b/packages/stream_chat_persistence/test/src/converter/list_coverter_test.dart
index a5fe7a49..9cee72b0 100644
--- a/packages/stream_chat_persistence/test/src/converter/list_coverter_test.dart
+++ b/packages/stream_chat_persistence/test/src/converter/list_coverter_test.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat_persistence/src/converter/list_converter.dart';
-import 'package:test/test.dart';
 
 void main() {
   group('mapToDart', () {
diff --git a/packages/stream_chat_persistence/test/src/converter/map_converter_test.dart b/packages/stream_chat_persistence/test/src/converter/map_converter_test.dart
index 6e14140b..c7754892 100644
--- a/packages/stream_chat_persistence/test/src/converter/map_converter_test.dart
+++ b/packages/stream_chat_persistence/test/src/converter/map_converter_test.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat_persistence/src/converter/map_converter.dart';
-import 'package:test/test.dart';
 
 void main() {
   group('mapToDart', () {
diff --git a/packages/stream_chat_persistence/test/src/converter/message_sending_status_converter_test.dart b/packages/stream_chat_persistence/test/src/converter/message_sending_status_converter_test.dart
index c53d8fb4..840f0469 100644
--- a/packages/stream_chat_persistence/test/src/converter/message_sending_status_converter_test.dart
+++ b/packages/stream_chat_persistence/test/src/converter/message_sending_status_converter_test.dart
@@ -1,6 +1,6 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/converter/message_sending_status_converter.dart';
-import 'package:test/test.dart';
 
 void main() {
   group('mapToDart', () {
diff --git a/packages/stream_chat_persistence/test/src/dao/channel_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/channel_dao_test.dart
index c0a00100..ff75c13c 100644
--- a/packages/stream_chat_persistence/test/src/dao/channel_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/channel_dao_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/channel_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart
index 81e629b6..2ea1e73a 100644
--- a/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/channel_query_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';
diff --git a/packages/stream_chat_persistence/test/src/dao/connection_event_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/connection_event_dao_test.dart
index 40c385ba..6b576169 100644
--- a/packages/stream_chat_persistence/test/src/dao/connection_event_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/connection_event_dao_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/connection_event_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';
diff --git a/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart
index 4ca3880b..33531ca9 100644
--- a/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';
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 d069f9f9..31546ecf 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
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 
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 f8fae456..45f2ed0a 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
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/dao/pinned_message_reaction_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/pinned_message_reaction_dao_test.dart
index aa92c5cc..5c451ec1 100644
--- a/packages/stream_chat_persistence/test/src/dao/pinned_message_reaction_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/pinned_message_reaction_dao_test.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/pinned_message_reaction_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/dao/reaction_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/reaction_dao_test.dart
index 21570d4e..8109e75e 100644
--- a/packages/stream_chat_persistence/test/src/dao/reaction_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/reaction_dao_test.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/reaction_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/dao/read_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/read_dao_test.dart
index ca556632..1cebd1eb 100644
--- a/packages/stream_chat_persistence/test/src/dao/read_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/read_dao_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';
diff --git a/packages/stream_chat_persistence/test/src/dao/user_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/user_dao_test.dart
index 1fd4eafd..ab88881a 100644
--- a/packages/stream_chat_persistence/test/src/dao/user_dao_test.dart
+++ b/packages/stream_chat_persistence/test/src/dao/user_dao_test.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 import '../../stream_chat_persistence_client_test.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/db/moor_chat_database_test.dart b/packages/stream_chat_persistence/test/src/db/moor_chat_database_test.dart
index 101b44ed..eb1b6933 100644
--- a/packages/stream_chat_persistence/test/src/db/moor_chat_database_test.dart
+++ b/packages/stream_chat_persistence/test/src/db/moor_chat_database_test.dart
@@ -1,8 +1,8 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:moor/ffi.dart';
 import 'package:moor/isolate.dart';
 import 'package:moor/moor.dart' hide isNotNull;
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
-import 'package:test/test.dart';
 
 DatabaseConnection _backgroundConnection() =>
     DatabaseConnection.fromExecutor(VmDatabase.memory());
diff --git a/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart
index b45f46b4..2c87097b 100644
--- a/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/channel_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/event_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/event_mapper_test.dart
index 3182162b..a7c72d0d 100644
--- a/packages/stream_chat_persistence/test/src/mapper/event_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/event_mapper_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/event_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart
index b3f834ef..19f299b3 100644
--- a/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/member_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart
index 52a58a1a..d26d905b 100644
--- a/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/message_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart
index 40c4ff6c..9f258b76 100644
--- a/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/pinned_message_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/pinned_message_reaction_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/pinned_message_reaction_mapper_test.dart
index b814b7dc..f031d941 100644
--- a/packages/stream_chat_persistence/test/src/mapper/pinned_message_reaction_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/pinned_message_reaction_mapper_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/pinned_message_reaction_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/reaction_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/reaction_mapper_test.dart
index e211f685..831d6068 100644
--- a/packages/stream_chat_persistence/test/src/mapper/reaction_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/reaction_mapper_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/reaction_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/read_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/read_mapper_test.dart
index eb296a75..f152e476 100644
--- a/packages/stream_chat_persistence/test/src/mapper/read_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/read_mapper_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/read_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart
index 55dbbff4..7b6ef2e8 100644
--- a/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart
+++ b/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/mapper/user_mapper.dart';
-import 'package:test/test.dart';
 
 import '../utils/date_matcher.dart';
 
diff --git a/packages/stream_chat_persistence/test/src/utils/date_matcher.dart b/packages/stream_chat_persistence/test/src/utils/date_matcher.dart
index dec68db0..5f55f46a 100644
--- a/packages/stream_chat_persistence/test/src/utils/date_matcher.dart
+++ b/packages/stream_chat_persistence/test/src/utils/date_matcher.dart
@@ -1,4 +1,4 @@
-import 'package:test/test.dart';
+import 'package:flutter_test/flutter_test.dart';
 
 Matcher isSameDateAs(DateTime targetDate) =>
     _IsSameDateAs(targetDate: targetDate);
diff --git a/packages/stream_chat_persistence/test/stream_chat_persistence_client_test.dart b/packages/stream_chat_persistence/test/stream_chat_persistence_client_test.dart
index 25e926b1..5c2b6bff 100644
--- a/packages/stream_chat_persistence/test/stream_chat_persistence_client_test.dart
+++ b/packages/stream_chat_persistence/test/stream_chat_persistence_client_test.dart
@@ -1,9 +1,10 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:moor/ffi.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/stream_chat_persistence_client.dart';
-import 'package:test/test.dart';
+
 import 'mock_chat_database.dart';
 import 'src/utils/date_matcher.dart';