diff --git a/tests/robotests/res/xml-mcc998/location_settings.xml b/tests/robotests/res/xml-mcc998/location_settings.xml
index 993af86..f61ca63 100644
--- a/tests/robotests/res/xml-mcc998/location_settings.xml
+++ b/tests/robotests/res/xml-mcc998/location_settings.xml
@@ -18,14 +18,20 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="fake_title_key"
-                  android:title="screen_title"
-                  settings:controller="com.android.settings.slices.FakePreferenceController">
+                  android:title="screen_title">
 
     <Preference
-        android:key="key"
+        android:key="key1"
         android:title="title"
         android:icon="@drawable/ic_android"
-        android:summary="summary"
+        android:summary="summary1"
         settings:controller="com.android.settings.core.BadPreferenceController"/>
 
+    <Preference
+        android:key="key2"
+        android:title="title"
+        android:icon="@drawable/ic_android"
+        android:summary="summary2"
+        settings:controller="com.android.settings.slices.FakePreferenceController"/>
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/res/xml-mcc999/location_settings.xml b/tests/robotests/res/xml-mcc999/location_settings.xml
index 5619c77..de77bfa 100644
--- a/tests/robotests/res/xml-mcc999/location_settings.xml
+++ b/tests/robotests/res/xml-mcc999/location_settings.xml
@@ -17,8 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:key="fake_title_key"
-                  android:title="screen_title"
-                  settings:controller="com.android.settings.slices.FakePreferenceController">
+                  android:title="screen_title">
 
     <Preference
         android:key="key"
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index 905361c..df60654 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -116,7 +116,7 @@
         final List<AbstractPreferenceController> controllers =
                 provider.getPreferenceControllers(mContext);
 
-        assertThat(controllers).hasSize(3);
+        assertThat(controllers).hasSize(2);
     }
 
     public static class NotAvailablePreferenceController