diff --git a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_2.png b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_2.png
new file mode 100644
index 00000000..0906f11a
Binary files /dev/null and b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_2.png differ
diff --git a/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_3.png b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_3.png
new file mode 100644
index 00000000..0906f11a
Binary files /dev/null and b/packages/stream_chat_flutter/test/src/goldens/gradient_avatar_3.png differ
diff --git a/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart b/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart
index aaf2bf41..c74ef9a3 100644
--- a/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart
+++ b/packages/stream_chat_flutter/test/src/gradient_avatar_test.dart
@@ -38,67 +38,6 @@ void main() {
     },
   );
 
-  testWidgets(
-    'control special character test',
-    (WidgetTester tester) async {
-      final client = MockClient();
-      final clientState = MockClientState();
-
-      when(() => client.state).thenReturn(clientState);
-      when(() => clientState.user).thenReturn(OwnUser(id: 'user-id'));
-
-      await tester.pumpWidget(
-        MaterialApp(
-          home: StreamChat(
-            client: client,
-            child: const Scaffold(
-              body: Center(
-                child: SizedBox(
-                  width: 50,
-                  height: 50,
-                  child: GradientAvatar(
-                      name: 'd123@/d de:\$as', userId: 'demo123'),
-                ),
-              ),
-            ),
-          ),
-        ),
-      );
-
-      expect(find.byType(GradientAvatar), findsOneWidget);
-    },
-  );
-
-  testWidgets(
-    'control alpha numeric test 2',
-    (WidgetTester tester) async {
-      final client = MockClient();
-      final clientState = MockClientState();
-
-      when(() => client.state).thenReturn(clientState);
-      when(() => clientState.user).thenReturn(OwnUser(id: 'user-id'));
-
-      await tester.pumpWidget(
-        MaterialApp(
-          home: StreamChat(
-            client: client,
-            child: const Scaffold(
-              body: Center(
-                child: SizedBox(
-                  width: 50,
-                  height: 50,
-                  child: GradientAvatar(name: '123@/d \$as', userId: 'demo123'),
-                ),
-              ),
-            ),
-          ),
-        ),
-      );
-
-      expect(find.byType(GradientAvatar), findsOneWidget);
-    },
-  );
-
   testGoldens(
     'golden test for the name "demo user"',
     (WidgetTester tester) async {
@@ -140,4 +79,47 @@ void main() {
       await screenMatchesGolden(tester, 'gradient_avatar_1');
     },
   );
+
+  testGoldens(
+    'control special character test',
+    (WidgetTester tester) async {
+      await tester.pumpWidget(
+        const MaterialApp(
+          home: Scaffold(
+            body: Center(
+              child: SizedBox(
+                width: 50,
+                height: 50,
+                child:
+                    GradientAvatar(name: 'd123@/d de:\$as', userId: 'demo123'),
+              ),
+            ),
+          ),
+        ),
+      );
+
+      await screenMatchesGolden(tester, 'gradient_avatar_2');
+    },
+  );
+
+  testGoldens(
+    'control special character test 2',
+    (WidgetTester tester) async {
+      await tester.pumpWidget(
+        const MaterialApp(
+          home: Scaffold(
+            body: Center(
+              child: SizedBox(
+                width: 50,
+                height: 50,
+                child: GradientAvatar(name: '123@/d \$as', userId: 'demo123'),
+              ),
+            ),
+          ),
+        ),
+      );
+
+      await screenMatchesGolden(tester, 'gradient_avatar_3');
+    },
+  );
 }