diff --git a/packages/stream_chat_flutter/test/src/avatar_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/avatar_theme_test.dart
similarity index 100%
rename from packages/stream_chat_flutter/test/src/avatar_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/avatar_theme_test.dart
diff --git a/packages/stream_chat_flutter/test/src/channel_header_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/channel_header_theme_test.dart
similarity index 100%
rename from packages/stream_chat_flutter/test/src/channel_header_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/channel_header_theme_test.dart
diff --git a/packages/stream_chat_flutter/test/src/channel_list_view_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/channel_list_view_theme_test.dart
similarity index 99%
rename from packages/stream_chat_flutter/test/src/channel_list_view_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/channel_list_view_theme_test.dart
index 80a21d25..38b1c524 100644
--- a/packages/stream_chat_flutter/test/src/channel_list_view_theme_test.dart
+++ b/packages/stream_chat_flutter/test/src/theme/channel_list_view_theme_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
-import 'mocks.dart';
+import '../mocks.dart';
 
 void main() {
   test('ChannelListViewThemeData copyWith, ==, hashCode basics', () {
diff --git a/packages/stream_chat_flutter/test/src/gallery_footer_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/gallery_footer_theme_test.dart
similarity index 100%
rename from packages/stream_chat_flutter/test/src/gallery_footer_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/gallery_footer_theme_test.dart
diff --git a/packages/stream_chat_flutter/test/src/gallery_header_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/gallery_header_theme_test.dart
similarity index 100%
rename from packages/stream_chat_flutter/test/src/gallery_header_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/gallery_header_theme_test.dart
diff --git a/packages/stream_chat_flutter/test/src/message_list_view_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/message_list_view_theme_test.dart
similarity index 99%
rename from packages/stream_chat_flutter/test/src/message_list_view_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/message_list_view_theme_test.dart
index ffe54dd0..476f5063 100644
--- a/packages/stream_chat_flutter/test/src/message_list_view_theme_test.dart
+++ b/packages/stream_chat_flutter/test/src/theme/message_list_view_theme_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
-import 'mocks.dart';
+import '../mocks.dart';
 
 class MockStreamChatClient extends Mock implements StreamChatClient {}
 
diff --git a/packages/stream_chat_flutter/test/src/message_search_list_view_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/message_search_list_view_theme_test.dart
similarity index 99%
rename from packages/stream_chat_flutter/test/src/message_search_list_view_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/message_search_list_view_theme_test.dart
index e485e0d6..4da1c7dc 100644
--- a/packages/stream_chat_flutter/test/src/message_search_list_view_theme_test.dart
+++ b/packages/stream_chat_flutter/test/src/theme/message_search_list_view_theme_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
-import 'mocks.dart';
+import '../mocks.dart';
 
 void main() {
   test('MessageSearchListViewThemeData copyWith, ==, hashCode basics', () {
diff --git a/packages/stream_chat_flutter/test/src/user_list_view_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/user_list_view_theme_test.dart
similarity index 99%
rename from packages/stream_chat_flutter/test/src/user_list_view_theme_test.dart
rename to packages/stream_chat_flutter/test/src/theme/user_list_view_theme_test.dart
index e9b7985a..a22eebd0 100644
--- a/packages/stream_chat_flutter/test/src/user_list_view_theme_test.dart
+++ b/packages/stream_chat_flutter/test/src/theme/user_list_view_theme_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
-import 'mocks.dart';
+import '../mocks.dart';
 
 void main() {
   test('UserListViewThemeData copyWith, ==, hashCode basics', () {