diff --git a/app/src/test/AndroidManifest.xml b/app/src/test/AndroidManifest.xml
index e0da21e94a..eca48e2558 100644
--- a/app/src/test/AndroidManifest.xml
+++ b/app/src/test/AndroidManifest.xml
@@ -2,4 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
     <uses-sdk tools:overrideLibrary="com.google.mlkit.genai.prompt, com.google.mlkit.genai.common, com.google.android.gms.basement, com.google.android.gms:play-services-basement, com.google.android.gms.common" />
+    <application
+        tools:replace="android:appComponentFactory"
+        android:appComponentFactory="androidx.core.app.CoreComponentFactory" />
 </manifest>
diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt
index 97fe688625..1c0223bfd1 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/UploadActivityUnitTests.kt
@@ -225,7 +225,7 @@ class UploadActivityUnitTests {
     @Test
     @Throws(Exception::class)
     fun testOnNextButtonClicked() {
-        activity.onNextButtonClicked(-1)
+        activity.onNextButtonClicked(0)
     }
 
     @Test