Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh	(revision 329043)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh	(revision 329044)
@@ -1,43 +1,39 @@
 #!/usr/local/bin/ksh93 -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"@(#)cleanup.ksh	1.2	09/08/06 SMI"
 #
 
 . $STF_SUITE/include/libtest.kshlib
 . $STF_SUITE/tests/userquota/userquota_common.kshlib
 
 if ! is_userquota_supported; then
 	log_unsupported "userquota is not supported in this system."
 fi
 
-log_must cleanup_quota
 log_must clean_user_group
-
-typeset mntp=$(get_prop mountpoint $QFS)
-log_must $CHMOD 0755 $mntp
 
 default_cleanup
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh	(revision 329043)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh	(revision 329044)
@@ -1,36 +1,37 @@
 #!/usr/local/bin/ksh93 -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"@(#)cleanup.ksh	1.2	07/01/09 SMI"
 #
 
 . ${STF_SUITE}/include/libtest.kshlib
 
 # The tests may leave the drive in an exported state, so we must explicitly
 # clear its label with labelclear instead of relying on zpool destroy
 DISK=${DISKS%% *}
 $ZPOOL destroy -f $TESTPOOL
-$ZPOOL labelclear -f $DISK
+[ -n "$DISK" ] && $ZPOOL labelclear -f $DISK
+log_pass