diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index cddf5504b..ac0cc4cd9 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -45,6 +45,14 @@ steps:
       - make BAZEL_OPTIONS=--config=cross-aarch64 artifacts/aarch64
       - make release
 
+  # Images tests.
+  - <<: *common
+    label: ":docker: Images (x86_64)"
+    command: make ARCH=x86_64 load-all-images
+  - <<: *common
+    label: ":docker: Images (aarch64)"
+    command: make ARCH=aarch64 load-all-images
+
   # Basic unit tests.
   - <<: *common
     label: ":test_tube: Unit tests"
diff --git a/images/basic/fsstress/Dockerfile b/images/basic/fsstress/Dockerfile.x86_64
similarity index 100%
rename from images/basic/fsstress/Dockerfile
rename to images/basic/fsstress/Dockerfile.x86_64