diff --git a/tests/luks-lvm.nix b/tests/luks-lvm.nix
index f578c6f..d59f3f4 100644
--- a/tests/luks-lvm.nix
+++ b/tests/luks-lvm.nix
@@ -5,6 +5,6 @@ makeDiskoTest {
   disko-config = import ../example/luks-lvm.nix;
   extraTestScript = ''
     machine.succeed("cryptsetup isLuks /dev/vdb2");
-    machine.succeed("grep -qs '/mnt/home' /proc/mounts");
+    machine.succeed("mountpoint /mnt/home");
   '';
 }
diff --git a/tests/lvm-raid.nix b/tests/lvm-raid.nix
index 6c865c6..102dcd7 100644
--- a/tests/lvm-raid.nix
+++ b/tests/lvm-raid.nix
@@ -4,7 +4,7 @@
 makeDiskoTest {
   disko-config = import ../example/lvm-raid.nix;
   extraTestScript = ''
-    machine.succeed("grep -qs '/mnt/home' /proc/mounts");
+    machine.succeed("mountpoint /mnt/home");
   '';
   extraConfig = {
     boot.kernelModules = [ "dm-raid" "dm-mirror" ];
diff --git a/tests/mdadm.nix b/tests/mdadm.nix
index c9a2162..bd57a00 100644
--- a/tests/mdadm.nix
+++ b/tests/mdadm.nix
@@ -5,6 +5,6 @@ makeDiskoTest {
   disko-config = import ../example/mdadm.nix;
   extraTestScript = ''
     machine.succeed("test -b /dev/md/raid1");
-    machine.succeed("grep -qs '/mnt/raid' /proc/mounts");
+    machine.succeed("mountpoint /mnt/raid");
   '';
 }
diff --git a/tests/zfs.nix b/tests/zfs.nix
index 9e5e746..e0c8fab 100644
--- a/tests/zfs.nix
+++ b/tests/zfs.nix
@@ -5,6 +5,6 @@ makeDiskoTest {
   disko-config = import ../example/zfs.nix;
   extraTestScript = ''
     machine.succeed("test -b /dev/zvol/zroot/zfs_testvolume");
-    machine.succeed("grep -qs '/mnt/ext4onzfs' /proc/mounts");
+    machine.succeed("mountpoint /mnt/ext4onzfs");
   '';
 }