diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 20f1ccd53..23a5347d0 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -289,7 +289,7 @@ steps:
       <<: *ubuntu_agents
       arch: "amd64"
   - <<: *common
-    label: ":docker: Containerd 1.3.9 tests"
+    label: ":docker: Containerd 1.3.9 tests (cgroupv1)"
     command: make containerd-test-1.3.9
     agents:
       <<: *platform_specific_agents
@@ -297,11 +297,21 @@ steps:
       cgroup: "v1"
       arch: "amd64"
   - <<: *common
-    label: ":docker: Containerd 1.4.3 tests"
+    label: ":docker: Containerd 1.4.3 tests (cgroupv1)"
     command: make containerd-test-1.4.3
     agents:
       <<: *platform_specific_agents
       <<: *ubuntu_agents
+      cgroup: "v1"
+  - <<: *common
+    # See above: not truly a source test.
+    <<: *source_test
+    label: ":docker: Containerd 1.4.3 tests (cgroupv2)"
+    command: make containerd-test-1.4.3
+    agents:
+      <<: *platform_specific_agents
+      <<: *ubuntu_agents
+      cgroup: "v2"
   - <<: *common
     label: ":docker: Containerd 1.5.4 tests (cgroupv1)"
     command: make containerd-test-1.5.4