diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
index b8b7190cf6..1b8c75f153 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
@@ -178,12 +178,23 @@ class RoomListPresenterTests {
             val initialItems = initialState.roomList.dataOrNull().orEmpty()
             assertThat(initialItems.size).isEqualTo(16)
             assertThat(initialItems.all { it.isPlaceholder }).isTrue()
-            roomListService.postAllRooms(listOf(aRoomSummaryFilled()))
+            roomListService.postAllRooms(
+                listOf(
+                    aRoomSummaryFilled(
+                        numUnreadMentions = 1,
+                        numUnreadMessages = 2,
+                    )
+                )
+            )
             val withRoomState = consumeItemsUntilPredicate { state -> state.roomList.dataOrNull()?.size == 1 }.last()
             val withRoomStateItems = withRoomState.roomList.dataOrNull().orEmpty()
             assertThat(withRoomStateItems.size).isEqualTo(1)
-            assertThat(withRoomStateItems.first())
-                .isEqualTo(createRoomListRoomSummary())
+            assertThat(withRoomStateItems.first()).isEqualTo(
+                createRoomListRoomSummary(
+                    numberOfUnreadMentions = 1,
+                    numberOfUnreadMessages = 2,
+                )
+            )
             scope.cancel()
         }
     }
@@ -199,7 +210,14 @@ class RoomListPresenterTests {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            roomListService.postAllRooms(listOf(aRoomSummaryFilled()))
+            roomListService.postAllRooms(
+                listOf(
+                    aRoomSummaryFilled(
+                        numUnreadMentions = 1,
+                        numUnreadMessages = 2,
+                    )
+                )
+            )
             skipItems(3)
             val loadedState = awaitItem()
             // Test filtering with result
@@ -210,8 +228,12 @@ class RoomListPresenterTests {
             assertThat(withFilteredRoomState.filteredRoomList.size).isEqualTo(1)
             assertThat(withFilteredRoomState.filter).isEqualTo(A_ROOM_NAME.substring(0, 3))
             assertThat(withFilteredRoomState.filteredRoomList.size).isEqualTo(1)
-            assertThat(withFilteredRoomState.filteredRoomList.first())
-                .isEqualTo(createRoomListRoomSummary())
+            assertThat(withFilteredRoomState.filteredRoomList.first()).isEqualTo(
+                createRoomListRoomSummary(
+                    numberOfUnreadMentions = 1,
+                    numberOfUnreadMessages = 2,
+                )
+            )
             // Test filtering without result
             withFilteredRoomState.eventSink.invoke(RoomListEvents.UpdateFilter("tada"))
             skipItems(1)
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt
index 2b413abe99..c991d7bf36 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt
@@ -29,11 +29,7 @@ class RoomListRoomSummaryTest {
     @Test
     fun `test default value`() {
         val sut = createRoomListRoomSummary(
-            numberOfUnreadMentions = 0,
-            numberOfUnreadMessages = 0,
-            numberOfUnreadNotifications = 0,
             isMarkedUnread = false,
-            userDefinedNotificationMode = null,
         )
         assertThat(sut.isHighlighted).isFalse()
         assertThat(sut.hasNewContent).isFalse()
@@ -42,11 +38,7 @@ class RoomListRoomSummaryTest {
     @Test
     fun `test isMarkedUnread set to true`() {
         val sut = createRoomListRoomSummary(
-            numberOfUnreadMentions = 0,
-            numberOfUnreadMessages = 0,
-            numberOfUnreadNotifications = 0,
             isMarkedUnread = true,
-            userDefinedNotificationMode = null,
         )
         assertThat(sut.isHighlighted).isTrue()
         assertThat(sut.hasNewContent).isTrue()
@@ -54,8 +46,8 @@ class RoomListRoomSummaryTest {
 }
 
 internal fun createRoomListRoomSummary(
-    numberOfUnreadMentions: Int = 1,
-    numberOfUnreadMessages: Int = 2,
+    numberOfUnreadMentions: Int = 0,
+    numberOfUnreadMessages: Int = 0,
     numberOfUnreadNotifications: Int = 0,
     isMarkedUnread: Boolean = false,
     userDefinedNotificationMode: RoomNotificationMode? = null,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
index bc3ce1d807..4871dcb402 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
@@ -37,8 +37,8 @@ fun aRoomSummaryFilled(
     isDirect: Boolean = false,
     avatarUrl: String? = null,
     lastMessage: RoomMessage? = aRoomMessage(),
-    numUnreadMentions: Int = 1,
-    numUnreadMessages: Int = 2,
+    numUnreadMentions: Int = 0,
+    numUnreadMessages: Int = 0,
     notificationMode: RoomNotificationMode? = null,
 ) = RoomSummary.Filled(
     aRoomSummaryDetails(