diff --git a/test-cases/apertis-update-manager-api.yaml b/test-cases/apertis-update-manager-api.yaml
index 4717f96b05e9518ff82c19ea7047913cfdeb68b0..48f59ea73eaf9100cee42a5a19cb71078c1adfe9 100644
--- a/test-cases/apertis-update-manager-api.yaml
+++ b/test-cases/apertis-update-manager-api.yaml
@@ -34,14 +34,19 @@ run:
     - "Get the Collection ID and ref"
     -  $ export CID=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 1 -d ' '); echo COLLECTION_ID=$CID
     -  $ export REF=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 2 -d ' '); echo REF=$REF
-    - "Create the commit with changed timestamp to allow upgrade with recent update file"
+    - "Create the list of files to skip and enshure there are some files in these directories"
+    - $ ls -1d /usr/share/locale /usr/share/man /usr/share/zoneinfo > /tmp/skip
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
+    - "Create the commit with changed timestamp and skipped list from above to allow upgrade with recent update file"
     - |
-        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago"); echo "New commit: $NEWID"
+        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago" --skip-list=/tmp/skip); echo "New commit: $NEWID"
     - "Deploy the prepared commit"
     - $ sudo ostree admin upgrade --allow-downgrade --deploy-only --override-commit=$NEWID --reboot
     - "Wait until the system is booted again and check the deployment"
     - $ sudo ostree admin status
     - "The booted commit (started with '*') must have ID which we prepare and the initial commit ID should be marked as '(rollback)'"
+    - "Check booted deployment have no file objects which we skip"
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
     - "Reboot the system"
diff --git a/test-cases/apertis-update-manager-automount.yaml b/test-cases/apertis-update-manager-automount.yaml
index c89d685d3d20ed863db361c443e6d0e4dd87d8f4..2dd25200cf69e52fbf7349789318b9de3c25407c 100644
--- a/test-cases/apertis-update-manager-automount.yaml
+++ b/test-cases/apertis-update-manager-automount.yaml
@@ -32,14 +32,19 @@ run:
     - "Get the Collection ID and ref"
     -  $ export CID=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 1 -d ' '); echo COLLECTION_ID=$CID
     -  $ export REF=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 2 -d ' '); echo REF=$REF
-    - "Create the commit with changed timestamp to allow upgrade with recent update file"
+    - "Create the list of files to skip and enshure there are some files in these directories"
+    - $ ls -1d /usr/share/locale /usr/share/man /usr/share/zoneinfo > /tmp/skip
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
+    - "Create the commit with changed timestamp and skipped list from above to allow upgrade with recent update file"
     - |
-        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago"); echo "New commit: $NEWID"
+        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago" --skip-list=/tmp/skip); echo "New commit: $NEWID"
     - "Deploy the prepared commit"
     - $ sudo ostree admin upgrade --allow-downgrade --deploy-only --override-commit=$NEWID --reboot
     - "Wait until the system is booted again and check the deployment"
     - $ sudo ostree admin status
     - "The booted commit (started with '*') must have ID which we prepare and the initial commit ID should be marked as '(rollback)'"
+    - "Check booted deployment have no file objects which we skip"
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
     - "Reboot the system"
diff --git a/test-cases/apertis-update-manager-diskfull.yaml b/test-cases/apertis-update-manager-diskfull.yaml
index 9180a91765a9ba9561621c91025e53aa3789e3fb..fb460afcfb6d3e67d5b14bc176fab72da02ff176 100644
--- a/test-cases/apertis-update-manager-diskfull.yaml
+++ b/test-cases/apertis-update-manager-diskfull.yaml
@@ -34,14 +34,19 @@ run:
     - "Get the Collection ID and ref"
     -  $ export CID=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 1 -d ' '); echo COLLECTION_ID=$CID
     -  $ export REF=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 2 -d ' '); echo REF=$REF
