Index: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh
===================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh	(revision 331001)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh	(revision 331002)
@@ -1,37 +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
 #
 
 # $FreeBSD$
 
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"@(#)setup.ksh	1.3	08/05/14 SMI"
 #
 
 . ${STF_SUITE}/include/libtest.kshlib
 verify_runnable "both"
 
-DISK=${DISKS%% *}
-
 default_setup $DISK
Index: head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg
===================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg	(revision 331001)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg	(revision 331002)
@@ -1,71 +1,73 @@
 #!/bin/ksh -p
 # vim: filetype=sh
 #
 # 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	"@(#)zpool_get.cfg	1.6	09/06/22 SMI"
 #
 
 # $FreeBSD$
 
 # Set the expected properties of zpool
 typeset -a properties=(
     "size"
     "capacity"
     "altroot"
     "health"
     "guid"
     "version"
     "bootfs"
     "delegation"
     "autoreplace"
     "cachefile"
     "failmode"
     "listsnapshots"
     "autoexpand"
     "dedupditto"
     "dedupratio"
     "free"
     "allocated"
     "readonly"
     "comment"
     "expandsize"
     "freeing"
     "fragmentation"
     "leaked"
     "feature@async_destroy"
     "feature@empty_bpobj"
     "feature@lz4_compress"
     "feature@multi_vdev_crash_dump"
     "feature@spacemap_histogram"
     "feature@enabled_txg"
     "feature@hole_birth"
     "feature@extensible_dataset"
     "feature@embedded_data"
     "feature@bookmarks"
     "feature@filesystem_limits"
     "feature@large_blocks"
     "feature@sha512"
     "feature@skein"
     # "feature@edonr" Edonr is not yet implemented on FreeBSD
 )
+
+export DISK=${DISKS%% *}