diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index ea5123d32be..38c0d8405c5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -219,8 +219,10 @@ public class StorageItemPreferenceControllerTest {
     @Ignore
     public void testClickFiles() {
         when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
+        when(mVolume.buildBrowseIntent()).thenReturn(new Intent());
         mPreference.setKey("pref_files");
-        mController.handlePreferenceTreeClick(mPreference);
+        assertThat(mController.handlePreferenceTreeClick(mPreference))
+            .isTrue();
 
         final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
         verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),