Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh	(revision 329045)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh	(revision 329046)
@@ -1,43 +1,35 @@
 #!/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.1	07/01/09 SMI"
 #
 
 . $STF_SUITE/tests/delegate/delegate_common.kshlib
 
-$ZFS 2>&1 | $GREP "allow" > /dev/null
-(($? != 0)) && log_unsupported
-
 cleanup_user_group
 
-# restore the state of svc:/network/nis/client:default
-if [[ -e $NISSTAFILE ]]; then
-	log_must $SVCADM enable svc:/network/nis/client:default
-	log_must $RM -f $NISSTAFILE
-fi
-
 default_cleanup
+log_pass
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh	(revision 329045)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh	(revision 329046)
@@ -1,60 +1,48 @@
 #!/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	"@(#)setup.ksh	1.1	07/01/09 SMI"
 #
 
 . $STF_SUITE/tests/delegate/delegate_common.kshlib
 
-$ZFS 2>&1 | $GREP "allow" > /dev/null
-(($? != 0)) && log_unsupported
-
-# check svc:/network/nis/client:default state
-# disable it if the state is ON
-# and the state will be restored during cleanup.ksh
-log_must $RM -f $NISSTAFILE
-if [[ "ON" == $($SVCS -H -o sta svc:/network/nis/client:default) ]]; then
-    log_must $SVCADM disable -t svc:/network/nis/client:default
-    log_must $TOUCH $NISSTAFILE
-fi
-
 cleanup_user_group
 
 # Create staff group and add two user to it
 log_must add_group $STAFF_GROUP
 log_must add_user $STAFF_GROUP $STAFF1
 log_must add_user $STAFF_GROUP $STAFF2
 
 # Create other group and add two user to it
 log_must add_group $OTHER_GROUP
 log_must add_user $OTHER_GROUP $OTHER1
 log_must add_user $OTHER_GROUP $OTHER2
 
 DISK=${DISKS%% *}
 default_volume_setup $DISK
 log_must $CHMOD 777 $TESTDIR
 
 log_pass
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh	(revision 329045)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh	(revision 329046)
@@ -1,40 +1,32 @@
 #!/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 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"@(#)cleanup.ksh	1.2	08/11/03 SMI"
 #
 
 . $STF_SUITE/tests/delegate/delegate_common.kshlib
 
-$ZFS 2>&1 | $GREP "allow" > /dev/null
-(($? != 0)) && log_unsupported
-
-if is_global_zone ; then
-	log_must $ZPOOL set delegation=on $TESTPOOL
-fi
-log_must restore_root_datasets
-
 log_pass