diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 868713d5..1a1ffead 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,8 +12,6 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
 
 env:
   REPO_SLUG: tonistiigi/binfmt
@@ -146,6 +144,9 @@ jobs:
         include:
           - dockerfile: ejabberd
             platform: linux/arm64
+          - dockerfile: tini
+            platform: linux/arm64
+            run: true
     steps:
       -
         name: Checkout
@@ -172,6 +173,18 @@ jobs:
         working-directory: test/dockerfiles/${{ matrix.dockerfile }}
         run: |
           docker buildx build --platform ${{ matrix.platform }} --output type=cacheonly .
+      -
+        name: Load image
+        if: ${{ matrix.run }}
+        working-directory: test/dockerfiles/${{ matrix.dockerfile }}
+        run: |
+          docker buildx build --platform ${{ matrix.platform }} -t ${{ matrix.dockerfile }}:local --load .
+      -
+        name: Run
+        if: ${{ matrix.run }}
+        working-directory: test/dockerfiles/${{ matrix.dockerfile }}
+        run: |
+          docker run --rm --platform ${{ matrix.platform }} ${{ matrix.dockerfile }}:local
 
   build:
     runs-on: ubuntu-latest
diff --git a/test/dockerfiles/tini/Dockerfile b/test/dockerfiles/tini/Dockerfile
new file mode 100644
index 00000000..33682c56
--- /dev/null
+++ b/test/dockerfiles/tini/Dockerfile
@@ -0,0 +1,22 @@
+# syntax=docker/dockerfile:1
+
+ARG TINI_VERSION="v0.19.0"
+
+FROM alpine:3.17
+RUN apk add --no-cache file wget
+ARG TINI_VERSION
+ARG TARGETPLATFORM
+RUN <<EOT
+  TINI_ARCH=$(case ${TARGETPLATFORM} in
+    "linux/amd64")   echo "amd64"   ;;
+    "linux/arm/v6")  echo "armel"   ;;
+    "linux/arm/v7")  echo "armhf"   ;;
+    "linux/arm64")   echo "arm64"   ;;
+    "linux/ppc64le") echo "ppc64le" ;;
+    "linux/s390x")   echo "390x"    ;;
+    *)               echo ""        ;; esac)
+  wget -q "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TINI_ARCH}" -qO /tini
+  chmod +x /tini
+  file /tini
+EOT
+CMD [ "/tini", "-s", "--", "uname", "-a" ]