diff --git a/ReactCommon/cxxreact/tests/BUCK b/ReactCommon/cxxreact/tests/BUCK
index 1d7657cc0..e78b7692b 100644
--- a/ReactCommon/cxxreact/tests/BUCK
+++ b/ReactCommon/cxxreact/tests/BUCK
@@ -11,7 +11,7 @@ TEST_SRCS = [
 ]
 
 if not IS_OSS_BUILD:
-    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "cxx_test")
+    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
     load("@xplat//configurations/buck/android:jni_instrumentation_test", "jni_instrumentation_test_lib")
     load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
     jni_instrumentation_test_lib(
@@ -34,7 +34,7 @@ if not IS_OSS_BUILD:
         ],
     )
 
-    cxx_test(
+    fb_xplat_cxx_test(
         name = 'tests',
         srcs = TEST_SRCS,
         compiler_flags = [
diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK
index 23a9f30cf..981dd874f 100644
--- a/ReactCommon/fabric/core/BUCK
+++ b/ReactCommon/fabric/core/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", "APPLE")
 
 APPLE_COMPILER_FLAGS = []
 
@@ -58,9 +58,9 @@ rn_xplat_cxx_library(
 )
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
+    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
 
-    cxx_test(
+    fb_xplat_cxx_test(
         name = "tests",
         srcs = glob(["tests/**/*.cpp"]),
         headers = glob(["tests/**/*.h"]),
diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK
index 88f7bc478..782b74522 100644
--- a/ReactCommon/fabric/debug/BUCK
+++ b/ReactCommon/fabric/debug/BUCK
@@ -1,5 +1,5 @@
 load("@xplat//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", "APPLE")
 
 APPLE_COMPILER_FLAGS = []
 
@@ -49,9 +49,9 @@ rn_xplat_cxx_library(
 )
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
+    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
 
-    cxx_test(
+    fb_xplat_cxx_test(
         name = "tests",
         srcs = glob(["tests/**/*.cpp"]),
         headers = glob(["tests/**/*.h"]),
diff --git a/ReactCommon/fabric/graphics/BUCK b/ReactCommon/fabric/graphics/BUCK
index 7cdb8c59b..52a42e392 100644
--- a/ReactCommon/fabric/graphics/BUCK
+++ b/ReactCommon/fabric/graphics/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", "APPLE")
 
 APPLE_COMPILER_FLAGS = []
 
@@ -53,9 +53,9 @@ rn_xplat_cxx_library(
 )
 
 if not IS_OSS_BUILD:
-    load("@xplat//configurations/buck:default_platform_defs.bzl", "APPLE")
+    load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
 
-    cxx_test(
+    fb_xplat_cxx_test(
         name = "tests",
         srcs = glob(["tests/**/*.cpp"]),
         headers = glob(["tests/**/*.h"]),
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index 6745136cf..4a3eeae2b 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -58,6 +58,7 @@ rn_xplat_cxx_library(
 
 if not IS_OSS_BUILD:
     load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
+
     fb_xplat_cxx_test(
         name = "tests",
         srcs = glob(["tests/**/*.cpp"]),
diff --git a/ReactCommon/fabric/view/BUCK b/ReactCommon/fabric/view/BUCK
index 1f2cff2c3..20b7108c2 100644
--- a/ReactCommon/fabric/view/BUCK
+++ b/ReactCommon/fabric/view/BUCK
@@ -61,6 +61,7 @@ rn_xplat_cxx_library(
 
 if not IS_OSS_BUILD:
     load("@xplat//build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
+    
     fb_xplat_cxx_test(
         name = "tests",
         srcs = glob(["tests/**/*.cpp"]),