diff --git a/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt
index 16414e66d3..fa60b348b1 100644
--- a/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt
+++ b/features/call/src/test/kotlin/io/element/android/features/call/MapWebkitPermissionsTest.kt
@@ -41,5 +41,4 @@ class MapWebkitPermissionsTest {
         val permission = mapWebkitPermissions(arrayOf(PermissionRequest.RESOURCE_PROTECTED_MEDIA_ID))
         assertThat(permission).isEmpty()
     }
-
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTests.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTests.kt
index 9d70e03fcd..d7d51c5eb4 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTests.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTests.kt
@@ -53,7 +53,7 @@ class ReactionSummaryPresenterTests {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            assertThat(initialState.target).isEqualTo(null)
+            assertThat(initialState.target).isNull()
 
             initialState.eventSink(summaryEvent)
             assertThat(awaitItem().target).isNotNull()
@@ -69,7 +69,7 @@ class ReactionSummaryPresenterTests {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            assertThat(initialState.target).isEqualTo(null)
+            assertThat(initialState.target).isNull()
 
             initialState.eventSink(summaryEvent)
             val reactions = awaitItem().target?.reactions
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt
index dd954a38e5..646a6e372f 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt
@@ -284,7 +284,7 @@ class InReplyToMetadataKtTest {
             ).metadata()
         }.test {
             awaitItem().let {
-                assertThat(it).isEqualTo(null)
+                assertThat(it).isNull()
             }
         }
     }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt
index 6b2ee68b3c..eb2c08d2be 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt
@@ -149,7 +149,7 @@ class DefaultVoiceMessagePlayerTest {
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isFalse()
                 assertThat(it.currentPosition).isEqualTo(0)
-                assertThat(it.duration).isEqualTo(null)
+                assertThat(it.duration).isNull()
             }
             matchReadyState(1_000L)
             player2.play()
@@ -177,7 +177,7 @@ class DefaultVoiceMessagePlayerTest {
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isFalse()
                 assertThat(it.currentPosition).isEqualTo(0)
-                assertThat(it.duration).isEqualTo(null)
+                assertThat(it.duration).isNull()
             }
             matchReadyState(1_000L)
             player1.play()
@@ -238,7 +238,7 @@ class DefaultVoiceMessagePlayerTest {
                 assertThat(it.isPlaying).isFalse()
                 assertThat(it.isEnded).isFalse()
                 assertThat(it.currentPosition).isEqualTo(2000)
-                assertThat(it.duration).isEqualTo(null)
+                assertThat(it.duration).isNull()
             }
             assertThat(player.prepare().isSuccess).isTrue()
             awaitItem().let {
@@ -300,7 +300,7 @@ private suspend fun TurbineTestContext<VoiceMessagePlayer.State>.matchInitialSta
         assertThat(it.isPlaying).isFalse()
         assertThat(it.isEnded).isFalse()
         assertThat(it.currentPosition).isEqualTo(0)
-        assertThat(it.duration).isEqualTo(null)
+        assertThat(it.duration).isNull()
     }
 }
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt
index b8638f2521..e85d95650d 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistTestTest.kt
@@ -98,4 +98,16 @@ class KonsistTestTest {
                 functionDeclaration.text.contains("isEqualTo(empty")
             }
     }
+
+    @Test
+    fun `use isNull() instead of isEqualTo(null)`() {
+        Konsist
+            .scopeFromTest()
+            .functions()
+            // Exclude self
+            .withoutName("use isNull() instead of isEqualTo(null)")
+            .assertFalse { functionDeclaration ->
+                functionDeclaration.text.contains("isEqualTo(null)")
+            }
+    }
 }