diff --git a/tests/p_autofs/10-autofs-nfs-mount.sh b/tests/p_autofs/10-autofs-nfs-mount.sh
index 395eab1..c6a0ad1 100755
--- a/tests/p_autofs/10-autofs-nfs-mount.sh
+++ b/tests/p_autofs/10-autofs-nfs-mount.sh
@@ -8,14 +8,18 @@ cp -a /etc/auto.master /etc/auto.master_orig
 echo '/autofs /etc/auto.autofs' >> /etc/auto.master
 echo 'nfs -fstype=nfs 127.0.0.1:/var/lib' > /etc/auto.autofs
 
-t_ServiceControl autofs start
+t_ServiceControl autofs restart
 
-t_Log 'Running test'
+t_Log 'Running test - accessing /var/lib via autofs'
 
-grep yum /autofs/nfs/
-#t_CheckExitStatus $ret_val
+ls -al /autofs/nfs | grep -q yum
+t_CheckExitStatus $?
 
 # return everything to previous state
 cp -a /etc/auto.master_orig /etc/auto.master
 rm -rf /etc/auto.autofs
 cat /dev/null > /etc/exports
+t_ServiceControl autofs stop
+t_ServiceControl nfs stop
+t_ServiceControl rpcbind stop
+