diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index cc492fbd4..1a8eac749 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -61,11 +61,19 @@ steps:
 
   # Build everything.
   - <<: *common
-    label: ":world_map: Build everything"
+    label: ":world_map: Build everything (AMD64)"
     command: "make build OPTIONS=--build_tag_filters=-nogo TARGETS=//..."
     agents:
       arch: "amd64"
 
+  - <<: *common
+    label: ":world_map: Build everything (ARM64)"
+    commands:
+      - "make build OPTIONS=--build_tag_filters=-nogo TARGETS=//pkg/..."
+      - "make build OPTIONS=--build_tag_filters=-nogo TARGETS=//runsc/..."
+    agents:
+      arch: "arm64"
+
   # Check that the Go branch builds. This is not technically required, as this build is maintained
   # as a GitHub action in order to preserve this maintaince across forks. However, providing the
   # action here may provide easier debuggability and diagnosis on failure.
@@ -151,6 +159,11 @@ steps:
     agents:
       cgroup: "v2"
       arch: "amd64"
+  - <<: *common
+    label: ":test_tube: Unit tests (ARM64)"
+    command: make unit-tests
+    agents:
+      arch: "arm64"
   - <<: *common
     label: ":test_tube: Container tests (cgroupv1)"
     command: make container-tests
diff --git a/test/perf/linux/signal_benchmark.cc b/test/perf/linux/signal_benchmark.cc
index cec679191..e54995dd0 100644
--- a/test/perf/linux/signal_benchmark.cc
+++ b/test/perf/linux/signal_benchmark.cc
@@ -25,6 +25,8 @@ namespace testing {
 
 namespace {
 
+#ifdef __x86_64__
+
 void FixupHandler(int sig, siginfo_t* si, void* void_ctx) {
   static unsigned int dataval = 0;
 
@@ -55,6 +57,8 @@ void BM_FaultSignalFixup(benchmark::State& state) {
 
 BENCHMARK(BM_FaultSignalFixup)->UseRealTime();
 
+#endif  // __x86_64__
+
 }  // namespace
 
 }  // namespace testing