diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2343cf5a..77047529 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,6 +38,7 @@ subiquity/common/filesystem/labels.py
 subiquity/common/filesystem/manipulator.py
 subiquity/common/filesystem/tests/__init__.py
 subiquity/common/filesystem/tests/test_actions.py
+subiquity/common/filesystem/tests/test_labels.py
 subiquity/common/filesystem/tests/test_manipulator.py
 subiquity/common/__init__.py
 subiquity/common/serialize.py
diff --git a/subiquity/common/filesystem/tests/test_labels.py b/subiquity/common/filesystem/tests/test_labels.py
new file mode 100644
index 00000000..75a66d99
--- /dev/null
+++ b/subiquity/common/filesystem/tests/test_labels.py
@@ -0,0 +1,125 @@
+# Copyright 2021 Canonical, Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import unittest
+
+from subiquity.common.filesystem.labels import (
+    annotations,
+    usage_labels,
+    )
+from subiquity.models.tests.test_filesystem import (
+    make_model,
+    make_model_and_disk,
+    make_model_and_partition,
+    make_partition,
+    )
+
+
+class TestAnnotations(unittest.TestCase):
+
+    def test_disk_annotations(self):
+        # disks never have annotations
+        model, disk = make_model_and_disk()
+        self.assertEqual(annotations(disk), [])
+        disk.preserve = True
+        self.assertEqual(annotations(disk), [])
+
+    def test_partition_annotations(self):
+        model = make_model()
+        part = make_partition(model)
+        self.assertEqual(annotations(part), ['new'])
+        part.preserve = True
+        self.assertEqual(annotations(part), ['existing'])
+
+        model = make_model()
+        part = make_partition(model, flag="bios_grub")
+        self.assertEqual(
+            annotations(part), ['new', 'BIOS grub spacer'])
+        part.preserve = True
+        self.assertEqual(
+            annotations(part),
+            ['existing', 'unconfigured', 'BIOS grub spacer'])
+        part.device.grub_device = True
+        self.assertEqual(
+            annotations(part),
+            ['existing', 'configured', 'BIOS grub spacer'])
+
+        model = make_model()
+        part = make_partition(model, flag="boot", grub_device=True)
+        self.assertEqual(annotations(part), ['new', 'backup ESP'])
+        fs = model.add_filesystem(part, fstype="fat32")
+        model.add_mount(fs, "/boot/efi")
+        self.assertEqual(annotations(part), ['new', 'primary ESP'])
+
+        model = make_model()
+        part = make_partition(model, flag="boot", preserve=True)
+        self.assertEqual(annotations(part), ['existing', 'unused ESP'])
+        part.grub_device = True
+        self.assertEqual(annotations(part), ['existing', 'backup ESP'])
+        fs = model.add_filesystem(part, fstype="fat32")
+        model.add_mount(fs, "/boot/efi")
+        self.assertEqual(annotations(part), ['existing', 'primary ESP'])
+
+        model = make_model()
+        part = make_partition(model, flag="prep", grub_device=True)
+        self.assertEqual(annotations(part), ['new', 'PReP'])
+
+        model = make_model()
+        part = make_partition(model, flag="prep", preserve=True)
+        self.assertEqual(
+            annotations(part), ['existing', 'PReP', 'unconfigured'])
+        part.grub_device = True
+        self.assertEqual(
+            annotations(part), ['existing', 'PReP', 'configured'])
+
+    def test_vg_default_annotations(self):
+        model, disk = make_model_and_disk()
+        vg = model.add_volgroup('vg-0', {disk})
+        self.assertEqual(annotations(vg), ['new'])
+        vg.preserve = True
+        self.assertEqual(annotations(vg), ['existing'])
+
+    def test_vg_encrypted_annotations(self):
+        model, disk = make_model_and_disk()
+        dm_crypt = model.add_dm_crypt(disk, key='passw0rd')
+        vg = model.add_volgroup('vg-0', {dm_crypt})
+        self.assertEqual(annotations(vg), ['new', 'encrypted'])
+
+
+class TestUsageLabels(unittest.TestCase):
+
+    def test_partition_usage_labels(self):
+        model, partition = make_model_and_partition()
+        self.assertEqual(usage_labels(partition), ["unused"])
+        fs = model.add_filesystem(partition, 'ext4')
+        self.assertEqual(
+            usage_labels(partition),
+            ["to be formatted as ext4", "not mounted"])
+        model._orig_config = model._render_actions()
+        fs.preserve = True
+        partition.preserve = True
+        self.assertEqual(
+            usage_labels(partition),
+            ["already formatted as ext4", "not mounted"])
+        model.remove_filesystem(fs)
+        fs2 = model.add_filesystem(partition, 'ext4')
+        self.assertEqual(
+            usage_labels(partition),
+            ["to be reformatted as ext4", "not mounted"])
+        model.add_mount(fs2, '/')
+        self.assertEqual(
+            usage_labels(partition),
+            ["to be reformatted as ext4", "mounted at /"])
diff --git a/subiquity/models/tests/test_filesystem.py b/subiquity/models/tests/test_filesystem.py
index 5ae26f2f..3edb928c 100644
--- a/subiquity/models/tests/test_filesystem.py
+++ b/subiquity/models/tests/test_filesystem.py
@@ -17,10 +17,6 @@ import unittest
 
 import attr
 
