diff --git a/android/build.gradle b/android/build.gradle
index b4890336f..b9c4c062e 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -30,6 +30,7 @@ android {
         test {
             java {
                 exclude 'com/facebook/sonar/plugins/facebook/**'
+                exclude 'com/facebook/flipper/plugins/facebook/**'
             }
         }
     }
diff --git a/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleFlipperPluginTest.java b/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleFlipperPluginTest.java
index 16ef9af31..7b829a34a 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleFlipperPluginTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/console/ConsoleFlipperPluginTest.java
@@ -13,12 +13,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import com.facebook.flipper.core.FlipperObject;
 import com.facebook.flipper.testing.FlipperConnectionMock;
 import com.facebook.flipper.testing.FlipperResponderMock;
-import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ConsoleFlipperPluginTest {
 
   FlipperConnectionMock connection;
diff --git a/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorFlipperPluginTest.java b/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorFlipperPluginTest.java
index 2c24521c4..a46318564 100644
--- a/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorFlipperPluginTest.java
+++ b/android/src/test/java/com/facebook/sonar/plugins/inspector/InspectorFlipperPluginTest.java
@@ -26,7 +26,7 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin.TouchOverla
 import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
 import com.facebook.flipper.testing.FlipperConnectionMock;
 import com.facebook.flipper.testing.FlipperResponderMock;
-import com.facebook.testing.robolectric.v3.WithTestDefaultsRunner;
+import org.robolectric.RobolectricTestRunner;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -39,7 +39,7 @@ import org.robolectric.RuntimeEnvironment;
 
 import javax.annotation.Nullable;
 
-@RunWith(WithTestDefaultsRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class InspectorFlipperPluginTest {
 
   private MockApplicationDescriptor mApplicationDescriptor;