diff --git a/test/suites/container_devices_disk.sh b/test/suites/container_devices_disk.sh
index c5e8609b64cc..49801dab87f6 100644
--- a/test/suites/container_devices_disk.sh
+++ b/test/suites/container_devices_disk.sh
@@ -86,6 +86,23 @@ test_container_devices_disk_shift() {
   [ "$(lxc exec foo-isol1 -- stat /mnt/a -c '%u:%g')" = "123:456" ] || false
   [ "$(lxc exec foo-isol2 -- stat /mnt/a -c '%u:%g')" = "123:456" ] || false
 
+  mkdir -p "${TEST_DIR}/empty-dir"
+  lxc exec foo -- mkdir /opt
+  lxc config device add foo empty-dir disk source="${TEST_DIR}/empty-dir" path=/opt
+  lxc config device remove foo empty-dir
+  lxc exec foo -- stat /opt
+
+  lxc exec foo -- touch /tmp/empty-dir
+  lxc config device add foo empty-dir disk source="${TEST_DIR}/empty-dir" path=/tmp/empty-dir
+  lxc config device remove foo empty-dir
+  lxc exec foo -- stat /tmp/empty-dir
+
+  lxc exec foo -- touch /tmp/new-dir
+  lxc config device add foo empty-dir disk source="${TEST_DIR}/empty-dir" path=/tmp/new-dir
+  lxc config device remove foo empty-dir
+  ! lxc exec foo -- stat /tmp/empty-dir
+  rm -rf "${TEST_DIR}/empty-dir"
+
   lxc delete -f foo-priv foo-isol1 foo-isol2
   lxc config device remove foo shifted
   lxc storage volume delete "${POOL}" foo-shift