diff --git a/test/cases/040_packages/009_extend/000_ext4/Dockerfile b/test/cases/040_packages/005_extend/000_ext4/Dockerfile
similarity index 100%
rename from test/cases/040_packages/009_extend/000_ext4/Dockerfile
rename to test/cases/040_packages/005_extend/000_ext4/Dockerfile
diff --git a/test/cases/040_packages/009_extend/000_ext4/check.sh b/test/cases/040_packages/005_extend/000_ext4/check.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/000_ext4/check.sh
rename to test/cases/040_packages/005_extend/000_ext4/check.sh
diff --git a/test/cases/040_packages/009_extend/000_ext4/extend.sh b/test/cases/040_packages/005_extend/000_ext4/extend.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/000_ext4/extend.sh
rename to test/cases/040_packages/005_extend/000_ext4/extend.sh
diff --git a/test/cases/040_packages/009_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml
similarity index 100%
rename from test/cases/040_packages/009_extend/000_ext4/test-create.yml
rename to test/cases/040_packages/005_extend/000_ext4/test-create.yml
diff --git a/test/cases/040_packages/009_extend/000_ext4/test.sh b/test/cases/040_packages/005_extend/000_ext4/test.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/000_ext4/test.sh
rename to test/cases/040_packages/005_extend/000_ext4/test.sh
diff --git a/test/cases/040_packages/009_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml
similarity index 100%
rename from test/cases/040_packages/009_extend/000_ext4/test.yml
rename to test/cases/040_packages/005_extend/000_ext4/test.yml
diff --git a/test/cases/040_packages/009_extend/001_btrfs/Dockerfile b/test/cases/040_packages/005_extend/001_btrfs/Dockerfile
similarity index 100%
rename from test/cases/040_packages/009_extend/001_btrfs/Dockerfile
rename to test/cases/040_packages/005_extend/001_btrfs/Dockerfile
diff --git a/test/cases/040_packages/009_extend/001_btrfs/check.sh b/test/cases/040_packages/005_extend/001_btrfs/check.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/001_btrfs/check.sh
rename to test/cases/040_packages/005_extend/001_btrfs/check.sh
diff --git a/test/cases/040_packages/009_extend/001_btrfs/extend.sh b/test/cases/040_packages/005_extend/001_btrfs/extend.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/001_btrfs/extend.sh
rename to test/cases/040_packages/005_extend/001_btrfs/extend.sh
diff --git a/test/cases/040_packages/009_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml
similarity index 100%
rename from test/cases/040_packages/009_extend/001_btrfs/test-create.yml
rename to test/cases/040_packages/005_extend/001_btrfs/test-create.yml
diff --git a/test/cases/040_packages/009_extend/001_btrfs/test.sh b/test/cases/040_packages/005_extend/001_btrfs/test.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/001_btrfs/test.sh
rename to test/cases/040_packages/005_extend/001_btrfs/test.sh
diff --git a/test/cases/040_packages/009_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml
similarity index 100%
rename from test/cases/040_packages/009_extend/001_btrfs/test.yml
rename to test/cases/040_packages/005_extend/001_btrfs/test.yml
diff --git a/test/cases/040_packages/009_extend/002_xfs/Dockerfile b/test/cases/040_packages/005_extend/002_xfs/Dockerfile
similarity index 100%
rename from test/cases/040_packages/009_extend/002_xfs/Dockerfile
rename to test/cases/040_packages/005_extend/002_xfs/Dockerfile
diff --git a/test/cases/040_packages/009_extend/002_xfs/check.sh b/test/cases/040_packages/005_extend/002_xfs/check.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/002_xfs/check.sh
rename to test/cases/040_packages/005_extend/002_xfs/check.sh
diff --git a/test/cases/040_packages/009_extend/002_xfs/extend.sh b/test/cases/040_packages/005_extend/002_xfs/extend.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/002_xfs/extend.sh
rename to test/cases/040_packages/005_extend/002_xfs/extend.sh
diff --git a/test/cases/040_packages/009_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml
similarity index 100%
rename from test/cases/040_packages/009_extend/002_xfs/test-create.yml
rename to test/cases/040_packages/005_extend/002_xfs/test-create.yml
diff --git a/test/cases/040_packages/009_extend/002_xfs/test.sh b/test/cases/040_packages/005_extend/002_xfs/test.sh
similarity index 100%
rename from test/cases/040_packages/009_extend/002_xfs/test.sh
rename to test/cases/040_packages/005_extend/002_xfs/test.sh
diff --git a/test/cases/040_packages/009_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml
similarity index 100%
rename from test/cases/040_packages/009_extend/002_xfs/test.yml
rename to test/cases/040_packages/005_extend/002_xfs/test.yml
diff --git a/test/cases/040_packages/008_format_mount/000_auto/check.sh b/test/cases/040_packages/006_format_mount/000_auto/check.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/000_auto/check.sh
rename to test/cases/040_packages/006_format_mount/000_auto/check.sh
diff --git a/test/cases/040_packages/008_format_mount/000_auto/test.sh b/test/cases/040_packages/006_format_mount/000_auto/test.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/000_auto/test.sh
rename to test/cases/040_packages/006_format_mount/000_auto/test.sh
diff --git a/test/cases/040_packages/008_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml
similarity index 100%
rename from test/cases/040_packages/008_format_mount/000_auto/test.yml
rename to test/cases/040_packages/006_format_mount/000_auto/test.yml
diff --git a/test/cases/040_packages/008_format_mount/001_by_label/check.sh b/test/cases/040_packages/006_format_mount/001_by_label/check.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/001_by_label/check.sh
rename to test/cases/040_packages/006_format_mount/001_by_label/check.sh
diff --git a/test/cases/040_packages/008_format_mount/001_by_label/test.sh b/test/cases/040_packages/006_format_mount/001_by_label/test.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/001_by_label/test.sh
rename to test/cases/040_packages/006_format_mount/001_by_label/test.sh
diff --git a/test/cases/040_packages/008_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml
similarity index 100%
rename from test/cases/040_packages/008_format_mount/001_by_label/test.yml
rename to test/cases/040_packages/006_format_mount/001_by_label/test.yml
diff --git a/test/cases/040_packages/008_format_mount/002_by_name/.gitignore b/test/cases/040_packages/006_format_mount/002_by_name/.gitignore
similarity index 100%
rename from test/cases/040_packages/008_format_mount/002_by_name/.gitignore
rename to test/cases/040_packages/006_format_mount/002_by_name/.gitignore
diff --git a/test/cases/040_packages/008_format_mount/002_by_name/check.sh b/test/cases/040_packages/006_format_mount/002_by_name/check.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/002_by_name/check.sh
rename to test/cases/040_packages/006_format_mount/002_by_name/check.sh
diff --git a/test/cases/040_packages/008_format_mount/002_by_name/test.sh b/test/cases/040_packages/006_format_mount/002_by_name/test.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/002_by_name/test.sh
rename to test/cases/040_packages/006_format_mount/002_by_name/test.sh
diff --git a/test/cases/040_packages/008_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
similarity index 100%
rename from test/cases/040_packages/008_format_mount/002_by_name/test.yml.in
rename to test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
diff --git a/test/cases/040_packages/008_format_mount/003_btrfs/check.sh b/test/cases/040_packages/006_format_mount/003_btrfs/check.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/003_btrfs/check.sh
rename to test/cases/040_packages/006_format_mount/003_btrfs/check.sh
diff --git a/test/cases/040_packages/008_format_mount/003_btrfs/test.sh b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/003_btrfs/test.sh
rename to test/cases/040_packages/006_format_mount/003_btrfs/test.sh
diff --git a/test/cases/040_packages/008_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml
similarity index 100%
rename from test/cases/040_packages/008_format_mount/003_btrfs/test.yml
rename to test/cases/040_packages/006_format_mount/003_btrfs/test.yml
diff --git a/test/cases/040_packages/008_format_mount/004_xfs/check.sh b/test/cases/040_packages/006_format_mount/004_xfs/check.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/004_xfs/check.sh
rename to test/cases/040_packages/006_format_mount/004_xfs/check.sh
diff --git a/test/cases/040_packages/008_format_mount/004_xfs/test.sh b/test/cases/040_packages/006_format_mount/004_xfs/test.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/004_xfs/test.sh
rename to test/cases/040_packages/006_format_mount/004_xfs/test.sh
diff --git a/test/cases/040_packages/008_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml
similarity index 100%
rename from test/cases/040_packages/008_format_mount/004_xfs/test.yml
rename to test/cases/040_packages/006_format_mount/004_xfs/test.yml
diff --git a/test/cases/040_packages/008_format_mount/010_multiple/check.sh b/test/cases/040_packages/006_format_mount/010_multiple/check.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/010_multiple/check.sh
rename to test/cases/040_packages/006_format_mount/010_multiple/check.sh
diff --git a/test/cases/040_packages/008_format_mount/010_multiple/test.sh b/test/cases/040_packages/006_format_mount/010_multiple/test.sh
similarity index 100%
rename from test/cases/040_packages/008_format_mount/010_multiple/test.sh
rename to test/cases/040_packages/006_format_mount/010_multiple/test.sh
diff --git a/test/cases/040_packages/008_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml
similarity index 100%
rename from test/cases/040_packages/008_format_mount/010_multiple/test.yml
rename to test/cases/040_packages/006_format_mount/010_multiple/test.yml
diff --git a/test/cases/040_packages/README.md b/test/cases/040_packages/README.md
new file mode 100644
index 000000000..e08ed3523
--- /dev/null
+++ b/test/cases/040_packages/README.md
@@ -0,0 +1,3 @@
+NOTE: The cases in this directory are ordered alphabetically.
+The index used is the position of the first letter of the name in the alphabet.
+For example, 001_a, 002_b, 003_c etc...