diff --git a/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt b/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt
index ce675dfcbe..ca920e9097 100644
--- a/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt
+++ b/app/instrumentation-tests/src/org/commcare/androidTests/AppPreferenceSettingsTest.kt
@@ -111,7 +111,7 @@ class AppPreferenceSettingsTest: BaseTest() {
     private fun selectSetting(text: String) {
         onView(withText("CommCare > Settings"))
                 .check(matches(isDisplayed()))
-        onView(withId(R.id.recycler_view))
+        onView(withId(androidx.preference.R.id.recycler_view))
                 .perform(RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
                         hasDescendant(withText(text))
                 ))
diff --git a/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt b/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt
index 335637f788..b0a3241b46 100644
--- a/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt
+++ b/app/instrumentation-tests/src/org/commcare/utils/InstrumentationUtility.kt
@@ -493,7 +493,7 @@ object InstrumentationUtility {
      */
     fun searchCaseAndSelect(text: String){
         onView(withId(R.id.search_action_bar)).perform(click())
-        enterText(R.id.search_src_text,text)
+        enterText(androidx.appcompat.R.id.search_src_text,text)
         onView(withId(R.id.screen_entity_detail_list)).isPresent()
         clickListItem(R.id.screen_entity_select_list, 0)
     }