-    - "Create the commit with changed timestamp to allow upgrade with recent update file"
+    - "Create the list of files to skip and enshure there are some files in these directories"
+    - $ ls -1d /usr/share/locale /usr/share/man /usr/share/zoneinfo > /tmp/skip
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
+    - "Create the commit with changed timestamp and skipped list from above to allow upgrade with recent update file"
     - |
-        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago"); echo "New commit: $NEWID"
+        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago" --skip-list=/tmp/skip); echo "New commit: $NEWID"
     - "Deploy the prepared commit"
     - $ sudo ostree admin upgrade --allow-downgrade --deploy-only --override-commit=$NEWID --reboot
     - "Wait until the system is booted again and check the deployment"
     - $ sudo ostree admin status
     - "The booted commit (started with '*') must have ID which we prepare and the initial commit ID should be marked as '(rollback)'"
+    - "Check booted deployment have no file objects which we skip"
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
     - "Reboot the system"
diff --git a/test-cases/apertis-update-manager-manual.yaml b/test-cases/apertis-update-manager-manual.yaml
index 3b2e8c698b555d2f4e2e8c456c4abeb47fba75d9..8d02323803ac15285cd1b5516b9b14b675d457c4 100644
--- a/test-cases/apertis-update-manager-manual.yaml
+++ b/test-cases/apertis-update-manager-manual.yaml
@@ -31,14 +31,19 @@ run:
     - "Get the Collection ID and ref"
     -  $ export CID=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 1 -d ' '); echo COLLECTION_ID=$CID
     -  $ export REF=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 2 -d ' '); echo REF=$REF
-    - "Create the commit with changed timestamp to allow upgrade with recent update file"
+    - "Create the list of files to skip and enshure there are some files in these directories"
+    - $ ls -1d /usr/share/locale /usr/share/man /usr/share/zoneinfo > /tmp/skip
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
+    - "Create the commit with changed timestamp and skipped list from above to allow upgrade with recent update file"
     - |
-        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago"); echo "New commit: $NEWID"
+        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago" --skip-list=/tmp/skip); echo "New commit: $NEWID"
     - "Deploy the prepared commit"
     - $ sudo ostree admin upgrade --allow-downgrade --deploy-only --override-commit=$NEWID --reboot
     - "Wait until the system is booted again and check the deployment"
     - $ sudo ostree admin status
     - "The booted commit (started with '*') must have ID which we prepare and the initial commit ID should be marked as '(rollback)'"
+    - "Check booted deployment have no file objects which we skip"
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
     - "Reboot the system"
diff --git a/test-cases/apertis-update-manager-powercut.yaml b/test-cases/apertis-update-manager-powercut.yaml
index 9ab30e97101d6cfb0b9777114639036ee1a56c9a..105f5674a38815391709346d303f7073cff5e008 100644
--- a/test-cases/apertis-update-manager-powercut.yaml
+++ b/test-cases/apertis-update-manager-powercut.yaml
@@ -35,14 +35,19 @@ run:
     - "Get the Collection ID and ref"
     -  $ export CID=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 1 -d ' '); echo COLLECTION_ID=$CID
     -  $ export REF=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 2 -d ' '); echo REF=$REF
-    - "Create the commit with changed timestamp to allow upgrade with recent update file"
+    - "Create the list of files to skip and enshure there are some files in these directories"
+    - $ ls -1d /usr/share/locale /usr/share/man /usr/share/zoneinfo > /tmp/skip
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
+    - "Create the commit with changed timestamp and skipped list from above to allow upgrade with recent update file"
     - |
-        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago"); echo "New commit: $NEWID"
+        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago" --skip-list=/tmp/skip); echo "New commit: $NEWID"
     - "Deploy the prepared commit"
     - $ sudo ostree admin upgrade --allow-downgrade --deploy-only --override-commit=$NEWID --reboot
     - "Wait until the system is booted again and check the deployment"
     - $ sudo ostree admin status
     - "The booted commit (started with '*') must have ID which we prepare and the initial commit ID should be marked as '(rollback)'"
