diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 9b6b7352b..b08224ca4 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -135,6 +135,12 @@ steps:
     label: ":toolbox: System call tests"
     command: make syscall-tests
     parallelism: 20
+  - <<: *common
+    label: ":muscle: System call tests (ARM64)"
+    command: make BAZEL_OPTIONS=--test_tag_filters=runsc_ptrace syscall-tests
+    parallelism: 10
+    agents:
+      queue: "arm64"
 
   # Integration tests.
   - <<: *common
diff --git a/tools/bazel.mk b/tools/bazel.mk
index 5dce58cfb..dba34a637 100644
--- a/tools/bazel.mk
+++ b/tools/bazel.mk
@@ -195,7 +195,7 @@ build    = $(call header,BUILD $(1)) && $(call build_paths,$(1),echo {})
 copy     = $(call header,COPY $(1) $(2)) && $(call build_paths,$(1),cp -fa {} $(2))
 run      = $(call header,RUN $(1) $(2)) && $(call build_paths,$(1),{} $(2))
 sudo     = $(call header,SUDO $(1) $(2)) && $(call build_paths,$(1),sudo -E {} $(2))
-test     = $(call header,TEST $(1)) && $(call wrapper,$(BAZEL) test $(TEST_OPTIONS) $(1))
+test     = $(call header,TEST $(1)) && $(call wrapper,$(BAZEL) test $(BAZEL_OPTIONS) $(TEST_OPTIONS) $(1))
 sudocopy = $(call header,COPY $(1) $(2)) && $(call build_paths,$(1),sudo cp -fa {} $(2))
 
 clean: ## Cleans the bazel cache.