diff --git a/backends/arm/test/TARGETS b/backends/arm/test/TARGETS
index 7949b0f4bd..b5600b15b1 100644
--- a/backends/arm/test/TARGETS
+++ b/backends/arm/test/TARGETS
@@ -5,11 +5,9 @@ load(":targets.bzl", "define_arm_tests")
 oncall("executorch")
 
 python_library(
-    name = "common",
-    srcs = ["common.py"],
+    name = "conftest",
+    srcs = ["conftest.py"],
     deps = [
-        "//executorch/backends/xnnpack/test/tester:tester",
-        "//executorch/backends/arm:arm_backend",
         "//executorch/exir:lib",
         "//executorch/exir/backend:compile_spec_schema",
         "fbsource//third-party/pypi/pytest:pytest",
@@ -20,6 +18,7 @@ python_library(
     name = "runner_utils",
     srcs = ["runner_utils.py"],
     deps = [
+        ":conftest",
         "//executorch/backends/xnnpack/test/tester:tester",
         "//executorch/backends/arm:arm_backend",
         "//executorch/exir:lib",
@@ -28,10 +27,14 @@ python_library(
 )
 
 python_library(
-    name = "conftest",
-    srcs = ["conftest.py"],
+    name = "common",
+    srcs = ["common.py"],
     deps = [
+        ":runner_utils",
+        "//executorch/backends/xnnpack/test/tester:tester",
+        "//executorch/backends/arm:arm_backend",
         "//executorch/exir:lib",
+        "//executorch/exir/backend:compile_spec_schema",
         "fbsource//third-party/pypi/pytest:pytest",
     ]
 )
diff --git a/backends/arm/test/targets.bzl b/backends/arm/test/targets.bzl
index 5f9074caa4..3335dc958c 100644
--- a/backends/arm/test/targets.bzl
+++ b/backends/arm/test/targets.bzl
@@ -1,4 +1,5 @@
-load("//caffe2/test/fb:defs.bzl", "define_tests")
+# load("//caffe2/test/fb:defs.bzl", "define_tests")
+load("@fbcode_macros//build_defs:python_pytest.bzl", "python_pytest")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 
 def define_arm_tests():
@@ -13,21 +14,22 @@ def define_arm_tests():
     for test_file in test_files:
         test_file_name = paths.basename(test_file)
         test_name = test_file_name.replace("test_", "").replace(".py", "")
-        TESTS[test_name] = [test_file]
 
-    define_tests(
-        pytest = True,
-        tests = TESTS,
-        pytest_config = "pytest.ini",
-        resources = ["conftest.py"],
-        preload_deps = [
-            "//executorch/kernels/quantized:custom_ops_generated_lib",
-        ],
-        deps = [
-            ":arm_tester",
-            ":conftest",
-            "//executorch/exir:lib",
-            "fbsource//third-party/pypi/pytest:pytest",
-            "fbsource//third-party/pypi/parameterized:parameterized",
-        ],
-    )
+        python_pytest(
+            name = test_name,
+            srcs = [test_file],
+            pytest_config = "pytest.ini",
+            resources = ["conftest.py"],
+            compile = "with-source",
+            typing = False,
+            preload_deps = [
+                "//executorch/kernels/quantized:custom_ops_generated_lib",
+            ],
+            deps = [
+                ":arm_tester",
+                ":conftest",
+                "//executorch/exir:lib",
+                "fbsource//third-party/pypi/pytest:pytest",
+                "fbsource//third-party/pypi/parameterized:parameterized",
+            ],
+        )