diff --git a/ReactCommon/fabric/attributedstring/BUCK b/ReactCommon/fabric/attributedstring/BUCK
index 21620481d..d48685eed 100644
--- a/ReactCommon/fabric/attributedstring/BUCK
+++ b/ReactCommon/fabric/attributedstring/BUCK
@@ -38,9 +38,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -48,7 +45,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/components/activityindicator/BUCK b/ReactCommon/fabric/components/activityindicator/BUCK
index eda131333..45074f25c 100644
--- a/ReactCommon/fabric/components/activityindicator/BUCK
+++ b/ReactCommon/fabric/components/activityindicator/BUCK
@@ -25,16 +25,13 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -60,7 +57,7 @@ fb_xplat_cxx_test(
         "-std=c++14",
         "-Wall",
     ],
-    platforms = APPLE,
+    platforms = (ANDROID, APPLE),
     deps = [
         "xplat//folly:molly",
         "xplat//third-party/gmock:gtest",
diff --git a/ReactCommon/fabric/components/image/BUCK b/ReactCommon/fabric/components/image/BUCK
index e496dc7a9..2ce6f3db1 100644
--- a/ReactCommon/fabric/components/image/BUCK
+++ b/ReactCommon/fabric/components/image/BUCK
@@ -35,16 +35,13 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -73,7 +70,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = APPLE,
+    platforms = (ANDROID, APPLE),
     deps = [
         "xplat//folly:molly",
         "xplat//third-party/gmock:gtest",
diff --git a/ReactCommon/fabric/components/root/BUCK b/ReactCommon/fabric/components/root/BUCK
index 56782c58e..d41d8fe3d 100644
--- a/ReactCommon/fabric/components/root/BUCK
+++ b/ReactCommon/fabric/components/root/BUCK
@@ -35,16 +35,13 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -71,7 +68,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = APPLE,
+    platforms = (ANDROID, APPLE),
     deps = [
         "xplat//folly:molly",
         "xplat//third-party/gmock:gtest",
diff --git a/ReactCommon/fabric/components/scrollview/BUCK b/ReactCommon/fabric/components/scrollview/BUCK
index 715220136..2e7124592 100644
--- a/ReactCommon/fabric/components/scrollview/BUCK
+++ b/ReactCommon/fabric/components/scrollview/BUCK
@@ -38,9 +38,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -48,7 +45,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -75,7 +72,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = APPLE,
+    platforms = (ANDROID, APPLE),
     deps = [
         "xplat//folly:molly",
         "xplat//third-party/gmock:gtest",
diff --git a/ReactCommon/fabric/components/slider/BUCK b/ReactCommon/fabric/components/slider/BUCK
index be2a99b7f..c82cd512f 100644
--- a/ReactCommon/fabric/components/slider/BUCK
+++ b/ReactCommon/fabric/components/slider/BUCK
@@ -35,16 +35,13 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -73,7 +70,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = APPLE,
+    platforms = (ANDROID, APPLE),
     deps = [
         "xplat//folly:molly",
         "xplat//third-party/gmock:gtest",
diff --git a/ReactCommon/fabric/components/text/BUCK b/ReactCommon/fabric/components/text/BUCK
index fd290c174..bceff95d9 100644
--- a/ReactCommon/fabric/components/text/BUCK
+++ b/ReactCommon/fabric/components/text/BUCK
@@ -42,9 +42,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -52,7 +49,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/components/view/BUCK b/ReactCommon/fabric/components/view/BUCK
index 868128eea..6cbed1c96 100644
--- a/ReactCommon/fabric/components/view/BUCK
+++ b/ReactCommon/fabric/components/view/BUCK
@@ -41,9 +41,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -51,7 +48,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -77,7 +74,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = APPLE,
+    platforms = (ANDROID, APPLE),
     deps = [
         "xplat//folly:molly",
         "xplat//third-party/gmock:gtest",
diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK
index e171ed429..4abae9d07 100644
--- a/ReactCommon/fabric/core/BUCK
+++ b/ReactCommon/fabric/core/BUCK
@@ -33,9 +33,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -43,7 +40,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK
index 8c2dbe3ea..7bbfeb29c 100644
--- a/ReactCommon/fabric/debug/BUCK
+++ b/ReactCommon/fabric/debug/BUCK
@@ -40,9 +40,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -50,7 +47,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/events/BUCK b/ReactCommon/fabric/events/BUCK
index 27dadeae5..39f34a7ab 100644
--- a/ReactCommon/fabric/events/BUCK
+++ b/ReactCommon/fabric/events/BUCK
@@ -38,9 +38,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -48,7 +45,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/graphics/BUCK b/ReactCommon/fabric/graphics/BUCK
index a1386775b..07b53c962 100644
--- a/ReactCommon/fabric/graphics/BUCK
+++ b/ReactCommon/fabric/graphics/BUCK
@@ -51,9 +51,6 @@ rn_xplat_cxx_library(
     ),
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     ios_deps = [
         "xplat//js:RCTImage",
@@ -82,7 +79,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/imagemanager/BUCK b/ReactCommon/fabric/imagemanager/BUCK
index 698d098d4..79d533fcc 100644
--- a/ReactCommon/fabric/imagemanager/BUCK
+++ b/ReactCommon/fabric/imagemanager/BUCK
@@ -48,9 +48,6 @@ rn_xplat_cxx_library(
     ),
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     ios_deps = [
         "xplat//js:RCTImage",
@@ -87,7 +84,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/mounting/BUCK b/ReactCommon/fabric/mounting/BUCK
index 21a1ab112..8b3c04702 100644
--- a/ReactCommon/fabric/mounting/BUCK
+++ b/ReactCommon/fabric/mounting/BUCK
@@ -38,9 +38,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -48,7 +45,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
diff --git a/ReactCommon/fabric/textlayoutmanager/BUCK b/ReactCommon/fabric/textlayoutmanager/BUCK
index a56bc8275..5d541d224 100644
--- a/ReactCommon/fabric/textlayoutmanager/BUCK
+++ b/ReactCommon/fabric/textlayoutmanager/BUCK
@@ -63,9 +63,6 @@ rn_xplat_cxx_library(
     ),
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":tests",
-    ],
     force_static = True,
     ios_deps = [
     ],
@@ -98,7 +95,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -126,7 +123,7 @@ fb_xplat_cxx_test(
         "-Wall",
     ],
     contacts = ["oncall+react_native@xmail.facebook.com"],
-    platforms = APPLE,
+    platforms = (ANDROID, APPLE),
     deps = [
         "xplat//folly:molly",
         "xplat//third-party/gmock:gtest",
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index c4c0d73df..f544d2a80 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -38,9 +38,6 @@ rn_xplat_cxx_library(
     ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    fbobjc_tests = [
-        ":uimanagertests",
-    ],
     force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
@@ -48,7 +45,7 @@ rn_xplat_cxx_library(
         "-DLOG_TAG=\"ReactNative\"",
         "-DWITH_FBSYSTRACE=1",
     ],
-    tests = [],
+    tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
         "xplat//fbsystrace:fbsystrace",
@@ -69,7 +66,7 @@ rn_xplat_cxx_library(
 )
 
 fb_xplat_cxx_test(
-    name = "uimanagertests",
+    name = "tests",
     srcs = glob(["tests/**/*.cpp"]),
     headers = glob(["tests/**/*.h"]),
     compiler_flags = [