diff --git a/vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt b/vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
index d8873a71a4..44ea65244b 100644
--- a/vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt
@@ -17,7 +17,6 @@
 package im.vector.app.core.utils
 
 import androidx.test.platform.app.InstrumentationRegistry
-import im.vector.app.features.room.VectorRoomDisplayNameFallbackProvider
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.SyncConfig
@@ -25,7 +24,7 @@ import org.matrix.android.sdk.api.SyncConfig
 fun getMatrixInstance(): Matrix {
     val context = InstrumentationRegistry.getInstrumentation().targetContext
     val configuration = MatrixConfiguration(
-            roomDisplayNameFallbackProvider = VectorRoomDisplayNameFallbackProvider(context),
+            roomDisplayNameFallbackProvider = TestRoomDisplayNameFallbackProvider(),
             syncConfig = SyncConfig(longPollTimeout = 5_000L),
     )
     return Matrix(context, configuration)
diff --git a/vector-app/src/androidTest/java/im/vector/app/core/utils/TestRoomDisplayNameFallbackProvider.kt b/vector-app/src/androidTest/java/im/vector/app/core/utils/TestRoomDisplayNameFallbackProvider.kt
new file mode 100644
index 0000000000..3d473d15d9
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/core/utils/TestRoomDisplayNameFallbackProvider.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.utils
+
+import org.matrix.android.sdk.api.provider.RoomDisplayNameFallbackProvider
+
+class TestRoomDisplayNameFallbackProvider : RoomDisplayNameFallbackProvider {
+
+    override fun excludedUserIds(roomId: String) = emptyList<String>()
+
+    override fun getNameForRoomInvite() =
+            "Room invite"
+
+    override fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>) =
+            "Empty room"
+
+    override fun getNameFor1member(name: String) =
+            name
+
+    override fun getNameFor2members(name1: String, name2: String) =
+            "$name1 and $name2"
+
+    override fun getNameFor3members(name1: String, name2: String, name3: String) =
+            "$name1, $name2 and $name3"
+
+    override fun getNameFor4members(name1: String, name2: String, name3: String, name4: String) =
+            "$name1, $name2, $name3 and $name4"
+
+    override fun getNameFor4membersAndMore(name1: String, name2: String, name3: String, remainingCount: Int) =
+            "$name1, $name2, $name3 and $remainingCount others"
+}