-from subiquity.common.filesystem.labels import (
-    annotations,
-    usage_labels,
-    )
 from subiquity.models.filesystem import (
     Bootloader,
     dehumanize_size,
@@ -217,74 +213,6 @@ def make_model_and_lv(bootloader=None):
 
 class TestFilesystemModel(unittest.TestCase):
 
-    def test_disk_annotations(self):
-        # disks never have annotations
-        model, disk = make_model_and_disk()
-        self.assertEqual(annotations(disk), [])
-        disk.preserve = True
-        self.assertEqual(annotations(disk), [])
-
-    def test_partition_annotations(self):
-        model = make_model()
-        part = make_partition(model)
-        self.assertEqual(annotations(part), ['new'])
-        part.preserve = True
-        self.assertEqual(annotations(part), ['existing'])
-
-        model = make_model()
-        part = make_partition(model, flag="bios_grub")
-        self.assertEqual(
-            annotations(part), ['new', 'BIOS grub spacer'])
-        part.preserve = True
-        self.assertEqual(
-            annotations(part),
-            ['existing', 'unconfigured', 'BIOS grub spacer'])
-        part.device.grub_device = True
-        self.assertEqual(
-            annotations(part),
-            ['existing', 'configured', 'BIOS grub spacer'])
-
-        model = make_model()
-        part = make_partition(model, flag="boot", grub_device=True)
-        self.assertEqual(annotations(part), ['new', 'backup ESP'])
-        fs = model.add_filesystem(part, fstype="fat32")
-        model.add_mount(fs, "/boot/efi")
-        self.assertEqual(annotations(part), ['new', 'primary ESP'])
-
-        model = make_model()
-        part = make_partition(model, flag="boot", preserve=True)
-        self.assertEqual(annotations(part), ['existing', 'unused ESP'])
-        part.grub_device = True
-        self.assertEqual(annotations(part), ['existing', 'backup ESP'])
-        fs = model.add_filesystem(part, fstype="fat32")
-        model.add_mount(fs, "/boot/efi")
-        self.assertEqual(annotations(part), ['existing', 'primary ESP'])
-
-        model = make_model()
-        part = make_partition(model, flag="prep", grub_device=True)
-        self.assertEqual(annotations(part), ['new', 'PReP'])
-
-        model = make_model()
-        part = make_partition(model, flag="prep", preserve=True)
-        self.assertEqual(
-            annotations(part), ['existing', 'PReP', 'unconfigured'])
-        part.grub_device = True
-        self.assertEqual(
-            annotations(part), ['existing', 'PReP', 'configured'])
-
-    def test_vg_default_annotations(self):
-        model, disk = make_model_and_disk()
-        vg = model.add_volgroup('vg-0', {disk})
-        self.assertEqual(annotations(vg), ['new'])
-        vg.preserve = True
-        self.assertEqual(annotations(vg), ['existing'])
-
-    def test_vg_encrypted_annotations(self):
-        model, disk = make_model_and_disk()
-        dm_crypt = model.add_dm_crypt(disk, key='passw0rd')
-        vg = model.add_volgroup('vg-0', {dm_crypt})
-        self.assertEqual(annotations(vg), ['new', 'encrypted'])
-
     def _test_ok_for_xxx(self, model, make_new_device, attr,
                          test_partitions=True):
         # Newly formatted devs are ok_for_raid
@@ -357,29 +285,6 @@ class TestFilesystemModel(unittest.TestCase):
         self.assertFalse(lv.ok_for_raid)
         self.assertFalse(lv.ok_for_lvm_vg)
 
-    def test_partition_usage_labels(self):
-        model, partition = make_model_and_partition()
-        self.assertEqual(usage_labels(partition), ["unused"])
-        fs = model.add_filesystem(partition, 'ext4')
-        self.assertEqual(
-            usage_labels(partition),
-            ["to be formatted as ext4", "not mounted"])
-        model._orig_config = model._render_actions()
-        fs.preserve = True
-        partition.preserve = True
-        self.assertEqual(
-            usage_labels(partition),
-            ["already formatted as ext4", "not mounted"])
-        model.remove_filesystem(fs)
-        fs2 = model.add_filesystem(partition, 'ext4')
-        self.assertEqual(
-            usage_labels(partition),
-            ["to be reformatted as ext4", "not mounted"])
-        model.add_mount(fs2, '/')
-        self.assertEqual(
-            usage_labels(partition),
-            ["to be reformatted as ext4", "mounted at /"])
-
     def test_is_esp(self):
         model = make_model(Bootloader.UEFI)
         gpt_disk = make_disk(model, ptable='gpt')