diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt
index 07a3387b8..21d1941aa 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchFragmentTest.kt
@@ -21,7 +21,10 @@ import androidx.core.content.edit
 import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
+import org.junit.Before
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
 import org.kiwix.kiwixmobile.R
@@ -40,6 +43,11 @@ class SearchFragmentTest : BaseActivityTest() {
     }
   }
 
+  @Before
+  fun waitForIdle() {
+    UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).waitForIdle()
+  }
+
   @Test fun searchFragmentSimple() {
     UiThreadStatement.runOnUiThread { activityRule.activity.navigate(R.id.libraryFragment) }
     val loadFileStream =
@@ -50,7 +58,7 @@ class SearchFragmentTest : BaseActivityTest() {
     loadFileStream.use { inputStream ->
       val outputStream: OutputStream = FileOutputStream(zimFile)
       outputStream.use { it ->
-        val buffer = ByteArray(1024)
+        val buffer = ByteArray(inputStream.available())
         var length: Int
         while (inputStream.read(buffer).also { length = it } > 0) {
           it.write(buffer, 0, length)
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchRobot.kt
index 4bd66f521..8cbe2957f 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/search/SearchRobot.kt
@@ -18,7 +18,6 @@
 
 package org.kiwix.kiwixmobile.search
 
-import android.os.Build
 import applyWithViewHierarchyPrinting
 import com.adevinta.android.barista.interaction.BaristaSleepInteractions
 import org.kiwix.kiwixmobile.BaseRobot
@@ -31,15 +30,13 @@ fun search(func: SearchRobot.() -> Unit) = SearchRobot().applyWithViewHierarchyP
 class SearchRobot : BaseRobot() {
 
   fun clickOnSearchItemInSearchList() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-      pressBack()
-    }
     BaristaSleepInteractions.sleep(TestUtils.TEST_PAUSE_MS_FOR_SEARCH_TEST.toLong())
     isVisible(ViewId(R.id.search_list))
     clickOn(ViewId(R.id.list_item_search_text))
   }
 
   fun checkZimFileSearchSuccessful(readerFragment: Int) {
+    BaristaSleepInteractions.sleep(TestUtils.TEST_PAUSE_MS_FOR_SEARCH_TEST.toLong())
     isVisible(ViewId(readerFragment))
   }
 }