diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
index 47838ddcdb..af2b98ea07 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
@@ -82,7 +82,7 @@ class DefaultFirebaseNewTokenHandlerTest {
                         A_USER_ID -> FakeUserPushStore(pushProviderName = FirebaseConfig.NAME)
                         A_USER_ID_2 -> FakeUserPushStore(pushProviderName = "Other")
                         A_USER_ID_3 -> FakeUserPushStore(pushProviderName = FirebaseConfig.NAME)
-                        else -> throw IllegalStateException()
+                        else -> error("Unexpected sessionId: $sessionId")
                     }
                 }
             ),
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt
index 34086f6f68..e180e36c38 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayResolverTest.kt
@@ -17,6 +17,7 @@
 package io.element.android.libraries.pushproviders.unifiedpush
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.pushproviders.unifiedpush.network.DiscoveryResponse
 import io.element.android.libraries.pushproviders.unifiedpush.network.DiscoveryUnifiedPush
 import io.element.android.tests.testutils.testCoroutineDispatchers
@@ -96,7 +97,7 @@ class DefaultUnifiedPushGatewayResolverTest {
     @Test
     fun `when a custom url is not reachable, the default url is returned`() = runTest {
         val unifiedPushApiFactory = FakeUnifiedPushApiFactory(
-            discoveryResponse = { throw Exception() }
+            discoveryResponse = { throw AN_EXCEPTION }
         )
         val sut = createDefaultUnifiedPushGatewayResolver(
             unifiedPushApiFactory = unifiedPushApiFactory