---
 tests/regression/apparmor/mount.sh |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Index: b/tests/regression/apparmor/mount.sh
===================================================================
--- a/tests/regression/apparmor/mount.sh
+++ b/tests/regression/apparmor/mount.sh
@@ -70,7 +70,9 @@ runchecktest "MOUNT (confined)" fail mou
 genprofile capability:sys_admin
 runchecktest "MOUNT (confined)" fail mount ${loop_device} ${mount_point}
 
-/bin/umount -text2 ${mount_point}
+if mountpoint -q ${mount_point} ; then
+	/bin/umount -text2 ${mount_point}
+fi
 
 # TEST A4.  confine UMOUNT
 
@@ -79,11 +81,13 @@ runchecktest "MOUNT (confined)" fail mou
 genprofile
 runchecktest "UMOUNT (confined)" fail umount ${loop_device} ${mount_point}
 
-# TEST A4.  confine UMOUNT - cap sys_admin allows unmount
+# TEST A5.  confine UMOUNT - cap sys_admin is not sufficient to unmount
 genprofile capability:sys_admin
-runchecktest "UMOUNT (confined)" pass umount ${loop_device} ${mount_point}
+runchecktest "UMOUNT (confined)" fail umount ${loop_device} ${mount_point}
 
 # cleanup, umount file
-/bin/umount ${loop_device} > /dev/null 2> /dev/null  || /sbin/losetup -d ${loop_device} > /dev/null 2> /dev/null
+if mountpoint -q ${mount_point} ; then
+	/bin/umount ${mount_point}
+fi
 
 /sbin/losetup -d ${loop_device} > /dev/null 2> /dev/null