diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 043f2faf1..edb099f87 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -208,6 +208,9 @@ public class ReactAppTestActivity extends FragmentActivity
             .getReactInstanceManagerBuilder()
             .setApplication(getApplication())
             .setBundleAssetName(bundleName);
+    if (spec.getJavaScriptExecutorFactory() != null) {
+      builder.setJavaScriptExecutorFactory(spec.getJavaScriptExecutorFactory());
+    }
     if (!spec.getAlternativeReactPackagesForTest().isEmpty()) {
       builder.addPackages(spec.getAlternativeReactPackagesForTest());
     } else {
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
index 29809ccf7..8a638c03a 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java
@@ -9,12 +9,14 @@ package com.facebook.react.testing;
 
 import android.annotation.SuppressLint;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.uimanager.ViewManager;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /**
  * A spec that allows a test to add additional NativeModules/JS modules to the ReactInstance. This
@@ -29,12 +31,18 @@ public class ReactInstanceSpecForTest {
   private final List<Class<? extends JavaScriptModule>> mJSModuleSpecs = new ArrayList<>();
   private final List<ViewManager> mViewManagers = new ArrayList<>();
   private final ArrayList<ReactPackage> mReactPackages = new ArrayList<>();
+  @Nullable private JavaScriptExecutorFactory mJavaScriptExecutorFactory = null;
 
   public ReactInstanceSpecForTest addNativeModule(NativeModule module) {
     mNativeModules.add(module);
     return this;
   }
 
+  public ReactInstanceSpecForTest setJavaScriptExecutorFactory(JavaScriptExecutorFactory javaScriptExecutorFactory) {
+    mJavaScriptExecutorFactory = javaScriptExecutorFactory;
+    return this;
+  }
+
   public ReactInstanceSpecForTest setPackage(ReactPackage reactPackage) {
     if (!mReactPackages.isEmpty()) {
       throw new IllegalStateException(
@@ -66,6 +74,11 @@ public class ReactInstanceSpecForTest {
     return mReactPackages.get(0);
   }
 
+  @Nullable
+  public JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
+    return mJavaScriptExecutorFactory;
+  }
+
   public List<ReactPackage> getAlternativeReactPackagesForTest() {
     return mReactPackages;
   }
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java
index c8c914f3e..dcfd33e01 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java
@@ -11,9 +11,11 @@ import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 import android.view.ViewGroup;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.testing.idledetection.IdleWaiter;
+import javax.annotation.Nullable;
 
 /**
  * Base class for instrumentation tests that runs React based application.
@@ -27,6 +29,9 @@ public abstract class ReactInstrumentationTest extends
 
   protected StringRecordingModule mRecordingModule;
 
+  @Nullable
+  protected JavaScriptExecutorFactory mJavaScriptExecutorFactory = null;
+
   public ReactInstrumentationTest() {
     super(ReactAppTestActivity.class);
   }
@@ -49,7 +54,7 @@ public abstract class ReactInstrumentationTest extends
   /**
    * Renders this component within this test's activity
    */
-  public void renderComponent(final String componentName) throws Exception {
+  public void renderComponent(final String componentName) {
     getActivity().renderComponent(componentName, null);
     waitForBridgeAndUIIdle();
   }
@@ -98,7 +103,12 @@ public abstract class ReactInstrumentationTest extends
    * Override this method to provide extra native modules to be loaded before the app starts
    */
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
-    return new ReactInstanceSpecForTest().addNativeModule(mRecordingModule);
+    ReactInstanceSpecForTest reactInstanceSpecForTest =
+      new ReactInstanceSpecForTest().addNativeModule(mRecordingModule);
+    if (mJavaScriptExecutorFactory != null) {
+      reactInstanceSpecForTest.setJavaScriptExecutorFactory(mJavaScriptExecutorFactory);
+    }
+    return reactInstanceSpecForTest;
   }
 
   /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index 3961083f7..ba257c840 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -25,7 +25,6 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.TraceListener;
-import java.lang.annotation.Native;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
index feba9bc1a..ea5d126f7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ProxyJavaScriptExecutor.java
@@ -7,10 +7,9 @@
 
 package com.facebook.react.bridge;
 
-import javax.annotation.Nullable;
-
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
+import javax.annotation.Nullable;
 
 /**
  * JavaScript executor that delegates JS calls processed by native code back to a java version