diff --git a/backends/aoti/slim/factory/test/BUCK b/backends/aoti/slim/factory/test/BUCK
new file mode 100644
index 00000000000..981043e51d7
--- /dev/null
+++ b/backends/aoti/slim/factory/test/BUCK
@@ -0,0 +1,4 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+load("targets.bzl", "define_common_targets")
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/aoti/slim/factory/test/TARGETS b/backends/aoti/slim/factory/test/TARGETS
deleted file mode 100644
index 77871de4469..00000000000
--- a/backends/aoti/slim/factory/test/TARGETS
+++ /dev/null
@@ -1,3 +0,0 @@
-load("targets.bzl", "define_common_targets")
-
-define_common_targets()
diff --git a/backends/aoti/slim/util/BUCK b/backends/aoti/slim/util/BUCK
new file mode 100644
index 00000000000..981043e51d7
--- /dev/null
+++ b/backends/aoti/slim/util/BUCK
@@ -0,0 +1,4 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+load("targets.bzl", "define_common_targets")
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/aoti/slim/util/TARGETS b/backends/aoti/slim/util/TARGETS
deleted file mode 100644
index 77871de4469..00000000000
--- a/backends/aoti/slim/util/TARGETS
+++ /dev/null
@@ -1,3 +0,0 @@
-load("targets.bzl", "define_common_targets")
-
-define_common_targets()
diff --git a/backends/aoti/slim/util/test/BUCK b/backends/aoti/slim/util/test/BUCK
new file mode 100644
index 00000000000..981043e51d7
--- /dev/null
+++ b/backends/aoti/slim/util/test/BUCK
@@ -0,0 +1,4 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
+load("targets.bzl", "define_common_targets")
+
+fbcode_target(_kind = define_common_targets,)
diff --git a/backends/aoti/slim/util/test/TARGETS b/backends/aoti/slim/util/test/TARGETS
deleted file mode 100644
index 77871de4469..00000000000
--- a/backends/aoti/slim/util/test/TARGETS
+++ /dev/null
@@ -1,3 +0,0 @@
-load("targets.bzl", "define_common_targets")
-
-define_common_targets()
diff --git a/backends/aoti/tests/TARGETS b/backends/aoti/tests/BUCK
similarity index 88%
rename from backends/aoti/tests/TARGETS
rename to backends/aoti/tests/BUCK
index d92e0e32a1f..7d8be09b528 100644
--- a/backends/aoti/tests/TARGETS
+++ b/backends/aoti/tests/BUCK
@@ -1,9 +1,10 @@
+load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target")
 load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest")
 load("@fbcode_macros//build_defs/lib:re_test_utils.bzl", "re_test_utils")
 
 oncall("executorch")
 
-cpp_unittest(
+fbcode_target(_kind = cpp_unittest,
     name = "test_common_shims",
     srcs = [
         "test_common_shims.cpp",
@@ -22,7 +23,7 @@ cpp_unittest(
     ],
 )
 
-cpp_unittest(
+fbcode_target(_kind = cpp_unittest,
     name = "test_common_shims_slim",
     srcs = [
         "test_common_shims_slim.cpp",