diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 3457ac676..26a981afd 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -111,9 +111,19 @@ steps:
   - <<: *common
     label: ":test_tube: Unit tests"
     command: make unit-tests
+  - <<: *common
+    label: ":test_tube: Unit tests (cgroupv2)"
+    command: make unit-tests
+    agents:
+            queue: "cgroupv2"
   - <<: *common
     label: ":test_tube: Container tests"
     command: make container-tests
+  - <<: *common
+    label: ":test_tube: Container tests (cgroupv2)"
+    command: make container-tests
+    agents:
+            queue: "cgroupv2"
 
   # All system call tests.
   - <<: *common
@@ -125,6 +135,11 @@ steps:
   - <<: *common
     label: ":docker: Docker tests"
     command: make docker-tests
+  - <<: *common
+    label: ":docker: Docker tests (cgroupv2)"
+    command: make docker-tests
+    agents:
+            queue: "cgroupv2"
   - <<: *common
     label: ":goggles: Overlay tests"
     command: make overlay-tests
@@ -152,6 +167,11 @@ steps:
   - <<: *common
     label: ":docker: Containerd 1.5.4 tests"
     command: make containerd-test-1.5.4
+  - <<: *common
+    label: ":docker: Containerd 1.5.4 tests (cgroupv2)"
+    command: make containerd-test-1.5.4
+    agents:
+            queue: "cgroupv2"
 
   # Check the website builds.
   - <<: *common