diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 3f33ee71b..d26c5c6a6 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -175,6 +175,14 @@ steps:
     command: make containerd-test-1.5.4
     agents:
             queue: "cgroupv2"
+  - <<: *common
+    label: ":docker: Containerd 1.6.0-rc.4 tests"
+    command: make containerd-test-1.6.0-rc.4
+  - <<: *common
+    label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv2)"
+    command: make containerd-test-1.6.0-rc.4
+    agents:
+            queue: "cgroupv2"
 
   # Check the website builds.
   - <<: *common
diff --git a/Makefile b/Makefile
index 1983e32d3..4dc9a10ba 100644
--- a/Makefile
+++ b/Makefile
@@ -337,6 +337,7 @@ containerd-tests: containerd-test-1.3.9
 endif
 containerd-tests: containerd-test-1.4.3
 containerd-tests: containerd-test-1.5.4
+containerd-tests: containerd-test-1.6.0-rc.4
 
 ##
 ## Benchmarks.