diff --git a/app/src/test/kotlin/io/element/android/app/KonsistTestTest.kt b/app/src/test/kotlin/io/element/android/app/KonsistTestTest.kt
index b4f24eeccb..3ed6bd2026 100644
--- a/app/src/test/kotlin/io/element/android/app/KonsistTestTest.kt
+++ b/app/src/test/kotlin/io/element/android/app/KonsistTestTest.kt
@@ -18,11 +18,21 @@ package io.element.android.app
 
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.modifierprovider.withoutOverrideModifier
+import com.lemonappdev.konsist.api.ext.list.withFunction
 import com.lemonappdev.konsist.api.ext.list.withReturnType
 import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.Test
 
 class KonsistTestTest {
+    @Test
+    fun `Classes name containing @Test must end with 'Test''`() {
+        Konsist
+            .scopeFromTest()
+            .classes()
+            .withFunction { it.hasAnnotationOf(Test::class) }
+            .assertTrue { it.name.endsWith("Test") }
+    }
+
     @Test
     fun `Function which creates Presenter in test MUST be named 'createPresenterName'`() {
         Konsist
diff --git a/features/call/src/test/kotlin/io/element/android/features/call/CallIntentDataParserTests.kt b/features/call/src/test/kotlin/io/element/android/features/call/CallIntentDataParserTest.kt
similarity index 99%
rename from features/call/src/test/kotlin/io/element/android/features/call/CallIntentDataParserTests.kt
rename to features/call/src/test/kotlin/io/element/android/features/call/CallIntentDataParserTest.kt
index f23a5fb43c..ae82767f45 100644
--- a/features/call/src/test/kotlin/io/element/android/features/call/CallIntentDataParserTests.kt
+++ b/features/call/src/test/kotlin/io/element/android/features/call/CallIntentDataParserTest.kt
@@ -23,7 +23,7 @@ import org.robolectric.RobolectricTestRunner
 import java.net.URLEncoder
 
 @RunWith(RobolectricTestRunner::class)
-class CallIntentDataParserTests {
+class CallIntentDataParserTest {
 
     private val callIntentDataParser = CallIntentDataParser()
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTests.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTest.kt
similarity index 98%
rename from features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTests.kt
rename to features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTest.kt
index c1d7e5bb6c..17c6ce3e4a 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTests.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTest.kt
@@ -22,7 +22,7 @@ import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import io.element.android.libraries.ui.strings.CommonStrings
 import org.junit.Test
 
-class ErrorFormatterTests {
+class ErrorFormatterTest {
 
     // region loginError
     @Test
diff --git a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTests.kt b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt
similarity index 99%
rename from libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTests.kt
rename to libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt
index de5703b090..7f83c9de8f 100644
--- a/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTests.kt
+++ b/libraries/core/src/test/kotlin/io/element/android/libraries/core/extensions/ResultTest.kt
@@ -19,7 +19,7 @@ package io.element.android.libraries.core.extensions
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 
-class ResultTests {
+class ResultTest {
 
     @Test
     fun testFlatMap() {
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTests.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
similarity index 99%
rename from libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTests.kt
rename to libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
index c906952bbb..4c26fcb3c7 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTests.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
@@ -61,7 +61,7 @@ import org.robolectric.annotation.Config
 
 @Suppress("LargeClass")
 @RunWith(RobolectricTestRunner::class)
-class DefaultRoomLastMessageFormatterTests {
+class DefaultRoomLastMessageFormatterTest {
 
     private lateinit var context: Context
     private lateinit var fakeMatrixClient: FakeMatrixClient
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTests.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTest.kt
similarity index 98%
rename from libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTests.kt
rename to libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTest.kt
index b3ccf5264d..5f987ad725 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTests.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTest.kt
@@ -19,7 +19,7 @@ package io.element.android.libraries.matrix.api.auth
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 
-class AuthErrorCodeTests {
+class AuthErrorCodeTest {
 
     @Test
     fun `errorCode finds UNKNOWN code`() {
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverterTests.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverterTest.kt
similarity index 98%
rename from libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverterTests.kt
rename to libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverterTest.kt
index ef0a586fba..d3d928c189 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverterTests.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/MatrixToConverterTest.kt
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
-class MatrixToConverterTests {
+class MatrixToConverterTest {
 
     @Test
     fun `converting a matrix-to url does nothing`() {
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilderTests.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilderTest.kt
similarity index 99%
rename from libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilderTests.kt
rename to libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilderTest.kt
index 0a9a03cabb..282f58ab21 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilderTests.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkBuilderTest.kt
@@ -23,7 +23,7 @@ import io.element.android.tests.testutils.assertThrowsInDebug
 import io.element.android.tests.testutils.isInDebug
 import org.junit.Test
 
-class PermalinkBuilderTests {
+class PermalinkBuilderTest {
 
     fun `building a permalink for an invalid user id throws when verifying the id`() {
         assertThrowsInDebug {
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParserTests.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParserTest.kt
similarity index 99%
rename from libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParserTests.kt
rename to libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParserTest.kt
index 74797083c4..d55b6aebbe 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParserTests.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/permalink/PermalinkParserTest.kt
@@ -22,7 +22,7 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
-class PermalinkParserTests {
+class PermalinkParserTest {
 
     @Test
     fun `parsing an invalid url returns a fallback link`() {
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTests.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
similarity index 99%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTests.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
index 2a8dd5c122..b0c02c9dcd 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTests.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
@@ -22,7 +22,7 @@ import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.AuthenticationException as RustAuthenticationException
 
-class AuthenticationExceptionMappingTests {
+class AuthenticationExceptionMappingTest {
 
     @Test
     fun `mapping an exception with no message returns 'Unknown error' message`() {
diff --git a/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTests.kt b/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTest.kt
similarity index 99%
rename from libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTests.kt
rename to libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTest.kt
index 4f17081f8b..d759dc3020 100644
--- a/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTests.kt
+++ b/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTest.kt
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
-class PickerTypeTests {
+class PickerTypeTest {
 
     @Test
     fun `ImageAndVideo - assert types`() {