diff --git a/src/test/java/io/getstream/chat/java/MessageCountTest.java b/src/test/java/io/getstream/chat/java/MessageCountTest.java
index 132cf564d..393b7708e 100644
--- a/src/test/java/io/getstream/chat/java/MessageCountTest.java
+++ b/src/test/java/io/getstream/chat/java/MessageCountTest.java
@@ -3,6 +3,7 @@
 import io.getstream.chat.java.models.Channel;
 import io.getstream.chat.java.models.Channel.ChannelGetResponse;
 import io.getstream.chat.java.models.Channel.ChannelRequestObject;
+import io.getstream.chat.java.models.ChannelType;
 import io.getstream.chat.java.models.Message;
 import io.getstream.chat.java.models.Message.MessageRequestObject;
 import java.util.HashMap;
@@ -17,11 +18,15 @@ public class MessageCountTest extends BasicTest {
   @DisplayName("Message count is present when feature enabled")
   @Test
   void whenCountMessagesEnabled_thenMessagesCount() {
-    // Create a fresh channel with default configuration (count_messages enabled by default)
+    // Enable count_messages on the built-in "messaging" channel type
+    Assertions.assertDoesNotThrow(
+        () -> ChannelType.update("messaging").countMessages(true).request());
+    pause();
+
     ChannelGetResponse channelGetResponse =
         Assertions.assertDoesNotThrow(
             () ->
-                Channel.getOrCreate("team", RandomStringUtils.randomAlphabetic(12))
+                Channel.getOrCreate("messaging", RandomStringUtils.randomAlphabetic(12))
                     .data(
                         ChannelRequestObject.builder()
                             .createdBy(testUserRequestObject)
@@ -47,6 +52,9 @@ void whenCountMessagesEnabled_thenMessagesCount() {
     Assertions.assertTrue(
         refreshed.getChannel().getMessageCount() == 1,
         "messages_count should be 1 when count_messages is enabled");
+
+    // Cleanup: delete channel created for this test
+    Assertions.assertDoesNotThrow(() -> Channel.delete(type, id).request());
   }
 
   @DisplayName("Message count is not returned when feature disabled")
@@ -87,5 +95,8 @@ void whenCountMessagesDisabled_thenNoMessageCountPresent() {
     Integer messagesCount = refreshed.getChannel().getMessageCount();
     Assertions.assertNull(
         messagesCount, "messages_count should not be present when count_messages is disabled");
+
+    // Cleanup: delete channel created for this test
+    Assertions.assertDoesNotThrow(() -> Channel.delete(type, id).request());
   }
 }