diff --git a/packages/dart_client/pubspec.yaml b/packages/dart_client/pubspec.yaml
index 99d6794b..024f9d90 100644
--- a/packages/dart_client/pubspec.yaml
+++ b/packages/dart_client/pubspec.yaml
@@ -21,10 +21,10 @@ dependencies:
   rxdart: ^0.24.1
   collection: ^1.14.12
   pedantic: ^1.9.2
+  freezed: ^0.12.7
 
 dev_dependencies:
   build_runner: ^1.10.0
   json_serializable: ^3.3.0
-  flutter_test:
-    sdk: flutter
+  test: ^1.15.7
   mockito: ^4.1.1
diff --git a/packages/dart_client/test/src/client_test.dart b/packages/dart_client/test/src/client_test.dart
index 011789be..299ccecb 100644
--- a/packages/dart_client/test/src/client_test.dart
+++ b/packages/dart_client/test/src/client_test.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 
 import 'package:dio/dio.dart';
 import 'package:dio/native_imp.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:logging/logging.dart';
 import 'package:mockito/mockito.dart';
 import 'package:stream_chat/src/api/requests.dart';
diff --git a/packages/dart_client/test/src/models/action_test.dart b/packages/dart_client/test/src/models/action_test.dart
index 2f75dddb..4859fcbe 100644
--- a/packages/dart_client/test/src/models/action_test.dart
+++ b/packages/dart_client/test/src/models/action_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/action.dart';
 
 void main() {
diff --git a/packages/dart_client/test/src/models/attachment_test.dart b/packages/dart_client/test/src/models/attachment_test.dart
index eaa8e9cc..b15458ad 100644
--- a/packages/dart_client/test/src/models/attachment_test.dart
+++ b/packages/dart_client/test/src/models/attachment_test.dart
@@ -2,7 +2,7 @@ import 'package:stream_chat/src/models/attachment.dart';
 import 'package:stream_chat/src/models/action.dart';
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('src/models/attachment', () {
diff --git a/packages/dart_client/test/src/models/channel_state_test.dart b/packages/dart_client/test/src/models/channel_state_test.dart
index 21ffb20c..b8ce3c80 100644
--- a/packages/dart_client/test/src/models/channel_state_test.dart
+++ b/packages/dart_client/test/src/models/channel_state_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/channel_config.dart';
 import 'package:stream_chat/src/models/channel_state.dart';
 import 'package:stream_chat/src/models/command.dart';
diff --git a/packages/dart_client/test/src/models/channel_test.dart b/packages/dart_client/test/src/models/channel_test.dart
index 7197d083..69b18197 100644
--- a/packages/dart_client/test/src/models/channel_test.dart
+++ b/packages/dart_client/test/src/models/channel_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/channel_model.dart';
 
 void main() {
diff --git a/packages/dart_client/test/src/models/command_test.dart b/packages/dart_client/test/src/models/command_test.dart
index 51774b84..dc44f736 100644
--- a/packages/dart_client/test/src/models/command_test.dart
+++ b/packages/dart_client/test/src/models/command_test.dart
@@ -1,7 +1,7 @@
 import 'package:stream_chat/src/models/command.dart';
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('src/models/command', () {
diff --git a/packages/dart_client/test/src/models/device_test.dart b/packages/dart_client/test/src/models/device_test.dart
index 3f68929f..3f8de16e 100644
--- a/packages/dart_client/test/src/models/device_test.dart
+++ b/packages/dart_client/test/src/models/device_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/device.dart';
 
 void main() {
diff --git a/packages/dart_client/test/src/models/event_test.dart b/packages/dart_client/test/src/models/event_test.dart
index eb7d0f5a..db99b01a 100644
--- a/packages/dart_client/test/src/models/event_test.dart
+++ b/packages/dart_client/test/src/models/event_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/event.dart';
 import 'package:stream_chat/src/models/own_user.dart';
 import 'package:stream_chat/stream_chat.dart';
diff --git a/packages/dart_client/test/src/models/member_test.dart b/packages/dart_client/test/src/models/member_test.dart
index 121b470f..237f0030 100644
--- a/packages/dart_client/test/src/models/member_test.dart
+++ b/packages/dart_client/test/src/models/member_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/member.dart';
 import 'package:stream_chat/src/models/user.dart';
 
diff --git a/packages/dart_client/test/src/models/message_test.dart b/packages/dart_client/test/src/models/message_test.dart
index de335c21..7541f722 100644
--- a/packages/dart_client/test/src/models/message_test.dart
+++ b/packages/dart_client/test/src/models/message_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/attachment.dart';
 import 'package:stream_chat/src/models/message.dart';
 import 'package:stream_chat/src/models/reaction.dart';
diff --git a/packages/dart_client/test/src/models/reaction_test.dart b/packages/dart_client/test/src/models/reaction_test.dart
index 2e8fe5f8..8bc92081 100644
--- a/packages/dart_client/test/src/models/reaction_test.dart
+++ b/packages/dart_client/test/src/models/reaction_test.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/reaction.dart';
 import 'dart:convert';
 
diff --git a/packages/dart_client/test/src/models/read_test.dart b/packages/dart_client/test/src/models/read_test.dart
index 83596170..b15ce66a 100644
--- a/packages/dart_client/test/src/models/read_test.dart
+++ b/packages/dart_client/test/src/models/read_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/read.dart';
 import 'package:stream_chat/src/models/user.dart';
 
diff --git a/packages/dart_client/test/src/models/serialization_test.dart b/packages/dart_client/test/src/models/serialization_test.dart
index c20d0012..e8a2de3f 100644
--- a/packages/dart_client/test/src/models/serialization_test.dart
+++ b/packages/dart_client/test/src/models/serialization_test.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/serialization.dart';
 
 void main() {
diff --git a/packages/dart_client/test/src/models/user_test.dart b/packages/dart_client/test/src/models/user_test.dart
index a148ec6e..6100b218 100644
--- a/packages/dart_client/test/src/models/user_test.dart
+++ b/packages/dart_client/test/src/models/user_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/src/models/user.dart';
 
 void main() {
diff --git a/packages/dart_client/test/version_test.dart b/packages/dart_client/test/version_test.dart
index 698f79e1..ada2a85c 100644
--- a/packages/dart_client/test/version_test.dart
+++ b/packages/dart_client/test/version_test.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:stream_chat/version.dart';
 
 void prepareTest() {
diff --git a/packages/dart_client/test_integration/client_test.dart b/packages/dart_client/test_integration/client_test.dart
deleted file mode 100644
index 98ec39cf..00000000
--- a/packages/dart_client/test_integration/client_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:logging/logging.dart';
-import 'package:stream_chat/src/client.dart';
-import 'package:stream_chat/stream_chat.dart';
-
-const API_KEY = '6xjf3dex3n7d';
-const TOKEN =
-    'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoid2lsZC1icmVlemUtNyJ9.VM2EX1EXOfgqa-bTH_3JzeY0T99ngWzWahSauP3dBMo';
-
-void main() {
-  test('test', () async {
-    final client = Client(
-      '6xjf3dex3n7d',
-      logLevel: Level.INFO,
-      tokenProvider: (_) async => '',
-    );
-    final user = User(id: 'wild-breeze-7');
-
-    await client.setGuestUser(user);
-  });
-}