diff --git a/Jenkinsfile b/Jenkinsfile
index 133383eee832aa41b4658f9db3314b4eed020290..0b2a50ce1db389998b7f8068e2f7666240f41730 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -264,6 +264,37 @@ def buildOStree(architecture, type, board, debosarguments = "", repo = "repo") {
         --filename ${image_name}.delta""")
 }
 
+def buildOStreeTestDelta(architecture, type, board, debosarguments = "", repo = "repo") {
+  def image_name = imageName(architecture, type, board, true)
+  def branch = "${osname}/${release}/${architecture}-${board}/${type}"
+  def test_branch = "${osname}/${release}/${architecture}-${board}/${type}_test"
+
+  sh(script: """
+      cd ${PIPELINE_VERSION}/${architecture}/${type}
+      debos ${debosarguments} \
+        --show-boot \
+        -t architecture:${architecture} \
+        -t type:$type \
+        -t board:$board \
+        -t suite:$release \
+        -t ospack:ospack_${release}-${architecture}-${type}_${PIPELINE_VERSION} \
+        -t image:${image_name} \
+        -t message:${release}-${type}-${architecture}-${board}_${PIPELINE_VERSION} \
+        -t ostree:${repo} \
+        ${WORKSPACE}/${osname}-ostree-commit.yaml""")
+
+  sh(script: """
+      cd ${PIPELINE_VERSION}/${architecture}/${type}
+      ostree --repo=${repo} static-delta generate \
+        --from=${branch} \
+        --to=${test_branch} \
+        --inline \
+        --min-fallback-size=1024 \
+        --filename ${image_name}_test.delta""")
+}
+
+
+
 /** Generate the image name
  *
  * To have a single place for image name generation.
@@ -321,6 +352,7 @@ def buildOStreeImage(architecture, type, board, debosarguments = "") {
 
     stage("${architecture} ${type} ${board} OStree image build") {
       buildOStree(architecture, type, board, debosarguments, repo)
+      buildOStreeTestDelta(architecture, type, board, debosarguments, repo)
 
       sh(script: """
           cd ${PIPELINE_VERSION}/${architecture}/${type}
diff --git a/apertis-ostree-test-commit.yaml b/apertis-ostree-test-commit.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0bfc5f7c6a7780191fb83325525b19e8d9b81fb6
--- /dev/null
+++ b/apertis-ostree-test-commit.yaml
@@ -0,0 +1,31 @@
+{{ $architecture := or .architecture "amd64" }}
+{{ $type := or .type "minimal" }}
+{{ $suite := or .suite "18.12" }}
+{{ $image := or .image (printf "apertis-ostree-%s-%s-%s" $suite  $type $architecture) }}
+
+{{ $board := or .board "uefi" }}
+{{ $repourl := or .repourl "https://images.apertis.org/ostree/repo" }}
+{{ $osname := or .osname "apertis" }}
+{{ $branch := or .branch (printf "%s/%s/%s-%s/%s" $osname $suite $architecture $board $type) }}
+{{ $ostree := or .ostree "repo" }}
+
+architecture: {{ $architecture }}
+
+actions:
+  - action: ostree-deploy
+    description: Deploying ostree onto image
+    repository: {{ $ostree }}
+    remote_repository: {{ $repourl }}
+    branch: {{ $branch }}
+    os: {{ $osname }}
+    append-kernel-cmdline: {{ $cmdline }}
+
+  - action: run
+    chroot: false
+    command: "rm ${ROOTDIR}/usr/bin/updatectl"
+
+  - action: ostree-commit
+    repository: {{ $ostree }}
+    branch: {{ $branch }}_bad
+    subject: {{ $message }} bad commit
+