diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
index c93dde90d1c..d72e6884712 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
@@ -35,7 +35,6 @@ import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -73,14 +72,13 @@ public class ButtonActionDialogFragmentTest {
         verify(mTargetFragment).handleDialogClick(anyInt());
     }
 
-    @Ignore
     @Test
     public void testOnClick_forceStop_dismissDialog() {
         ButtonActionDialogFragment fragment =
-                spy(ButtonActionDialogFragment.newInstance(FORCE_STOP_ID));
+                ButtonActionDialogFragment.newInstance(FORCE_STOP_ID);
         FragmentController.setupFragment(fragment, FragmentActivity.class, 0 /* containerViewId */,
                 null /* bundle */);
-        doReturn(mTargetFragment).when(fragment).getTargetFragment();
+        fragment.setTargetFragment(mTargetFragment, 0);
         doNothing().when(mTargetFragment).handleDialogClick(anyInt());
         final AlertDialog dialog = mock(AlertDialog.class);
 
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
index d776183f56e..f2752ae8b25 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
@@ -37,7 +37,6 @@ import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
@@ -58,24 +57,23 @@ public class InstantAppButtonDialogFragmentTest {
     public void setUp() {
         final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
         mContext = spy(RuntimeEnvironment.application);
-        mFragment = spy(InstantAppButtonDialogFragment.newInstance(TEST_PACKAGE));
+        mFragment = InstantAppButtonDialogFragment.newInstance(TEST_PACKAGE);
         mFragment.show(activity.getSupportFragmentManager(), "InstantAppButtonDialogFragment");
-        doReturn(mContext).when(mFragment).getContext();
     }
 
-    @Ignore
     @Test
     public void onClick_shouldDeleteApp() {
+        final InstantAppButtonDialogFragment spyFragment = spy(mFragment);
+        doReturn(mContext).when(spyFragment).getContext();
         final PackageManager packageManager = mock(PackageManager.class);
         when(mContext.getPackageManager()).thenReturn(packageManager);
 
-        mFragment.onClick(null /* dialog */, 0  /* which */);
+        spyFragment.onClick(null /* dialog */, 0  /* which */);
 
         verify(packageManager)
             .deletePackageAsUser(eq(TEST_PACKAGE), any(), anyInt(), anyInt());
     }
 
-    @Ignore
     @Test
     public void onCreateDialog_clearAppDialog_shouldShowClearAppDataConfirmation() {
         final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();