+    - "Check booted deployment have no file objects which we skip"
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
     - "Add udev rule for limiting the maximal read speed from USB drive to 1MBps."
diff --git a/test-cases/apertis-update-manager-rollback.yaml b/test-cases/apertis-update-manager-rollback.yaml
index f23f015e8d959ef204b9a9a2abcd898a1330e139..91565923a02220d97115567a654d1bb578598aef 100644
--- a/test-cases/apertis-update-manager-rollback.yaml
+++ b/test-cases/apertis-update-manager-rollback.yaml
@@ -37,14 +37,19 @@ run:
     - "Get the Collection ID and ref"
     -  $ export CID=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 1 -d ' '); echo COLLECTION_ID=$CID
     -  $ export REF=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 2 -d ' '); echo REF=$REF
-    - "Create the commit with changed timestamp to allow upgrade with recent update file"
+    - "Create the list of files to skip and enshure there are some files in these directories"
+    - $ ls -1d /usr/share/locale /usr/share/man /usr/share/zoneinfo > /tmp/skip
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
+    - "Create the commit with changed timestamp and skipped list from above to allow upgrade with recent update file"
     - |
-        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago"); echo "New commit: $NEWID"
+        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago" --skip-list=/tmp/skip); echo "New commit: $NEWID"
     - "Deploy the prepared commit"
     - $ sudo ostree admin upgrade --allow-downgrade --deploy-only --override-commit=$NEWID --reboot
     - "Wait until the system is booted again and check the deployment"
     - $ sudo ostree admin status
     - "The booted commit (started with '*') must have ID which we prepare and the initial commit ID should be marked as '(rollback)'"
+    - "Check booted deployment have no file objects which we skip"
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
     - "Reboot the system"
diff --git a/test-cases/apertis-update-manager-usb-unplug.yaml b/test-cases/apertis-update-manager-usb-unplug.yaml
index 2c3d740f612b9c66205a5c028814f5e0e92b1616..f0ee4ef0eaf7a296a250ca7671061978e787adfe 100644
--- a/test-cases/apertis-update-manager-usb-unplug.yaml
+++ b/test-cases/apertis-update-manager-usb-unplug.yaml
@@ -33,14 +33,19 @@ run:
     - "Get the Collection ID and ref"
     -  $ export CID=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 1 -d ' '); echo COLLECTION_ID=$CID
     -  $ export REF=$(sudo ostree refs -c | head -n 1 | tr -d '(),' | cut -f 2 -d ' '); echo REF=$REF
-    - "Create the commit with changed timestamp to allow upgrade with recent update file"
+    - "Create the list of files to skip and enshure there are some files in these directories"
+    - $ ls -1d /usr/share/locale /usr/share/man /usr/share/zoneinfo > /tmp/skip
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
+    - "Create the commit with changed timestamp and skipped list from above to allow upgrade with recent update file"
     - |
-        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago"); echo "New commit: $NEWID"
+        $ export NEWID=$(sudo ostree commit --orphan --tree=ref=$BOOTID --add-metadata-string=ostree.collection-binding=$CID --bind-ref=$REF --timestamp="1 year ago" --skip-list=/tmp/skip); echo "New commit: $NEWID"
     - "Deploy the prepared commit"
     - $ sudo ostree admin upgrade --allow-downgrade --deploy-only --override-commit=$NEWID --reboot
     - "Wait until the system is booted again and check the deployment"
     - $ sudo ostree admin status
     - "The booted commit (started with '*') must have ID which we prepare and the initial commit ID should be marked as '(rollback)'"
+    - "Check booted deployment have no file objects which we skip"
+    - $ du -sh /usr/share/locale /usr/share/man /usr/share/zoneinfo
     - "Remove the initial deployment"
     - $ sudo ostree admin undeploy 1
     - "Add udev rule for limiting the maximal read speed from USB drive to 64Kbps."