diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
index 33759db55..c14e4d035 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/BUCK
@@ -5,13 +5,12 @@ include_defs('//ReactAndroid/DEFS')
 SANDCASTLE_FLAKY = [
   'ReactHorizontalScrollViewTestCase.java',
   'ReactScrollViewTestCase.java',
-  'ReactSwipeRefreshLayoutTestCase.java',
-  'TestIdTestCase.java',
 ]
 
 deps = [
+  react_native_dep('third-party/android/support/v4:lib-support-v4'),
+  react_native_dep('third-party/java/junit:junit'),
   react_native_integration_tests_target('java/com/facebook/react/testing:testing'),
-  react_native_target('java/com/facebook/react:react'),
   react_native_target('java/com/facebook/react/bridge:bridge'),
   react_native_target('java/com/facebook/react/common:common'),
   react_native_target('java/com/facebook/react/modules/core:core'),
@@ -19,8 +18,8 @@ deps = [
   react_native_target('java/com/facebook/react/modules/systeminfo:systeminfo'),
   react_native_target('java/com/facebook/react/modules/timepicker:timepicker'),
   react_native_target('java/com/facebook/react/touch:touch'),
-  react_native_target('java/com/facebook/react/uimanager:uimanager'),
   react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
+  react_native_target('java/com/facebook/react/uimanager:uimanager'),
   react_native_target('java/com/facebook/react/views/picker:picker'),
   react_native_target('java/com/facebook/react/views/progressbar:progressbar'),
   react_native_target('java/com/facebook/react/views/recyclerview:recyclerview'),
@@ -30,8 +29,7 @@ deps = [
   react_native_target('java/com/facebook/react/views/text:text'),
   react_native_target('java/com/facebook/react/views/textinput:textinput'),
   react_native_target('java/com/facebook/react/views/view:view'),
-  react_native_dep('third-party/android/support/v4:lib-support-v4'),
-  react_native_dep('third-party/java/junit:junit'),
+  react_native_target('java/com/facebook/react:react'),
 ]
 
 android_library(