diff --git a/scripts/run-android-ci-instrumentation-tests.js b/scripts/run-android-ci-instrumentation-tests.js
index 329d46070fa12b..4d60bf7591fbfc 100644
--- a/scripts/run-android-ci-instrumentation-tests.js
+++ b/scripts/run-android-ci-instrumentation-tests.js
@@ -28,11 +28,19 @@ const numberOfRetries = argv.retries || 1;
 const tryExecNTimes = require('./try-n-times');
 const path = require('path');
 
+// Flaky tests ignored on Circle CI. They still run internally at fb.
+const ignoredTests = [
+  'ReactScrollViewTestCase',
+  'ReactHorizontalScrollViewTestCase'
+];
+
 // ReactAndroid/src/androidTest/java/com/facebook/react/tests/ReactHorizontalScrollViewTestCase.java
 const testClasses = ls(`${argv.path}/*.java`)
 .map(javaFile => {
   // ReactHorizontalScrollViewTestCase
   return path.basename(javaFile, '.java');
+}).filter(className => {
+  return ignoredTests.indexOf(className) === -1;
 }).map(className => {
   // com.facebook.react.tests.ReactHorizontalScrollViewTestCase
   return argv.package + '.' + className;
diff --git a/scripts/run-android-local-integration-tests.sh b/scripts/run-android-local-integration-tests.sh
index 4d454a1c732803..a85d02be37cfa2 100755
--- a/scripts/run-android-local-integration-tests.sh
+++ b/scripts/run-android-local-integration-tests.sh
@@ -20,4 +20,5 @@ buck fetch ReactAndroid/src/androidTest/buck-runner:instrumentation-tests
 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests
 
 echo "Running integration tests..."
-adb shell am instrument -w com.facebook.react.tests/android.support.test.runner.AndroidJUnitRunner
+# Use the JS script that runs all tests in a loop and is easy to tweak
+node ./scripts/run-android-ci-instrumentation-tests.js --path ./ReactAndroid/src/androidTest/java/com/facebook/react/tests --package com.facebook.react.tests