diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt
index 73271b8e070..8cdda8cea47 100644
--- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt
+++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/auth/LogoutUseCaseTest.kt
@@ -379,7 +379,7 @@ class LogoutUseCaseTest {
             .coroutine { clearRetainedClientId() }
             .wasInvoked(exactly = once)
         verify(arrangement.pushTokenRepository)
-            .coroutine { setUpdateFirebaseTokenFlag(eq(true)) }
+            .coroutine { setUpdateFirebaseTokenFlag(true) }
             .wasInvoked(exactly = once)
     }
 
diff --git a/logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt
index 8d4c8caa2f5..f477730fade 100644
--- a/logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt
+++ b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/data/client/ProteusClientProviderTest.kt
@@ -8,10 +8,10 @@ import com.wire.kalium.util.FileUtil
 import com.wire.kalium.util.KaliumDispatcherImpl
 import io.mockative.Mock
 import io.mockative.any
-import io.mockative.coVerify
-import io.mockative.every
 import io.mockative.mock
 import io.mockative.once
+import io.mockative.verify
+import io.mockative.given
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import java.nio.file.Paths
@@ -32,7 +32,9 @@ class ProteusClientProviderTest {
         try {
             proteusClientProvider.getOrCreate()
         } catch (e: ProteusStorageMigrationException) {
-            coVerify { arrangement.proteusMigrationRecoveryHandler.clearClientData(any()) }.wasInvoked(once)
+            verify(arrangement.proteusMigrationRecoveryHandler)
+                .coroutine { clearClientData(any()) }
+                .wasInvoked(exactly = once)
         }
     }
 
@@ -45,7 +47,10 @@ class ProteusClientProviderTest {
         val proteusMigrationRecoveryHandler = mock(ProteusMigrationRecoveryHandler::class)
 
         init {
-            every { passphraseStorage.getPassphrase(any()) }.returns("passphrase")
+            given(passphraseStorage)
+                .suspendFunction(passphraseStorage::getPassphrase)
+                .whenInvokedWith(any())
+                .thenReturn("passphrase")
         }
 
         /**
diff --git a/logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt
index 7a52607adb6..185b0d0ddb0 100644
--- a/logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt
+++ b/logic/src/jvmTest/kotlin/com/wire/kalium/logic/feature/client/ProteusMigrationRecoveryHandlerTest.kt
@@ -3,9 +3,9 @@ package com.wire.kalium.logic.feature.client
 import com.wire.kalium.logic.data.logout.LogoutReason
 import com.wire.kalium.logic.feature.auth.LogoutUseCase
 import io.mockative.Mock
-import io.mockative.coVerify
 import io.mockative.mock
 import io.mockative.once
+import io.mockative.verify
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -21,7 +21,9 @@ class ProteusMigrationRecoveryHandlerTest {
         proteusMigrationRecoveryHandler.clearClientData(clearLocalFiles)
 
         // then
-        coVerify { arrangement.logoutUseCase(LogoutReason.MIGRATION_TO_CC_FAILED, true) }.wasInvoked(once)
+        verify(arrangement.logoutUseCase)
+            .coroutine { invoke(LogoutReason.MIGRATION_TO_CC_FAILED, true) }
+            .wasInvoked(exactly = once)
     }
 
     private class Arrangement {