diff --git a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt
index 9cfe85bd1..b3fb19c10 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt
@@ -4,6 +4,8 @@ import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.verify
 import fr.free.nrw.commons.CommonsApplication
 import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
+import io.mockk.every
+import io.mockk.mockkObject
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,7 +31,6 @@ class ThanksClientTest {
     private lateinit var commonsApplication: CommonsApplication
 
     private lateinit var thanksClient: ThanksClient
-    private lateinit var mockedApplication: MockedStatic<CommonsApplication>
 
     /**
      * initial setup, test environment
@@ -38,8 +39,8 @@ class ThanksClientTest {
     @Throws(Exception::class)
     fun setUp() {
         MockitoAnnotations.openMocks(this)
-        mockedApplication = Mockito.mockStatic(CommonsApplication::class.java)
-        `when`(CommonsApplication.instance).thenReturn(commonsApplication)
+        mockkObject(CommonsApplication)
+        every { CommonsApplication.instance }.returns(commonsApplication)
         thanksClient = ThanksClient(csrfTokenClient, service)
     }
 
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt
index 00f438e1e..be3b7e8e3 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/description/DescriptionEditActivityUnitTest.kt
@@ -10,6 +10,7 @@ import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
+import fr.free.nrw.commons.CommonsApplication
 import fr.free.nrw.commons.Media
 import fr.free.nrw.commons.R
 import fr.free.nrw.commons.TestCommonsApplication
@@ -19,6 +20,8 @@ import fr.free.nrw.commons.description.EditDescriptionConstants.WIKITEXT
 import fr.free.nrw.commons.settings.Prefs
 import fr.free.nrw.commons.upload.UploadMediaDetail
 import fr.free.nrw.commons.upload.UploadMediaDetailAdapter
+import io.mockk.every
+import io.mockk.mockkObject
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -54,6 +57,9 @@ class DescriptionEditActivityUnitTest {
     @Mock
     private lateinit var rvDescriptions: RecyclerView
 
+    @Mock
+    private lateinit var commonsApplication: CommonsApplication
+
     private lateinit var media: Media
 
     @Before
@@ -82,6 +88,8 @@ class DescriptionEditActivityUnitTest {
         bundle.putString(Prefs.DESCRIPTION_LANGUAGE, "bn")
         bundle.putParcelable("media", media)
         intent.putExtras(bundle)
+        mockkObject(CommonsApplication)
+        every { CommonsApplication.instance }.returns(commonsApplication)
         activity =
             Robolectric.buildActivity(DescriptionEditActivity::class.java, intent).create().get()
         binding = ActivityDescriptionEditBinding.inflate(LayoutInflater.from(activity))