diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index 209502316d2..6745136cf81 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -1,5 +1,5 @@
 load("//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "get_apple_inspector_flags")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "react_native_xplat_target", "rn_xplat_cxx_library", "get_apple_inspector_flags", "ANDROID", "APPLE")
 
 APPLE_COMPILER_FLAGS = []
 
@@ -57,9 +57,8 @@ rn_xplat_cxx_library(
 )
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
-
-    cxx_test(
+    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
+    fb_xplat_cxx_test(
         name = "tests",
         srcs = glob(["tests/**/*.cpp"]),
         headers = glob(["tests/**/*.h"]),
diff --git a/ReactCommon/fabric/view/BUCK b/ReactCommon/fabric/view/BUCK
index d6ef5a048cf..1f2cff2c3fc 100644
--- a/ReactCommon/fabric/view/BUCK
+++ b/ReactCommon/fabric/view/BUCK
@@ -1,6 +1,5 @@
 load("//configurations/buck/apple:flag_defs.bzl", "get_application_ios_flags", "get_debug_preprocessor_flags", "OBJC_ARC_PREPROCESSOR_FLAGS")
-load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "get_apple_inspector_flags")
-load("//ReactNative:DEFS.bzl", "react_native_xplat_target")
+load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "get_apple_inspector_flags", "react_native_xplat_target", "ANDROID", "APPLE")
 
 APPLE_COMPILER_FLAGS = []
 
@@ -61,9 +60,8 @@ rn_xplat_cxx_library(
 )
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
-
-    cxx_test(
+    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
+    fb_xplat_cxx_test(
         name = "tests",
         srcs = glob(["tests/**/*.cpp"]),
         headers = glob(["tests/**/*.h"]),