diff --git a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
index fbb53fd3..efc8610b 100644
--- a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
+++ b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
@@ -1,5 +1,3 @@
-import 'package:meta/meta.dart';
-import 'package:moor/ffi.dart';
 import 'package:moor/moor.dart';
 import 'package:stream_chat/stream_chat.dart';
 
@@ -46,10 +44,6 @@ class MoorChatDatabase extends _$MoorChatDatabase {
     DatabaseConnection connection,
   ) : super.connect(connection);
 
-  /// Custom constructor used only for testing
-  @visibleForTesting
-  MoorChatDatabase.testable(this._userId) : super(VmDatabase.memory());
-
   final String _userId;
 
   /// User id to which the database is connected
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 d6ac8123..9a458574 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
@@ -3,12 +3,14 @@ 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';
+
 void main() {
   late ChannelDao channelDao;
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     channelDao = database.channelDao;
   });
 
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 9b5e3470..a69a07ee 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
@@ -5,6 +5,7 @@ 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';
 
 void main() {
@@ -12,7 +13,7 @@ void main() {
   late ChannelQueryDao channelQueryDao;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     channelQueryDao = database.channelQueryDao;
   });
 
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 536fe3bc..40c385ba 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
@@ -3,6 +3,7 @@ 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';
 
 void main() {
@@ -10,7 +11,7 @@ void main() {
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     eventDao = database.connectionEventDao;
   });
 
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 6654de4c..8ce704a4 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
@@ -5,6 +5,7 @@ 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';
 
 void main() {
@@ -12,7 +13,7 @@ void main() {
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     memberDao = database.memberDao;
   });
 
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 0d986590..54cc219a 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
@@ -5,12 +5,14 @@ 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';
+
 void main() {
   late MessageDao messageDao;
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     messageDao = database.messageDao;
   });
 
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 33bf96b1..42a54107 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
@@ -5,12 +5,14 @@ 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';
+
 void main() {
   late PinnedMessageDao pinnedMessageDao;
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     pinnedMessageDao = database.pinnedMessageDao;
   });
 
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 73ff63fe..4edda680 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
@@ -5,12 +5,14 @@ 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';
+
 void main() {
   late ReactionDao reactionDao;
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     reactionDao = database.reactionDao;
   });
 
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 77b7a7f9..287dcad4 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
@@ -3,6 +3,7 @@ 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';
 
 void main() {
@@ -10,7 +11,7 @@ void main() {
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     readDao = database.readDao;
   });
 
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 5332a298..ffb50edd 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
@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';
 import 'package:stream_chat/stream_chat.dart';
 
+import '../../stream_chat_persistence_client_test.dart';
+
 void main() {
   late UserDao userDao;
   late MoorChatDatabase database;
 
   setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
     userDao = database.userDao;
   });
 
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 8a275201..83524870 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,4 +1,5 @@
 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';
@@ -6,8 +7,8 @@ import 'package:test/test.dart';
 import 'mock_chat_database.dart';
 import 'src/utils/date_matcher.dart';
 
-MoorChatDatabase _testDatabaseProvider(String userId, ConnectionMode mode) =>
-    MoorChatDatabase.testable(userId);
+MoorChatDatabase testDatabaseProvider(String userId, [ConnectionMode? mode]) =>
+    MoorChatDatabase(userId, VmDatabase.memory());
 
 void main() {
   group('connect', () {
@@ -15,7 +16,7 @@ void main() {
     test('successfully connects with the Database', () async {
       final client = StreamChatPersistenceClient(logLevel: Level.ALL);
       expect(client.db, isNull);
-      await client.connect(userId, databaseProvider: _testDatabaseProvider);
+      await client.connect(userId, databaseProvider: testDatabaseProvider);
       expect(client.db, isNotNull);
       expect(client.db, isA<MoorChatDatabase>());
       expect(client.db!.userId, userId);
@@ -28,13 +29,13 @@ void main() {
     test('throws if already connected', () async {
       final client = StreamChatPersistenceClient(logLevel: Level.ALL);
       expect(client.db, isNull);
-      await client.connect(userId, databaseProvider: _testDatabaseProvider);
+      await client.connect(userId, databaseProvider: testDatabaseProvider);
       expect(client.db, isNotNull);
       expect(client.db, isNotNull);
       expect(client.db, isA<MoorChatDatabase>());
       expect(client.db!.userId, userId);
       expect(
-        () => client.connect(userId, databaseProvider: _testDatabaseProvider),
+        () => client.connect(userId, databaseProvider: testDatabaseProvider),
         throwsException,
       );
 
@@ -47,7 +48,7 @@ void main() {
   test('disconnect', () async {
     const userId = 'testUserId';
     final client = StreamChatPersistenceClient(logLevel: Level.ALL);
-    await client.connect(userId, databaseProvider: _testDatabaseProvider);
+    await client.connect(userId, databaseProvider: testDatabaseProvider);
     expect(client.db, isNotNull);
     await client.disconnect(flush: true);
     expect(client.db, isNull);