diff --git a/src/modules/mount/test.yaml b/src/modules/mount/tests/1.global
similarity index 100%
rename from src/modules/mount/test.yaml
rename to src/modules/mount/tests/1.global
diff --git a/src/modules/mount/tests/1.job b/src/modules/mount/tests/1.job
new file mode 100644
index 000000000..94b3a1492
--- /dev/null
+++ b/src/modules/mount/tests/1.job
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+bogus: true
+
+# No configuration needed because the partitions are
+# all filesystems that require no special handling.
diff --git a/src/modules/mount/tests/2.global b/src/modules/mount/tests/2.global
new file mode 100644
index 000000000..20aba89ec
--- /dev/null
+++ b/src/modules/mount/tests/2.global
@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+partitions:
+    - device: "/dev/sdb1"
+      mountPoint: "/"
+      fs: "btrfs"
+
+# Expect a complaint and a default btrfs layout
diff --git a/src/modules/mount/tests/2.job b/src/modules/mount/tests/2.job
new file mode 100644
index 000000000..40d8c6171
--- /dev/null
+++ b/src/modules/mount/tests/2.job
@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+
+# Expect a complaint and a default btrfs layout because the
+# partitions use btrfs