diff --git a/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt b/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt
index 91016512a1..1ccab5d343 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt
@@ -5,8 +5,10 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkStatic
+import io.mockk.unmockkAll
 import io.mockk.verify
 import io.reactivex.rxjava3.core.Single
+import org.junit.After
 import org.junit.Before
 import org.junit.BeforeClass
 import org.junit.Rule
@@ -90,6 +92,11 @@ class SafetyNumberRepositoryTest {
     every { Recipient.self() } returns recipientPool[0]
   }
 
+  @After
+  fun tearDown() {
+    unmockkAll()
+  }
+
   /**
    * Batch request for a current identity key should return an empty list and not perform any identity key updates.
    */
diff --git a/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt b/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt
index d0cb356be3..a59eb735e3 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJobTest.kt
@@ -10,7 +10,9 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkStatic
+import io.mockk.unmockkAll
 import io.mockk.verify
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -95,6 +97,11 @@ class InAppPaymentRecurringContextJobTest {
     }
   }
 
+  @After
+  fun tearDown() {
+    unmockkAll()
+  }
+
   @Test
   fun `Given user is unregistered, when I run then I expect failure`() {
     every { mockSignalStore.account.isRegistered } returns true
diff --git a/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt
index 603d1cbea7..f5faa97786 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt
@@ -6,6 +6,7 @@ import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.runs
 import io.mockk.slot
+import io.mockk.unmockkAll
 import io.mockk.verify
 import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import io.reactivex.rxjava3.schedulers.TestScheduler
@@ -44,6 +45,7 @@ class StoriesTest {
   @After
   fun tearDown() {
     RxJavaPlugins.reset()
+    unmockkAll()
   }
 
   @Test
diff --git a/app/src/test/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceConfigTest.kt b/app/src/test/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceConfigTest.kt
index 99d2cc096d..1022c9496b 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceConfigTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/webrtc/audio/AudioDeviceConfigTest.kt
@@ -131,7 +131,7 @@ class AudioDeviceConfigTest {
 
   @After
   fun tearDown() {
-    mockkStatic(AppDependencies::class)
+    unmockkStatic(AppDependencies::class)
     unmockkStatic(PackageManager::class)
     unmockkObject(RemoteConfig)
     unmockkStatic(AcousticEchoCanceler::class)