diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py
index fb3be0dca..d501bb78a 100644
--- a/test/functional/tests/conftest.py
+++ b/test/functional/tests/conftest.py
@@ -264,6 +264,7 @@ def base_prepare(item):
                        raid.array_devices)):
                 raid.umount_all_partitions()
                 raid.remove_partitions()
+                raid.unmount()
                 raid.stop()
                 for device in raid.array_devices:
                     Mdadm.zero_superblock(posixpath.join('/dev', device.get_device_id()))
@@ -279,9 +280,9 @@ def base_prepare(item):
                 )
 
             disk.umount_all_partitions()
-            Mdadm.zero_superblock(posixpath.join('/dev', disk.get_device_id()))
-            TestRun.executor.run_expect_success("udevadm settle")
             disk.remove_partitions()
+            disk.unmount()
+            Mdadm.zero_superblock(posixpath.join('/dev', disk.get_device_id()))
             create_partition_table(disk, PartitionTable.gpt)
 
         TestRun.usr.already_updated = True