Merge branch 'master' into OS-5783

941 files changed, 21430 insertions, 8768 deletions

diff --git a/manifest b/manifest
index ac4d24124d..6d2762f9b1 100644
--- a/manifest
+++ b/manifest
@@ -871,7 +871,7 @@ f kernel/firmware/iwn/iwlwifi-4965-2.ucode 0666 root sys
 f kernel/firmware/iwn/iwlwifi-5000-2.ucode 0666 root sys
 f kernel/firmware/iwn/iwlwifi-5150-2.ucode 0666 root sys
 f kernel/firmware/iwn/iwlwifi-6000-4.ucode 0666 root sys
-f kernel/firmware/iwn/iwlwifi-6000g2a-5.ucode 0666 root sys
+f kernel/firmware/iwn/iwlwifi-6000g2a-6.ucode 0666 root sys
 f kernel/firmware/iwn/iwlwifi-6000g2b-6.ucode 0666 root sys
 f kernel/firmware/iwn/iwlwifi-6050-5.ucode 0666 root sys
 d kernel/fs 0755 root sys
diff --git a/usr/src/boot/sys/boot/efi/boot1/boot1.c b/usr/src/boot/sys/boot/efi/boot1/boot1.c
index b11c93e934..7692f52e68 100644
--- a/usr/src/boot/sys/boot/efi/boot1/boot1.c
+++ b/usr/src/boot/sys/boot/efi/boot1/boot1.c
@@ -410,7 +410,7 @@ try_boot(void)
 	if ((status = bs->LoadImage(TRUE, image, devpath_last(dev->devpath),
 	    loaderbuf, loadersize, &loaderhandle)) != EFI_SUCCESS) {
 		printf("Failed to load image provided by %s, size: %zu, (%lu)\n",
-		     mod->name, bufsize, EFI_ERROR_CODE(status));
+		     mod->name, loadersize, EFI_ERROR_CODE(status));
 		goto errout;
 	}
 
diff --git a/usr/src/boot/sys/boot/forth/delay.4th b/usr/src/boot/sys/boot/forth/delay.4th
index 56dfcf05f4..28cfa5c26e 100644
--- a/usr/src/boot/sys/boot/forth/delay.4th
+++ b/usr/src/boot/sys/boot/forth/delay.4th
@@ -66,7 +66,7 @@ only forth definitions also delay-processing
 
 	false delay_showdots ! \ reset to zero and read from environment
 	s" delay_showdots" getenv dup -1 <> if
-		2drop \ don't need the value, just existance
+		2drop \ don't need the value, just existence
 		true delay_showdots !
 	else
 		drop
diff --git a/usr/src/boot/sys/boot/forth/loader.4th b/usr/src/boot/sys/boot/forth/loader.4th
index a7a2813d7d..b6955f1b98 100644
--- a/usr/src/boot/sys/boot/forth/loader.4th
+++ b/usr/src/boot/sys/boot/forth/loader.4th
@@ -500,7 +500,7 @@ only forth definitions also support-functions
 \ ***** start
 \
 \       Initializes support.4th global variables, sets loader_conf_files,
-\       processes conf files, and, if any one such file was succesfully
+\       processes conf files, and, if any one such file was successfully
 \       read to the end, loads kernel and modules.
 
 : start  ( -- ) ( throws: abort & user-defined )
@@ -508,9 +508,11 @@ only forth definitions also support-functions
   include_bootenv
   include_conf_files
   include_transient
+  \ If the user defined a post-initialize hook, call it now
+  s" post-initialize" sfind if execute else drop then
   parse-boot-args
   \ Will *NOT* try to load kernel and modules if no configuration file
-  \ was succesfully loaded!
+  \ was successfully loaded!
   any_conf_read? if
     s" loader_delay" getenv -1 = if
       load_xen_throw
@@ -531,13 +533,15 @@ only forth definitions also support-functions
 \
 \	Overrides support.4th initialization word with one that does
 \	everything start one does, short of loading the kernel and
-\	modules. Returns a flag
+\	modules. Returns a flag.
 
 : initialize ( -- flag )
   s" /boot/defaults/loader.conf" initialize
   include_bootenv
   include_conf_files
   include_transient
+  \ If the user defined a post-initialize hook, call it now
+  s" post-initialize" sfind if execute else drop then
   parse-boot-args
   any_conf_read?
 ;
diff --git a/usr/src/boot/sys/boot/forth/menu.4th b/usr/src/boot/sys/boot/forth/menu.4th
index 9c7ba8e3ae..02e9c90954 100644
--- a/usr/src/boot/sys/boot/forth/menu.4th
+++ b/usr/src/boot/sys/boot/forth/menu.4th
@@ -253,7 +253,7 @@ also menu-infrastructure definitions
 ;
 
 \ This function parses $kernels into variables that are used by the menu to
-\ display wich kernel to boot when the [overloaded] `boot' word is interpreted.
+\ display which kernel to boot when the [overloaded] `boot' word is interpreted.
 \ Used internally by menu-create, you need not (nor should you) call this
 \ directly.
 \ 
@@ -863,7 +863,7 @@ also menu-infrastructure definitions
 	again
 ;
 
-: menu-erase ( -- ) \ Erases menu and resets positioning variable to positon 1.
+: menu-erase ( -- ) \ Erases menu and resets positioning variable to position 1.
 
 	\ Clear the screen area associated with the interactive menu
 	menuX @ menuY @
diff --git a/usr/src/boot/sys/boot/forth/support.4th b/usr/src/boot/sys/boot/forth/support.4th
index 2d2fe03426..95848c5416 100644
--- a/usr/src/boot/sys/boot/forth/support.4th
+++ b/usr/src/boot/sys/boot/forth/support.4th
@@ -59,7 +59,7 @@
 \ string conf_files		configuration files to be loaded
 \ cell modules_options		pointer to first module information
 \ value verbose?		indicates if user wants a verbose loading
-\ value any_conf_read?		indicates if a conf file was succesfully read
+\ value any_conf_read?		indicates if a conf file was successfully read
 \
 \ Other exported words:
 \    note, strlen is internal
@@ -1056,7 +1056,7 @@ only forth also support-functions definitions
 
 string current_file_name_ref	\ used to print the file name
 
-\ Indicates if any conf file was succesfully read
+\ Indicates if any conf file was successfully read
 
 0 value any_conf_read?
 
@@ -1438,7 +1438,7 @@ string current_file_name_ref	\ used to print the file name
 
 : load_error_message verbose? if ." failed!" cr then ;
 
-: load_succesful_message verbose? if ." ok" cr then ;
+: load_successful_message verbose? if ." ok" cr then ;
 
 : load_module
   load_parameters load
@@ -1456,7 +1456,7 @@ string current_file_name_ref	\ used to print the file name
       then
     else
       after_load
-      load_succesful_message true	\ Succesful, do not retry
+      load_successful_message true	\ Successful, do not retry
     then
   until
 ;
@@ -1654,7 +1654,7 @@ also builtins
 \   1. /boot/path
 \   2. path
 \
-\ The module_path variable is overridden if load is succesful, by
+\ The module_path variable is overridden if load is successful, by
 \ prepending the successful path.
 
 : load_from_directory ( path len 1 | flags len' path len 2 -- flag )
@@ -1741,7 +1741,7 @@ also builtins
 \ will first be tried as a full path, and, next, search on the
 \ directories pointed by module_path.
 \
-\ The module_path variable is overridden if load is succesful, by
+\ The module_path variable is overridden if load is successful, by
 \ prepending the successful path.
 
 : load_directory_or_file ( path len 1 | flags len' path len 2 -- flag )
diff --git a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c
index faa03309a8..bf11f27e0c 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biosdisk.c
+++ b/usr/src/boot/sys/boot/i386/libi386/biosdisk.c
@@ -288,9 +288,12 @@ bd_print(int verbose)
 	int i, ret = 0;
 
 	for (i = 0; i < nbdinfo; i++) {
-		sprintf(line, "    disk%d:   BIOS drive %c:\n", i,
+		snprintf(line, sizeof (line),
+		    "    disk%d:   BIOS drive %c (%ju X %u):\n", i,
 		    (bdinfo[i].bd_unit < 0x80) ? ('A' + bdinfo[i].bd_unit):
-		    ('C' + bdinfo[i].bd_unit - 0x80));
+		    ('C' + bdinfo[i].bd_unit - 0x80),
+		    (uintmax_t)bdinfo[i].bd_sectors,
+		    bdinfo[i].bd_sectorsize);
 		ret = pager_output(line);
 		if (ret != 0)
 			return (ret);
diff --git a/usr/src/boot/sys/boot/i386/libi386/smbios.c b/usr/src/boot/sys/boot/i386/libi386/smbios.c
index 7a7ce4ba4f..2aa62fa85d 100644
--- a/usr/src/boot/sys/boot/i386/libi386/smbios.c
+++ b/usr/src/boot/sys/boot/i386/libi386/smbios.c
@@ -238,6 +238,11 @@ smbios_parse_table(const caddr_t addr)
 		smbios_setenv("smbios.system.serial", addr, 0x07);
 		smbios_setuuid("smbios.system.uuid", addr + 0x08, smbios.ver);
 #endif
+		if (smbios.major > 2 ||
+		    (smbios.major == 2 && smbios.minor >= 4)) {
+			smbios_setenv("smbios.system.sku", addr, 0x19);
+			smbios_setenv("smbios.system.family", addr, 0x1a);
+		}
 		break;
 
 	case 2:		/* 3.3.3 Base Board (or Module) Information (Type 2) */
@@ -246,7 +251,9 @@ smbios_parse_table(const caddr_t addr)
 		smbios_setenv("smbios.planar.version", addr, 0x06);
 #ifdef SMBIOS_SERIAL_NUMBERS
 		smbios_setenv("smbios.planar.serial", addr, 0x07);
+		smbios_setenv("smbios.planar.tag", addr, 0x08);
 #endif
+		smbios_setenv("smbios.planar.location", addr, 0x0a);
 		break;
 
 	case 3:		/* 3.3.4 System Enclosure or Chassis (Type 3) */
diff --git a/usr/src/cmd/Makefile.targ b/usr/src/cmd/Makefile.targ
index 0dcc692c78..4b3e5b3181 100644
--- a/usr/src/cmd/Makefile.targ
+++ b/usr/src/cmd/Makefile.targ
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2015 by Delphix. All rights reserved.
+#
 # cmd/Makefile.targ
 # common target definitions for command builds
 #
@@ -64,6 +66,11 @@ $(KSHPROG): $(KSHPROG).ksh
 	sed -e "s/TEXT_DOMAIN/${TEXT_DOMAIN}/g" $(KSHPROG).ksh > $@
 	$(CHMOD) +x $@
 
+$(BASHPROG): $(BASHPROG).bash
+	$(RM) $@
+	sed -e "s/TEXT_DOMAIN/${TEXT_DOMAIN}/g" $(BASHPROG).bash > $@
+	$(CHMOD) +x $@
+
 #
 # For message catalogue files
 #
diff --git a/usr/src/cmd/acpi/acpidump/Makefile b/usr/src/cmd/acpi/acpidump/Makefile
index f5bdff70c2..35a352d851 100644
--- a/usr/src/cmd/acpi/acpidump/Makefile
+++ b/usr/src/cmd/acpi/acpidump/Makefile
@@ -9,6 +9,7 @@
 # http://www.illumos.org/license/CDDL.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2016 RackTop Systems.
 #
 
 PROG=		acpidump
@@ -29,7 +30,7 @@ CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_DUMP_APP
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	$(LINK.c) -o $@ $(OBJS) ../common/acpi.a
+	$(LINK.c) -o $@ $(OBJS) ../common/acpi.a $(LDLIBS)
 	$(POST_PROCESS)
 
 install: all $(ROOTUSRSBINPROG)
diff --git a/usr/src/cmd/acpi/acpixtract/Makefile b/usr/src/cmd/acpi/acpixtract/Makefile
index 7ec08f9ab5..deba09c0cc 100644
--- a/usr/src/cmd/acpi/acpixtract/Makefile
+++ b/usr/src/cmd/acpi/acpixtract/Makefile
@@ -9,6 +9,7 @@
 # http://www.illumos.org/license/CDDL.
 #
 # Copyright 2016 Joyent, Inc.
+# Copyright 2016 RackTop Systems.
 #
 
 PROG=		acpixtract
@@ -28,7 +29,7 @@ CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_XTRACT_APP
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	$(LINK.c) -o $@ $(OBJS) ../common/acpi.a
+	$(LINK.c) -o $@ $(OBJS) ../common/acpi.a $(LDLIBS)
 	$(POST_PROCESS)
 
 install: all $(ROOTUSRSBINPROG)
diff --git a/usr/src/cmd/fwflash/Makefile.com b/usr/src/cmd/fwflash/Makefile.com
index 5f0873b244..59e2bcdb36 100644
--- a/usr/src/cmd/fwflash/Makefile.com
+++ b/usr/src/cmd/fwflash/Makefile.com
@@ -26,8 +26,6 @@
 #
 # common rules for $SRC/cmd/fwflash
 
-CLOSED=			$(SRC)/../closed
-
 CERRWARN +=		-_gcc=-Wno-parentheses
 CERRWARN +=		-_gcc=-Wno-uninitialized
 CERRWARN +=		-_gcc=-Wno-address
diff --git a/usr/src/cmd/fwflash/Makefile.targ b/usr/src/cmd/fwflash/Makefile.targ
index b0da734aff..57efebf6ac 100644
--- a/usr/src/cmd/fwflash/Makefile.targ
+++ b/usr/src/cmd/fwflash/Makefile.targ
@@ -28,6 +28,7 @@
 
 include $(SRC)/Makefile.master
 include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/cmd/Makefile.ctf
 
 SRCS=		fwflash.c
 HDRS=		fwflash.h
@@ -56,7 +57,7 @@ CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 LDLIBS += -ldevinfo -lumem -lscf
 
 
-$(ROOTUSRINCLDFWFLASH)/%:  $(HDRDIR)/% 
+$(ROOTUSRINCLDFWFLASH)/%:  $(HDRDIR)/%
 	$(INS.file)
 
 
@@ -66,11 +67,12 @@ $(PROG): install_h $(OBJS)
 
 %.o: $(SRCDIR)/%.c
 	$(COMPILE.c) $(CFLAGS) -o $@ $<
+	$(CTFCONVERT_O)
 
 
 all:	$(PROG)
 
-clean: 
+clean:
 	$(RM) $(POFILE) $(POFILES) $(LINTFILE) $(PROG)
 
 clobber: clean
diff --git a/usr/src/cmd/fwflash/plugins/Makefile.targ b/usr/src/cmd/fwflash/plugins/Makefile.targ
index 8650ee545b..8edeaccd66 100644
--- a/usr/src/cmd/fwflash/plugins/Makefile.targ
+++ b/usr/src/cmd/fwflash/plugins/Makefile.targ
@@ -61,6 +61,9 @@ $(SD-GENERIC_LIB):= SONAME = $(SD-GENERIC_LIB)
 $(HERMON-MELLANOX_LIB):= DYNFLAGS += -R/usr/lib/fwflash/identify 
 $(HERMON-MELLANOX_LIB):= LDLIBS += -L. $(ROOT)/usr/lib/fwflash/identify/hermon.so
 
+$(SD-GENERIC_LIB):= LDLIBS += -L$(ROOT)/usr/lib/scsi -lscsi
+$(SD-GENERIC_LIB):= DYNFLAGS += -R/usr/lib/scsi
+
 
 .KEEP STATE:
 
diff --git a/usr/src/cmd/fwflash/plugins/transport/common/sd.c b/usr/src/cmd/fwflash/plugins/transport/common/sd.c
index 46faad0877..6dcff9d0f1 100644
--- a/usr/src/cmd/fwflash/plugins/transport/common/sd.c
+++ b/usr/src/cmd/fwflash/plugins/transport/common/sd.c
@@ -18,14 +18,18 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright 2016 Joyent, Inc.
  */
 
 /*
  * sd / ssd (SCSI Direct-attached Device) specific functions.
  */
+
 #include <libnvpair.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,16 +37,20 @@
 #include <sys/types.h>
 #include <sys/sysmacros.h>
 #include <sys/queue.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <scsi/libscsi.h>
+#include <sys/scsi/scsi_types.h>
 #include <libintl.h> /* for gettext(3c) */
 #include <fwflash/fwflash.h>
+#include <sys/debug.h>
+#include <umem.h>
 
 typedef struct sam4_statdesc {
-	int status;
-	char *message;
+	int sam_status;
+	char *sam_message;
 } sam4_statdesc_t;
 
 static sam4_statdesc_t sam4_status[] = {
@@ -53,12 +61,10 @@ static sam4_statdesc_t sam4_status[] = {
 	{ SAM4_STATUS_RESERVATION_CONFLICT, "Status: Device is RESERVED" },
 	{ SAM4_STATUS_TASK_SET_FULL,
 	    "Status: TASK SET FULL (insufficient resources in command queue" },
-	{ SAM4_STATUS_TASK_ABORTED, "Status: TASK ABORTED" },
-	{ NULL, NULL }
+	{ SAM4_STATUS_TASK_ABORTED, "Status: TASK ABORTED" }
 };
 
-#define	NSAM4_STATUS	\
-	(sizeof (sam4_status) / sizeof (sam4_status[0]))
+#define	NSAM4_STATUS	(sizeof (sam4_status) / sizeof (sam4_status[0]))
 
 #define	FW_SD_FREE_DEVPATH(devpath)	{	\
 		di_devfs_path_free((devpath));	\
@@ -100,27 +106,35 @@ static sam4_statdesc_t sam4_status[] = {
 		FW_SD_FREE_IDENT_PID((thisdev), (devpath))	\
 	}
 
-int errno;
+/*
+ * This is our default partial write size when we encounter a situation where we
+ * need to upgrade disks whose firmware image cannot be done in a single write.
+ * While in theory we should just use the maximum transfer size and make sure
+ * it's aligned, that's proven to be problematic for some Seagate disks. Hence
+ * we just make sure that if partial writes are required that this value fits in
+ * the required alignment and in the actual maximum transfer size.
+ */
+#define	FW_SD_PARTIAL_WRITE_SIZE	(64 * 1024)
+
+/*
+ * Declarations required for fwflash
+ */
 char drivername[] = "sd\0";
 int plugin_version = FWPLUGIN_VERSION_2;
 
-static char *devprefix = "/devices";
+/*
+ * Data provided by fwflash
+ */
 extern di_node_t rootnode;
 extern struct fw_plugin *self;
 extern struct vrfyplugin *verifier;
 extern int fwflash_debug;
 
-/* required functions for this plugin */
-int fw_readfw(struct devicelist *device, char *filename);
-int fw_writefw(struct devicelist *device);
-int fw_identify(int start);
-int fw_devinfo(struct devicelist *thisdev);
-void fw_cleanup(struct devicelist *thisdev);
+static char *sdfw_devprefix = "/devices";
 
-/* helper functions */
-static char *find_link(di_node_t bnode, char *acc_devname);
-static int link_cb(di_devlink_t devlink, void *arg);
-static int sd_idtfy_custmz(struct devicelist *device, char *sp);
+static char *sdfw_find_link(di_node_t bnode, char *acc_devname);
+static int sdfw_link_cb(di_devlink_t devlink, void *arg);
+static int sdfw_idtfy_custmz(struct devicelist *device, char *sp);
 
 /*
  * We don't currently support reading firmware from a disk. If we do eventually
@@ -141,17 +155,215 @@ fw_readfw(struct devicelist *flashdev, char *filename)
 	return (FWFLASH_SUCCESS);
 }
 
+
+static int
+sdfw_read_descriptor(struct devicelist *flashdev, libscsi_hdl_t *hdl,
+    libscsi_target_t *targ, uint8_t *align)
+{
+	spc3_read_buffer_cdb_t *rb_cdb;
+	size_t nwritten;
+	libscsi_action_t *action = NULL;
+	uint8_t descbuf[4];
+	sam4_status_t samstatus;
+
+	VERIFY3P(hdl, !=, NULL);
+	VERIFY3P(targ, !=, NULL);
+	VERIFY3P(align, !=, NULL);
+
+	if ((action = libscsi_action_alloc(hdl, SPC3_CMD_READ_BUFFER,
+	    LIBSCSI_AF_READ, descbuf, sizeof (descbuf))) == NULL) {
+		logmsg(MSG_ERROR, gettext("%s: failed to alloc scsi action: "
+		    "%s\n"),
+		    flashdev->drvname, libscsi_errmsg(hdl));
+		return (FWFLASH_FAILURE);
+	}
+
+	rb_cdb = (spc3_read_buffer_cdb_t *)libscsi_action_get_cdb(action);
+
+	rb_cdb->rbc_mode = SPC3_RB_MODE_DESCRIPTOR;
+
+	/*
+	 * Microcode upgrade usually only uses the first buffer ID which is
+	 * sequentially indexed from zero. Strictly speaking these are all
+	 * vendor defined, but so far most vendors we've seen use index zero
+	 * for this.
+	 */
+	rb_cdb->rbc_bufferid = 0;
+
+	rb_cdb->rbc_allocation_len[0] = 0;
+	rb_cdb->rbc_allocation_len[1] = 0;
+	rb_cdb->rbc_allocation_len[2] = sizeof (descbuf);
+
+	if (libscsi_exec(action, targ) != 0) {
+		logmsg(MSG_ERROR, gettext("%s: failed to execute SCSI buffer "
+		    "data read: %s\n"),
+		    flashdev->drvname, libscsi_errmsg(hdl));
+		libscsi_action_free(action);
+		return (FWFLASH_FAILURE);
+	}
+
+	if ((samstatus = libscsi_action_get_status(action)) !=
+	    SAM4_STATUS_GOOD) {
+		int i;
+		for (i = 0; i < NSAM4_STATUS; i++) {
+			if (samstatus == sam4_status[i].sam_status) {
+				logmsg(MSG_ERROR, gettext("%s: SCSI buffer "
+				    "data read failed: %s\n"),
+				    flashdev->drvname,
+				    sam4_status[i].sam_message);
+				libscsi_action_free(action);
+				return (FWFLASH_FAILURE);
+			}
+		}
+		logmsg(MSG_ERROR, gettext("%s: SCSI buffer data read failed: "
+		    "unknown error: %d\n"), flashdev->drvname, samstatus);
+		libscsi_action_free(action);
+		return (FWFLASH_FAILURE);
+	}
+
+	if (libscsi_action_get_buffer(action, NULL, NULL, &nwritten) != 0) {
+		logmsg(MSG_ERROR, gettext("%s: failed to get actual data "
+		    "size: %s\n"),
+		    flashdev->drvname, libscsi_errmsg(hdl));
+		libscsi_action_free(action);
+		return (FWFLASH_FAILURE);
+	}
+	libscsi_action_free(action);
+
+	if (nwritten != sizeof (descbuf)) {
+		logmsg(MSG_ERROR, gettext("%s: received a short read from the "
+		    "SCSI READ BUFFER command, expected %u bytes, read %u\n"),
+		    flashdev->drvname, sizeof (descbuf), nwritten);
+		return (FWFLASH_FAILURE);
+	}
+
+	if (descbuf[0] == 0 && descbuf[1] == 0 && descbuf[2] == 0 &&
+	    descbuf[3] == 0) {
+		logmsg(MSG_ERROR, gettext("%s: devices %s does not support "
+		    "firmware upgrade\n"), verifier->vendor,
+		    flashdev->access_devname);
+		return (FWFLASH_FAILURE);
+	}
+
+	*align = descbuf[0];
+
+	return (FWFLASH_SUCCESS);
+}
+
+static int
+sdfw_write(struct devicelist *flashdev, libscsi_hdl_t *handle,
+    libscsi_target_t *target, size_t len, size_t off, void *buf)
+{
+	sam4_status_t samstatus;
+	libscsi_action_t *action = NULL;
+	spc3_write_buffer_cdb_t *wb_cdb;
+
+	logmsg(MSG_INFO, "%s: writing %u bytes of image %s at offset %u from "
+	    "address %p\n", flashdev->drvname, len, verifier->imgfile, off,
+	    buf);
+	logmsg(MSG_INFO, "%s: writing to buffer id %u\n",
+	    flashdev->drvname, verifier->flashbuf);
+
+	VERIFY3P(flashdev, !=, NULL);
+	VERIFY3P(handle, !=, NULL);
+	VERIFY3P(target, !=, NULL);
+	VERIFY3P(buf, !=, NULL);
+	VERIFY3U(len, >, 0);
+	VERIFY3U(off + len, <=, verifier->imgsize);
+
+	action = libscsi_action_alloc(handle, SPC3_CMD_WRITE_BUFFER,
+	    LIBSCSI_AF_WRITE | LIBSCSI_AF_RQSENSE | LIBSCSI_AF_ISOLATE, buf,
+	    len);
+	if (action == NULL) {
+		logmsg(MSG_ERROR, gettext("%s: failed to alloc scsi action: "
+		    "%s\n"), flashdev->drvname, libscsi_errmsg(handle));
+		goto err;
+	}
+
+	wb_cdb = (spc3_write_buffer_cdb_t *)libscsi_action_get_cdb(action);
+
+	wb_cdb->wbc_mode = SPC3_WB_MODE_DL_UCODE_OFFS_SAVE;
+
+	wb_cdb->wbc_buffer_offset[0] = (off >> 16) & 0xff;
+	wb_cdb->wbc_buffer_offset[1] = (off >> 8) & 0xff;
+	wb_cdb->wbc_buffer_offset[2] = off & 0xff;
+
+	wb_cdb->wbc_bufferid = verifier->flashbuf;
+
+	wb_cdb->wbc_parameter_list_len[0] = (len >> 16) & 0xff;
+	wb_cdb->wbc_parameter_list_len[1] = (len >> 8) & 0xff;
+	wb_cdb->wbc_parameter_list_len[2] = len & 0xff;
+
+	logmsg(MSG_INFO, "%s: spc3_write_buffer_cdb_t opcode: %u\n",
+	    flashdev->drvname, wb_cdb->wbc_opcode);
+
+	if (libscsi_exec(action, target) != 0) {
+		logmsg(MSG_ERROR, gettext("%s: failed to execute SCSI WRITE "
+		    "BUFFER: %s\n"),
+		    flashdev->drvname, libscsi_errmsg(handle));
+		goto err;
+	}
+
+	if ((samstatus = libscsi_action_get_status(action)) ==
+	    SAM4_STATUS_CHECK_CONDITION) {
+		uint64_t asc = 0, ascq = 0, key = 0;
+		const char *code, *keystr;
+
+		if (libscsi_action_parse_sense(action, &key, &asc, &ascq,
+		    NULL) != 0) {
+			logmsg(MSG_ERROR, gettext("%s: failed to write "
+			    "firmware. Received CHECK_CONDITION that cannot be "
+			    "parsed.\n"),
+			    flashdev->drvname);
+			goto err;
+		}
+
+		code = libscsi_sense_code_name(asc, ascq);
+		keystr = libscsi_sense_key_name(key);
+
+		logmsg(MSG_ERROR, gettext("%s: failed to write firmware: "
+		    "received sense key %llu (%s) additional sense code "
+		    "0x%llx/0x%llx (%s)\n"), flashdev->drvname, key,
+		    keystr != NULL ? keystr : "<unknown>",
+		    asc, ascq, code != NULL ? code : "<unknown>");
+		goto err;
+	} else if (samstatus != SAM4_STATUS_GOOD) {
+		int i;
+
+		logmsg(MSG_ERROR, gettext("%s: SCSI buffer data write failed:"),
+		    flashdev->drvname);
+		for (i = 0; i < NSAM4_STATUS; i++) {
+			if (samstatus == sam4_status[i].sam_status) {
+				logmsg(MSG_ERROR, gettext("%s\n"),
+				    sam4_status[i].sam_message);
+				goto err;
+			}
+		}
+		logmsg(MSG_ERROR, gettext("unknown error: %d\n"), samstatus);
+		goto err;
+	} else {
+		logmsg(MSG_INFO, "%s: received STATUS GOOD\n",
+		    flashdev->drvname);
+	}
+
+	libscsi_action_free(action);
+	return (FWFLASH_SUCCESS);
+
+err:
+	if (action != NULL)
+		libscsi_action_free(action);
+	return (FWFLASH_FAILURE);
+}
+
 int
 fw_writefw(struct devicelist *flashdev)
 {
-	int rv;
-	int i = 0;
 	libscsi_hdl_t	*handle;
 	libscsi_target_t *target;
-	libscsi_action_t *action;
 	libscsi_errno_t serr;
-	spc3_write_buffer_cdb_t *wb_cdb;
-	sam4_status_t samstatus;
+	size_t maxxfer, nwrite;
+	uint8_t align;
+	int ret = FWFLASH_FAILURE;
 
 	if ((verifier == NULL) || (verifier->imgsize == 0) ||
 	    (verifier->fwimage == NULL)) {
@@ -168,8 +380,8 @@ fw_writefw(struct devicelist *flashdev)
 		return (FWFLASH_FAILURE);
 	}
 
-	if ((target = libscsi_open(handle, NULL, flashdev->access_devname))
-	    == NULL) {
+	if ((target = libscsi_open(handle, NULL, flashdev->access_devname)) ==
+	    NULL) {
 		logmsg(MSG_ERROR,
 		    gettext("%s: unable to open device %s\n"),
 		    flashdev->drvname, flashdev->access_devname);
@@ -177,55 +389,90 @@ fw_writefw(struct devicelist *flashdev)
 		return (FWFLASH_FAILURE);
 	}
 
-	action = libscsi_action_alloc(handle, SPC3_CMD_WRITE_BUFFER,
-	    LIBSCSI_AF_WRITE|LIBSCSI_AF_RQSENSE,
-	    (void *)verifier->fwimage, (size_t)verifier->imgsize);
-
-	wb_cdb = (spc3_write_buffer_cdb_t *)libscsi_action_get_cdb(action);
+	if (libscsi_max_transfer(target, &maxxfer) != 0) {
+		logmsg(MSG_ERROR, gettext("%s: failed to determine device "
+		    "maximum transfer size: %s\n"), flashdev->drvname,
+		    libscsi_errmsg(handle));
+		goto err;
+	}
 
-	wb_cdb->wbc_mode = SPC3_WB_MODE_DL_UCODE_SAVE;
-	wb_cdb->wbc_bufferid = verifier->flashbuf;
+	if (sdfw_read_descriptor(flashdev, handle, target, &align) !=
+	    FWFLASH_SUCCESS) {
+		goto err;
+	}
 
-	wb_cdb->wbc_buffer_offset[0] = 0;
-	wb_cdb->wbc_buffer_offset[1] = 0;
-	wb_cdb->wbc_buffer_offset[2] = 0;
+	/*
+	 * If the maximum transfer size is less than the maximum image size then
+	 * we have to do some additional work. We need to read the descriptor
+	 * via a READ BUFFER command and make sure that we support the required
+	 * offset alignment. Note that an alignment of 0xff indicates that the
+	 * device does not support partial writes and must receive the firmware
+	 * in a single WRITE BUFFER.  Otherwise a value in align represents a
+	 * required offset alignment of 2^off. From there, we make sure that
+	 * this works for our partial write size and that our partial write size
+	 * fits in the maximum transfer size.
+	 */
+	if (maxxfer < verifier->imgsize) {
+		logmsg(MSG_INFO, "%s: Maximum transfer is %u, required "
+		    "alignment is 2^%d\n", flashdev->drvname, maxxfer, align);
+		if (FW_SD_PARTIAL_WRITE_SIZE > maxxfer) {
+			logmsg(MSG_ERROR, gettext("%s: cannot write firmware "
+			    "image: HBA enforces a maximum transfer size of "
+			    "%u bytes, but the default partial transfer size "
+			    "is %u bytes\n"), flashdev->drvname, maxxfer,
+			    FW_SD_PARTIAL_WRITE_SIZE);
+			goto err;
+		}
+		maxxfer = FW_SD_PARTIAL_WRITE_SIZE;
 
-	wb_cdb->wbc_parameter_list_len[0] =
-	    (verifier->imgsize & 0xff0000) >> 16;
-	wb_cdb->wbc_parameter_list_len[1] = (verifier->imgsize & 0xff00) >> 8;
-	wb_cdb->wbc_parameter_list_len[2] = (verifier->imgsize & 0xff);
+		if (ffsll(maxxfer) < align || align == 0xff) {
+			logmsg(MSG_ERROR, gettext("%s: cannot write firmware "
+			    "image: device requires partial writes aligned "
+			    "to an unsupported value\n"), flashdev->drvname);
+			goto err;
+		}
 
-	rv = libscsi_exec(action, target);
-	samstatus = libscsi_action_get_status(action);
+		logmsg(MSG_INFO, "%s: final transfer block size is %u\n",
+		    flashdev->drvname, maxxfer);
+	}
 
-	logmsg(MSG_INFO, "\nscsi_writebuffer: ret 0x%0x, samstatus 0x%0x\n",
-	    rv, samstatus);
+	logmsg(MSG_INFO, "%s: Writing out %u bytes to %s\n", flashdev->drvname,
+	    verifier->imgsize, flashdev->access_devname);
+	nwrite = 0;
+	for (;;) {
+		uintptr_t buf;
+		size_t towrite = MIN(maxxfer, verifier->imgsize - nwrite);
 
-	libscsi_action_free(action);
-	libscsi_close(handle, target);
-	libscsi_fini(handle);
+		if (towrite == 0)
+			break;
 
-	if (rv != FWFLASH_SUCCESS)
-		return (FWFLASH_FAILURE);
+		buf = (uintptr_t)verifier->fwimage;
+		buf += nwrite;
 
-	for (i = 0; i < NSAM4_STATUS; i++) {
-		if (sam4_status[i].status == samstatus) {
-			logmsg(MSG_ERROR, gettext("RETURN STATUS: %s\n"),
-			    (sam4_status[i].message));
-			break;
+		if (sdfw_write(flashdev, handle, target, towrite, nwrite,
+		    (void *)buf) != FWFLASH_SUCCESS) {
+			logmsg(MSG_ERROR, gettext("%s: failed to write to %s "
+			    "successfully: %s\n"), flashdev->drvname,
+			    flashdev->access_devname, libscsi_errmsg(handle));
+			goto err;
 		}
-	}
-	if (i == NSAM4_STATUS)
-		logmsg(MSG_ERROR, gettext("Status UNKNOWN\n"));
 
-	if (samstatus == SAM4_STATUS_GOOD) {
-		logmsg(MSG_ERROR, gettext("Note: For flash based disks "
-		    "(SSD, etc). You may need power off the system to wait a "
-		    "few minutes for supercap to fully discharge, then power "
-		    "on the system again to activate the new firmware\n"));
-		return (FWFLASH_SUCCESS);
+		nwrite += towrite;
 	}
-	return (FWFLASH_FAILURE);
+
+	logmsg(MSG_ERROR, gettext("Note: For flash based disks "
+	    "(SSD, etc). You may need power off the system to wait a "
+	    "few minutes for supercap to fully discharge, then power "
+	    "on the system again to activate the new firmware\n"));
+	ret = FWFLASH_SUCCESS;
+
+err:
+	if (target != NULL)
+		libscsi_close(handle, target);
+	if (handle != NULL)
+		libscsi_fini(handle);
+
+	return (ret);
 }
 
 /*
@@ -300,8 +547,8 @@ fw_identify(int start)
 			continue;
 		}
 
-		if ((newdev = calloc(1, sizeof (struct devicelist)))
-		    == NULL) {
+		if ((newdev = calloc(1, sizeof (struct devicelist))) ==
+		    NULL) {
 			logmsg(MSG_ERROR,
 			    gettext("%s: identification function unable "
 			    "to allocate space for device entry\n"),
@@ -311,8 +558,8 @@ fw_identify(int start)
 			return (FWFLASH_FAILURE);
 		}
 
-		if ((newdev->drvname = calloc(1, strlen(driver) + 1))
-		    == NULL) {
+		if ((newdev->drvname = calloc(1, strlen(driver) + 1)) ==
+		    NULL) {
 			logmsg(MSG_ERROR,
 			    gettext("%s: Unable to allocate space to store a "
 			    "driver name\n"), driver);
@@ -322,8 +569,8 @@ fw_identify(int start)
 		}
 		(void) strlcpy(newdev->drvname, driver, strlen(driver) + 1);
 
-		if ((newdev->classname = calloc(1, strlen(driver) + 1))
-		    == NULL) {
+		if ((newdev->classname = calloc(1, strlen(driver) + 1)) ==
+		    NULL) {
 			logmsg(MSG_ERROR,
 			    gettext("%s: Unable to allocate space for a class "
 			    "name\n"), drivername);
@@ -345,12 +592,12 @@ fw_identify(int start)
 
 		/* The slice number may be 2 or 0, we will try 2 first */
 		(void) snprintf(newdev->access_devname, MAXPATHLEN,
-		    "%s%s:c,raw", devprefix, devpath);
+		    "%s%s:c,raw", sdfw_devprefix, devpath);
 		if ((target = libscsi_open(handle, NULL,
 		    newdev->access_devname)) == NULL) {
 			/* try 0 for EFI label */
 			(void) snprintf(newdev->access_devname, MAXPATHLEN,
-			    "%s%s:a,raw", devprefix, devpath);
+			    "%s%s:a,raw", sdfw_devprefix, devpath);
 			if ((target = libscsi_open(handle, NULL,
 			    newdev->access_devname)) == NULL) {
 				logmsg(MSG_INFO,
@@ -362,7 +609,7 @@ fw_identify(int start)
 		}
 
 		/* and the /dev/rdsk/ name */
-		if ((newdev->addresses[0] = find_link(thisnode,
+		if ((newdev->addresses[0] = sdfw_find_link(thisnode,
 		    newdev->access_devname)) == NULL) {
 			libscsi_fini(handle);
 			FW_SD_FREE_ACC_NAME(newdev, devpath)
@@ -423,7 +670,7 @@ fw_identify(int start)
 				 * There is no SPACE character in the PID field
 				 * Customize strings for special SATA disks
 				 */
-				if (sd_idtfy_custmz(newdev, sp_temp)
+				if (sdfw_idtfy_custmz(newdev, sp_temp)
 				    != FWFLASH_SUCCESS) {
 					libscsi_close(handle, target);
 					libscsi_fini(handle);
@@ -483,8 +730,8 @@ fw_identify(int start)
 
 		/* Revision ID */
 		sp_temp = (char *)libscsi_revision(target);
-		if ((newdev->ident->revid = calloc(1, strlen(sp_temp) + 1))
-		    == NULL || sp_temp == NULL) {
+		if ((newdev->ident->revid = calloc(1, strlen(sp_temp) + 1)) ==
+		    NULL || sp_temp == NULL) {
 			logmsg(MSG_ERROR, gettext("%s: unable to get revision "
 			    "id of %s\n"), newdev->drvname,
 			    newdev->access_devname);
@@ -634,7 +881,7 @@ fw_cleanup(struct devicelist *thisdev)
  * Helper functions
  */
 static int
-link_cb(di_devlink_t devlink, void *arg)
+sdfw_link_cb(di_devlink_t devlink, void *arg)
 {
 	const char *result;
 
@@ -645,14 +892,14 @@ link_cb(di_devlink_t devlink, void *arg)
 		(void) strlcpy(arg, result, strlen(result) + 1);
 	}
 
-	logmsg(MSG_INFO, "\nlink_cb::linkdata->resultstr = %s\n",
+	logmsg(MSG_INFO, "\nsdfw_link_cb::linkdata->resultstr = %s\n",
 	    ((result != NULL) ? result : "(null)"));
 
 	return (DI_WALK_CONTINUE);
 }
 
 static char *
-find_link(di_node_t bnode, char *acc_devname)
+sdfw_find_link(di_node_t bnode, char *acc_devname)
 {
 	di_minor_t devminor = DI_MINOR_NIL;
 	di_devlink_handle_t hdl;
@@ -661,7 +908,7 @@ find_link(di_node_t bnode, char *acc_devname)
 
 	if (bnode == DI_NODE_NIL) {
 		logmsg(MSG_ERROR,
-		    gettext("find_link must be called with non-null "
+		    gettext("sdfw_find_link must be called with non-null "
 		    "di_node_t\n"));
 		return (NULL);
 	}
@@ -690,8 +937,8 @@ find_link(di_node_t bnode, char *acc_devname)
 	}
 
 	errno = 0;
-	if (di_devlink_walk(hdl, linkname, acc_devname + strlen(devprefix),
-	    DI_PRIMARY_LINK, (void *)cbresult, link_cb) < 0) {
+	if (di_devlink_walk(hdl, linkname, acc_devname + strlen(sdfw_devprefix),
+	    DI_PRIMARY_LINK, (void *)cbresult, sdfw_link_cb) < 0) {
 		logmsg(MSG_ERROR,
 		    gettext("Unable to walk devlink snapshot for %s: %s\n"),
 		    acc_devname, strerror(errno));
@@ -710,7 +957,7 @@ find_link(di_node_t bnode, char *acc_devname)
 }
 
 static int
-sd_idtfy_custmz(struct devicelist *device, char *sp)
+sdfw_idtfy_custmz(struct devicelist *device, char *sp)
 {
 	/* vid customization */
 	if (strncmp(sp, "ST", 2) == 0) {
@@ -724,7 +971,7 @@ sd_idtfy_custmz(struct devicelist *device, char *sp)
 			return (FWFLASH_FAILURE);
 		}
 	} else {
-		/* disks to do in the furture, fill 'ATA' first */
+		/* disks to do in the future, fill 'ATA' first */
 		if ((device->ident->vid = strdup("ATA")) == NULL) {
 			return (FWFLASH_FAILURE);
 		}
diff --git a/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c b/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c
index d66339226f..e99655d3e5 100644
--- a/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c
+++ b/usr/src/cmd/fwflash/plugins/vendor/sd-GENERIC.c
@@ -1,89 +1,150 @@
 /*
- * CDDL HEADER START
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
  *
- * 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
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
  */
+
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright 2016 Joyent, Inc.
  */
 
+/*
+ * This is a general firmware flash plugin that does basic verification for
+ * devices backed by sd(7D).
+ *
+ * The sd(7D) target for firmware flashing uses the general SCSI WRITE BUFFER
+ * options with various modes to instruct the drive to download and install
+ * microcode (what SPC-3 calls firmware). To verify that something fits, we can
+ * use the READ BUFFER command with mode 03h to indicate that we want to
+ * buffer's descriptor. This gives us both the buffer's total size and the
+ * required alignment for writes.
+ *
+ * Unfortunately, it's impossible to know for certain if that size is supposed
+ * to be equivalent to the microcode's. While a READ BUFFER is supposed to
+ * return the same data as with a WRITE BUFFER command, experimental evidence
+ * has shown that this isn't always the case. Especially as the firmware buffer
+ * usually leverages buffer zero, but has custom modes to access it.
+ */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/sysmacros.h>
-#include <fcntl.h>
-#include <sys/condvar.h>
-#include <string.h>
-#include <strings.h>
-
-#include <sys/byteorder.h>
-
-#include <libintl.h> /* for gettext(3c) */
+#include <libintl.h>
 #include <fwflash/fwflash.h>
+#include <scsi/libscsi.h>
 
-char vendor[] = "GENERIC \0";
-
-/* MAXIMGSIZE = 1.4 * 1024 * 1024 bytes */
-/* Currently the largest firmware image size is 1.4 MB */
-/* 1468006 = 1.4 * 1024 * 1024 */
-#define	MAXIMGSIZE	((unsigned int)(1468006))
-
+/*
+ * The fwflash plugin interface is a bit odd for a modern committed interface
+ * and requires us to refer to data objects in the parent explicitly to get
+ * access to and set various information. It also doesn't allow us a means of
+ * setting data for our transport layer.
+ */
 extern struct vrfyplugin *verifier;
 
-/* required functions for this plugin */
-int vendorvrfy(struct devicelist *devicenode);
-
 /*
- * Important information about how this verification plugin works
- *
- * Direct-attached disks (sd instances) which support firmware
- * download accept image files up to 1.4 * 1024 * 1024 bytes in
- * size, and do their own verification of the image, rejecting the
- * file if it is not appropriate for them.
- *
- * All that we need to do here is set the various verifier fields
- * correctly, and check that the filesize as read from the filesystem
- * is less than 1.4 * 1024 * 1024 bytes.
+ * Declare the name of our vendor. This is required by the fwflash
+ * plugin interface. Note it must be a character array. Using a pointer may
+ * confuse the framework and its use of dlsym.
  */
+char vendor[] = "GENERIC";
 
 int
-vendorvrfy(struct devicelist *devicenode)
+vendorvrfy(struct devicelist *dvp)
 {
-	if (verifier->imgsize > MAXIMGSIZE) {
-		logmsg(MSG_ERROR,
-		    gettext("\nsd-GENERIC firmware image verifier: "
-		    "supplied filename %s exceeds maximum allowable "
-		    "size of %d bytes\n"),
-		    verifier->imgfile, MAXIMGSIZE);
+	libscsi_hdl_t *hdl = NULL;
+	libscsi_target_t *targ = NULL;
+	libscsi_action_t *act = NULL;
+	libscsi_errno_t serr;
+	spc3_read_buffer_cdb_t *rb_cdb;
+	uint8_t descbuf[4];
+	uint32_t size;
+
+	int ret = FWFLASH_FAILURE;
+
+	if ((hdl = libscsi_init(LIBSCSI_VERSION, &serr)) == NULL) {
+		logmsg(MSG_ERROR, gettext("%s: failed to initialize "
+		    "libscsi: %s\n"),
+		    verifier->vendor, libscsi_strerror(serr));
 		return (FWFLASH_FAILURE);
 	}
 
-	logmsg(MSG_INFO,
-	    "sd-GENERIC verifier for device\n"
-	    "vid %s, pid %s, rev %s\npath %s\n",
-	    devicenode->ident->vid,
-	    devicenode->ident->pid,
-	    devicenode->ident->revid,
-	    devicenode->addresses[0]);
+	if ((targ = libscsi_open(hdl, NULL, dvp->access_devname)) ==
+	    NULL) {
+		logmsg(MSG_ERROR,
+		    gettext("%s: unable to open device %s\n"),
+		    verifier->vendor, dvp->access_devname);
+		goto cleanup;
+	}
+
+	if ((act = libscsi_action_alloc(hdl, SPC3_CMD_READ_BUFFER,
+	    LIBSCSI_AF_READ, descbuf, sizeof (descbuf))) == NULL) {
+		logmsg(MSG_ERROR, "%s: failed to alloc scsi action: %s\n",
+		    verifier->vendor, libscsi_errmsg(hdl));
+		goto cleanup;
+	}
+
+	rb_cdb = (spc3_read_buffer_cdb_t *)libscsi_action_get_cdb(act);
+
+	rb_cdb->rbc_mode = SPC3_RB_MODE_DESCRIPTOR;
+
+	/*
+	 * Microcode upgrade usually only uses the first buffer ID which are
+	 * sequentially indexed from zero. Strictly speaking these are all
+	 * vendor defined, but so far most vendors we've seen use index zero
+	 * for this.
+	 */
+	rb_cdb->rbc_bufferid = 0;
+
+	rb_cdb->rbc_allocation_len[0] = 0;
+	rb_cdb->rbc_allocation_len[1] = 0;
+	rb_cdb->rbc_allocation_len[2] = sizeof (descbuf);
+
+	if (libscsi_exec(act, targ) != 0) {
+		logmsg(MSG_ERROR, gettext("%s: failed to execute SCSI buffer "
+		    "descriptor read: %s\n"), verifier->vendor,
+		    libscsi_errmsg(hdl));
+		goto cleanup;
+	}
+
+	if (libscsi_action_get_status(act) != SAM4_STATUS_GOOD) {
+		logmsg(MSG_ERROR, gettext("%s: SCSI READ BUFFER command to "
+		    "determine maximum image size failed\n"), verifier->vendor);
+		goto cleanup;
+	}
+
+	if (descbuf[0] == 0 && descbuf[1] == 0 && descbuf[2] == 0 &&
+	    descbuf[3] == 0) {
+		logmsg(MSG_ERROR, gettext("%s: devices %s does not support "
+		    "firmware upgrade\n"), verifier->vendor,
+		    dvp->access_devname);
+		goto cleanup;
+	}
+
+	size = (descbuf[1] << 16) | (descbuf[2] << 8) | descbuf[3];
+	logmsg(MSG_INFO, gettext("%s: checking maximum image size %u against "
+	    "actual image size: %u\n"), verifier->vendor, size,
+	    verifier->imgsize);
+	if (size < verifier->imgsize) {
+		logmsg(MSG_ERROR, gettext("%s: supplied firmware image %s "
+		    "exceeds maximum image size of %u\n"),
+		    verifier->vendor, verifier->imgfile, size);
+		goto cleanup;
+	}
+
+	logmsg(MSG_INFO, gettext("%s: successfully validated images %s\n"),
+	    verifier->vendor, verifier->imgfile);
+
 	verifier->flashbuf = 0;
+	ret = FWFLASH_SUCCESS;
+cleanup:
+	if (act != NULL)
+		libscsi_action_free(act);
+	if (targ != NULL)
+		libscsi_close(hdl, targ);
+	if (hdl != NULL)
+		libscsi_fini(hdl);
 
-	return (FWFLASH_SUCCESS);
+	return (ret);
 }
diff --git a/usr/src/cmd/mdb/common/modules/zfs/zfs.c b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
index 12f26d382c..fd419f6ea2 100644
--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -66,9 +66,12 @@ enum spa_flags {
 	SPA_FLAG_HISTOGRAMS		= 1 << 5
 };
 
+/*
+ * If any of these flags are set, call spa_vdevs in spa_print
+ */
 #define	SPA_FLAG_ALL_VDEV	\
 	(SPA_FLAG_VDEVS | SPA_FLAG_ERRORS | SPA_FLAG_METASLAB_GROUPS | \
-	SPA_FLAG_METASLABS | SPA_FLAG_HISTOGRAMS)
+	SPA_FLAG_METASLABS)
 
 static int
 getmember(uintptr_t addr, const char *type, mdb_ctf_id_t *idp,
@@ -1082,8 +1085,65 @@ arc_print(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 typedef struct mdb_spa_print {
 	pool_state_t spa_state;
 	char spa_name[ZFS_MAX_DATASET_NAME_LEN];
+	uintptr_t spa_normal_class;
 } mdb_spa_print_t;
 
+
+const char histo_stars[] = "****************************************";
+const int histo_width = sizeof (histo_stars) - 1;
+
+static void
+dump_histogram(const uint64_t *histo, int size, int offset)
+{
+	int i;
+	int minidx = size - 1;
+	int maxidx = 0;
+	uint64_t max = 0;
+
+	for (i = 0; i < size; i++) {
+		if (histo[i] > max)
+			max = histo[i];
+		if (histo[i] > 0 && i > maxidx)
+			maxidx = i;
+		if (histo[i] > 0 && i < minidx)
+			minidx = i;
+	}
+
+	if (max < histo_width)
+		max = histo_width;
+
+	for (i = minidx; i <= maxidx; i++) {
+		mdb_printf("%3u: %6llu %s\n",
+		    i + offset, (u_longlong_t)histo[i],
+		    &histo_stars[(max - histo[i]) * histo_width / max]);
+	}
+}
+
+typedef struct mdb_metaslab_class {
+	uint64_t mc_histogram[RANGE_TREE_HISTOGRAM_SIZE];
+} mdb_metaslab_class_t;
+
+/*
+ * spa_class_histogram(uintptr_t class_addr)
+ *
+ * Prints free space histogram for a device class
+ *
+ * Returns DCMD_OK, or DCMD_ERR.
+ */
+static int
+spa_class_histogram(uintptr_t class_addr)
+{
+	mdb_metaslab_class_t mc;
+	if (mdb_ctf_vread(&mc, "metaslab_class_t",
+	    "mdb_metaslab_class_t", class_addr, 0) == -1)
+		return (DCMD_ERR);
+
+	mdb_inc_indent(4);
+	dump_histogram(mc.mc_histogram, RANGE_TREE_HISTOGRAM_SIZE, 0);
+	mdb_dec_indent(4);
+	return (DCMD_OK);
+}
+
 /*
  * ::spa
  *
@@ -1144,6 +1204,8 @@ spa_print(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		state = statetab[spa.spa_state];
 
 	mdb_printf("%0?p %9s %s\n", addr, state, spa.spa_name);
+	if (spa_flags & SPA_FLAG_HISTOGRAMS)
+		spa_class_histogram(spa.spa_normal_class);
 
 	if (spa_flags & SPA_FLAG_CONFIG) {
 		mdb_printf("\n");
@@ -1216,35 +1278,7 @@ spa_print_config(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	    0, NULL));
 }
 
-const char histo_stars[] = "****************************************";
-const int histo_width = sizeof (histo_stars) - 1;
 
-static void
-dump_histogram(const uint64_t *histo, int size, int offset)
-{
-	int i;
-	int minidx = size - 1;
-	int maxidx = 0;
-	uint64_t max = 0;
-
-	for (i = 0; i < size; i++) {
-		if (histo[i] > max)
-			max = histo[i];
-		if (histo[i] > 0 && i > maxidx)
-			maxidx = i;
-		if (histo[i] > 0 && i < minidx)
-			minidx = i;
-	}
-
-	if (max < histo_width)
-		max = histo_width;
-
-	for (i = minidx; i <= maxidx; i++) {
-		mdb_printf("%3u: %6llu %s\n",
-		    i + offset, (u_longlong_t)histo[i],
-		    &histo_stars[(max - histo[i]) * histo_width / max]);
-	}
-}
 
 typedef struct mdb_range_tree {
 	uint64_t rt_space;
@@ -3722,11 +3756,11 @@ static const mdb_dcmd_t dcmds[] = {
 	    "\t-M display metaslab group statistic\n"
 	    "\t-h display histogram (requires -m or -M)\n",
 	    "given a spa_t, print vdev summary", spa_vdevs },
-	{ "vdev", ":[-re]\n"
+	{ "vdev", ":[-remMh]\n"
 	    "\t-r display recursively\n"
 	    "\t-e display statistics\n"
-	    "\t-m display metaslab statistics\n"
-	    "\t-M display metaslab group statistics\n"
+	    "\t-m display metaslab statistics (top level vdev only)\n"
+	    "\t-M display metaslab group statistics (top level vdev only)\n"
 	    "\t-h display histogram (requires -m or -M)\n",
 	    "vdev_t summary", vdev_print },
 	{ "zio", ":[-cpr]\n"
diff --git a/usr/src/cmd/sgs/include/conv.h b/usr/src/cmd/sgs/include/conv.h
index da1320f347..14b6a185a3 100644
--- a/usr/src/cmd/sgs/include/conv.h
+++ b/usr/src/cmd/sgs/include/conv.h
@@ -26,6 +26,7 @@
  * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
  * Copyright (c) 2015, Joyent, Inc. All rights reserved.
+ * Copyright 2016 RackTop Systems.
  */
 
 #ifndef	_CONV_H
@@ -42,7 +43,9 @@
 #include <sgs.h>
 #include <sgsmsg.h>
 
+#ifndef	NATIVE_BUILD
 #include <sys/secflags.h>
+#endif
 
 #ifdef	__cplusplus
 extern "C" {
@@ -328,12 +331,14 @@ typedef union {
 	char				buf[CONV_CNOTE_PROC_FLAG_BUFSIZE];
 } Conv_cnote_proc_flag_buf_t;
 
+#ifndef	NATIVE_BUILD
 /* conv_prsecflags() */
 #define	CONV_PRSECFLAGS_BUFSIZE		57
 typedef union {
 	Conv_inv_buf_t			inv_buf;
 	char				buf[CONV_PRSECFLAGS_BUFSIZE];
 } Conv_secflags_buf_t;
+#endif
 
 /* conv_cnote_sigset() */
 #define	CONV_CNOTE_SIGSET_BUFSIZE	639
@@ -831,8 +836,10 @@ extern	const char	*conv_cnote_pr_why(short, Conv_fmt_flags_t,
 			    Conv_inv_buf_t *);
 extern	const char	*conv_cnote_priv(int, Conv_fmt_flags_t,
 			    Conv_inv_buf_t *);
+#ifndef	NATIVE_BUILD
 extern	const char	*conv_prsecflags(secflagset_t, Conv_fmt_flags_t,
 			    Conv_secflags_buf_t *);
+#endif
 extern	const char	*conv_cnote_psetid(int, Conv_fmt_flags_t,
 			    Conv_inv_buf_t *);
 extern	const char	*conv_cnote_sa_flags(int, Conv_fmt_flags_t,
diff --git a/usr/src/cmd/sgs/ld/Makefile.com b/usr/src/cmd/sgs/ld/Makefile.com
index 1462a7af29..01ba9c1ff1 100644
--- a/usr/src/cmd/sgs/ld/Makefile.com
+++ b/usr/src/cmd/sgs/ld/Makefile.com
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2016 RackTop Systems.
 #
 
 PROG =		ld
@@ -52,6 +53,7 @@ CLEANFILES +=	$(LINTOUTS)
 native :=	LDFLAGS = -R$(SGSPROTO) $(ZNOVERSION)
 native :=	LDLIBS = -L$(SGSPROTO) $(LD_LIB) -lelf $(CONVLIBDIR) \
 		    $(CONV_LIB)
+native :=	CPPFLAGS += -DNATIVE_BUILD
 
 BLTDEFS=	msg.h
 BLTDATA=	msg.c
diff --git a/usr/src/cmd/sgs/libld/common/args.c b/usr/src/cmd/sgs/libld/common/args.c
index 495fed322c..d130f4ecf3 100644
--- a/usr/src/cmd/sgs/libld/common/args.c
+++ b/usr/src/cmd/sgs/libld/common/args.c
@@ -1444,11 +1444,15 @@ parseopt_pass1(Ofl_desc *ofl, int argc, char **argv, int *usage)
 				} else if (*p == '=') {
 					p++;
 
-					if (strcmp(p,
-					    MSG_ORIG(MSG_ARG_ENABLED)) == 0) {
+					if ((strcmp(p,
+					    MSG_ORIG(MSG_ARG_ENABLED)) == 0) ||
+					    (strcmp(p,
+					    MSG_ORIG(MSG_ARG_ENABLE)) == 0)) {
 						ofl->ofl_aslr = 1;
-					} else if (strcmp(p,
-					    MSG_ORIG(MSG_ARG_DISABLED)) == 0) {
+					} else if ((strcmp(p,
+					    MSG_ORIG(MSG_ARG_DISABLED)) == 0) ||
+					    (strcmp(p,
+					    MSG_ORIG(MSG_ARG_DISABLE)) == 0)) {
 						ofl->ofl_aslr = -1;
 					} else {
 						ld_eprintf(ofl, ERR_FATAL,
diff --git a/usr/src/cmd/sgs/libld/common/libld.msg b/usr/src/cmd/sgs/libld/common/libld.msg
index dd77130b40..26c0e33054 100644
--- a/usr/src/cmd/sgs/libld/common/libld.msg
+++ b/usr/src/cmd/sgs/libld/common/libld.msg
@@ -1477,6 +1477,8 @@
 
 @ MSG_ARG_ENABLED	"enabled"
 @ MSG_ARG_DISABLED	"disabled"
+@ MSG_ARG_ENABLE	"enable"
+@ MSG_ARG_DISABLE	"disable"
 
 # -z guidance=item strings
 @ MSG_ARG_GUIDE_DELIM		",: \t"
diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com
index d1dc9dd27c..860c62369a 100644
--- a/usr/src/cmd/sgs/liblddbg/Makefile.com
+++ b/usr/src/cmd/sgs/liblddbg/Makefile.com
@@ -21,6 +21,7 @@
 
 #
 # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2016 RackTop Systems.
 #
 
 LIBRARY =	liblddbg.a
@@ -67,6 +68,7 @@ DYNFLAGS +=	$(VERSREF) $(CC_USE_PROTO) '-R$$ORIGIN'
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) -lc
 
 native :=	DYNFLAGS	+= $(CONVLIBDIR)
+native :=	CPPFLAGS	+= -DNATIVE_BUILD
 
 BLTDEFS =	msg.h
 BLTDATA =	msg.c
diff --git a/usr/src/cmd/sgs/packages/common/SUNWonld-README b/usr/src/cmd/sgs/packages/common/SUNWonld-README
index bc757a0aa4..0f3d5f67bd 100644
--- a/usr/src/cmd/sgs/packages/common/SUNWonld-README
+++ b/usr/src/cmd/sgs/packages/common/SUNWonld-README
@@ -1659,3 +1659,4 @@ Bugid   Risk Synopsis
 6098	ld(1) should not require symbols which identify group sections be global
 6252	ld should merge function/data-sections in the same manner as GNU ld
 7323	ld(1) -zignore can erroneously discard init and fini arrays as unreferenced
+7594	ld -zaslr should accept Solaris-compatible values
diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c
index 1357cf9707..95985a6c48 100644
--- a/usr/src/cmd/zdb/zdb.c
+++ b/usr/src/cmd/zdb/zdb.c
@@ -75,10 +75,12 @@
 	DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES))
 
 #ifndef lint
+extern int reference_tracking_enable;
 extern boolean_t zfs_recover;
 extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
 extern int zfs_vdev_async_read_max_active;
 #else
+int reference_tracking_enable;
 boolean_t zfs_recover;
 uint64_t zfs_arc_max, zfs_arc_meta_limit;
 int zfs_vdev_async_read_max_active;
@@ -3666,6 +3668,11 @@ main(int argc, char **argv)
 	 */
 	zfs_vdev_async_read_max_active = 10;
 
+	/*
+	 * Disable reference tracking for better performance.
+	 */
+	reference_tracking_enable = B_FALSE;
+
 	kernel_init(FREAD);
 	g_zfs = libzfs_init();
 	ASSERT(g_zfs != NULL);
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c
index f9318db544..7d9153f9fe 100644
--- a/usr/src/cmd/zfs/zfs_main.c
+++ b/usr/src/cmd/zfs/zfs_main.c
@@ -232,7 +232,7 @@ get_usage(zfs_help_t idx)
 		    "[-o \"all\" | field[,...]]\n"
 		    "\t    [-t type[,...]] [-s source[,...]]\n"
 		    "\t    <\"all\" | property[,...]> "
-		    "[filesystem|volume|snapshot] ...\n"));
+		    "[filesystem|volume|snapshot|bookmark] ...\n"));
 	case HELP_INHERIT:
 		return (gettext("\tinherit [-rS] <property> "
 		    "<filesystem|volume|snapshot> ...\n"));
@@ -1658,7 +1658,7 @@ zfs_do_get(int argc, char **argv)
 {
 	zprop_get_cbdata_t cb = { 0 };
 	int i, c, flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
-	int types = ZFS_TYPE_DATASET;
+	int types = ZFS_TYPE_DATASET | ZFS_TYPE_BOOKMARK;
 	char *value, *fields;
 	int ret = 0;
 	int limit = 0;
diff --git a/usr/src/cmd/ztest/Makefile b/usr/src/cmd/ztest/Makefile
index 1a34525b2d..5c9bfd4ee8 100644
--- a/usr/src/cmd/ztest/Makefile
+++ b/usr/src/cmd/ztest/Makefile
@@ -22,10 +22,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright (c) 2015 by Delphix. All rights reserved.
 #
 
 PROG:sh=	basename `pwd`
+BASHPROG=	zloop
+ROOTBASHPROG=	$(ROOTBIN)/$(BASHPROG)
 
 include ../Makefile.cmd
 
@@ -40,9 +42,11 @@ lint	:=	TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber lint:	$(SUBDIRS)
+all lint:	$(SUBDIRS) $(BASHPROG)
 
-install:	$(SUBDIRS)
+clean clobber:	$(SUBDIRS)
+
+install:	$(SUBDIRS) $(ROOTBASHPROG)
 	-$(RM) $(ROOTPROG)
 	-$(LN) $(ISAEXEC) $(ROOTPROG)
 
diff --git a/usr/src/cmd/ztest/zloop.bash b/usr/src/cmd/ztest/zloop.bash
new file mode 100755
index 0000000000..7203356d3d
--- /dev/null
+++ b/usr/src/cmd/ztest/zloop.bash
@@ -0,0 +1,204 @@
+#!/bin/bash
+
+#
+# CDDL HEADER START
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
+#
+
+set -x
+export BITS=64
+export UMEM_DEBUG=default,verbose
+export UMEM_LOGGING=transaction,contents
+set +x
+
+sparc_32=sparc
+sparc_64=sparcv9
+i386_32=i86
+i386_64=amd64
+ARCH=`uname -p`
+eval 'ARCHBITS=${'"${ARCH}_${BITS}"'}'
+BIN=$ROOT/usr/bin/${ARCHBITS}
+SBIN=$ROOT/usr/sbin/${ARCHBITS}
+DEFAULTWORKDIR=/var/tmp
+DEFAULTCOREDIR=/var/tmp/zloop
+
+function usage
+{
+	echo -e "\n$0 [-t <timeout>] [-c <dump directory>]" \
+	    "[ -- [extra ztest parameters]]\n" \
+	    "\n" \
+	    "  This script runs ztest repeatedly with randomized arguments.\n" \
+	    "  If a crash is encountered, the ztest logs, any associated\n" \
+	    "  vdev files, and core file (if one exists) are moved to the\n" \
+	    "  output directory ($DEFAULTCOREDIR by default). Any options\n" \
+	    "  after the -- end-of-options marker will be passed to ztest.\n" \
+	    "\n" \
+	    "  Options:\n" \
+	    "    -t  Total time to loop for, in seconds. If not provided,\n" \
+	    "        zloop runs forever.\n" \
+	    "    -f  Specify working directory for ztest vdev files.\n" \
+	    "    -c  Specify a core dump directory to use.\n" \
+	    "    -h  Print this help message.\n" \
+	    "" >&2
+}
+
+function or_die
+{
+	$@
+	if [[ $? -ne 0 ]]; then
+		echo "Command failed: $@"
+		exit 1
+	fi
+}
+
+function store_core
+{
+	if [[ $ztrc -ne 0 ]] || [[ -f core ]]; then
+		coreid=$(/bin/date "+zloop-%y%m%d-%H%M%S")
+		foundcrashes=$(($foundcrashes + 1))
+
+		dest=$coredir/$coreid
+		or_die /bin/mkdir $dest
+		or_die /bin/mkdir $dest/vdev
+
+		echo "*** ztest crash found - moving logs to $coredir/$coreid"
+
+		or_die /bin/mv ztest.history $dest/
+		or_die /bin/mv ztest.out $dest/
+		or_die /bin/mv $workdir/ztest* $dest/vdev/
+		or_die /bin/mv $workdir/zpool.cache $dest/vdev/
+
+		# check for core
+		if [[ -f core ]]; then
+			corestatus=$(mdb -e "::status" core)
+			corestack=$(mdb -e "::stack" core)
+
+			# Dump core + logs to stored directory
+			echo "$corestatus" >>$dest/status
+			echo "$corestack" >>$dest/status
+			or_die /bin/mv core $dest/
+
+			# Record info in cores logfile
+			echo "*** core @ $coredir/$coreid/core:" | /bin/tee -a ztest.cores
+			echo "$corestatus" | /bin/tee -a ztest.cores
+			echo "$corestack" | /bin/tee -a ztest.cores
+			echo "" | /bin/tee -a ztest.cores
+		fi
+		echo "continuing..."
+	fi
+}
+
+set -x
+export PATH=${BIN}:${SBIN}
+export LD_LIBRARY_PATH=$ROOT/lib/$BITS:$ROOT/usr/lib/$BITS
+set +x
+
+# parse arguments
+# expected format: zloop [-t timeout] [-c coredir] [-- extra ztest args]
+coredir=$DEFAULTCOREDIR
+workdir=$DEFAULTWORKDIR
+timeout=0
+while getopts ":ht:c:f:" opt; do
+	case $opt in
+		t ) [[ $OPTARG -gt 0 ]] && timeout=$OPTARG ;;
+		c ) [[ $OPTARG ]] && coredir=$OPTARG ;;
+		f ) [[ $OPTARG ]] && workdir=$(/usr/bin/readlink -f $OPTARG) ;;
+		h ) usage
+		    exit 2
+		    ;;
+		* ) echo "Invalid argument: -$OPTARG";
+		    usage
+		    exit 1
+	esac
+done
+# pass remaining arguments on to ztest
+shift $((OPTIND - 1))
+
+if [[ -f core ]]; then
+	echo "There's a core dump here you might want to look at first."
+	exit 1
+fi
+
+if [[ ! -d $coredir ]]; then
+	echo "core dump directory ($coredir) does not exist, creating it."
+	or_die /bin/mkdir -p $coredir
+fi
+
+if [[ ! -w $coredir ]]; then
+	echo "core dump directory ($coredir) is not writable."
+	exit 1
+fi
+
+or_die /bin/rm -f ztest.history
+or_die /bin/rm -f ztest.cores
+
+ztrc=0		# ztest return value
+foundcrashes=0	# number of crashes found so far
+starttime=$(/bin/date +%s)
+curtime=$starttime
+
+# if no timeout was specified, loop forever.
+while [[ $timeout -eq 0 ]] || [[ $curtime -le $(($starttime + $timeout)) ]]; do
+	zopt="-VVVVV"
+
+	# switch between common arrangements & fully randomized
+	if [[ $((RANDOM % 2)) -eq 0 ]]; then
+		mirrors=2
+		raidz=0
+		parity=1
+		vdevs=2
+	else
+		mirrors=$(((RANDOM % 3) * 1))
+		parity=$(((RANDOM % 3) + 1))
+		raidz=$((((RANDOM % 9) + parity + 1) * (RANDOM % 2)))
+		vdevs=$(((RANDOM % 3) + 3))
+	fi
+	align=$(((RANDOM % 2) * 3 + 9))
+	runtime=$((RANDOM % 100))
+	passtime=$((RANDOM % (runtime / 3 + 1) + 10))
+	size=128m
+
+	zopt="$zopt -m $mirrors"
+	zopt="$zopt -r $raidz"
+	zopt="$zopt -R $parity"
+	zopt="$zopt -v $vdevs"
+	zopt="$zopt -a $align"
+	zopt="$zopt -T $runtime"
+	zopt="$zopt -P $passtime"
+	zopt="$zopt -s $size"
+	zopt="$zopt -f $workdir"
+
+	cmd="ztest $zopt $@"
+	desc="$(/bin/date '+%m/%d %T') $cmd"
+	echo "$desc" | /bin/tee -a ztest.history
+	echo "$desc" >>ztest.out
+	$BIN/$cmd >>ztest.out 2>&1
+	ztrc=$?
+	/bin/egrep '===|WARNING' ztest.out >>ztest.history
+
+	store_core
+
+	curtime=$(/bin/date +%s)
+done
+
+echo "zloop finished, $foundcrashes crashes found"
+
+/bin/uptime >>ztest.out
+
+if [[ $foundcrashes -gt 0 ]]; then
+	exit 1
+fi
diff --git a/usr/src/common/dis/i386/dis_tables.c b/usr/src/common/dis/i386/dis_tables.c
index c21c392d77..3c66777c3a 100644
--- a/usr/src/common/dis/i386/dis_tables.c
+++ b/usr/src/common/dis/i386/dis_tables.c
@@ -21,7 +21,7 @@
  */
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, Joyent, Inc.
+ * Copyright 2016 Joyent, Inc.
  */
 
 /*
@@ -689,7 +689,7 @@ const instable_t dis_opSIMDdata16[256] = {
 /*  [70]  */	TNSZ("pshufd",XMMP,16),	INVALID,		INVALID,		INVALID,
 /*  [74]  */	TNSZ("pcmpeqb",XMM,16),	TNSZ("pcmpeqw",XMM,16),	TNSZ("pcmpeqd",XMM,16),	INVALID,
 /*  [78]  */	TNSZ("extrq",XMM2I,16),	TNSZ("extrq",XMM,16), INVALID,		INVALID,
-/*  [7C]  */	INVALID,		INVALID,		TNSZ("movd",XMM3MXS,4),	TNSZ("movdqa",XMMS,16),
+/*  [7C]  */	TNSZ("haddpd",XMM,16),	TNSZ("hsubpd",XMM,16),	TNSZ("movd",XMM3MXS,4),	TNSZ("movdqa",XMMS,16),
 
 /*  [80]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [84]  */	INVALID,		INVALID,		INVALID,		INVALID,
@@ -716,7 +716,7 @@ const instable_t dis_opSIMDdata16[256] = {
 /*  [C8]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [CC]  */	INVALID,		INVALID,		INVALID,		INVALID,
 
-/*  [D0]  */	INVALID,		TNSZ("psrlw",XMM,16),	TNSZ("psrld",XMM,16),	TNSZ("psrlq",XMM,16),
+/*  [D0]  */	TNSZ("addsubpd",XMM,16),TNSZ("psrlw",XMM,16),	TNSZ("psrld",XMM,16),	TNSZ("psrlq",XMM,16),
 /*  [D4]  */	TNSZ("paddq",XMM,16),	TNSZ("pmullw",XMM,16),	TNSZ("movq",XMMS,8),	TNS("pmovmskb",XMMX3),
 /*  [D8]  */	TNSZ("psubusb",XMM,16),	TNSZ("psubusw",XMM,16),	TNSZ("pminub",XMM,16),	TNSZ("pand",XMM,16),
 /*  [DC]  */	TNSZ("paddusb",XMM,16),	TNSZ("paddusw",XMM,16),	TNSZ("pmaxub",XMM,16),	TNSZ("pandn",XMM,16),
@@ -823,7 +823,7 @@ const instable_t dis_opSIMDrepnz[256] = {
 /*  [08]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [0C]  */	INVALID,		INVALID,		INVALID,		INVALID,
 
-/*  [10]  */	TNSZ("movsd",XMM,8),	TNSZ("movsd",XMMS,8),	INVALID,		INVALID,
+/*  [10]  */	TNSZ("movsd",XMM,8),	TNSZ("movsd",XMMS,8),	TNSZ("movddup",XMM,8),	INVALID,
 /*  [14]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [18]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [1C]  */	INVALID,		INVALID,		INVALID,		INVALID,
@@ -856,7 +856,7 @@ const instable_t dis_opSIMDrepnz[256] = {
 /*  [70]  */	TNSZ("pshuflw",XMMP,16),INVALID,		INVALID,		INVALID,
 /*  [74]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [78]  */	TNSZ("insertq",XMMX2I,16),TNSZ("insertq",XMM,8),INVALID,		INVALID,
-/*  [7C]  */	INVALID,		INVALID,		INVALID,		INVALID,
+/*  [7C]  */	TNSZ("haddps",XMM,16),	TNSZ("hsubps",XMM,16),	INVALID,		INVALID,
 
 /*  [80]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [84]  */	INVALID,		INVALID,		INVALID,		INVALID,
@@ -883,7 +883,7 @@ const instable_t dis_opSIMDrepnz[256] = {
 /*  [C8]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [CC]  */	INVALID,		INVALID,		INVALID,		INVALID,
 
-/*  [D0]  */	INVALID,		INVALID,		INVALID,		INVALID,
+/*  [D0]  */	TNSZ("addsubps",XMM,16),INVALID,		INVALID,		INVALID,
 /*  [D4]  */	INVALID,		INVALID,		TNS("movdq2q",XMMXM),	INVALID,
 /*  [D8]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [DC]  */	INVALID,		INVALID,		INVALID,		INVALID,
@@ -893,7 +893,7 @@ const instable_t dis_opSIMDrepnz[256] = {
 /*  [E8]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [EC]  */	INVALID,		INVALID,		INVALID,		INVALID,
 
-/*  [F0]  */	INVALID,		INVALID,		INVALID,		INVALID,
+/*  [F0]  */	TNS("lddqu",XMMM),	INVALID,		INVALID,		INVALID,
 /*  [F4]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [F8]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [FC]  */	INVALID,		INVALID,		INVALID,		INVALID,
@@ -1235,8 +1235,8 @@ const instable_t dis_opSIMDrepz[256] = {
 /*  [08]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [0C]  */	INVALID,		INVALID,		INVALID,		INVALID,
 
-/*  [10]  */	TNSZ("movss",XMM,4),	TNSZ("movss",XMMS,4),	INVALID,		INVALID,
-/*  [14]  */	INVALID,		INVALID,		INVALID,		INVALID,
+/*  [10]  */	TNSZ("movss",XMM,4),	TNSZ("movss",XMMS,4),	TNSZ("movsldup",XMM,16),INVALID,
+/*  [14]  */	INVALID,		INVALID,		TNSZ("movshdup",XMM,16),INVALID,
 /*  [18]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [1C]  */	INVALID,		INVALID,		INVALID,		INVALID,
 
@@ -1478,8 +1478,8 @@ const instable_t dis_op0F38[256] = {
 
 /*  [C0]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [C4]  */	INVALID,		INVALID,		INVALID,		INVALID,
-/*  [C8]  */	INVALID,		INVALID,		INVALID,		INVALID,
-/*  [CC]  */	INVALID,		INVALID,		INVALID,		INVALID,
+/*  [C8]  */	TNSZ("sha1nexte",XMM,16),TNSZ("sha1msg1",XMM,16),TNSZ("sha1msg2",XMM,16),TNSZ("sha256rnds2",XMM,16),
+/*  [CC]  */	TNSZ("sha256msg1",XMM,16),TNSZ("sha256msg2",XMM,16),INVALID,		INVALID,
 
 /*  [D0]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [D4]  */	INVALID,		INVALID,		INVALID,		INVALID,
@@ -1641,7 +1641,7 @@ const instable_t dis_op0F3A[256] = {
 /*  [C0]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [C4]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [C8]  */	INVALID,		INVALID,		INVALID,		INVALID,
-/*  [CC]  */	INVALID,		INVALID,		INVALID,		INVALID,
+/*  [CC]  */	TNSZ("sha1rnds4",XMMP,16),INVALID,		INVALID,		INVALID,
 
 /*  [D0]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [D4]  */	INVALID,		INVALID,		INVALID,		INVALID,
@@ -1772,7 +1772,7 @@ const instable_t dis_op0F[16][16] = {
 /*  [2C]  */	TNSZ("cvttps2pi",XMMOXMM,8),TNSZ("cvtps2pi",XMMOXMM,8),TNSZ("ucomiss",XMMO,4),TNSZ("comiss",XMMO,4),
 }, {
 /*  [30]  */	TNS("wrmsr",NORM),	TNS("rdtsc",NORM),	TNS("rdmsr",NORM),	TNS("rdpmc",NORM),
-/*  [34]  */	TNSx("sysenter",NORM),	TNSx("sysexit",NORM),	INVALID,		INVALID,
+/*  [34]  */	TNS("sysenter",NORM),	TNS("sysexit",NORM),	INVALID,		INVALID,
 /*  [38]  */	INVALID,		INVALID,		INVALID,		INVALID,
 /*  [3C]  */	INVALID,		INVALID,		INVALID,		INVALID,
 }, {
@@ -2078,19 +2078,19 @@ const instable_t dis_opFP1n2[8][8] = {
 /*  [2,0]  */	TNS("fiaddl",M),	TNS("fimull",M),	TNS("ficoml",M),	TNS("ficompl",M),
 /*  [2,4]  */	TNS("fisubl",M),	TNS("fisubrl",M),	TNS("fidivl",M),	TNS("fidivrl",M),
 }, {
-/*  [3,0]  */	TNS("fildl",M),		INVALID,		TNS("fistl",M),		TNS("fistpl",M),
+/*  [3,0]  */	TNS("fildl",M),		TNSZ("tisttpl",M,4),	TNS("fistl",M),		TNS("fistpl",M),
 /*  [3,4]  */	INVALID,		TNSZ("fldt",M,10),	INVALID,		TNSZ("fstpt",M,10),
 }, {
 /*  [4,0]  */	TNSZ("faddl",M,8),	TNSZ("fmull",M,8),	TNSZ("fcoml",M,8),	TNSZ("fcompl",M,8),
 /*  [4,1]  */	TNSZ("fsubl",M,8),	TNSZ("fsubrl",M,8),	TNSZ("fdivl",M,8),	TNSZ("fdivrl",M,8),
 }, {
-/*  [5,0]  */	TNSZ("fldl",M,8),	INVALID,		TNSZ("fstl",M,8),	TNSZ("fstpl",M,8),
+/*  [5,0]  */	TNSZ("fldl",M,8),	TNSZ("fisttpll",M,8),	TNSZ("fstl",M,8),	TNSZ("fstpl",M,8),
 /*  [5,4]  */	TNSZ("frstor",M,108),	INVALID,		TNSZ("fnsave",M,108),	TNSZ("fnstsw",M,2),
 }, {
 /*  [6,0]  */	TNSZ("fiadd",M,2),	TNSZ("fimul",M,2),	TNSZ("ficom",M,2),	TNSZ("ficomp",M,2),
 /*  [6,4]  */	TNSZ("fisub",M,2),	TNSZ("fisubr",M,2),	TNSZ("fidiv",M,2),	TNSZ("fidivr",M,2),
 }, {
-/*  [7,0]  */	TNSZ("fild",M,2),	INVALID,		TNSZ("fist",M,2),	TNSZ("fistp",M,2),
+/*  [7,0]  */	TNSZ("fild",M,2),	TNSZ("fisttp",M,2),	TNSZ("fist",M,2),	TNSZ("fistp",M,2),
 /*  [7,4]  */	TNSZ("fbld",M,10),	TNSZ("fildll",M,8),	TNSZ("fbstp",M,10),	TNSZ("fistpll",M,8),
 } };
 
@@ -3286,12 +3286,15 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
 				goto error;
 #endif
 			switch (dp->it_adrmode) {
+				case XMMP:
+					break;
 				case XMMP_66r:
 				case XMMPRM_66r:
 				case XMM3PM_66r:
 					if (opnd_size_prefix == 0) {
 						goto error;
 					}
+
 					break;
 				case XMMP_66o:
 					if (opnd_size_prefix == 0) {
@@ -3369,6 +3372,7 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
 #endif
 			switch (dp->it_adrmode) {
 				case ADX:
+				case XMM:
 					break;
 				case RM_66r:
 				case XMM_66r:
@@ -3459,9 +3463,12 @@ dtrace_disx86(dis86_t *x, uint_t cpu_mode)
 		goto error;
 
 	/*
-	 * deal with MMX/SSE opcodes which are changed by prefixes
+	 * Deal with MMX/SSE opcodes which are changed by prefixes. Note, we do
+	 * need to include UNKNOWN below, as we may have instructions that
+	 * actually have a prefix, but don't exist in any other form.
 	 */
 	switch (dp->it_adrmode) {
+	case UNKNOWN:
 	case MMO:
 	case MMOIMPL:
 	case MMO3P:
@@ -4436,6 +4443,44 @@ xmmprm:
 			x->d86_opnd[1] = x->d86_opnd[2];
 			x->d86_numopnds = 2;
 		}
+
+		/*
+		 * The pclmulqdq instruction has a series of alternate names for
+		 * various encodings of the immediate byte. As such, if we
+		 * happen to find it and the immediate value matches, we'll
+		 * rewrite the mnemonic.
+		 */
+		if (strcmp(dp->it_name, "pclmulqdq") == 0) {
+			boolean_t changed = B_TRUE;
+			switch (x->d86_opnd[0].d86_value) {
+			case 0x00:
+				(void) strncpy(x->d86_mnem, "pclmullqlqdq",
+				    OPLEN);
+				break;
+			case 0x01:
+				(void) strncpy(x->d86_mnem, "pclmulhqlqdq",
+				    OPLEN);
+				break;
+			case 0x10:
+				(void) strncpy(x->d86_mnem, "pclmullqhqdq",
+				    OPLEN);
+				break;
+			case 0x11:
+				(void) strncpy(x->d86_mnem, "pclmulhqhqdq",
+				    OPLEN);
+				break;
+			default:
+				changed = B_FALSE;
+				break;
+			}
+
+			if (changed == B_TRUE) {
+				x->d86_opnd[0].d86_value_size = 0;
+				x->d86_opnd[0] = x->d86_opnd[1];
+				x->d86_opnd[1] = x->d86_opnd[2];
+				x->d86_numopnds = 2;
+			}
+		}
 #endif
 		break;
 
diff --git a/usr/src/common/zfs/zfs_namecheck.c b/usr/src/common/zfs/zfs_namecheck.c
index 439d4491a0..950d41f353 100644
--- a/usr/src/common/zfs/zfs_namecheck.c
+++ b/usr/src/common/zfs/zfs_namecheck.c
@@ -120,9 +120,9 @@ permset_namecheck(const char *path, namecheck_err_t *why, char *what)
 }
 
 /*
- * Dataset names must be of the following form:
+ * Entity names must be of the following form:
  *
- * 	[component][/]*[component][@component]
+ * 	[component/]*[component][(@|#)component]?
  *
  * Where each component is made up of alphanumeric characters plus the following
  * characters:
@@ -133,10 +133,10 @@ permset_namecheck(const char *path, namecheck_err_t *why, char *what)
  * names for temporary clones (for online recv).
  */
 int
-dataset_namecheck(const char *path, namecheck_err_t *why, char *what)
+entity_namecheck(const char *path, namecheck_err_t *why, char *what)
 {
-	const char *loc, *end;
-	int found_snapshot;
+	const char *start, *end;
+	int found_delim;
 
 	/*
 	 * Make sure the name is not too long.
@@ -161,12 +161,13 @@ dataset_namecheck(const char *path, namecheck_err_t *why, char *what)
 		return (-1);
 	}
 
-	loc = path;
-	found_snapshot = 0;
+	start = path;
+	found_delim = 0;
 	for (;;) {
 		/* Find the end of this component */
-		end = loc;
-		while (*end != '/' && *end != '@' && *end != '\0')
+		end = start;
+		while (*end != '/' && *end != '@' && *end != '#' &&
+		    *end != '\0')
 			end++;
 
 		if (*end == '\0' && end[-1] == '/') {
@@ -176,25 +177,8 @@ dataset_namecheck(const char *path, namecheck_err_t *why, char *what)
 			return (-1);
 		}
 
-		/* Zero-length components are not allowed */
-		if (loc == end) {
-			if (why) {
-				/*
-				 * Make sure this is really a zero-length
-				 * component and not a '@@'.
-				 */
-				if (*end == '@' && found_snapshot) {
-					*why = NAME_ERR_MULTIPLE_AT;
-				} else {
-					*why = NAME_ERR_EMPTY_COMPONENT;
-				}
-			}
-
-			return (-1);
-		}
-
 		/* Validate the contents of this component */
-		while (loc != end) {
+		for (const char *loc = start; loc != end; loc++) {
 			if (!valid_char(*loc) && *loc != '%') {
 				if (why) {
 					*why = NAME_ERR_INVALCHAR;
@@ -202,43 +186,64 @@ dataset_namecheck(const char *path, namecheck_err_t *why, char *what)
 				}
 				return (-1);
 			}
-			loc++;
 		}
 
-		/* If we've reached the end of the string, we're OK */
-		if (*end == '\0')
-			return (0);
-
-		if (*end == '@') {
-			/*
-			 * If we've found an @ symbol, indicate that we're in
-			 * the snapshot component, and report a second '@'
-			 * character as an error.
-			 */
-			if (found_snapshot) {
+		/* Snapshot or bookmark delimiter found */
+		if (*end == '@' || *end == '#') {
+			/* Multiple delimiters are not allowed */
+			if (found_delim != 0) {
 				if (why)
-					*why = NAME_ERR_MULTIPLE_AT;
+					*why = NAME_ERR_MULTIPLE_DELIMITERS;
 				return (-1);
 			}
 
-			found_snapshot = 1;
+			found_delim = 1;
+		}
+
+		/* Zero-length components are not allowed */
+		if (start == end) {
+			if (why)
+				*why = NAME_ERR_EMPTY_COMPONENT;
+			return (-1);
 		}
 
+		/* If we've reached the end of the string, we're OK */
+		if (*end == '\0')
+			return (0);
+
 		/*
-		 * If there is a '/' in a snapshot name
+		 * If there is a '/' in a snapshot or bookmark name
 		 * then report an error
 		 */
-		if (*end == '/' && found_snapshot) {
+		if (*end == '/' && found_delim != 0) {
 			if (why)
 				*why = NAME_ERR_TRAILING_SLASH;
 			return (-1);
 		}
 
 		/* Update to the next component */
-		loc = end + 1;
+		start = end + 1;
 	}
 }
 
+/*
+ * Dataset is any entity, except bookmark
+ */
+int
+dataset_namecheck(const char *path, namecheck_err_t *why, char *what)
+{
+	int ret = entity_namecheck(path, why, what);
+
+	if (ret == 0 && strchr(path, '#') != NULL) {
+		if (why != NULL) {
+			*why = NAME_ERR_INVALCHAR;
+			*what = '#';
+		}
+		return (-1);
+	}
+
+	return (ret);
+}
 
 /*
  * mountpoint names must be of the following form:
diff --git a/usr/src/common/zfs/zfs_namecheck.h b/usr/src/common/zfs/zfs_namecheck.h
index cbefbaa0d5..db70641dba 100644
--- a/usr/src/common/zfs/zfs_namecheck.h
+++ b/usr/src/common/zfs/zfs_namecheck.h
@@ -38,7 +38,7 @@ typedef enum {
 	NAME_ERR_EMPTY_COMPONENT,	/* name contains an empty component */
 	NAME_ERR_TRAILING_SLASH,	/* name ends with a slash */
 	NAME_ERR_INVALCHAR,		/* invalid character found */
-	NAME_ERR_MULTIPLE_AT,		/* multiple '@' characters found */
+	NAME_ERR_MULTIPLE_DELIMITERS,	/* multiple '@'/'#' delimiters found */
 	NAME_ERR_NOLETTER,		/* pool doesn't begin with a letter */
 	NAME_ERR_RESERVED,		/* entire name is reserved */
 	NAME_ERR_DISKLIKE,		/* reserved disk name (c[0-9].*) */
@@ -49,6 +49,7 @@ typedef enum {
 #define	ZFS_PERMSET_MAXLEN	64
 
 int pool_namecheck(const char *, namecheck_err_t *, char *);
+int entity_namecheck(const char *, namecheck_err_t *, char *);
 int dataset_namecheck(const char *, namecheck_err_t *, char *);
 int mountpoint_namecheck(const char *, namecheck_err_t *);
 int zfs_component_namecheck(const char *, namecheck_err_t *, char *);
diff --git a/usr/src/lib/brand/lx/lx_support/lx_support.c b/usr/src/lib/brand/lx/lx_support/lx_support.c
index fa4bbffc4a..65679b0603 100644
--- a/usr/src/lib/brand/lx/lx_support/lx_support.c
+++ b/usr/src/lib/brand/lx/lx_support/lx_support.c
@@ -21,7 +21,7 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2015 Joyent, Inc.  All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 /*
@@ -86,63 +86,19 @@ lxs_err(char *msg, ...)
 }
 
 /*
- * The Linux init(1M) command requires communication over the /dev/initctl
- * FIFO.  Since any attempt to create a file in /dev will fail, we must
- * create it here.
+ * Cleanup from earlier versions of the code which created a /dev/initctl FIFO.
  */
 static void
-lxs_make_initctl()
+lxs_remove_initctl()
 {
-	char		cmdbuf[ARG_MAX];
-	char		path[MAXPATHLEN];
 	char		special[MAXPATHLEN];
-	struct stat	buf;
-	int		err;
 
 	if (snprintf(special, sizeof (special), "%s/dev/initctl", zoneroot) >=
 	    sizeof (special))
-		lxs_err("%s: %s", gettext("Failed to create /dev/initctl"),
+		lxs_err("%s: %s", gettext("Failed to cleanup /dev/initctl"),
 		    gettext("zoneroot is too long"));
 
-	if (snprintf(path, sizeof (path), "%s/root/dev/initctl", zoneroot) >=
-	    sizeof (path))
-		lxs_err("%s: %s", gettext("Failed to create /dev/initctl"),
-		    gettext("zoneroot is too long"));
-
-	/* create the actual fifo as <zoneroot>/dev/initctl */
-	if (stat(special, &buf) != 0) {
-		err = errno;
-		if (err != ENOENT)
-			lxs_err("%s: %s",
-			    gettext("Failed to create /dev/initctl"),
-			    strerror(err));
-		if (mkfifo(special, 0644) < 0) {
-			err = errno;
-			lxs_err("%s: %s",
-			    gettext("Failed to create /dev/initctl"),
-			    strerror(err));
-		}
-	} else {
-		if ((buf.st_mode & S_IFIFO) == 0)
-			lxs_err("%s: %s",
-			    gettext("Failed to create /dev/initctl"),
-			    gettext("It already exists, and is not a FIFO."));
-	}
-
-	/*
-	 * now lofs mount the <zoneroot>/dev/initctl fifo onto
-	 * <zoneroot>/root/dev/initctl
-	 */
-	if (snprintf(cmdbuf, sizeof (cmdbuf), "%s -F lofs %s %s", MOUNT_CMD,
-	    special, path) >= sizeof (cmdbuf))
-		lxs_err("%s: %s", gettext("Failed to lofs mount /dev/initctl"),
-		    gettext("zoneroot is too long"));
-
-	if (system(cmdbuf) < 0) {
-		err = errno;
-		lxs_err("%s: %s", gettext("Failed to lofs mount /dev/initctl"),
-		    strerror(err));
-	}
+	(void) unlink(special);
 }
 
 /*
@@ -214,7 +170,7 @@ lxs_boot()
 	zone_dochandle_t zdh;
 	char		*krelease;
 
-	lxs_make_initctl();
+	lxs_remove_initctl();
 	lxs_remove_autofsck();
 
 	if ((zdh = zonecfg_init_handle()) == NULL)
diff --git a/usr/src/lib/brand/lx/testing/pts_ignorelist b/usr/src/lib/brand/lx/testing/pts_ignorelist
index 623147661a..2c4f307b55 100644
--- a/usr/src/lib/brand/lx/testing/pts_ignorelist
+++ b/usr/src/lib/brand/lx/testing/pts_ignorelist
@@ -180,54 +180,45 @@ conformance/interfaces/pthread_rwlock_unlock/pthread_rwlock_unlock_4-1 UNSUPPORT
 conformance/interfaces/pthread_rwlock_unlock/pthread_rwlock_unlock_4-2 UNSUPPORTED
 
 #
-# lx-brand does not have proc_priocntl privilege.
-#
-# pthread_setschedparam_1-1 returns FAILED instead UNRESOLVED
-#
-conformance/interfaces/fork/fork_17-1 UNRESOLVED
-conformance/interfaces/fork/fork_17-2 UNRESOLVED
-conformance/interfaces/pthread_attr_setinheritsched/pthread_attr_setinheritsched_2-2 UNRESOLVED
-conformance/interfaces/pthread_attr_setinheritsched/pthread_attr_setinheritsched_2-3 UNRESOLVED
-conformance/interfaces/pthread_attr_setinheritsched/pthread_attr_setinheritsched_2-4 UNRESOLVED
-conformance/interfaces/pthread_attr_setschedparam/pthread_attr_setschedparam_1-3 UNRESOLVED
-conformance/interfaces/pthread_attr_setschedparam/pthread_attr_setschedparam_1-4 UNRESOLVED
-conformance/interfaces/pthread_attr_setschedpolicy/pthread_attr_setschedpolicy_1-2 UNRESOLVED
-conformance/interfaces/pthread_attr_setschedpolicy/pthread_attr_setschedpolicy_1-3 UNRESOLVED
-conformance/interfaces/pthread_attr_setschedpolicy/pthread_attr_setschedpolicy_2-1 UNRESOLVED
-conformance/interfaces/pthread_cancel/pthread_cancel_3-1 UNRESOLVED
-conformance/interfaces/pthread_create/pthread_create_1-6 UNRESOLVED
-conformance/interfaces/pthread_getschedparam/pthread_getschedparam_1-2 UNRESOLVED
-conformance/interfaces/pthread_getschedparam/pthread_getschedparam_1-3 UNRESOLVED
-conformance/interfaces/pthread_setschedprio/pthread_setschedprio_1-1 UNRESOLVED
-conformance/interfaces/pthread_setschedparam/pthread_setschedparam_1-1 FAILED
-conformance/interfaces/pthread_setschedparam/pthread_setschedparam_1-2 UNRESOLVED
-conformance/interfaces/pthread_setschedparam/pthread_setschedparam_4-1 UNRESOLVED
-conformance/interfaces/sched_rr_get_interval/sched_rr_get_interval_1-1 UNRESOLVED
-conformance/interfaces/sched_rr_get_interval/sched_rr_get_interval_2-1 UNRESOLVED
-conformance/interfaces/sched_rr_get_interval/sched_rr_get_interval_3-1 UNRESOLVED
-conformance/interfaces/sched_setparam/sched_setparam_2-1 UNRESOLVED
-conformance/interfaces/sched_setparam/sched_setparam_2-2 UNRESOLVED
-conformance/interfaces/sched_setparam/sched_setparam_9-1 UNRESOLVED
-conformance/interfaces/sched_setparam/sched_setparam_23-6 UNRESOLVED
-conformance/interfaces/sched_setscheduler/sched_setscheduler_1-1 UNRESOLVED
-conformance/interfaces/sched_setscheduler/sched_setscheduler_4-1 UNRESOLVED
-conformance/interfaces/sched_setscheduler/sched_setscheduler_16-1 UNRESOLVED
-conformance/interfaces/sched_setscheduler/sched_setscheduler_19-1 UNRESOLVED
-conformance/interfaces/sched_setscheduler/sched_setscheduler_22-1 UNRESOLVED
-conformance/interfaces/sched_setscheduler/sched_setscheduler_22-2 UNRESOLVED
-conformance/interfaces/sched_yield/sched_yield_1-1 UNRESOLVED
-conformance/interfaces/sem_post/sem_post_8-1 UNRESOLVED
-conformance/interfaces/sigaction/sigaction_16-1 UNTESTED
-functional/threads/condvar/condvar_pthread_cond_wait_1 UNRESOLVED
-functional/threads/condvar/condvar_pthread_cond_wait_2 UNRESOLVED
-functional/threads/pi_test/pi_test_pitest-1 UNRESOLVED
-functional/threads/pi_test/pi_test_pitest-2 UNRESOLVED
-functional/threads/pi_test/pi_test_pitest-3 UNRESOLVED
-functional/threads/pi_test/pi_test_pitest-4 UNRESOLVED
+# Part of this test is verifying specific thread scheduling and I'm
+# not sure how much I trust it. This test fails on native too.
+#
+conformance/interfaces/sched_setparam/sched_setparam_9-1 FAILED
+
+#
+# Linux doesn't support PTHREAD_SCOPE_PROCESS, see
+# pthread_attr_setscope(3).
+#
+conformance/interfaces/sched_setscheduler/sched_setscheduler_22-1 UNSUPPORTED
+conformance/interfaces/sched_setscheduler/sched_setscheduler_22-2 UNSUPPORTED
+
+#
+# These tests test specific scheduling behavior. They pass on native
+# when actually running in the RT class, but we run lx zones in the
+# FSS class and can't guarantee specific scheduling order.
+#
+conformance/interfaces/pthread_create/pthread_create_1-6 FAILED
+conformance/interfaces/sem_post/sem_post_8-1 FAILED
+
+#
+# It looks like we are missing some futex support that
+# pthread_mutex_timedlock() requires:
+#
+# futex(0x602820, FUTEX_LOCK_PI_PRIVATE, 1) = -1 ENOSYS
+#
+functional/threads/pi_test/pi_test_pitest-1 FAILED
+functional/threads/pi_test/pi_test_pitest-2 FAILED
+functional/threads/pi_test/pi_test_pitest-3 FAILED
+functional/threads/pi_test/pi_test_pitest-4 FAILED
+functional/threads/pi_test/pi_test_pitest-6 FAILED
+
+#
+# Another case where we need FUTEX_LOCK_PI, but slightly different
+# from the ones above. Glibc's implementation of pthread_mutex_lock()
+# doesn't check for ENOSYS from FUTEX_LOCK_PI and instead chugs along
+# assuming it has the mutex.
+#
 functional/threads/pi_test/pi_test_pitest-5 UNRESOLVED
-functional/threads/pi_test/pi_test_pitest-6 UNRESOLVED
-functional/threads/schedule/schedule_1-1 UNRESOLVED
-functional/threads/schedule/schedule_1-2 UNRESOLVED
 
 #
 # glibc doesn't support PTHREAD_SCOPE_PROCESS.
diff --git a/usr/src/lib/brand/lx/zone/platform.xml b/usr/src/lib/brand/lx/zone/platform.xml
index 13cdf6e80c..7b9f325920 100644
--- a/usr/src/lib/brand/lx/zone/platform.xml
+++ b/usr/src/lib/brand/lx/zone/platform.xml
@@ -152,8 +152,6 @@
 	<symlink source="kmsg" target="console" />
 	<symlink source="conslog" target="console" />
 
-	<!-- Create a mount point for the /dev/initctl fifo -->
-	<device match="null" name="initctl" />
 	<!-- Create a mount point for /dev/shm tmpfs (see shm_overview(7)) -->
 	<!-- We need to force a dir for the Linux mount to work ok -->
 	<symlink source="shm/loop" target="." />
diff --git a/usr/src/lib/libc/port/llib-lc b/usr/src/lib/libc/port/llib-lc
index d887a44f37..358e1fb71a 100644
--- a/usr/src/lib/libc/port/llib-lc
+++ b/usr/src/lib/libc/port/llib-lc
@@ -100,6 +100,7 @@
 #include <sys/cladm.h>
 #include <sys/corectl.h>
 #include <sys/dl.h>
+#include <sys/epoll.h>
 #include <sys/exacct.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
diff --git a/usr/src/lib/libshare/common/libsharecore.c b/usr/src/lib/libshare/common/libsharecore.c
index ba2aa89fb6..87657a13bf 100644
--- a/usr/src/lib/libshare/common/libsharecore.c
+++ b/usr/src/lib/libshare/common/libsharecore.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
 /*
@@ -2170,7 +2171,7 @@ sa_delete_sharetab(sa_handle_t handle, char *path, char *proto)
 /*
  * sa_needs_refresh(handle)
  *
- * Returns B_TRUE if the internal cache needs to be refreshed do to a
+ * Returns B_TRUE if the internal cache needs to be refreshed due to a
  * change by another process.  B_FALSE returned otherwise.
  */
 boolean_t
diff --git a/usr/src/lib/libsmartsshd/Makefile.com b/usr/src/lib/libsmartsshd/Makefile.com
index 914aab055b..1c189a88d8 100644
--- a/usr/src/lib/libsmartsshd/Makefile.com
+++ b/usr/src/lib/libsmartsshd/Makefile.com
@@ -18,8 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2011 Joyent, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright 2016 Joyent, Inc.
 #
 
 LIBRARY=	libsmartsshd.a
@@ -34,7 +33,7 @@ SRCS =	$(OBJECTS:%.o=$(SRCDIR)/%.c)
 
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT -D_FILE_OFFSET_BITS=64
 LIBS =		$(DYNLIB) $(LINTLIB)
-LDLIBS +=	-lc -ldoor
+LDLIBS +=	-lc -ldoor -lmd5
 
 $(LINTLIB) :=	SRCS=	$(SRCDIR)/$(LINTSRC)
 
diff --git a/usr/src/lib/libsmartsshd/common/mapfile-vers b/usr/src/lib/libsmartsshd/common/mapfile-vers
index ce5fc7a9c0..c3c6fe4946 100644
--- a/usr/src/lib/libsmartsshd/common/mapfile-vers
+++ b/usr/src/lib/libsmartsshd/common/mapfile-vers
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Joyent Inc. All rights reserved.
+# Copyright 2016 Joyent, Inc.
 #
 
 #
@@ -40,6 +40,9 @@ $mapfile_version 2
 SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	sshd_user_rsa_key_allowed;
+	sshd_user_dsa_key_allowed;
+	sshd_user_ecdsa_key_allowed;
+	sshd_user_key_allowed;
     local:
 	*;
 };
diff --git a/usr/src/lib/libsmartsshd/common/sshd-plugin.c b/usr/src/lib/libsmartsshd/common/sshd-plugin.c
index fdb279b817..a6463cea12 100644
--- a/usr/src/lib/libsmartsshd/common/sshd-plugin.c
+++ b/usr/src/lib/libsmartsshd/common/sshd-plugin.c
@@ -38,6 +38,8 @@
 
 #include <openssl/rsa.h>
 
+#include <md5.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -123,6 +125,48 @@ sshd_allowed_in_capi(struct passwd *pw, const char *fp)
 	return (0);
 }
 
+static int
+tohexstr(uchar_t *bytes, size_t blen, char *hexstr, size_t hexlen)
+{
+	size_t i, j;
+	const char hexlist[] = "0123456789abcdef";
+
+	if (hexlen < 1)
+		return (-1);
+	for (i = 0, j = 0; i < blen; i++) {
+		/*
+		 * We need 3 bytes output per input byte -- the third byte is
+		 * either for a : or the \0 at the end.
+		 */
+		if (hexlen < (j + 3))
+			return (-1);
+		hexstr[j++] = hexlist[(bytes[i] >> 4) & 0xf];
+		hexstr[j++] = hexlist[bytes[i] & 0xf];
+		if (i + 1 < blen)
+			hexstr[j++] = ':';
+	}
+	hexstr[j] = '\0';
+	return (0);
+}
+
+/* ARGSUSED */
+int
+sshd_user_key_allowed(struct passwd *pw, const char *type,
+    const unsigned char *buf, size_t size)
+{
+	unsigned char md5buf[MD5_DIGEST_LENGTH];
+	/*
+	 * Will contain the fingerprint MD5 in colonhex format. Need 3 bytes
+	 * per MD5 byte: two for hex digits, plus one for either ':' or '\0'.
+	 */
+	char hex[MD5_DIGEST_LENGTH * 3];
+
+	md5_calc(md5buf, buf, size);
+	if (tohexstr(md5buf, sizeof (md5buf), hex, sizeof (hex)) != 0)
+		return (0);
+	return (sshd_allowed_in_capi(pw, hex));
+}
+
 /* ARGSUSED */
 int
 sshd_user_rsa_key_allowed(struct passwd *pw, RSA *key, const char *fp)
@@ -137,6 +181,12 @@ sshd_user_dsa_key_allowed(struct passwd *pw, DSA *key, const char *fp)
 	return (sshd_allowed_in_capi(pw, fp));
 }
 
+/* ARGSUSED */
+int
+sshd_user_ecdsa_key_allowed(struct passwd *pw, DSA *key, const char *fp)
+{
+	return (sshd_allowed_in_capi(pw, fp));
+}
 
 #ifdef __cplusplus
 }
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c
index f4b26d4c8d..bbb0acaa3d 100644
--- a/usr/src/lib/libzfs/common/libzfs_dataset.c
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
- * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2012 DEY Storage Systems, Inc.  All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek. All rights reserved.
  * Copyright (c) 2013 Martin Matuska. All rights reserved.
@@ -105,7 +105,7 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
 	char what;
 
 	(void) zfs_prop_get_table();
-	if (dataset_namecheck(path, &why, &what) != 0) {
+	if (entity_namecheck(path, &why, &what) != 0) {
 		if (hdl != NULL) {
 			switch (why) {
 			case NAME_ERR_TOOLONG:
@@ -134,9 +134,10 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
 				    "'%c' in name"), what);
 				break;
 
-			case NAME_ERR_MULTIPLE_AT:
+			case NAME_ERR_MULTIPLE_DELIMITERS:
 				zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-				    "multiple '@' delimiters in name"));
+				    "multiple '@' and/or '#' delimiters in "
+				    "name"));
 				break;
 
 			case NAME_ERR_NOLETTER:
@@ -167,7 +168,7 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
 	if (!(type & ZFS_TYPE_SNAPSHOT) && strchr(path, '@') != NULL) {
 		if (hdl != NULL)
 			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-			    "snapshot delimiter '@' in filesystem name"));
+			    "snapshot delimiter '@' is not expected here"));
 		return (0);
 	}
 
@@ -178,6 +179,20 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
 		return (0);
 	}
 
+	if (!(type & ZFS_TYPE_BOOKMARK) && strchr(path, '#') != NULL) {
+		if (hdl != NULL)
+			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+			    "bookmark delimiter '#' is not expected here"));
+		return (0);
+	}
+
+	if (type == ZFS_TYPE_BOOKMARK && strchr(path, '#') == NULL) {
+		if (hdl != NULL)
+			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+			    "missing '#' delimiter in bookmark name"));
+		return (0);
+	}
+
 	if (modifying && strchr(path, '%') != NULL) {
 		if (hdl != NULL)
 			zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
@@ -619,8 +634,36 @@ make_bookmark_handle(zfs_handle_t *parent, const char *path,
 	return (zhp);
 }
 
+struct zfs_open_bookmarks_cb_data {
+	const char *path;
+	zfs_handle_t *zhp;
+};
+
+static int
+zfs_open_bookmarks_cb(zfs_handle_t *zhp, void *data)
+{
+	struct zfs_open_bookmarks_cb_data *dp = data;
+
+	/*
+	 * Is it the one we are looking for?
+	 */
+	if (strcmp(dp->path, zfs_get_name(zhp)) == 0) {
+		/*
+		 * We found it.  Save it and let the caller know we are done.
+		 */
+		dp->zhp = zhp;
+		return (EEXIST);
+	}
+
+	/*
+	 * Not found.  Close the handle and ask for another one.
+	 */
+	zfs_close(zhp);
+	return (0);
+}
+
 /*
- * Opens the given snapshot, filesystem, or volume.   The 'types'
+ * Opens the given snapshot, bookmark, filesystem, or volume.   The 'types'
  * argument is a mask of acceptable types.  The function will print an
  * appropriate error message and return NULL if it can't be opened.
  */
@@ -629,6 +672,7 @@ zfs_open(libzfs_handle_t *hdl, const char *path, int types)
 {
 	zfs_handle_t *zhp;
 	char errbuf[1024];
+	char *bookp;
 
 	(void) snprintf(errbuf, sizeof (errbuf),
 	    dgettext(TEXT_DOMAIN, "cannot open '%s'"), path);
@@ -636,20 +680,68 @@ zfs_open(libzfs_handle_t *hdl, const char *path, int types)
 	/*
 	 * Validate the name before we even try to open it.
 	 */
-	if (!zfs_validate_name(hdl, path, ZFS_TYPE_DATASET, B_FALSE)) {
-		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-		    "invalid dataset name"));
+	if (!zfs_validate_name(hdl, path, types, B_FALSE)) {
 		(void) zfs_error(hdl, EZFS_INVALIDNAME, errbuf);
 		return (NULL);
 	}
 
 	/*
-	 * Try to get stats for the dataset, which will tell us if it exists.
+	 * Bookmarks needs to be handled separately.
 	 */
-	errno = 0;
-	if ((zhp = make_dataset_handle(hdl, path)) == NULL) {
-		(void) zfs_standard_error(hdl, errno, errbuf);
-		return (NULL);
+	bookp = strchr(path, '#');
+	if (bookp == NULL) {
+		/*
+		 * Try to get stats for the dataset, which will tell us if it
+		 * exists.
+		 */
+		errno = 0;
+		if ((zhp = make_dataset_handle(hdl, path)) == NULL) {
+			(void) zfs_standard_error(hdl, errno, errbuf);
+			return (NULL);
+		}
+	} else {
+		char dsname[ZFS_MAX_DATASET_NAME_LEN];
+		zfs_handle_t *pzhp;
+		struct zfs_open_bookmarks_cb_data cb_data = {path, NULL};
+
+		/*
+		 * We need to cut out '#' and everything after '#'
+		 * to get the parent dataset name only.
+		 */
+		assert(bookp - path < sizeof (dsname));
+		(void) strncpy(dsname, path, bookp - path);
+		dsname[bookp - path] = '\0';
+
+		/*
+		 * Create handle for the parent dataset.
+		 */
+		errno = 0;
+		if ((pzhp = make_dataset_handle(hdl, dsname)) == NULL) {
+			(void) zfs_standard_error(hdl, errno, errbuf);
+			return (NULL);
+		}
+
+		/*
+		 * Iterate bookmarks to find the right one.
+		 */
+		errno = 0;
+		if ((zfs_iter_bookmarks(pzhp, zfs_open_bookmarks_cb,
+		    &cb_data) == 0) && (cb_data.zhp == NULL)) {
+			(void) zfs_error(hdl, EZFS_NOENT, errbuf);
+			zfs_close(pzhp);
+			return (NULL);
+		}
+		if (cb_data.zhp == NULL) {
+			(void) zfs_standard_error(hdl, errno, errbuf);
+			zfs_close(pzhp);
+			return (NULL);
+		}
+		zhp = cb_data.zhp;
+
+		/*
+		 * Cleanup.
+		 */
+		zfs_close(pzhp);
 	}
 
 	if (!(types & zhp->zfs_type)) {
@@ -1601,8 +1693,9 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvlist_t *props)
 		 * its canmount property to 'on' or 'noauto'.  We only use
 		 * the changelist logic to unmount when setting canmount=off.
 		 */
-		if (!(prop == ZFS_PROP_CANMOUNT &&
-		    fnvpair_value_uint64(elem) != ZFS_CANMOUNT_OFF)) {
+		if (prop != ZFS_PROP_CANMOUNT ||
+		    (fnvpair_value_uint64(elem) == ZFS_CANMOUNT_OFF &&
+		    zfs_is_mounted(zhp, NULL))) {
 			cls[cl_idx] = changelist_gather(zhp, prop, 0, 0);
 			if (cls[cl_idx] == NULL)
 				goto error;
@@ -2046,6 +2139,7 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
 			if (zfs_prop_readonly(prop) &&
 			    *source != NULL && (*source)[0] == '\0') {
 				*source = NULL;
+				return (-1);
 			}
 			break;
 
diff --git a/usr/src/lib/libzfs/common/libzfs_impl.h b/usr/src/lib/libzfs/common/libzfs_impl.h
index 043d8c4832..c99a8324df 100644
--- a/usr/src/lib/libzfs/common/libzfs_impl.h
+++ b/usr/src/lib/libzfs/common/libzfs_impl.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 Pawel Jakub Dawidek. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
- * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  */
 
 #ifndef	_LIBZFS_IMPL_H
@@ -73,7 +73,6 @@ struct libzfs_handle {
 	int libzfs_printerr;
 	int libzfs_storeerr; /* stuff error messages into buffer */
 	void *libzfs_sharehdl; /* libshare handle */
-	uint_t libzfs_shareflags;
 	boolean_t libzfs_mnttab_enable;
 	avl_tree_t libzfs_mnttab_cache;
 	int libzfs_pool_iter;
@@ -84,8 +83,6 @@ struct libzfs_handle {
 	boolean_t libzfs_cachedprops;
 };
 
-#define	ZFSSHARE_MISS	0x01	/* Didn't find entry in cache */
-
 struct zfs_handle {
 	libzfs_handle_t *zfs_hdl;
 	zpool_handle_t *zpool_hdl;
diff --git a/usr/src/lib/libzfs/common/libzfs_mount.c b/usr/src/lib/libzfs/common/libzfs_mount.c
index 7828e28f03..d1419fb3a8 100644
--- a/usr/src/lib/libzfs/common/libzfs_mount.c
+++ b/usr/src/lib/libzfs/common/libzfs_mount.c
@@ -22,7 +22,7 @@
 /*
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2014, 2016 by Delphix. All rights reserved.
  * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
  */
 
@@ -658,35 +658,30 @@ _zfs_init_libshare(void)
 int
 zfs_init_libshare(libzfs_handle_t *zhandle, int service)
 {
-	int ret = SA_OK;
-
 	if (_sa_init == NULL)
-		ret = SA_CONFIG_ERR;
+		return (SA_CONFIG_ERR);
 
-	if (ret == SA_OK && zhandle->libzfs_shareflags & ZFSSHARE_MISS) {
-		/*
-		 * We had a cache miss. Most likely it is a new ZFS
-		 * dataset that was just created. We want to make sure
-		 * so check timestamps to see if a different process
-		 * has updated any of the configuration. If there was
-		 * some non-ZFS change, we need to re-initialize the
-		 * internal cache.
-		 */
-		zhandle->libzfs_shareflags &= ~ZFSSHARE_MISS;
-		if (_sa_needs_refresh != NULL &&
-		    _sa_needs_refresh(zhandle->libzfs_sharehdl)) {
-			zfs_uninit_libshare(zhandle);
-			zhandle->libzfs_sharehdl = _sa_init(service);
-		}
+	/*
+	 * Attempt to refresh libshare. This is necessary if there was a cache
+	 * miss for a new ZFS dataset that was just created, or if state of the
+	 * sharetab file has changed since libshare was last initialized. We
+	 * want to make sure so check timestamps to see if a different process
+	 * has updated any of the configuration. If there was some non-ZFS
+	 * change, we need to re-initialize the internal cache.
+	 */
+	if (_sa_needs_refresh != NULL &&
+	    _sa_needs_refresh(zhandle->libzfs_sharehdl)) {
+		zfs_uninit_libshare(zhandle);
+		zhandle->libzfs_sharehdl = _sa_init(service);
 	}
 
-	if (ret == SA_OK && zhandle && zhandle->libzfs_sharehdl == NULL)
+	if (zhandle && zhandle->libzfs_sharehdl == NULL)
 		zhandle->libzfs_sharehdl = _sa_init(service);
 
-	if (ret == SA_OK && zhandle->libzfs_sharehdl == NULL)
-		ret = SA_NO_MEMORY;
+	if (zhandle->libzfs_sharehdl == NULL)
+		return (SA_NO_MEMORY);
 
-	return (ret);
+	return (SA_OK);
 }
 
 /*
@@ -832,7 +827,6 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_share_proto_t *proto)
 				    zfs_get_name(zhp));
 				return (-1);
 			}
-			hdl->libzfs_shareflags |= ZFSSHARE_MISS;
 			share = zfs_sa_find_share(hdl->libzfs_sharehdl,
 			    mountpoint);
 		}
diff --git a/usr/src/lib/libzfs/common/libzfs_pool.c b/usr/src/lib/libzfs/common/libzfs_pool.c
index c6f7d5d88c..325adb2c4f 100644
--- a/usr/src/lib/libzfs/common/libzfs_pool.c
+++ b/usr/src/lib/libzfs/common/libzfs_pool.c
@@ -947,9 +947,10 @@ zpool_name_valid(libzfs_handle_t *hdl, boolean_t isopen, const char *pool)
 				    "trailing slash in name"));
 				break;
 
-			case NAME_ERR_MULTIPLE_AT:
+			case NAME_ERR_MULTIPLE_DELIMITERS:
 				zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-				    "multiple '@' delimiters in name"));
+				    "multiple '@' and/or '#' delimiters in "
+				    "name"));
 				break;
 
 			default:
diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c
index cf204d706e..eab6d4bacb 100644
--- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c
+++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c
@@ -3533,7 +3533,8 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
 	}
 
 	if (clp) {
-		err |= changelist_postfix(clp);
+		if (!flags->nomount)
+			err |= changelist_postfix(clp);
 		changelist_free(clp);
 	}
 
diff --git a/usr/src/lib/libzfs/common/libzfs_util.c b/usr/src/lib/libzfs/common/libzfs_util.c
index 848663e1f8..c79da78024 100644
--- a/usr/src/lib/libzfs/common/libzfs_util.c
+++ b/usr/src/lib/libzfs/common/libzfs_util.c
@@ -730,7 +730,7 @@ zfs_get_pool_handle(const zfs_handle_t *zhp)
  * Given a name, determine whether or not it's a valid path
  * (starts with '/' or "./").  If so, walk the mnttab trying
  * to match the device number.  If not, treat the path as an
- * fs/vol/snap name.
+ * fs/vol/snap/bkmark name.
  */
 zfs_handle_t *
 zfs_path_to_zhandle(libzfs_handle_t *hdl, char *path, zfs_type_t argtype)
diff --git a/usr/src/lib/scsi/libscsi/common/libscsi.h b/usr/src/lib/scsi/libscsi/common/libscsi.h
index 4d57d1299c..dea6972332 100644
--- a/usr/src/lib/scsi/libscsi/common/libscsi.h
+++ b/usr/src/lib/scsi/libscsi/common/libscsi.h
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 #ifndef	_LIBSCSI_H
@@ -97,6 +98,7 @@ typedef struct libscsi_engine_ops {
 	void (*lseo_close)(libscsi_hdl_t *, void *);
 	int (*lseo_exec)(libscsi_hdl_t *, void *, libscsi_action_t *);
 	void (*lseo_target_name)(libscsi_hdl_t *, void *, char *, size_t);
+	int (*lseo_max_transfer)(libscsi_hdl_t *, void *, size_t *);
 } libscsi_engine_ops_t;
 
 typedef struct libscsi_engine {
@@ -116,6 +118,7 @@ extern libscsi_hdl_t *libscsi_get_handle(libscsi_target_t *);
 extern const char *libscsi_vendor(libscsi_target_t *);
 extern const char *libscsi_product(libscsi_target_t *);
 extern const char *libscsi_revision(libscsi_target_t *);
+extern int libscsi_max_transfer(libscsi_target_t *, size_t *);
 
 extern libscsi_errno_t libscsi_errno(libscsi_hdl_t *);
 extern const char *libscsi_errmsg(libscsi_hdl_t *);
diff --git a/usr/src/lib/scsi/libscsi/common/scsi_engine.c b/usr/src/lib/scsi/libscsi/common/scsi_engine.c
index 3c6d5ecee9..e0e4f0a5f3 100644
--- a/usr/src/lib/scsi/libscsi/common/scsi_engine.c
+++ b/usr/src/lib/scsi/libscsi/common/scsi_engine.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 #include <sys/types.h>
@@ -616,3 +617,16 @@ libscsi_exec(libscsi_action_t *ap, libscsi_target_t *tp)
 
 	return (ret);
 }
+
+int
+libscsi_max_transfer(libscsi_target_t *tp, size_t *sizep)
+{
+	libscsi_hdl_t *hp = tp->lst_hdl;
+	if (tp->lst_engine->lse_ops->lseo_max_transfer == NULL) {
+		return (libscsi_error(hp, ESCSI_NOTSUP, "max transfer "
+		    "request not supported by engine"));
+	}
+
+	return (tp->lst_engine->lse_ops->lseo_max_transfer(hp, tp->lst_priv,
+	    sizep));
+}
diff --git a/usr/src/lib/scsi/libscsi/mapfile-vers b/usr/src/lib/scsi/libscsi/mapfile-vers
index 7e0d8e251c..067756f44b 100644
--- a/usr/src/lib/scsi/libscsi/mapfile-vers
+++ b/usr/src/lib/scsi/libscsi/mapfile-vers
@@ -71,6 +71,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 		libscsi_vendor;
 		libscsi_product;
 		libscsi_revision;
+		libscsi_max_transfer;
 		libscsi_get_handle;
 
 		libscsi_alloc;
diff --git a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/uscsi.c b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/uscsi.c
index 06cdb0b339..6952a032ad 100644
--- a/usr/src/lib/scsi/plugins/scsi/engines/uscsi/uscsi.c
+++ b/usr/src/lib/scsi/plugins/scsi/engines/uscsi/uscsi.c
@@ -22,10 +22,10 @@
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright 2016 Joyent, Inc.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/scsi/impl/uscsi.h>
 #include <sys/scsi/generic/commands.h>
@@ -111,10 +111,10 @@ xlate_flags(libscsi_hdl_t *hp, uint_t flags, int *uf)
 			f |= USCSI_DIAGNOSE;
 			break;
 		case LIBSCSI_AF_ISOLATE:
-			f = USCSI_ISOLATE;
+			f |= USCSI_ISOLATE;
 			break;
 		case LIBSCSI_AF_RQSENSE:
-			f = USCSI_RQENABLE;
+			f |= USCSI_RQENABLE;
 			break;
 		default:
 			return (libscsi_error(hp, ESCSI_BOGUSFLAGS,
@@ -214,11 +214,43 @@ uscsi_target_name(libscsi_hdl_t *hp, void *private, char *buf, size_t len)
 	(void) snprintf(buf, len, "%s", dp->dev);
 }
 
+static int
+uscsi_max_transfer(libscsi_hdl_t *hp, void *private, size_t *sizep)
+{
+	uscsi_xfer_t xfer;
+	struct uscsi_dev *dp = (struct uscsi_dev *)private;
+
+	if (ioctl(dp->fd, USCSIMAXXFER, &xfer) < 0) {
+		ASSERT(errno != EFAULT);
+		switch (errno) {
+		case EINVAL:
+			return (libscsi_error(hp, ESCSI_BADCMD, "internal "
+			    "uscsi error"));
+		case EPERM:
+			return (libscsi_error(hp, ESCSI_PERM, "insufficient "
+			    "privileges "));
+		case ENOTTY:
+			return (libscsi_error(hp, ESCSI_NOTSUP, "max transfer "
+			    "request not supported on device"));
+		default:
+			return (libscsi_error(hp, ESCSI_SYS, "uscsi ioctl "
+			    "failed: %s", strerror(errno)));
+		}
+	}
+
+	if (xfer > SIZE_MAX)
+		xfer = SIZE_MAX;
+
+	*sizep = (size_t)xfer;
+	return (0);
+}
+
 static const libscsi_engine_ops_t uscsi_ops = {
 	.lseo_open = uscsi_open,
 	.lseo_close = uscsi_close,
 	.lseo_exec = uscsi_exec,
-	.lseo_target_name = uscsi_target_name
+	.lseo_target_name = uscsi_target_name,
+	.lseo_max_transfer = uscsi_max_transfer
 };
 
 static const libscsi_engine_t uscsi_engine = {
diff --git a/usr/src/man/man1m/dladm.1m b/usr/src/man/man1m/dladm.1m
index 5ab77af33b..f27ea69f32 100644
--- a/usr/src/man/man1m/dladm.1m
+++ b/usr/src/man/man1m/dladm.1m
@@ -2524,7 +2524,7 @@ See "Options," above.
 .RS 4n
 Delete the VLAN link specified.
 .sp
-The \fBdelete-vlan\fRsubcommand accepts the following options:
+The \fBdelete-vlan\fR subcommand accepts the following options:
 .sp
 .ne 2
 .na
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index dc09c50458..8c78343cc4 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -28,7 +28,7 @@
 .\" Copyright (c) 2014 Integros [integros.com]
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\"
-.Dd September 3, 2016
+.Dd September 16, 2016
 .Dt ZFS 1M
 .Os
 .Sh NAME
@@ -112,7 +112,7 @@
 .Oo Fl s Ar source Ns Oo , Ns Ar source Oc Ns ... Oc
 .Oo Fl t Ar type Ns Oo , Ns Ar type Oc Ns ... Oc
 .Cm all | Ar property Ns Oo , Ns Ar property Oc Ns ...
-.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns | Ns Ar bookmark Ns ...
 .Nm
 .Cm inherit
 .Op Fl rS
@@ -2123,7 +2123,7 @@ section.
 .Oo Fl s Ar source Ns Oo , Ns Ar source Oc Ns ... Oc
 .Oo Fl t Ar type Ns Oo , Ns Ar type Oc Ns ... Oc
 .Cm all | Ar property Ns Oo , Ns Ar property Oc Ns ...
-.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns | Ns Ar bookmark Ns ...
 .Xc
 Displays properties for the given datasets. If no datasets are specified, then
 the command displays properties for all datasets on the system. For each
diff --git a/usr/src/man/man4/nfs.4 b/usr/src/man/man4/nfs.4
index 683feab5df..fa124022d5 100644
--- a/usr/src/man/man4/nfs.4
+++ b/usr/src/man/man4/nfs.4
@@ -19,7 +19,7 @@
 .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\"
-.Dd March 12, 2016
+.Dd November 16, 2016
 .Dt NFS 4
 .Os
 .Sh NAME
@@ -79,8 +79,8 @@ is
 .Li 2 ,
 while the default maximum version is
 .Li 4 .
-.It Sy delegation Ns = Ns Sy on Ns | Ns Sy off
-By default, this variable is commented out and the NFS server provides
+.It Sy server_delegation Ns = Ns Sy on Ns | Ns Sy off
+By default the NFS server provides
 delegations to clients. The user can turn off delegations for all exported
 filesystems by setting this variable to
 .Li off .
diff --git a/usr/src/man/man7i/uscsi.7i b/usr/src/man/man7i/uscsi.7i
index 3247f53cc1..f246590ca4 100644
--- a/usr/src/man/man7i/uscsi.7i
+++ b/usr/src/man/man7i/uscsi.7i
@@ -1,9 +1,10 @@
 '\" te
 .\" Copyright (c) 2007 by Sun Microsystems, Inc.  All rights reserved.
+.\" Copyright 2016 Joyent, Inc.
 .\" 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]
-.TH USCSI 7I "May 29, 2007"
+.TH USCSI 7I "Sep 23, 2016"
 .SH NAME
 uscsi \- user SCSI command interface
 .SH SYNOPSIS
@@ -15,7 +16,6 @@ uscsi \- user SCSI command interface
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBuscsi\fR command is very powerful and somewhat dangerous; therefore it
 has some permission restrictions. See \fBWARNINGS\fR for more details.
@@ -349,8 +349,13 @@ See the \fBscsi_pkt\fR(9S) flag \fBFLAG_RENEGOTIATE_WIDE_SYNC\fR for more
 information.
 .RE
 
+The \fBuscsi_xfer_t\fR is a type definition that corresponds to a 64-bit
+unsigned integer. It should be used for the \fBUSCSIMAXXFER\fR ioctls. This is
+used for determining the maximum transfer size that can be performed in a single
+\fBUSCSICMD\fR ioctl. If the SCSI request is larger than the specified size,
+then it may not work, depending on the hardware platform.
+
 .SH IOCTLS
-.sp
 .LP
 The \fBioctl\fR supported by drivers providing the \fBuscsi\fR interface is:
 .sp
@@ -371,10 +376,24 @@ status, and Request Sense is enabled, the sense data itself is returned in
 Sense data transfer.
 .RE
 
-.SH ERRORS
 .sp
 .ne 2
 .na
+.B USCSIMAXXFER
+.ad
+.RS 12n
+The argument is a pointer to a \fBuscsi_xfer_t\fR value. The maximum transfer
+size that can be used with the \fBUSCSICMD\fR ioctl for the current device will
+be returned in the \fBuscsi_xfer_t\fR.
+.sp
+.LP
+Not all devices which support the \fBUSCSICMD\fR ioctl also support the
+\fBUSCSIMAXXFER\fR ioctl.
+.RE
+
+.SH ERRORS
+.ne 2
+.na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 10n
@@ -396,7 +415,8 @@ An error occurred during the execution of the command.
 \fB\fBEPERM\fR\fR
 .ad
 .RS 10n
-A process without root credentials tried to execute the \fBUSCSICMD\fR ioctl.
+A process without root credentials tried to execute the \fBUSCSICMD\fR or
+\fRUSCSIMAXXFER\fR ioctl.
 .RE
 
 .sp
@@ -405,12 +425,11 @@ A process without root credentials tried to execute the \fBUSCSICMD\fR ioctl.
 \fB\fBEFAULT\fR\fR
 .ad
 .RS 10n
-The \fBuscsi_cmd\fR itself, the \fBuscsi_cdb\fR, the \fBuscsi_buf\fR, or the
-\fBuscsi_rqbuf\fR point to an invalid address.
+The \fBuscsi_cmd\fR itself, the \fBuscsi_cdb\fR, the \fBuscsi_buf\fR, the
+\fBuscsi_rqbuf\fR, or the \fBuscsi_xfer_t\fR point to an invalid address.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -426,14 +445,12 @@ Interface Stability 	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBioctl\fR(2), \fBattributes\fR(5), \fBsd\fR(7D), \fBst\fR(7D)
 .sp
 .LP
 \fIANSI Small Computer System Interface-2 (SCSI-2)\fR
 .SH WARNINGS
-.sp
 .LP
 The \fBuscsi\fR command is very powerful, but somewhat dangerous, and so its
 use is restricted to processes running as root, regardless of the file
@@ -450,7 +467,8 @@ number is used to send the command.
 The \fBuscsi\fR interface is not recommended for very large data transfers
 (typically more than 16MB). If the requested transfer size exceeds the maximum
 transfer size of the DMA engine, it will not be broken up into multiple
-transfers and DMA errors may result.
+transfers and DMA errors may result. The \fBUSCSIMAXXFER\fR ioctl can be used
+to determine the maximum transfer size.
 .sp
 .LP
 The \fBUSCSICMD\fR ioctl associates a \fBstruct uscsi_cmd\fR with a device by
diff --git a/usr/src/man/man9e/mc_getprop.9e b/usr/src/man/man9e/mc_getprop.9e
index c9a9f1786f..7f8912711e 100644
--- a/usr/src/man/man9e/mc_getprop.9e
+++ b/usr/src/man/man9e/mc_getprop.9e
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2016 Joyent, Inc.
 .\"
-.Dd June 02, 2016
+.Dd November 15, 2016
 .Dt MC_GETPROP 9E
 .Os
 .Sh NAME
@@ -93,6 +93,11 @@ argument and use
 on it, comparing it to each of its private (bounded-size) properties to
 identify which one it is.
 .Pp
+At this time, private properties are limited to being string based
+properties. If other types of property values are used, they will not be
+rendered correctly by
+.Xr dladm 1M .
+.Pp
 The device
 driver can access its device soft state by casting the
 .Fa device
diff --git a/usr/src/man/man9e/power.9e b/usr/src/man/man9e/power.9e
index 63da04546e..0133969362 100644
--- a/usr/src/man/man9e/power.9e
+++ b/usr/src/man/man9e/power.9e
@@ -3,7 +3,7 @@
 .\" 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]
-.TH POWER 9E "Dec 12, 2003"
+.TH POWER 9E "Sep 16, 2016"
 .SH NAME
 power \- power a device attached to the system
 .SH SYNOPSIS
@@ -18,13 +18,11 @@ power \- power a device attached to the system
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI). This entry point is required. If the driver
 writer does not supply this entry point, the value \fBNULL\fR must be used in
-the \fBcb_ops\fR(9S) structure instead.
+the \fBdev_ops\fR(9S) structure instead.
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIdip\fR\fR
@@ -52,7 +50,6 @@ Desired component power level.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpower\fR(9E) function is the device-specific Power Management entry
 point. This function is called when the system wants the driver to set the
@@ -85,7 +82,6 @@ If the system requests an inappropriate power transition for the device (for
 example, a request to power down a device which has just become busy), then the
 power level should not be changed and power should return \fBDDI_FAILURE\fR.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBpower()\fR function returns:
 .sp
@@ -107,11 +103,9 @@ Failed to set the power to the requested \fIlevel\fR.
 .RE
 
 .SH CONTEXT
-.sp
 .LP
 The \fBpower()\fR function is called from user or kernel context only.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -127,10 +121,9 @@ Interface stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattach\fR(9E), \fBdetach\fR(9E), \fBpm_busy_component\fR(9F),
-\fBpm_idle_component\fR(9F), \fBpm_raise_power\fR(9F), \fBcb_ops\fR(9S)
+\fBpm_idle_component\fR(9F), \fBpm_raise_power\fR(9F), \fBdev_ops\fR(9S)
 .sp
 .LP
 \fIWriting Device Drivers\fR
diff --git a/usr/src/man/man9f/rmalloc.9f b/usr/src/man/man9f/rmalloc.9f
index fc522fcfbe..bf60744bed 100644
--- a/usr/src/man/man9f/rmalloc.9f
+++ b/usr/src/man/man9f/rmalloc.9f
@@ -3,7 +3,7 @@
 .\" 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]
-.TH RMALLOC 9F "Jan 16, 2006"
+.TH RMALLOC 9F "Nov 11, 2016"
 .SH NAME
 rmalloc \- allocate space from a resource map
 .SH SYNOPSIS
@@ -45,7 +45,8 @@ Number of units of the resource.
 .LP
 The \fBrmalloc()\fR function is used by a driver to allocate space from a
 previously defined and initialized resource map. The map itself is allocated by
-calling the function \fBrmallocmap\fR(9F). \fBrmalloc()\fR is one of five
+calling the function \fBrmallocmap\fR(9F) or \fBrmallocmap_wait\fR(9F).
+\fBrmalloc()\fR is one of six
 functions used for resource map management. The other functions include:
 .sp
 .ne 2
@@ -77,6 +78,15 @@ Allocate a resource map and initialize it.
 .sp
 .ne 2
 .na
+\fB\fBrmallocmap_wait\fR(9F)\fR
+.ad
+.RS 20n
+Allocate a resource map and initialize it.  Wait if necessary.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBrmfreemap\fR(9F)\fR
 .ad
 .RS 20n
@@ -119,8 +129,8 @@ illustrates the following procedures:
 .TP
 .ie t \(bu
 .el o
-Panics the system if the required amount of memory can not be allocated (lines
-11-15).
+Returns error if the required amount of memory can not be allocated (lines
+9-17).
 .RE
 .RS +4
 .TP
@@ -132,35 +142,37 @@ and \fBrmfree\fR(9F) to initialize the total resource area.
 .sp
 .in +2
 .nf
-1   #define XX_MAPSIZE	12
-2   #define XX_BUFSIZE  2560
-3   static struct map *xx_mp;         /* Private buffer space map */
+1   #define XX_MAPSIZE  12
+2   #define XX_SIZE     2560
+3   #define XX_BUFSIZE  (XX_MAPSIZE * XX_SIZE)
+4
+5   static struct map *xx_mp;         /* Resource map */
+6   static void *bp;                  /* Private buffer */
     .\|.\|.
-4   xxstart(\|)
-5        /*
-6         *  Allocate private buffer.  If insufficient memory,
-7         *  display message and halt system.
-8         */
-9   {
-10    register caddr_t bp;
+7   xxstart(\|)
+8   {
     .\|.\|.
-11    if ((bp = kmem_alloc(XX_BUFSIZE, KM_NOSLEEP) == 0)  {
-12
-13        cmn_err(CE_PANIC, "xxstart: kmem_alloc failed before %d buffer"
-14                  "allocation", XX_BUFSIZE);
-15    }
-16
-17    /*
-18     * Initialize the resource map with number
-19     * of slots in map.
-20     */
-21    xx_mp = rmallocmap(XX_MAPSIZE);
-22
-24    /*
-25     * Initialize space management map with total
-26     * buffer area it is to manage.
-27     */
-28    rmfree(xx_mp, XX_BUFSIZE, bp);
+9     /*
+10     *  Allocate private buffer.  If insufficient memory,
+11     *  display message and return error.
+12     */
+13    if ((bp = kmem_alloc(XX_BUFSIZE, KM_NOSLEEP) == NULL)  {
+14        cmn_err(CE_WARN, "xxstart: kmem_alloc failed for %d bytes",
+15            XX_BUFSIZE);
+16        return (ENOMEM);
+17    }
+18
+19    /*
+20     * Allocate the resource map with number
+21     * of slots in map.
+22     */
+23    xx_mp = rmallocmap(XX_MAPSIZE);
+24
+25    /*
+26     * Initialize the resource map with total
+27     * area it is to manage.
+28     */
+29    rmfree(xx_mp, XX_MAPSIZE, 1);
       .\|.\|.\fI\fR
 .fi
 .in -2
@@ -184,21 +196,35 @@ The next example illustrates the following procedures:
 .ie t \(bu
 .el o
 The size of the \fBI/O\fR request is calculated and stored in the \fIsize\fR
-variable (line 10).
+variable (line 16).
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+The number of the resource units needed is calculated and stored in the
+\fIcnt\fR variable (line 19).
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+Space is allocated from the resource map through the \fBrmalloc()\fR function
+using the \fIcnt\fR value (line 25).  If the allocation fails return error.
 .RE
 .RS +4
 .TP
 .ie t \(bu
 .el o
-Buffers are allocated through the \fBrmalloc()\fR function using the \fIsize\fR
-value (line 15). If the allocation fails the system will panic.
+The buffer address is calculated and stored in the \fIaddr\fR variable
+(line 31).
 .RE
 .RS +4
 .TP
 .ie t \(bu
 .el o
 The \fBuiomove\fR(9F) function is used to move data to the allocated buffer
-(line 23).
+(line 37).
 .RE
 .RS +4
 .TP
@@ -211,34 +237,48 @@ returned.
 .sp
 .in +2
 .nf
-1   #define XX_BUFSIZE  2560
-2   #define XX_MAXSIZE  (XX_BUFSIZE / 4)
-3
-4   static struct map *xx_mp;         /* Private buffer space map */
+1   #define XX_MAPSIZE  12
+2   #define XX_SIZE     2560
+3   #define XX_BUFSIZE  (XX_MAPSIZE * XX_SIZE)
+4   #define XX_MAXSIZE  (XX_BUFSIZE / 4)
+5
+6   static struct map *xx_mp;         /* Resource map */
+7   static void *bp;                  /* Private buffer */
     ...
-5   xxread(dev_t dev, uio_t *uiop, cred_t *credp)
-6   {
-7
-8   register caddr_t addr;
-9   register int     size;
-10      size = min(COUNT, XX_MAXSIZE);  /* Break large I/O  */
-11                                          /* request into small ones */
-12     /*
-13      * Get buffer.
-14      */
-15    if ((addr = (caddr_t)rmalloc(xx_mp, size)) == 0)
-16        cmn_err(CE_PANIC, "read: rmalloc failed allocation of size %d",
-17                size);
+8   xxread(dev_t dev, uio_t *uiop, cred_t *credp)
+9   {
+10
+11    void *addr;
+12    size_t size;
+13    unsigned long idx;
+14    unsigned long cnt;
+15
+16    size = min(COUNT, XX_MAXSIZE);  /* Break large I/O  */
+17                                    /* request into small ones */
 18
-19     /*
-20      * Move data to buffer.  If invalid address is found,
-21      * return buffer to map and return error code.
-22      */
-23    if (uiomove(addr, size, UIO_READ, uiop) == -1)  {
-24        rmfree(xx_mp, size, addr);
-25        return(EFAULT);
-26    }
-27  }\fI\fR
+19    cnt = size / XX_SIZE;           /* Calculate the number of */
+20                                    /* chunks needed */
+21
+22    /*
+23     * Get the buffer index.
+24     */
+25    if ((idx = rmalloc(xx_mp, cnt)) == 0)
+26        return (ENOMEM);
+27
+28    /*
+29     * Get the buffer address.
+30     */
+31    addr = bp + (idx - 1) * XX_SIZE;
+32
+33    /*
+34     * Move data to buffer.  If invalid address is found,
+35     * return buffer to map and return error code.
+36     */
+37    if (uiomove(addr, size, UIO_READ, uiop) == -1)  {
+38        rmfree(xx_mp, cnt, idx);
+39        return (EFAULT);
+40    }
+41  }\fI\fR
 .fi
 .in -2
 
@@ -246,6 +286,7 @@ returned.
 .sp
 .LP
 \fBkmem_alloc\fR(9F), \fBrmalloc_wait\fR(9F), \fBrmallocmap\fR(9F),
+\fBrmallocmap_wait\fR(9F),
 \fBrmfree\fR(9F), \fBrmfreemap\fR(9F), \fBuiomove\fR(9F)
 .sp
 .LP
diff --git a/usr/src/man/man9f/usb_get_max_pkts_per_isoc_request.9f b/usr/src/man/man9f/usb_get_max_pkts_per_isoc_request.9f
index 108cb44838..021b94c58e 100644
--- a/usr/src/man/man9f/usb_get_max_pkts_per_isoc_request.9f
+++ b/usr/src/man/man9f/usb_get_max_pkts_per_isoc_request.9f
@@ -3,7 +3,7 @@
 .\" 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]
-.TH USB_GET_MAX_PKTS_PER_ISOC_REQUEST 9F "Jan 5, 2004"
+.TH USB_GET_MAX_PKTS_PER_ISOC_REQUEST 9F "Nov 10, 2016"
 .SH NAME
 usb_get_max_pkts_per_isoc_request \- Get maximum number of packets allowed per
 isochronous request
@@ -18,11 +18,9 @@ isochronous request
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIdip\fR\fR
@@ -32,7 +30,6 @@ Pointer to the device's \fBdev_info\fR structure.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBusb_get_max_pkts_per_isoc_request()\fR function returns the maximum
 number of isochronous packets per request that the host control driver can
@@ -50,17 +47,14 @@ max = usb_get_max_pkts_per_isoc_request(dip) * endpoint_max_packet_size;
 where endpoint_max_packet_size is the wMaxPacketSize field of the isochronous
 endpoint over which the transfer will take place.
 .SH RETURN VALUES
-.sp
 .LP
-On success, the \fBusb_get_current_frame_number()\fR function returns the
+On success, the \fBusb_get_max_pkts_per_isoc_request()\fR function returns the
 maximum number of isochronous pkts per request. On failure it returns \fB0\fR.
 The function fails if \fIdip\fR is NULL.
 .SH CONTEXT
-.sp
 .LP
 May be called from user, kernel or interrupt context.
 .SH EXAMPLES
-.sp
 .in +2
 .nf
 /*
@@ -103,7 +97,6 @@ if (usb_pipe_isoc_xfer(pipe, isoc_req, USB_FLAGS_NOSLEEP) != USB_SUCCESS) {
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -121,7 +114,6 @@ Interface stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattributes\fR(5), \fBusb_pipe_isoc_xfer\fR(9F), \fBusb_alloc_request\fR(9F),
 \fBusb_get_current_frame_number\fR(9F). \fBusb_ep_descr\fR(9S),
diff --git a/usr/src/pkg/manifests/driver-network-iwn.mf b/usr/src/pkg/manifests/driver-network-iwn.mf
index 18da9add2b..a7b55d2c7a 100644
--- a/usr/src/pkg/manifests/driver-network-iwn.mf
+++ b/usr/src/pkg/manifests/driver-network-iwn.mf
@@ -35,36 +35,36 @@ dir path=kernel/firmware/iwn group=sys
 dir path=usr/share/man
 dir path=usr/share/man/man7d
 driver name=iwn clone_perms="iwn 0666 root sys" perms="* 0666 root sys" \
-    alias=pciex8086,0082 \
-    alias=pciex8086,0083 \
-    alias=pciex8086,0084 \
-    alias=pciex8086,0085 \
-    alias=pciex8086,0087 \
-    alias=pciex8086,0089 \
-    alias=pciex8086,008a \
-    alias=pciex8086,008b \
-    alias=pciex8086,008d \
-    alias=pciex8086,008e \
-    alias=pciex8086,0090 \
-    alias=pciex8086,0091 \
-    alias=pciex8086,0887 \
-    alias=pciex8086,0888 \
-    alias=pciex8086,088e \
-    alias=pciex8086,088f \
-    alias=pciex8086,0890 \
-    alias=pciex8086,0891 \
-    alias=pciex8086,0892 \
-    alias=pciex8086,0893 \
-    alias=pciex8086,0894 \
-    alias=pciex8086,0895 \
-    alias=pciex8086,0896 \
-    alias=pciex8086,0897 \
-    alias=pciex8086,08ae \
-    alias=pciex8086,08af \
     alias=pciex8086,422b \
     alias=pciex8086,422c \
     alias=pciex8086,4238 \
-    alias=pciex8086,4239
+    alias=pciex8086,4239 \
+    alias=pciex8086,82 \
+    alias=pciex8086,83 \
+    alias=pciex8086,84 \
+    alias=pciex8086,85 \
+    alias=pciex8086,87 \
+    alias=pciex8086,887 \
+    alias=pciex8086,888 \
+    alias=pciex8086,88e \
+    alias=pciex8086,88f \
+    alias=pciex8086,89 \
+    alias=pciex8086,890 \
+    alias=pciex8086,891 \
+    alias=pciex8086,892 \
+    alias=pciex8086,893 \
+    alias=pciex8086,894 \
+    alias=pciex8086,895 \
+    alias=pciex8086,896 \
+    alias=pciex8086,897 \
+    alias=pciex8086,8a \
+    alias=pciex8086,8ae \
+    alias=pciex8086,8af \
+    alias=pciex8086,8b \
+    alias=pciex8086,8d \
+    alias=pciex8086,8e \
+    alias=pciex8086,90 \
+    alias=pciex8086,91
 file path=kernel/drv/$(ARCH64)/iwn group=sys
 file path=kernel/drv/iwn group=sys
 file path=kernel/firmware/iwn/iwlwifi-100-5.ucode
@@ -77,7 +77,7 @@ file path=kernel/firmware/iwn/iwlwifi-4965-2.ucode
 file path=kernel/firmware/iwn/iwlwifi-5000-2.ucode
 file path=kernel/firmware/iwn/iwlwifi-5150-2.ucode
 file path=kernel/firmware/iwn/iwlwifi-6000-4.ucode
-file path=kernel/firmware/iwn/iwlwifi-6000g2a-5.ucode
+file path=kernel/firmware/iwn/iwlwifi-6000g2a-6.ucode
 file path=kernel/firmware/iwn/iwlwifi-6000g2b-6.ucode
 file path=kernel/firmware/iwn/iwlwifi-6050-5.ucode
 file path=usr/share/man/man7d/iwn.7d
diff --git a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
index a9afe1fa0b..43ec74d44f 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
@@ -21,7 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/system/file-system/zfs/tests@$(PKGVERS)
@@ -54,6 +54,7 @@ $(i386_ONLY)file path=usr/bin/$(ARCH32)/zlook mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/ztest mode=0555
 file path=usr/bin/$(ARCH64)/zlook mode=0555
 file path=usr/bin/$(ARCH64)/ztest mode=0555
+file path=usr/bin/zloop mode=0555
 file path=usr/include/sys/fs/zut.h
 file path=usr/lib/devfsadm/linkmod/SUNW_zut_link.so group=sys
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zhack mode=0555
diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.mf
index f3ab60203f..7a1a0624f4 100644
--- a/usr/src/pkg/manifests/system-test-ostest.mf
+++ b/usr/src/pkg/manifests/system-test-ostest.mf
@@ -31,6 +31,7 @@ dir path=opt/os-tests/tests/sigqueue
 file path=opt/os-tests/README mode=0444
 file path=opt/os-tests/bin/ostest mode=0555
 file path=opt/os-tests/runfiles/default.run mode=0444
+file path=opt/os-tests/tests/epoll_test mode=0555
 file path=opt/os-tests/tests/file-locking/acquire-lock.32 mode=0555
 file path=opt/os-tests/tests/file-locking/acquire-lock.64 mode=0555
 file path=opt/os-tests/tests/file-locking/runtests.32 mode=0555
diff --git a/usr/src/test/os-tests/runfiles/default.run b/usr/src/test/os-tests/runfiles/default.run
index 1b95421f84..216f189519 100644
--- a/usr/src/test/os-tests/runfiles/default.run
+++ b/usr/src/test/os-tests/runfiles/default.run
@@ -48,6 +48,10 @@ tests = ['sigqueue_queue_size']
 user = root
 tests = ['sdevfs_eisdir']
 
+[/opt/os-tests/tests/timer]
+user = root
+tests = ['timer_limit']
+
 [/opt/os-tests/tests/tmpfs]
 user = root
 tests = ['tmpfs_badmount', 'tmpfs_enospc']
diff --git a/usr/src/test/os-tests/tests/Makefile b/usr/src/test/os-tests/tests/Makefile
index fcbab56508..b4330ae706 100644
--- a/usr/src/test/os-tests/tests/Makefile
+++ b/usr/src/test/os-tests/tests/Makefile
@@ -14,6 +14,6 @@
 # Copyright 2016 Joyent, Inc.
 #
 
-SUBDIRS = poll secflags sigqueue spoof-ras sdevfs tmpfs file-locking
+SUBDIRS = poll secflags sigqueue spoof-ras sdevfs timer tmpfs file-locking
 
 include $(SRC)/test/Makefile.com
diff --git a/usr/src/test/os-tests/tests/poll/Makefile b/usr/src/test/os-tests/tests/poll/Makefile
index 66ee75160e..14cc28b056 100644
--- a/usr/src/test/os-tests/tests/poll/Makefile
+++ b/usr/src/test/os-tests/tests/poll/Makefile
@@ -21,7 +21,8 @@ PROG = poll_test epoll_test
 OBJS = $(PROG:%=%.o)
 SRCS = $(OBJS:%.o=%.c)
 
-LDLIBS += -lsocket
+poll_test := LDLIBS += -lsocket
+poll_test.ln := LDLIBS += -lsocket
 C99MODE = -xc99=%all
 
 ROOTOPTPKG = $(ROOT)/opt/os-tests
@@ -30,11 +31,13 @@ TESTDIR = $(ROOTOPTPKG)/tests
 CMDS = $(PROG:%=$(TESTDIR)/%)
 $(CMDS) := FILEMODE = 0555
 
+LINTS = $(PROG:%=%.ln)
+
 all: $(PROG)
 
 install: all $(CMDS)
 
-lint: lint_SRCS
+lint: $(LINTS)
 
 clobber: clean
 	-$(RM) $(PROG)
@@ -42,6 +45,9 @@ clobber: clean
 clean:
 	-$(RM) $(OBJS)
 
+%.ln: %.c
+	$(LINT.c) $< $(UTILS) $(LDLIBS)
+
 $(CMDS): $(TESTDIR) $(PROG)
 
 $(TESTDIR):
diff --git a/usr/src/test/os-tests/tests/timer/Makefile b/usr/src/test/os-tests/tests/timer/Makefile
new file mode 100644
index 0000000000..dd85b0caf8
--- /dev/null
+++ b/usr/src/test/os-tests/tests/timer/Makefile
@@ -0,0 +1,50 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2016 Joyent, Inc.
+#
+
+include $(SRC)/Makefile.master
+
+ROOTOPTPKG = $(ROOT)/opt/os-tests
+TESTDIR = $(ROOTOPTPKG)/tests/timer
+
+PROGS = timer_limit
+
+include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/test/Makefile.com
+
+C99MODE = -xc99=%all
+
+
+CMDS = $(PROGS:%=$(TESTDIR)/%)
+$(CMDS) := FILEMODE = 0555
+
+all: $(PROGS)
+
+install: all $(CMDS)
+
+lint:
+
+clobber: clean
+	-$(RM) $(PROGS)
+
+clean:
+	-$(RM) *.o
+
+$(CMDS): $(TESTDIR) $(PROGS)
+
+$(TESTDIR):
+	$(INS.dir)
+
+$(TESTDIR)/%: %
+	$(INS.file)
diff --git a/usr/src/test/os-tests/tests/timer/timer_limit.c b/usr/src/test/os-tests/tests/timer/timer_limit.c
new file mode 100644
index 0000000000..77473c806f
--- /dev/null
+++ b/usr/src/test/os-tests/tests/timer/timer_limit.c
@@ -0,0 +1,83 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <time.h>
+#include <limits.h>
+#include <assert.h>
+#include <sys/sysconfig.h>
+#include <sys/sysmacros.h>
+
+/* Need direct access to _sysconfig to query NCPU */
+extern long _sysconfig(int);
+
+
+static int
+mktimer(timer_t *timer)
+{
+	struct sigevent sev;
+	sev.sigev_notify = SIGEV_SIGNAL;
+	sev.sigev_signo = SIGRTMIN;
+	sev.sigev_value.sival_ptr = timer;
+
+	return (timer_create(CLOCK_MONOTONIC, &sev, timer));
+}
+
+int
+main()
+{
+	long ncpu;
+	size_t limit;
+	timer_t *timers, timer_overage;
+
+	/* Query NCPU with private sysconfig param */
+	ncpu = _sysconfig(_CONFIG_NPROC_NCPU);
+	assert(ncpu > 0 && ncpu < INT32_MAX);
+
+	/* Current specified limit is 4 * NCPU */
+	limit = 4 * ncpu;
+	timers = calloc(limit + 1, sizeof (timer_t));
+	assert(timers != NULL);
+
+	/* Slowly walk up to the limit doing creations/deletions */
+	for (int i = 1; i <= limit; i = MIN(limit, i*2)) {
+		for (int j = 0; j < i; j++) {
+			assert(mktimer(&timers[j]) == 0);
+		}
+
+		/*
+		 * Attempt to allocate one additional timer if we've reached
+		 * the assumed limit.
+		 */
+		if (i == limit) {
+			assert(mktimer(&timer_overage) == -1);
+		}
+
+		for (int j = 0; j < i; j++) {
+			assert(timer_delete(timers[j]) == 0);
+		}
+
+		/* Bail out if we've finished at the limit */
+		if (i == limit)
+			break;
+	}
+
+
+	return (0);
+}
diff --git a/usr/src/test/util-tests/tests/dis/Makefile b/usr/src/test/util-tests/tests/dis/Makefile
index cf2b8e3ae7..42dd1f73a5 100644
--- a/usr/src/test/util-tests/tests/dis/Makefile
+++ b/usr/src/test/util-tests/tests/dis/Makefile
@@ -26,37 +26,58 @@ SPARC_TESTS = \
 
 I386_TESTS =		\
 	32.adx 		\
+	32.avx		\
+	32.avx2		\
 	32.aes 		\
 	32.bmi1 	\
 	32.bmi2 	\
+	32.f16c 	\
 	32.fma-pd 	\
 	32.fma-ps 	\
 	32.fma-sd 	\
 	32.fma-ss 	\
 	32.lzcnt 	\
+	32.movbe	\
+	32.pclmulqdq	\
 	32.popcnt 	\
+	32.sha		\
+	32.sse-3	\
+	32.sse-4.1 	\
 	32.sse-4.2 	\
 	32.ssse3 	\
 	32.xsave 	\
+	64.avx		\
+	64.avx2		\
 	64.adx 		\
 	64.aes 		\
 	64.bmi1 	\
 	64.bmi2 	\
 	64.ept 		\
+	64.f16c 	\
 	64.fma-pd 	\
 	64.fma-ps 	\
 	64.fma-sd 	\
 	64.fma-ss 	\
 	64.lzcnt 	\
+	64.movbe	\
+	64.pclmulqdq	\
 	64.popcnt 	\
 	64.random 	\
+	64.sha		\
+	64.sse-3	\
+	64.sse-4.1 	\
 	64.sse-4.2 	\
 	64.ssse3 	\
 	64.vmx 		\
 	64.xsave 	\
+	tst.cpuid	\
+	tst.fence	\
+	tst.msr		\
 	tst.mwait 	\
 	tst.random	\
 	tst.smap	\
+	tst.sep		\
+	tst.tsc		\
 	tst.vmx
 
 I386_FILES = $(I386_TESTS:%=%.s) $(I386_TESTS:%=%.out)
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.avx.out b/usr/src/test/util-tests/tests/dis/i386/32.avx.out
new file mode 100644
index 0000000000..4bba31418d
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.avx.out
@@ -0,0 +1,1984 @@
+    libdis_test:        c5 f1 58 d0        vaddpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x4:    c5 e1 58 20        vaddpd (%eax),%xmm3,%xmm4
+    libdis_test+0x8:    c5 d1 58 71 42     vaddpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xd:    c5 f5 58 d0        vaddpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x11:   c5 e5 58 23        vaddpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x15:   c5 d5 58 72 42     vaddpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1a:   c5 f0 58 d0        vaddps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e:   c5 e0 58 20        vaddps (%eax),%xmm3,%xmm4
+    libdis_test+0x22:   c5 d0 58 71 42     vaddps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x27:   c5 f4 58 d0        vaddps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2b:   c5 e4 58 23        vaddps (%ebx),%ymm3,%ymm4
+    libdis_test+0x2f:   c5 d4 58 72 42     vaddps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x34:   c5 f3 58 d0        vaddsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x38:   c5 e3 58 20        vaddsd (%eax),%xmm3,%xmm4
+    libdis_test+0x3c:   c5 d3 58 71 42     vaddsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x41:   c5 f2 58 d0        vaddss %xmm0,%xmm1,%xmm2
+    libdis_test+0x45:   c5 e2 58 20        vaddss (%eax),%xmm3,%xmm4
+    libdis_test+0x49:   c5 d2 58 71 42     vaddss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x4e:   c5 f1 d0 d0        vaddsubpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x52:   c5 e1 d0 20        vaddsubpd (%eax),%xmm3,%xmm4
+    libdis_test+0x56:   c5 d1 d0 71 42     vaddsubpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x5b:   c5 f5 d0 d0        vaddsubpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x5f:   c5 e5 d0 23        vaddsubpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x63:   c5 d5 d0 72 42     vaddsubpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x68:   c5 f3 d0 d0        vaddsubps %xmm0,%xmm1,%xmm2
+    libdis_test+0x6c:   c5 e3 d0 20        vaddsubps (%eax),%xmm3,%xmm4
+    libdis_test+0x70:   c5 d3 d0 71 42     vaddsubps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x75:   c5 f7 d0 d0        vaddsubps %ymm0,%ymm1,%ymm2
+    libdis_test+0x79:   c5 e7 d0 23        vaddsubps (%ebx),%ymm3,%ymm4
+    libdis_test+0x7d:   c5 d7 d0 72 42     vaddsubps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x82:   c4 e2 71 de d0     vaesdec %xmm0,%xmm1,%xmm2
+    libdis_test+0x87:   c4 e2 61 de 20     vaesdec (%eax),%xmm3,%xmm4
+    libdis_test+0x8c:   c4 e2 51 de 71 42  vaesdec 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x92:   c4 e2 71 df d0     vaesdeclast %xmm0,%xmm1,%xmm2
+    libdis_test+0x97:   c4 e2 61 df 20     vaesdeclast (%eax),%xmm3,%xmm4
+    libdis_test+0x9c:   c4 e2 51 df 71 42  vaesdeclast 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xa2:   c4 e2 71 dc d0     vaesenc %xmm0,%xmm1,%xmm2
+    libdis_test+0xa7:   c4 e2 61 dc 20     vaesenc (%eax),%xmm3,%xmm4
+    libdis_test+0xac:   c4 e2 51 dc 71 42  vaesenc 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb2:   c4 e2 71 dd d0     vaesenclast %xmm0,%xmm1,%xmm2
+    libdis_test+0xb7:   c4 e2 61 dd 20     vaesenclast (%eax),%xmm3,%xmm4
+    libdis_test+0xbc:   c4 e2 51 dd 71 42  vaesenclast 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xc2:   c4 e2 79 db c8     vaesimc %xmm0,%xmm1
+    libdis_test+0xc7:   c4 e2 79 db 1e     vaesimc (%esi),%xmm3
+    libdis_test+0xcc:   c4 e2 79 db 5f 42  vaesimc 0x42(%edi),%xmm3
+    libdis_test+0xd2:   c4 e3 79 df c8 42  vaeskeygenassist $0x42,%xmm0,%xmm1
+    libdis_test+0xd8:   c4 e3 79 df 1e 23  vaeskeygenassist $0x23,(%esi),%xmm3
+    libdis_test+0xde:   c4 e3 79 df 5f 42  vaeskeygenassist $0x42,0x42(%edi),%xmm3
+                        42 
+    libdis_test+0xe5:   c5 f1 55 d0        vandnpd %xmm0,%xmm1,%xmm2
+    libdis_test+0xe9:   c5 e1 55 20        vandnpd (%eax),%xmm3,%xmm4
+    libdis_test+0xed:   c5 d1 55 71 42     vandnpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xf2:   c5 f5 55 d0        vandnpd %ymm0,%ymm1,%ymm2
+    libdis_test+0xf6:   c5 e5 55 23        vandnpd (%ebx),%ymm3,%ymm4
+    libdis_test+0xfa:   c5 d5 55 72 42     vandnpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xff:   c5 f0 55 d0        vandnps %xmm0,%xmm1,%xmm2
+    libdis_test+0x103:  c5 e0 55 20        vandnps (%eax),%xmm3,%xmm4
+    libdis_test+0x107:  c5 d0 55 71 42     vandnps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x10c:  c5 f4 55 d0        vandnps %ymm0,%ymm1,%ymm2
+    libdis_test+0x110:  c5 e4 55 23        vandnps (%ebx),%ymm3,%ymm4
+    libdis_test+0x114:  c5 d4 55 72 42     vandnps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x119:  c5 f1 54 d0        vandpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x11d:  c5 e1 54 20        vandpd (%eax),%xmm3,%xmm4
+    libdis_test+0x121:  c5 d1 54 71 42     vandpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x126:  c5 f5 54 d0        vandpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x12a:  c5 e5 54 23        vandpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x12e:  c5 d5 54 72 42     vandpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x133:  c5 f0 54 d0        vandps %xmm0,%xmm1,%xmm2
+    libdis_test+0x137:  c5 e0 54 20        vandps (%eax),%xmm3,%xmm4
+    libdis_test+0x13b:  c5 d0 54 71 42     vandps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x140:  c5 f4 54 d0        vandps %ymm0,%ymm1,%ymm2
+    libdis_test+0x144:  c5 e4 54 23        vandps (%ebx),%ymm3,%ymm4
+    libdis_test+0x148:  c5 d4 54 72 42     vandps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x14d:  c4 e3 51 0d fb 48  vblendpd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x153:  c4 e3 69 0d 23 48  vblendpd $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x159:  c4 e3 71 0d 73 08  vblendpd $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x160:  c4 e3 55 0d fb 48  vblendpd $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x166:  c4 e3 6d 0d 23 48  vblendpd $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x16c:  c4 e3 75 0d 73 08  vblendpd $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x173:  c4 e3 51 0c fb 48  vblendps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x179:  c4 e3 69 0c 23 48  vblendps $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x17f:  c4 e3 71 0c 73 08  vblendps $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x186:  c4 e3 55 0c fb 48  vblendps $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x18c:  c4 e3 6d 0c 23 48  vblendps $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x192:  c4 e3 75 0c 73 08  vblendps $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x199:  c4 e3 69 4b d9 00  vblendvpd %xmm0,%xmm1,%xmm2,%xmm3
+    libdis_test+0x19f:  c4 e3 69 4b 18 00  vblendvpd %xmm0,(%eax),%xmm2,%xmm3
+    libdis_test+0x1a5:  c4 e3 69 4b 5b 10  vblendvpd %xmm0,0x10(%ebx),%xmm2,%xmm3
+                        00 
+    libdis_test+0x1ac:  c4 e3 6d 4b d9 00  vblendvpd %ymm0,%ymm1,%ymm2,%ymm3
+    libdis_test+0x1b2:  c4 e3 6d 4b 18 00  vblendvpd %ymm0,(%eax),%ymm2,%ymm3
+    libdis_test+0x1b8:  c4 e3 6d 4b 5b 10  vblendvpd %ymm0,0x10(%ebx),%ymm2,%ymm3
+                        00 
+    libdis_test+0x1bf:  c4 e3 69 4a d9 00  vblendvps %xmm0,%xmm1,%xmm2,%xmm3
+    libdis_test+0x1c5:  c4 e3 69 4a 18 00  vblendvps %xmm0,(%eax),%xmm2,%xmm3
+    libdis_test+0x1cb:  c4 e3 69 4a 5b 10  vblendvps %xmm0,0x10(%ebx),%xmm2,%xmm3
+                        00 
+    libdis_test+0x1d2:  c4 e3 6d 4a d9 00  vblendvps %ymm0,%ymm1,%ymm2,%ymm3
+    libdis_test+0x1d8:  c4 e3 6d 4a 18 00  vblendvps %ymm0,(%eax),%ymm2,%ymm3
+    libdis_test+0x1de:  c4 e3 6d 4a 5b 10  vblendvps %ymm0,0x10(%ebx),%ymm2,%ymm3
+                        00 
+    libdis_test+0x1e5:  c4 e2 7d 1a 00     vbroadcastf128 (%eax),%ymm0
+    libdis_test+0x1ea:  c4 e2 7d 1a 40 42  vbroadcastf128 0x42(%eax),%ymm0
+    libdis_test+0x1f0:  c4 e2 7d 19 00     vbroadcastsd (%eax),%ymm0
+    libdis_test+0x1f5:  c4 e2 7d 19 40 42  vbroadcastsd 0x42(%eax),%ymm0
+    libdis_test+0x1fb:  c4 e2 7d 18 00     vbroadcastss (%eax),%ymm0
+    libdis_test+0x200:  c4 e2 7d 18 40 42  vbroadcastss 0x42(%eax),%ymm0
+    libdis_test+0x206:  c5 f1 c2 d0 10     vcmppd $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x20b:  c5 e1 c2 20 10     vcmppd $0x10,(%eax),%xmm3,%xmm4
+    libdis_test+0x210:  c5 d1 c2 71 42 10  vcmppd $0x10,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x216:  c5 f5 c2 d0 10     vcmppd $0x10,%ymm0,%ymm1,%ymm2
+    libdis_test+0x21b:  c5 e5 c2 23 10     vcmppd $0x10,(%ebx),%ymm3,%ymm4
+    libdis_test+0x220:  c5 d5 c2 72 42 10  vcmppd $0x10,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x226:  c5 f0 c2 d0 10     vcmpps $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x22b:  c5 e0 c2 20 10     vcmpps $0x10,(%eax),%xmm3,%xmm4
+    libdis_test+0x230:  c5 d0 c2 71 42 10  vcmpps $0x10,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x236:  c5 f4 c2 d0 10     vcmpps $0x10,%ymm0,%ymm1,%ymm2
+    libdis_test+0x23b:  c5 e4 c2 23 10     vcmpps $0x10,(%ebx),%ymm3,%ymm4
+    libdis_test+0x240:  c5 d4 c2 72 42 10  vcmpps $0x10,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x246:  c5 f3 c2 d0 10     vcmpsd $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x24b:  c5 e3 c2 20 10     vcmpsd $0x10,(%eax),%xmm3,%xmm4
+    libdis_test+0x250:  c5 d3 c2 71 42 10  vcmpsd $0x10,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x256:  c5 f2 c2 d0 10     vcmpss $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x25b:  c5 e2 c2 20 10     vcmpss $0x10,(%eax),%xmm3,%xmm4
+    libdis_test+0x260:  c5 d2 c2 71 42 10  vcmpss $0x10,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x266:  c5 f1 c2 d0 08     vcmppd $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x26b:  c5 e1 c2 20 08     vcmppd $0x8,(%eax),%xmm3,%xmm4
+    libdis_test+0x270:  c5 d1 c2 71 42 08  vcmppd $0x8,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x276:  c5 f5 c2 d0 08     vcmppd $0x8,%ymm0,%ymm1,%ymm2
+    libdis_test+0x27b:  c5 e5 c2 23 08     vcmppd $0x8,(%ebx),%ymm3,%ymm4
+    libdis_test+0x280:  c5 d5 c2 72 42 08  vcmppd $0x8,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x286:  c5 f0 c2 d0 08     vcmpps $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x28b:  c5 e0 c2 20 08     vcmpps $0x8,(%eax),%xmm3,%xmm4
+    libdis_test+0x290:  c5 d0 c2 71 42 08  vcmpps $0x8,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x296:  c5 f4 c2 d0 08     vcmpps $0x8,%ymm0,%ymm1,%ymm2
+    libdis_test+0x29b:  c5 e4 c2 23 08     vcmpps $0x8,(%ebx),%ymm3,%ymm4
+    libdis_test+0x2a0:  c5 d4 c2 72 42 08  vcmpps $0x8,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2a6:  c5 f3 c2 d0 08     vcmpsd $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2ab:  c5 e3 c2 20 08     vcmpsd $0x8,(%eax),%xmm3,%xmm4
+    libdis_test+0x2b0:  c5 d3 c2 71 42 08  vcmpsd $0x8,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2b6:  c5 f2 c2 d0 08     vcmpss $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2bb:  c5 e2 c2 20 08     vcmpss $0x8,(%eax),%xmm3,%xmm4
+    libdis_test+0x2c0:  c5 d2 c2 71 42 08  vcmpss $0x8,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2c6:  c5 f1 c2 d0 18     vcmppd $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2cb:  c5 e1 c2 20 18     vcmppd $0x18,(%eax),%xmm3,%xmm4
+    libdis_test+0x2d0:  c5 d1 c2 71 42 18  vcmppd $0x18,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2d6:  c5 f5 c2 d0 18     vcmppd $0x18,%ymm0,%ymm1,%ymm2
+    libdis_test+0x2db:  c5 e5 c2 23 18     vcmppd $0x18,(%ebx),%ymm3,%ymm4
+    libdis_test+0x2e0:  c5 d5 c2 72 42 18  vcmppd $0x18,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2e6:  c5 f0 c2 d0 18     vcmpps $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2eb:  c5 e0 c2 20 18     vcmpps $0x18,(%eax),%xmm3,%xmm4
+    libdis_test+0x2f0:  c5 d0 c2 71 42 18  vcmpps $0x18,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2f6:  c5 f4 c2 d0 18     vcmpps $0x18,%ymm0,%ymm1,%ymm2
+    libdis_test+0x2fb:  c5 e4 c2 23 18     vcmpps $0x18,(%ebx),%ymm3,%ymm4
+    libdis_test+0x300:  c5 d4 c2 72 42 18  vcmpps $0x18,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x306:  c5 f3 c2 d0 18     vcmpsd $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x30b:  c5 e3 c2 20 18     vcmpsd $0x18,(%eax),%xmm3,%xmm4
+    libdis_test+0x310:  c5 d3 c2 71 42 18  vcmpsd $0x18,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x316:  c5 f2 c2 d0 18     vcmpss $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x31b:  c5 e2 c2 20 18     vcmpss $0x18,(%eax),%xmm3,%xmm4
+    libdis_test+0x320:  c5 d2 c2 71 42 18  vcmpss $0x18,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x326:  c5 f1 c2 d0 00     vcmppd $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x32b:  c5 e1 c2 20 00     vcmppd $0x0,(%eax),%xmm3,%xmm4
+    libdis_test+0x330:  c5 d1 c2 71 42 00  vcmppd $0x0,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x336:  c5 f5 c2 d0 00     vcmppd $0x0,%ymm0,%ymm1,%ymm2
+    libdis_test+0x33b:  c5 e5 c2 23 00     vcmppd $0x0,(%ebx),%ymm3,%ymm4
+    libdis_test+0x340:  c5 d5 c2 72 42 00  vcmppd $0x0,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x346:  c5 f0 c2 d0 00     vcmpps $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x34b:  c5 e0 c2 20 00     vcmpps $0x0,(%eax),%xmm3,%xmm4
+    libdis_test+0x350:  c5 d0 c2 71 42 00  vcmpps $0x0,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x356:  c5 f4 c2 d0 00     vcmpps $0x0,%ymm0,%ymm1,%ymm2
+    libdis_test+0x35b:  c5 e4 c2 23 00     vcmpps $0x0,(%ebx),%ymm3,%ymm4
+    libdis_test+0x360:  c5 d4 c2 72 42 00  vcmpps $0x0,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x366:  c5 f3 c2 d0 00     vcmpsd $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x36b:  c5 e3 c2 20 00     vcmpsd $0x0,(%eax),%xmm3,%xmm4
+    libdis_test+0x370:  c5 d3 c2 71 42 00  vcmpsd $0x0,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x376:  c5 f2 c2 d0 00     vcmpss $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x37b:  c5 e2 c2 20 00     vcmpss $0x0,(%eax),%xmm3,%xmm4
+    libdis_test+0x380:  c5 d2 c2 71 42 00  vcmpss $0x0,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x386:  c5 f1 c2 d0 1b     vcmppd $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x38b:  c5 e1 c2 20 1b     vcmppd $0x1b,(%eax),%xmm3,%xmm4
+    libdis_test+0x390:  c5 d1 c2 71 42 1b  vcmppd $0x1b,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x396:  c5 f5 c2 d0 1b     vcmppd $0x1b,%ymm0,%ymm1,%ymm2
+    libdis_test+0x39b:  c5 e5 c2 23 1b     vcmppd $0x1b,(%ebx),%ymm3,%ymm4
+    libdis_test+0x3a0:  c5 d5 c2 72 42 1b  vcmppd $0x1b,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x3a6:  c5 f0 c2 d0 1b     vcmpps $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3ab:  c5 e0 c2 20 1b     vcmpps $0x1b,(%eax),%xmm3,%xmm4
+    libdis_test+0x3b0:  c5 d0 c2 71 42 1b  vcmpps $0x1b,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x3b6:  c5 f4 c2 d0 1b     vcmpps $0x1b,%ymm0,%ymm1,%ymm2
+    libdis_test+0x3bb:  c5 e4 c2 23 1b     vcmpps $0x1b,(%ebx),%ymm3,%ymm4
+    libdis_test+0x3c0:  c5 d4 c2 72 42 1b  vcmpps $0x1b,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x3c6:  c5 f3 c2 d0 1b     vcmpsd $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3cb:  c5 e3 c2 20 1b     vcmpsd $0x1b,(%eax),%xmm3,%xmm4
+    libdis_test+0x3d0:  c5 d3 c2 71 42 1b  vcmpsd $0x1b,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x3d6:  c5 f2 c2 d0 1b     vcmpss $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3db:  c5 e2 c2 20 1b     vcmpss $0x1b,(%eax),%xmm3,%xmm4
+    libdis_test+0x3e0:  c5 d2 c2 71 42 1b  vcmpss $0x1b,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x3e6:  c5 f1 c2 d0 0b     vcmppd $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3eb:  c5 e1 c2 20 0b     vcmppd $0xb,(%eax),%xmm3,%xmm4
+    libdis_test+0x3f0:  c5 d1 c2 71 42 0b  vcmppd $0xb,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x3f6:  c5 f5 c2 d0 0b     vcmppd $0xb,%ymm0,%ymm1,%ymm2
+    libdis_test+0x3fb:  c5 e5 c2 23 0b     vcmppd $0xb,(%ebx),%ymm3,%ymm4
+    libdis_test+0x400:  c5 d5 c2 72 42 0b  vcmppd $0xb,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x406:  c5 f0 c2 d0 0b     vcmpps $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x40b:  c5 e0 c2 20 0b     vcmpps $0xb,(%eax),%xmm3,%xmm4
+    libdis_test+0x410:  c5 d0 c2 71 42 0b  vcmpps $0xb,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x416:  c5 f4 c2 d0 0b     vcmpps $0xb,%ymm0,%ymm1,%ymm2
+    libdis_test+0x41b:  c5 e4 c2 23 0b     vcmpps $0xb,(%ebx),%ymm3,%ymm4
+    libdis_test+0x420:  c5 d4 c2 72 42 0b  vcmpps $0xb,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x426:  c5 f3 c2 d0 0b     vcmpsd $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x42b:  c5 e3 c2 20 0b     vcmpsd $0xb,(%eax),%xmm3,%xmm4
+    libdis_test+0x430:  c5 d3 c2 71 42 0b  vcmpsd $0xb,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x436:  c5 f2 c2 d0 0b     vcmpss $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x43b:  c5 e2 c2 20 0b     vcmpss $0xb,(%eax),%xmm3,%xmm4
+    libdis_test+0x440:  c5 d2 c2 71 42 0b  vcmpss $0xb,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x446:  c5 f1 c2 d0 1d     vcmppd $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x44b:  c5 e1 c2 20 1d     vcmppd $0x1d,(%eax),%xmm3,%xmm4
+    libdis_test+0x450:  c5 d1 c2 71 42 1d  vcmppd $0x1d,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x456:  c5 f5 c2 d0 1d     vcmppd $0x1d,%ymm0,%ymm1,%ymm2
+    libdis_test+0x45b:  c5 e5 c2 23 1d     vcmppd $0x1d,(%ebx),%ymm3,%ymm4
+    libdis_test+0x460:  c5 d5 c2 72 42 1d  vcmppd $0x1d,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x466:  c5 f0 c2 d0 1d     vcmpps $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x46b:  c5 e0 c2 20 1d     vcmpps $0x1d,(%eax),%xmm3,%xmm4
+    libdis_test+0x470:  c5 d0 c2 71 42 1d  vcmpps $0x1d,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x476:  c5 f4 c2 d0 1d     vcmpps $0x1d,%ymm0,%ymm1,%ymm2
+    libdis_test+0x47b:  c5 e4 c2 23 1d     vcmpps $0x1d,(%ebx),%ymm3,%ymm4
+    libdis_test+0x480:  c5 d4 c2 72 42 1d  vcmpps $0x1d,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x486:  c5 f3 c2 d0 1d     vcmpsd $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x48b:  c5 e3 c2 20 1d     vcmpsd $0x1d,(%eax),%xmm3,%xmm4
+    libdis_test+0x490:  c5 d3 c2 71 42 1d  vcmpsd $0x1d,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x496:  c5 f2 c2 d0 1d     vcmpss $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x49b:  c5 e2 c2 20 1d     vcmpss $0x1d,(%eax),%xmm3,%xmm4
+    libdis_test+0x4a0:  c5 d2 c2 71 42 1d  vcmpss $0x1d,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x4a6:  c5 f1 c2 d0 0d     vcmppd $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4ab:  c5 e1 c2 20 0d     vcmppd $0xd,(%eax),%xmm3,%xmm4
+    libdis_test+0x4b0:  c5 d1 c2 71 42 0d  vcmppd $0xd,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x4b6:  c5 f5 c2 d0 0d     vcmppd $0xd,%ymm0,%ymm1,%ymm2
+    libdis_test+0x4bb:  c5 e5 c2 23 0d     vcmppd $0xd,(%ebx),%ymm3,%ymm4
+    libdis_test+0x4c0:  c5 d5 c2 72 42 0d  vcmppd $0xd,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x4c6:  c5 f0 c2 d0 0d     vcmpps $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4cb:  c5 e0 c2 20 0d     vcmpps $0xd,(%eax),%xmm3,%xmm4
+    libdis_test+0x4d0:  c5 d0 c2 71 42 0d  vcmpps $0xd,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x4d6:  c5 f4 c2 d0 0d     vcmpps $0xd,%ymm0,%ymm1,%ymm2
+    libdis_test+0x4db:  c5 e4 c2 23 0d     vcmpps $0xd,(%ebx),%ymm3,%ymm4
+    libdis_test+0x4e0:  c5 d4 c2 72 42 0d  vcmpps $0xd,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x4e6:  c5 f3 c2 d0 0d     vcmpsd $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4eb:  c5 e3 c2 20 0d     vcmpsd $0xd,(%eax),%xmm3,%xmm4
+    libdis_test+0x4f0:  c5 d3 c2 71 42 0d  vcmpsd $0xd,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x4f6:  c5 f2 c2 d0 0d     vcmpss $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4fb:  c5 e2 c2 20 0d     vcmpss $0xd,(%eax),%xmm3,%xmm4
+    libdis_test+0x500:  c5 d2 c2 71 42 0d  vcmpss $0xd,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x506:  c5 f1 c2 d0 1e     vcmppd $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x50b:  c5 e1 c2 20 1e     vcmppd $0x1e,(%eax),%xmm3,%xmm4
+    libdis_test+0x510:  c5 d1 c2 71 42 1e  vcmppd $0x1e,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x516:  c5 f5 c2 d0 1e     vcmppd $0x1e,%ymm0,%ymm1,%ymm2
+    libdis_test+0x51b:  c5 e5 c2 23 1e     vcmppd $0x1e,(%ebx),%ymm3,%ymm4
+    libdis_test+0x520:  c5 d5 c2 72 42 1e  vcmppd $0x1e,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x526:  c5 f0 c2 d0 1e     vcmpps $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x52b:  c5 e0 c2 20 1e     vcmpps $0x1e,(%eax),%xmm3,%xmm4
+    libdis_test+0x530:  c5 d0 c2 71 42 1e  vcmpps $0x1e,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x536:  c5 f4 c2 d0 1e     vcmpps $0x1e,%ymm0,%ymm1,%ymm2
+    libdis_test+0x53b:  c5 e4 c2 23 1e     vcmpps $0x1e,(%ebx),%ymm3,%ymm4
+    libdis_test+0x540:  c5 d4 c2 72 42 1e  vcmpps $0x1e,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x546:  c5 f3 c2 d0 1e     vcmpsd $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x54b:  c5 e3 c2 20 1e     vcmpsd $0x1e,(%eax),%xmm3,%xmm4
+    libdis_test+0x550:  c5 d3 c2 71 42 1e  vcmpsd $0x1e,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x556:  c5 f2 c2 d0 1e     vcmpss $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x55b:  c5 e2 c2 20 1e     vcmpss $0x1e,(%eax),%xmm3,%xmm4
+    libdis_test+0x560:  c5 d2 c2 71 42 1e  vcmpss $0x1e,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x566:  c5 f1 c2 d0 0e     vcmppd $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x56b:  c5 e1 c2 20 0e     vcmppd $0xe,(%eax),%xmm3,%xmm4
+    libdis_test+0x570:  c5 d1 c2 71 42 0e  vcmppd $0xe,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x576:  c5 f5 c2 d0 0e     vcmppd $0xe,%ymm0,%ymm1,%ymm2
+    libdis_test+0x57b:  c5 e5 c2 23 0e     vcmppd $0xe,(%ebx),%ymm3,%ymm4
+    libdis_test+0x580:  c5 d5 c2 72 42 0e  vcmppd $0xe,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x586:  c5 f0 c2 d0 0e     vcmpps $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x58b:  c5 e0 c2 20 0e     vcmpps $0xe,(%eax),%xmm3,%xmm4
+    libdis_test+0x590:  c5 d0 c2 71 42 0e  vcmpps $0xe,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x596:  c5 f4 c2 d0 0e     vcmpps $0xe,%ymm0,%ymm1,%ymm2
+    libdis_test+0x59b:  c5 e4 c2 23 0e     vcmpps $0xe,(%ebx),%ymm3,%ymm4
+    libdis_test+0x5a0:  c5 d4 c2 72 42 0e  vcmpps $0xe,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x5a6:  c5 f3 c2 d0 0e     vcmpsd $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5ab:  c5 e3 c2 20 0e     vcmpsd $0xe,(%eax),%xmm3,%xmm4
+    libdis_test+0x5b0:  c5 d3 c2 71 42 0e  vcmpsd $0xe,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x5b6:  c5 f2 c2 d0 0e     vcmpss $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5bb:  c5 e2 c2 20 0e     vcmpss $0xe,(%eax),%xmm3,%xmm4
+    libdis_test+0x5c0:  c5 d2 c2 71 42 0e  vcmpss $0xe,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x5c6:  c5 f1 c2 d0 12     vcmppd $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5cb:  c5 e1 c2 20 12     vcmppd $0x12,(%eax),%xmm3,%xmm4
+    libdis_test+0x5d0:  c5 d1 c2 71 42 12  vcmppd $0x12,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x5d6:  c5 f5 c2 d0 12     vcmppd $0x12,%ymm0,%ymm1,%ymm2
+    libdis_test+0x5db:  c5 e5 c2 23 12     vcmppd $0x12,(%ebx),%ymm3,%ymm4
+    libdis_test+0x5e0:  c5 d5 c2 72 42 12  vcmppd $0x12,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x5e6:  c5 f0 c2 d0 12     vcmpps $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5eb:  c5 e0 c2 20 12     vcmpps $0x12,(%eax),%xmm3,%xmm4
+    libdis_test+0x5f0:  c5 d0 c2 71 42 12  vcmpps $0x12,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x5f6:  c5 f4 c2 d0 12     vcmpps $0x12,%ymm0,%ymm1,%ymm2
+    libdis_test+0x5fb:  c5 e4 c2 23 12     vcmpps $0x12,(%ebx),%ymm3,%ymm4
+    libdis_test+0x600:  c5 d4 c2 72 42 12  vcmpps $0x12,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x606:  c5 f3 c2 d0 12     vcmpsd $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x60b:  c5 e3 c2 20 12     vcmpsd $0x12,(%eax),%xmm3,%xmm4
+    libdis_test+0x610:  c5 d3 c2 71 42 12  vcmpsd $0x12,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x616:  c5 f2 c2 d0 12     vcmpss $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x61b:  c5 e2 c2 20 12     vcmpss $0x12,(%eax),%xmm3,%xmm4
+    libdis_test+0x620:  c5 d2 c2 71 42 12  vcmpss $0x12,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x626:  c5 f1 c2 d0 02     vcmppd $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x62b:  c5 e1 c2 20 02     vcmppd $0x2,(%eax),%xmm3,%xmm4
+    libdis_test+0x630:  c5 d1 c2 71 42 02  vcmppd $0x2,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x636:  c5 f5 c2 d0 02     vcmppd $0x2,%ymm0,%ymm1,%ymm2
+    libdis_test+0x63b:  c5 e5 c2 23 02     vcmppd $0x2,(%ebx),%ymm3,%ymm4
+    libdis_test+0x640:  c5 d5 c2 72 42 02  vcmppd $0x2,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x646:  c5 f0 c2 d0 02     vcmpps $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x64b:  c5 e0 c2 20 02     vcmpps $0x2,(%eax),%xmm3,%xmm4
+    libdis_test+0x650:  c5 d0 c2 71 42 02  vcmpps $0x2,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x656:  c5 f4 c2 d0 02     vcmpps $0x2,%ymm0,%ymm1,%ymm2
+    libdis_test+0x65b:  c5 e4 c2 23 02     vcmpps $0x2,(%ebx),%ymm3,%ymm4
+    libdis_test+0x660:  c5 d4 c2 72 42 02  vcmpps $0x2,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x666:  c5 f3 c2 d0 02     vcmpsd $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x66b:  c5 e3 c2 20 02     vcmpsd $0x2,(%eax),%xmm3,%xmm4
+    libdis_test+0x670:  c5 d3 c2 71 42 02  vcmpsd $0x2,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x676:  c5 f2 c2 d0 02     vcmpss $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x67b:  c5 e2 c2 20 02     vcmpss $0x2,(%eax),%xmm3,%xmm4
+    libdis_test+0x680:  c5 d2 c2 71 42 02  vcmpss $0x2,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x686:  c5 f1 c2 d0 11     vcmppd $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x68b:  c5 e1 c2 20 11     vcmppd $0x11,(%eax),%xmm3,%xmm4
+    libdis_test+0x690:  c5 d1 c2 71 42 11  vcmppd $0x11,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x696:  c5 f5 c2 d0 11     vcmppd $0x11,%ymm0,%ymm1,%ymm2
+    libdis_test+0x69b:  c5 e5 c2 23 11     vcmppd $0x11,(%ebx),%ymm3,%ymm4
+    libdis_test+0x6a0:  c5 d5 c2 72 42 11  vcmppd $0x11,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x6a6:  c5 f0 c2 d0 11     vcmpps $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6ab:  c5 e0 c2 20 11     vcmpps $0x11,(%eax),%xmm3,%xmm4
+    libdis_test+0x6b0:  c5 d0 c2 71 42 11  vcmpps $0x11,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x6b6:  c5 f4 c2 d0 11     vcmpps $0x11,%ymm0,%ymm1,%ymm2
+    libdis_test+0x6bb:  c5 e4 c2 23 11     vcmpps $0x11,(%ebx),%ymm3,%ymm4
+    libdis_test+0x6c0:  c5 d4 c2 72 42 11  vcmpps $0x11,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x6c6:  c5 f3 c2 d0 11     vcmpsd $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6cb:  c5 e3 c2 20 11     vcmpsd $0x11,(%eax),%xmm3,%xmm4
+    libdis_test+0x6d0:  c5 d3 c2 71 42 11  vcmpsd $0x11,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x6d6:  c5 f2 c2 d0 11     vcmpss $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6db:  c5 e2 c2 20 11     vcmpss $0x11,(%eax),%xmm3,%xmm4
+    libdis_test+0x6e0:  c5 d2 c2 71 42 11  vcmpss $0x11,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x6e6:  c5 f1 c2 d0 01     vcmppd $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6eb:  c5 e1 c2 20 01     vcmppd $0x1,(%eax),%xmm3,%xmm4
+    libdis_test+0x6f0:  c5 d1 c2 71 42 01  vcmppd $0x1,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x6f6:  c5 f5 c2 d0 01     vcmppd $0x1,%ymm0,%ymm1,%ymm2
+    libdis_test+0x6fb:  c5 e5 c2 23 01     vcmppd $0x1,(%ebx),%ymm3,%ymm4
+    libdis_test+0x700:  c5 d5 c2 72 42 01  vcmppd $0x1,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x706:  c5 f0 c2 d0 01     vcmpps $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x70b:  c5 e0 c2 20 01     vcmpps $0x1,(%eax),%xmm3,%xmm4
+    libdis_test+0x710:  c5 d0 c2 71 42 01  vcmpps $0x1,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x716:  c5 f4 c2 d0 01     vcmpps $0x1,%ymm0,%ymm1,%ymm2
+    libdis_test+0x71b:  c5 e4 c2 23 01     vcmpps $0x1,(%ebx),%ymm3,%ymm4
+    libdis_test+0x720:  c5 d4 c2 72 42 01  vcmpps $0x1,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x726:  c5 f3 c2 d0 01     vcmpsd $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x72b:  c5 e3 c2 20 01     vcmpsd $0x1,(%eax),%xmm3,%xmm4
+    libdis_test+0x730:  c5 d3 c2 71 42 01  vcmpsd $0x1,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x736:  c5 f2 c2 d0 01     vcmpss $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x73b:  c5 e2 c2 20 01     vcmpss $0x1,(%eax),%xmm3,%xmm4
+    libdis_test+0x740:  c5 d2 c2 71 42 01  vcmpss $0x1,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x746:  c5 f1 c2 d0 0c     vcmppd $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x74b:  c5 e1 c2 20 0c     vcmppd $0xc,(%eax),%xmm3,%xmm4
+    libdis_test+0x750:  c5 d1 c2 71 42 0c  vcmppd $0xc,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x756:  c5 f5 c2 d0 0c     vcmppd $0xc,%ymm0,%ymm1,%ymm2
+    libdis_test+0x75b:  c5 e5 c2 23 0c     vcmppd $0xc,(%ebx),%ymm3,%ymm4
+    libdis_test+0x760:  c5 d5 c2 72 42 0c  vcmppd $0xc,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x766:  c5 f0 c2 d0 0c     vcmpps $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x76b:  c5 e0 c2 20 0c     vcmpps $0xc,(%eax),%xmm3,%xmm4
+    libdis_test+0x770:  c5 d0 c2 71 42 0c  vcmpps $0xc,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x776:  c5 f4 c2 d0 0c     vcmpps $0xc,%ymm0,%ymm1,%ymm2
+    libdis_test+0x77b:  c5 e4 c2 23 0c     vcmpps $0xc,(%ebx),%ymm3,%ymm4
+    libdis_test+0x780:  c5 d4 c2 72 42 0c  vcmpps $0xc,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x786:  c5 f3 c2 d0 0c     vcmpsd $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x78b:  c5 e3 c2 20 0c     vcmpsd $0xc,(%eax),%xmm3,%xmm4
+    libdis_test+0x790:  c5 d3 c2 71 42 0c  vcmpsd $0xc,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x796:  c5 f2 c2 d0 0c     vcmpss $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x79b:  c5 e2 c2 20 0c     vcmpss $0xc,(%eax),%xmm3,%xmm4
+    libdis_test+0x7a0:  c5 d2 c2 71 42 0c  vcmpss $0xc,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x7a6:  c5 f1 c2 d0 1c     vcmppd $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7ab:  c5 e1 c2 20 1c     vcmppd $0x1c,(%eax),%xmm3,%xmm4
+    libdis_test+0x7b0:  c5 d1 c2 71 42 1c  vcmppd $0x1c,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x7b6:  c5 f5 c2 d0 1c     vcmppd $0x1c,%ymm0,%ymm1,%ymm2
+    libdis_test+0x7bb:  c5 e5 c2 23 1c     vcmppd $0x1c,(%ebx),%ymm3,%ymm4
+    libdis_test+0x7c0:  c5 d5 c2 72 42 1c  vcmppd $0x1c,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x7c6:  c5 f0 c2 d0 1c     vcmpps $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7cb:  c5 e0 c2 20 1c     vcmpps $0x1c,(%eax),%xmm3,%xmm4
+    libdis_test+0x7d0:  c5 d0 c2 71 42 1c  vcmpps $0x1c,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x7d6:  c5 f4 c2 d0 1c     vcmpps $0x1c,%ymm0,%ymm1,%ymm2
+    libdis_test+0x7db:  c5 e4 c2 23 1c     vcmpps $0x1c,(%ebx),%ymm3,%ymm4
+    libdis_test+0x7e0:  c5 d4 c2 72 42 1c  vcmpps $0x1c,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x7e6:  c5 f3 c2 d0 1c     vcmpsd $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7eb:  c5 e3 c2 20 1c     vcmpsd $0x1c,(%eax),%xmm3,%xmm4
+    libdis_test+0x7f0:  c5 d3 c2 71 42 1c  vcmpsd $0x1c,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x7f6:  c5 f2 c2 d0 1c     vcmpss $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7fb:  c5 e2 c2 20 1c     vcmpss $0x1c,(%eax),%xmm3,%xmm4
+    libdis_test+0x800:  c5 d2 c2 71 42 1c  vcmpss $0x1c,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x806:  c5 f1 c2 d0 14     vcmppd $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x80b:  c5 e1 c2 20 14     vcmppd $0x14,(%eax),%xmm3,%xmm4
+    libdis_test+0x810:  c5 d1 c2 71 42 14  vcmppd $0x14,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x816:  c5 f5 c2 d0 14     vcmppd $0x14,%ymm0,%ymm1,%ymm2
+    libdis_test+0x81b:  c5 e5 c2 23 14     vcmppd $0x14,(%ebx),%ymm3,%ymm4
+    libdis_test+0x820:  c5 d5 c2 72 42 14  vcmppd $0x14,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x826:  c5 f0 c2 d0 14     vcmpps $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x82b:  c5 e0 c2 20 14     vcmpps $0x14,(%eax),%xmm3,%xmm4
+    libdis_test+0x830:  c5 d0 c2 71 42 14  vcmpps $0x14,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x836:  c5 f4 c2 d0 14     vcmpps $0x14,%ymm0,%ymm1,%ymm2
+    libdis_test+0x83b:  c5 e4 c2 23 14     vcmpps $0x14,(%ebx),%ymm3,%ymm4
+    libdis_test+0x840:  c5 d4 c2 72 42 14  vcmpps $0x14,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x846:  c5 f3 c2 d0 14     vcmpsd $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x84b:  c5 e3 c2 20 14     vcmpsd $0x14,(%eax),%xmm3,%xmm4
+    libdis_test+0x850:  c5 d3 c2 71 42 14  vcmpsd $0x14,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x856:  c5 f2 c2 d0 14     vcmpss $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x85b:  c5 e2 c2 20 14     vcmpss $0x14,(%eax),%xmm3,%xmm4
+    libdis_test+0x860:  c5 d2 c2 71 42 14  vcmpss $0x14,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x866:  c5 f1 c2 d0 04     vcmppd $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x86b:  c5 e1 c2 20 04     vcmppd $0x4,(%eax),%xmm3,%xmm4
+    libdis_test+0x870:  c5 d1 c2 71 42 04  vcmppd $0x4,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x876:  c5 f5 c2 d0 04     vcmppd $0x4,%ymm0,%ymm1,%ymm2
+    libdis_test+0x87b:  c5 e5 c2 23 04     vcmppd $0x4,(%ebx),%ymm3,%ymm4
+    libdis_test+0x880:  c5 d5 c2 72 42 04  vcmppd $0x4,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x886:  c5 f0 c2 d0 04     vcmpps $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x88b:  c5 e0 c2 20 04     vcmpps $0x4,(%eax),%xmm3,%xmm4
+    libdis_test+0x890:  c5 d0 c2 71 42 04  vcmpps $0x4,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x896:  c5 f4 c2 d0 04     vcmpps $0x4,%ymm0,%ymm1,%ymm2
+    libdis_test+0x89b:  c5 e4 c2 23 04     vcmpps $0x4,(%ebx),%ymm3,%ymm4
+    libdis_test+0x8a0:  c5 d4 c2 72 42 04  vcmpps $0x4,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x8a6:  c5 f3 c2 d0 04     vcmpsd $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8ab:  c5 e3 c2 20 04     vcmpsd $0x4,(%eax),%xmm3,%xmm4
+    libdis_test+0x8b0:  c5 d3 c2 71 42 04  vcmpsd $0x4,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x8b6:  c5 f2 c2 d0 04     vcmpss $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8bb:  c5 e2 c2 20 04     vcmpss $0x4,(%eax),%xmm3,%xmm4
+    libdis_test+0x8c0:  c5 d2 c2 71 42 04  vcmpss $0x4,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x8c6:  c5 f1 c2 d0 19     vcmppd $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8cb:  c5 e1 c2 20 19     vcmppd $0x19,(%eax),%xmm3,%xmm4
+    libdis_test+0x8d0:  c5 d1 c2 71 42 19  vcmppd $0x19,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x8d6:  c5 f5 c2 d0 19     vcmppd $0x19,%ymm0,%ymm1,%ymm2
+    libdis_test+0x8db:  c5 e5 c2 23 19     vcmppd $0x19,(%ebx),%ymm3,%ymm4
+    libdis_test+0x8e0:  c5 d5 c2 72 42 19  vcmppd $0x19,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x8e6:  c5 f0 c2 d0 19     vcmpps $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8eb:  c5 e0 c2 20 19     vcmpps $0x19,(%eax),%xmm3,%xmm4
+    libdis_test+0x8f0:  c5 d0 c2 71 42 19  vcmpps $0x19,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x8f6:  c5 f4 c2 d0 19     vcmpps $0x19,%ymm0,%ymm1,%ymm2
+    libdis_test+0x8fb:  c5 e4 c2 23 19     vcmpps $0x19,(%ebx),%ymm3,%ymm4
+    libdis_test+0x900:  c5 d4 c2 72 42 19  vcmpps $0x19,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x906:  c5 f3 c2 d0 19     vcmpsd $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x90b:  c5 e3 c2 20 19     vcmpsd $0x19,(%eax),%xmm3,%xmm4
+    libdis_test+0x910:  c5 d3 c2 71 42 19  vcmpsd $0x19,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x916:  c5 f2 c2 d0 19     vcmpss $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x91b:  c5 e2 c2 20 19     vcmpss $0x19,(%eax),%xmm3,%xmm4
+    libdis_test+0x920:  c5 d2 c2 71 42 19  vcmpss $0x19,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x926:  c5 f1 c2 d0 09     vcmppd $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x92b:  c5 e1 c2 20 09     vcmppd $0x9,(%eax),%xmm3,%xmm4
+    libdis_test+0x930:  c5 d1 c2 71 42 09  vcmppd $0x9,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x936:  c5 f5 c2 d0 09     vcmppd $0x9,%ymm0,%ymm1,%ymm2
+    libdis_test+0x93b:  c5 e5 c2 23 09     vcmppd $0x9,(%ebx),%ymm3,%ymm4
+    libdis_test+0x940:  c5 d5 c2 72 42 09  vcmppd $0x9,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x946:  c5 f0 c2 d0 09     vcmpps $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x94b:  c5 e0 c2 20 09     vcmpps $0x9,(%eax),%xmm3,%xmm4
+    libdis_test+0x950:  c5 d0 c2 71 42 09  vcmpps $0x9,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x956:  c5 f4 c2 d0 09     vcmpps $0x9,%ymm0,%ymm1,%ymm2
+    libdis_test+0x95b:  c5 e4 c2 23 09     vcmpps $0x9,(%ebx),%ymm3,%ymm4
+    libdis_test+0x960:  c5 d4 c2 72 42 09  vcmpps $0x9,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x966:  c5 f3 c2 d0 09     vcmpsd $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x96b:  c5 e3 c2 20 09     vcmpsd $0x9,(%eax),%xmm3,%xmm4
+    libdis_test+0x970:  c5 d3 c2 71 42 09  vcmpsd $0x9,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x976:  c5 f2 c2 d0 09     vcmpss $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x97b:  c5 e2 c2 20 09     vcmpss $0x9,(%eax),%xmm3,%xmm4
+    libdis_test+0x980:  c5 d2 c2 71 42 09  vcmpss $0x9,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x986:  c5 f1 c2 d0 1a     vcmppd $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x98b:  c5 e1 c2 20 1a     vcmppd $0x1a,(%eax),%xmm3,%xmm4
+    libdis_test+0x990:  c5 d1 c2 71 42 1a  vcmppd $0x1a,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x996:  c5 f5 c2 d0 1a     vcmppd $0x1a,%ymm0,%ymm1,%ymm2
+    libdis_test+0x99b:  c5 e5 c2 23 1a     vcmppd $0x1a,(%ebx),%ymm3,%ymm4
+    libdis_test+0x9a0:  c5 d5 c2 72 42 1a  vcmppd $0x1a,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x9a6:  c5 f0 c2 d0 1a     vcmpps $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9ab:  c5 e0 c2 20 1a     vcmpps $0x1a,(%eax),%xmm3,%xmm4
+    libdis_test+0x9b0:  c5 d0 c2 71 42 1a  vcmpps $0x1a,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x9b6:  c5 f4 c2 d0 1a     vcmpps $0x1a,%ymm0,%ymm1,%ymm2
+    libdis_test+0x9bb:  c5 e4 c2 23 1a     vcmpps $0x1a,(%ebx),%ymm3,%ymm4
+    libdis_test+0x9c0:  c5 d4 c2 72 42 1a  vcmpps $0x1a,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x9c6:  c5 f3 c2 d0 1a     vcmpsd $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9cb:  c5 e3 c2 20 1a     vcmpsd $0x1a,(%eax),%xmm3,%xmm4
+    libdis_test+0x9d0:  c5 d3 c2 71 42 1a  vcmpsd $0x1a,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x9d6:  c5 f2 c2 d0 1a     vcmpss $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9db:  c5 e2 c2 20 1a     vcmpss $0x1a,(%eax),%xmm3,%xmm4
+    libdis_test+0x9e0:  c5 d2 c2 71 42 1a  vcmpss $0x1a,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x9e6:  c5 f1 c2 d0 0a     vcmppd $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9eb:  c5 e1 c2 20 0a     vcmppd $0xa,(%eax),%xmm3,%xmm4
+    libdis_test+0x9f0:  c5 d1 c2 71 42 0a  vcmppd $0xa,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x9f6:  c5 f5 c2 d0 0a     vcmppd $0xa,%ymm0,%ymm1,%ymm2
+    libdis_test+0x9fb:  c5 e5 c2 23 0a     vcmppd $0xa,(%ebx),%ymm3,%ymm4
+    libdis_test+0xa00:  c5 d5 c2 72 42 0a  vcmppd $0xa,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xa06:  c5 f0 c2 d0 0a     vcmpps $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa0b:  c5 e0 c2 20 0a     vcmpps $0xa,(%eax),%xmm3,%xmm4
+    libdis_test+0xa10:  c5 d0 c2 71 42 0a  vcmpps $0xa,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xa16:  c5 f4 c2 d0 0a     vcmpps $0xa,%ymm0,%ymm1,%ymm2
+    libdis_test+0xa1b:  c5 e4 c2 23 0a     vcmpps $0xa,(%ebx),%ymm3,%ymm4
+    libdis_test+0xa20:  c5 d4 c2 72 42 0a  vcmpps $0xa,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xa26:  c5 f3 c2 d0 0a     vcmpsd $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa2b:  c5 e3 c2 20 0a     vcmpsd $0xa,(%eax),%xmm3,%xmm4
+    libdis_test+0xa30:  c5 d3 c2 71 42 0a  vcmpsd $0xa,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xa36:  c5 f2 c2 d0 0a     vcmpss $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa3b:  c5 e2 c2 20 0a     vcmpss $0xa,(%eax),%xmm3,%xmm4
+    libdis_test+0xa40:  c5 d2 c2 71 42 0a  vcmpss $0xa,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xa46:  c5 f1 c2 d0 16     vcmppd $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa4b:  c5 e1 c2 20 16     vcmppd $0x16,(%eax),%xmm3,%xmm4
+    libdis_test+0xa50:  c5 d1 c2 71 42 16  vcmppd $0x16,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xa56:  c5 f5 c2 d0 16     vcmppd $0x16,%ymm0,%ymm1,%ymm2
+    libdis_test+0xa5b:  c5 e5 c2 23 16     vcmppd $0x16,(%ebx),%ymm3,%ymm4
+    libdis_test+0xa60:  c5 d5 c2 72 42 16  vcmppd $0x16,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xa66:  c5 f0 c2 d0 16     vcmpps $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa6b:  c5 e0 c2 20 16     vcmpps $0x16,(%eax),%xmm3,%xmm4
+    libdis_test+0xa70:  c5 d0 c2 71 42 16  vcmpps $0x16,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xa76:  c5 f4 c2 d0 16     vcmpps $0x16,%ymm0,%ymm1,%ymm2
+    libdis_test+0xa7b:  c5 e4 c2 23 16     vcmpps $0x16,(%ebx),%ymm3,%ymm4
+    libdis_test+0xa80:  c5 d4 c2 72 42 16  vcmpps $0x16,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xa86:  c5 f3 c2 d0 16     vcmpsd $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa8b:  c5 e3 c2 20 16     vcmpsd $0x16,(%eax),%xmm3,%xmm4
+    libdis_test+0xa90:  c5 d3 c2 71 42 16  vcmpsd $0x16,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xa96:  c5 f2 c2 d0 16     vcmpss $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa9b:  c5 e2 c2 20 16     vcmpss $0x16,(%eax),%xmm3,%xmm4
+    libdis_test+0xaa0:  c5 d2 c2 71 42 16  vcmpss $0x16,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xaa6:  c5 f1 c2 d0 06     vcmppd $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xaab:  c5 e1 c2 20 06     vcmppd $0x6,(%eax),%xmm3,%xmm4
+    libdis_test+0xab0:  c5 d1 c2 71 42 06  vcmppd $0x6,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xab6:  c5 f5 c2 d0 06     vcmppd $0x6,%ymm0,%ymm1,%ymm2
+    libdis_test+0xabb:  c5 e5 c2 23 06     vcmppd $0x6,(%ebx),%ymm3,%ymm4
+    libdis_test+0xac0:  c5 d5 c2 72 42 06  vcmppd $0x6,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xac6:  c5 f0 c2 d0 06     vcmpps $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xacb:  c5 e0 c2 20 06     vcmpps $0x6,(%eax),%xmm3,%xmm4
+    libdis_test+0xad0:  c5 d0 c2 71 42 06  vcmpps $0x6,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xad6:  c5 f4 c2 d0 06     vcmpps $0x6,%ymm0,%ymm1,%ymm2
+    libdis_test+0xadb:  c5 e4 c2 23 06     vcmpps $0x6,(%ebx),%ymm3,%ymm4
+    libdis_test+0xae0:  c5 d4 c2 72 42 06  vcmpps $0x6,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xae6:  c5 f3 c2 d0 06     vcmpsd $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xaeb:  c5 e3 c2 20 06     vcmpsd $0x6,(%eax),%xmm3,%xmm4
+    libdis_test+0xaf0:  c5 d3 c2 71 42 06  vcmpsd $0x6,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xaf6:  c5 f2 c2 d0 06     vcmpss $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xafb:  c5 e2 c2 20 06     vcmpss $0x6,(%eax),%xmm3,%xmm4
+    libdis_test+0xb00:  c5 d2 c2 71 42 06  vcmpss $0x6,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb06:  c5 f1 c2 d0 15     vcmppd $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb0b:  c5 e1 c2 20 15     vcmppd $0x15,(%eax),%xmm3,%xmm4
+    libdis_test+0xb10:  c5 d1 c2 71 42 15  vcmppd $0x15,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb16:  c5 f5 c2 d0 15     vcmppd $0x15,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb1b:  c5 e5 c2 23 15     vcmppd $0x15,(%ebx),%ymm3,%ymm4
+    libdis_test+0xb20:  c5 d5 c2 72 42 15  vcmppd $0x15,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xb26:  c5 f0 c2 d0 15     vcmpps $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb2b:  c5 e0 c2 20 15     vcmpps $0x15,(%eax),%xmm3,%xmm4
+    libdis_test+0xb30:  c5 d0 c2 71 42 15  vcmpps $0x15,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb36:  c5 f4 c2 d0 15     vcmpps $0x15,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb3b:  c5 e4 c2 23 15     vcmpps $0x15,(%ebx),%ymm3,%ymm4
+    libdis_test+0xb40:  c5 d4 c2 72 42 15  vcmpps $0x15,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xb46:  c5 f3 c2 d0 15     vcmpsd $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb4b:  c5 e3 c2 20 15     vcmpsd $0x15,(%eax),%xmm3,%xmm4
+    libdis_test+0xb50:  c5 d3 c2 71 42 15  vcmpsd $0x15,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb56:  c5 f2 c2 d0 15     vcmpss $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb5b:  c5 e2 c2 20 15     vcmpss $0x15,(%eax),%xmm3,%xmm4
+    libdis_test+0xb60:  c5 d2 c2 71 42 15  vcmpss $0x15,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb66:  c5 f1 c2 d0 05     vcmppd $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb6b:  c5 e1 c2 20 05     vcmppd $0x5,(%eax),%xmm3,%xmm4
+    libdis_test+0xb70:  c5 d1 c2 71 42 05  vcmppd $0x5,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb76:  c5 f5 c2 d0 05     vcmppd $0x5,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb7b:  c5 e5 c2 23 05     vcmppd $0x5,(%ebx),%ymm3,%ymm4
+    libdis_test+0xb80:  c5 d5 c2 72 42 05  vcmppd $0x5,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xb86:  c5 f0 c2 d0 05     vcmpps $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb8b:  c5 e0 c2 20 05     vcmpps $0x5,(%eax),%xmm3,%xmm4
+    libdis_test+0xb90:  c5 d0 c2 71 42 05  vcmpps $0x5,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xb96:  c5 f4 c2 d0 05     vcmpps $0x5,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb9b:  c5 e4 c2 23 05     vcmpps $0x5,(%ebx),%ymm3,%ymm4
+    libdis_test+0xba0:  c5 d4 c2 72 42 05  vcmpps $0x5,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xba6:  c5 f3 c2 d0 05     vcmpsd $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbab:  c5 e3 c2 20 05     vcmpsd $0x5,(%eax),%xmm3,%xmm4
+    libdis_test+0xbb0:  c5 d3 c2 71 42 05  vcmpsd $0x5,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xbb6:  c5 f2 c2 d0 05     vcmpss $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbbb:  c5 e2 c2 20 05     vcmpss $0x5,(%eax),%xmm3,%xmm4
+    libdis_test+0xbc0:  c5 d2 c2 71 42 05  vcmpss $0x5,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xbc6:  c5 f1 c2 d0 17     vcmppd $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbcb:  c5 e1 c2 20 17     vcmppd $0x17,(%eax),%xmm3,%xmm4
+    libdis_test+0xbd0:  c5 d1 c2 71 42 17  vcmppd $0x17,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xbd6:  c5 f5 c2 d0 17     vcmppd $0x17,%ymm0,%ymm1,%ymm2
+    libdis_test+0xbdb:  c5 e5 c2 23 17     vcmppd $0x17,(%ebx),%ymm3,%ymm4
+    libdis_test+0xbe0:  c5 d5 c2 72 42 17  vcmppd $0x17,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xbe6:  c5 f0 c2 d0 17     vcmpps $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbeb:  c5 e0 c2 20 17     vcmpps $0x17,(%eax),%xmm3,%xmm4
+    libdis_test+0xbf0:  c5 d0 c2 71 42 17  vcmpps $0x17,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xbf6:  c5 f4 c2 d0 17     vcmpps $0x17,%ymm0,%ymm1,%ymm2
+    libdis_test+0xbfb:  c5 e4 c2 23 17     vcmpps $0x17,(%ebx),%ymm3,%ymm4
+    libdis_test+0xc00:  c5 d4 c2 72 42 17  vcmpps $0x17,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xc06:  c5 f3 c2 d0 17     vcmpsd $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc0b:  c5 e3 c2 20 17     vcmpsd $0x17,(%eax),%xmm3,%xmm4
+    libdis_test+0xc10:  c5 d3 c2 71 42 17  vcmpsd $0x17,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xc16:  c5 f2 c2 d0 17     vcmpss $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc1b:  c5 e2 c2 20 17     vcmpss $0x17,(%eax),%xmm3,%xmm4
+    libdis_test+0xc20:  c5 d2 c2 71 42 17  vcmpss $0x17,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xc26:  c5 f1 c2 d0 07     vcmppd $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc2b:  c5 e1 c2 20 07     vcmppd $0x7,(%eax),%xmm3,%xmm4
+    libdis_test+0xc30:  c5 d1 c2 71 42 07  vcmppd $0x7,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xc36:  c5 f5 c2 d0 07     vcmppd $0x7,%ymm0,%ymm1,%ymm2
+    libdis_test+0xc3b:  c5 e5 c2 23 07     vcmppd $0x7,(%ebx),%ymm3,%ymm4
+    libdis_test+0xc40:  c5 d5 c2 72 42 07  vcmppd $0x7,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xc46:  c5 f0 c2 d0 07     vcmpps $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc4b:  c5 e0 c2 20 07     vcmpps $0x7,(%eax),%xmm3,%xmm4
+    libdis_test+0xc50:  c5 d0 c2 71 42 07  vcmpps $0x7,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xc56:  c5 f4 c2 d0 07     vcmpps $0x7,%ymm0,%ymm1,%ymm2
+    libdis_test+0xc5b:  c5 e4 c2 23 07     vcmpps $0x7,(%ebx),%ymm3,%ymm4
+    libdis_test+0xc60:  c5 d4 c2 72 42 07  vcmpps $0x7,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xc66:  c5 f3 c2 d0 07     vcmpsd $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc6b:  c5 e3 c2 20 07     vcmpsd $0x7,(%eax),%xmm3,%xmm4
+    libdis_test+0xc70:  c5 d3 c2 71 42 07  vcmpsd $0x7,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xc76:  c5 f2 c2 d0 07     vcmpss $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc7b:  c5 e2 c2 20 07     vcmpss $0x7,(%eax),%xmm3,%xmm4
+    libdis_test+0xc80:  c5 d2 c2 71 42 07  vcmpss $0x7,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xc86:  c5 d1 c2 fb 48     vcmppd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xc8b:  c5 e9 c2 23 48     vcmppd $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0xc90:  c5 f1 c2 73 08 48  vcmppd $0x48,0x8(%ebx),%xmm1,%xmm6
+    libdis_test+0xc96:  c5 d5 c2 fb 48     vcmppd $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0xc9b:  c5 ed c2 23 48     vcmppd $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0xca0:  c5 f5 c2 73 08 48  vcmppd $0x48,0x8(%ebx),%ymm1,%ymm6
+    libdis_test+0xca6:  c5 d0 c2 fb 48     vcmpps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xcab:  c5 e8 c2 23 48     vcmpps $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0xcb0:  c5 f0 c2 73 08 48  vcmpps $0x48,0x8(%ebx),%xmm1,%xmm6
+    libdis_test+0xcb6:  c5 d4 c2 fb 48     vcmpps $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0xcbb:  c5 ec c2 23 48     vcmpps $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0xcc0:  c5 f4 c2 73 08 48  vcmpps $0x48,0x8(%ebx),%ymm1,%ymm6
+    libdis_test+0xcc6:  c5 d3 c2 fb 48     vcmpsd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xccb:  c5 eb c2 23 48     vcmpsd $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0xcd0:  c5 f3 c2 73 08 48  vcmpsd $0x48,0x8(%ebx),%xmm1,%xmm6
+    libdis_test+0xcd6:  c5 d2 c2 fb 48     vcmpss $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xcdb:  c5 ea c2 23 48     vcmpss $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0xce0:  c5 f2 c2 73 08 48  vcmpss $0x48,0x8(%ebx),%xmm1,%xmm6
+    libdis_test+0xce6:  c5 f1 c2 d0 1f     vcmppd $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xceb:  c5 e1 c2 20 1f     vcmppd $0x1f,(%eax),%xmm3,%xmm4
+    libdis_test+0xcf0:  c5 d1 c2 71 42 1f  vcmppd $0x1f,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xcf6:  c5 f5 c2 d0 1f     vcmppd $0x1f,%ymm0,%ymm1,%ymm2
+    libdis_test+0xcfb:  c5 e5 c2 23 1f     vcmppd $0x1f,(%ebx),%ymm3,%ymm4
+    libdis_test+0xd00:  c5 d5 c2 72 42 1f  vcmppd $0x1f,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xd06:  c5 f0 c2 d0 1f     vcmpps $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd0b:  c5 e0 c2 20 1f     vcmpps $0x1f,(%eax),%xmm3,%xmm4
+    libdis_test+0xd10:  c5 d0 c2 71 42 1f  vcmpps $0x1f,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xd16:  c5 f4 c2 d0 1f     vcmpps $0x1f,%ymm0,%ymm1,%ymm2
+    libdis_test+0xd1b:  c5 e4 c2 23 1f     vcmpps $0x1f,(%ebx),%ymm3,%ymm4
+    libdis_test+0xd20:  c5 d4 c2 72 42 1f  vcmpps $0x1f,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xd26:  c5 f3 c2 d0 1f     vcmpsd $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd2b:  c5 e3 c2 20 1f     vcmpsd $0x1f,(%eax),%xmm3,%xmm4
+    libdis_test+0xd30:  c5 d3 c2 71 42 1f  vcmpsd $0x1f,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xd36:  c5 f2 c2 d0 1f     vcmpss $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd3b:  c5 e2 c2 20 1f     vcmpss $0x1f,(%eax),%xmm3,%xmm4
+    libdis_test+0xd40:  c5 d2 c2 71 42 1f  vcmpss $0x1f,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xd46:  c5 f1 c2 d0 0f     vcmppd $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd4b:  c5 e1 c2 20 0f     vcmppd $0xf,(%eax),%xmm3,%xmm4
+    libdis_test+0xd50:  c5 d1 c2 71 42 0f  vcmppd $0xf,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xd56:  c5 f5 c2 d0 0f     vcmppd $0xf,%ymm0,%ymm1,%ymm2
+    libdis_test+0xd5b:  c5 e5 c2 23 0f     vcmppd $0xf,(%ebx),%ymm3,%ymm4
+    libdis_test+0xd60:  c5 d5 c2 72 42 0f  vcmppd $0xf,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xd66:  c5 f0 c2 d0 0f     vcmpps $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd6b:  c5 e0 c2 20 0f     vcmpps $0xf,(%eax),%xmm3,%xmm4
+    libdis_test+0xd70:  c5 d0 c2 71 42 0f  vcmpps $0xf,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xd76:  c5 f4 c2 d0 0f     vcmpps $0xf,%ymm0,%ymm1,%ymm2
+    libdis_test+0xd7b:  c5 e4 c2 23 0f     vcmpps $0xf,(%ebx),%ymm3,%ymm4
+    libdis_test+0xd80:  c5 d4 c2 72 42 0f  vcmpps $0xf,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xd86:  c5 f3 c2 d0 0f     vcmpsd $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd8b:  c5 e3 c2 20 0f     vcmpsd $0xf,(%eax),%xmm3,%xmm4
+    libdis_test+0xd90:  c5 d3 c2 71 42 0f  vcmpsd $0xf,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xd96:  c5 f2 c2 d0 0f     vcmpss $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd9b:  c5 e2 c2 20 0f     vcmpss $0xf,(%eax),%xmm3,%xmm4
+    libdis_test+0xda0:  c5 d2 c2 71 42 0f  vcmpss $0xf,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xda6:  c5 f1 c2 d0 13     vcmppd $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdab:  c5 e1 c2 20 13     vcmppd $0x13,(%eax),%xmm3,%xmm4
+    libdis_test+0xdb0:  c5 d1 c2 71 42 13  vcmppd $0x13,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xdb6:  c5 f5 c2 d0 13     vcmppd $0x13,%ymm0,%ymm1,%ymm2
+    libdis_test+0xdbb:  c5 e5 c2 23 13     vcmppd $0x13,(%ebx),%ymm3,%ymm4
+    libdis_test+0xdc0:  c5 d5 c2 72 42 13  vcmppd $0x13,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xdc6:  c5 f0 c2 d0 13     vcmpps $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdcb:  c5 e0 c2 20 13     vcmpps $0x13,(%eax),%xmm3,%xmm4
+    libdis_test+0xdd0:  c5 d0 c2 71 42 13  vcmpps $0x13,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xdd6:  c5 f4 c2 d0 13     vcmpps $0x13,%ymm0,%ymm1,%ymm2
+    libdis_test+0xddb:  c5 e4 c2 23 13     vcmpps $0x13,(%ebx),%ymm3,%ymm4
+    libdis_test+0xde0:  c5 d4 c2 72 42 13  vcmpps $0x13,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xde6:  c5 f3 c2 d0 13     vcmpsd $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdeb:  c5 e3 c2 20 13     vcmpsd $0x13,(%eax),%xmm3,%xmm4
+    libdis_test+0xdf0:  c5 d3 c2 71 42 13  vcmpsd $0x13,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xdf6:  c5 f2 c2 d0 13     vcmpss $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdfb:  c5 e2 c2 20 13     vcmpss $0x13,(%eax),%xmm3,%xmm4
+    libdis_test+0xe00:  c5 d2 c2 71 42 13  vcmpss $0x13,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xe06:  c5 f1 c2 d0 03     vcmppd $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe0b:  c5 e1 c2 20 03     vcmppd $0x3,(%eax),%xmm3,%xmm4
+    libdis_test+0xe10:  c5 d1 c2 71 42 03  vcmppd $0x3,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xe16:  c5 f5 c2 d0 03     vcmppd $0x3,%ymm0,%ymm1,%ymm2
+    libdis_test+0xe1b:  c5 e5 c2 23 03     vcmppd $0x3,(%ebx),%ymm3,%ymm4
+    libdis_test+0xe20:  c5 d5 c2 72 42 03  vcmppd $0x3,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xe26:  c5 f0 c2 d0 03     vcmpps $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe2b:  c5 e0 c2 20 03     vcmpps $0x3,(%eax),%xmm3,%xmm4
+    libdis_test+0xe30:  c5 d0 c2 71 42 03  vcmpps $0x3,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xe36:  c5 f4 c2 d0 03     vcmpps $0x3,%ymm0,%ymm1,%ymm2
+    libdis_test+0xe3b:  c5 e4 c2 23 03     vcmpps $0x3,(%ebx),%ymm3,%ymm4
+    libdis_test+0xe40:  c5 d4 c2 72 42 03  vcmpps $0x3,0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xe46:  c5 f3 c2 d0 03     vcmpsd $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe4b:  c5 e3 c2 20 03     vcmpsd $0x3,(%eax),%xmm3,%xmm4
+    libdis_test+0xe50:  c5 d3 c2 71 42 03  vcmpsd $0x3,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xe56:  c5 f2 c2 d0 03     vcmpss $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe5b:  c5 e2 c2 20 03     vcmpss $0x3,(%eax),%xmm3,%xmm4
+    libdis_test+0xe60:  c5 d2 c2 71 42 03  vcmpss $0x3,0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xe66:  c5 f9 2f c8        vcomisd %xmm0,%xmm1
+    libdis_test+0xe6a:  c5 f9 2f 1e        vcomisd (%esi),%xmm3
+    libdis_test+0xe6e:  c5 f9 2f 5f 42     vcomisd 0x42(%edi),%xmm3
+    libdis_test+0xe73:  c5 f8 2f c8        vcomiss %xmm0,%xmm1
+    libdis_test+0xe77:  c5 f8 2f 1e        vcomiss (%esi),%xmm3
+    libdis_test+0xe7b:  c5 f8 2f 5f 42     vcomiss 0x42(%edi),%xmm3
+    libdis_test+0xe80:  c5 fa e6 c8        vcvtdq2pd %xmm0,%xmm1
+    libdis_test+0xe84:  c5 fa e6 1e        vcvtdq2pd (%esi),%xmm3
+    libdis_test+0xe88:  c5 fa e6 5f 42     vcvtdq2pd 0x42(%edi),%xmm3
+    libdis_test+0xe8d:  c5 fe e6 f7        vcvtdq2pd %xmm7,%ymm6
+    libdis_test+0xe91:  c5 fe e6 65 00     vcvtdq2pd 0x0(%ebp),%ymm4
+    libdis_test+0xe96:  c5 fe e6 64 24 42  vcvtdq2pd 0x42(%esp),%ymm4
+    libdis_test+0xe9c:  c5 f8 5b c8        vcvtdq2ps %xmm0,%xmm1
+    libdis_test+0xea0:  c5 f8 5b 1e        vcvtdq2ps (%esi),%xmm3
+    libdis_test+0xea4:  c5 f8 5b 5f 42     vcvtdq2ps 0x42(%edi),%xmm3
+    libdis_test+0xea9:  c5 fc 5b f7        vcvtdq2ps %ymm7,%ymm6
+    libdis_test+0xead:  c5 fc 5b 65 00     vcvtdq2ps 0x0(%ebp),%ymm4
+    libdis_test+0xeb2:  c5 fc 5b 64 24 42  vcvtdq2ps 0x42(%esp),%ymm4
+    libdis_test+0xeb8:  c5 ff e6 de        vcvtpd2dq %ymm6,%xmm3
+    libdis_test+0xebc:  c5 fb e6 c8        vcvtpd2dq %xmm0,%xmm1
+    libdis_test+0xec0:  c5 fb e6 1e        vcvtpd2dq (%esi),%xmm3
+    libdis_test+0xec4:  c5 fb e6 5f 42     vcvtpd2dq 0x42(%edi),%xmm3
+    libdis_test+0xec9:  c5 ff e6 f7        vcvtpd2dq %ymm7,%xmm6
+    libdis_test+0xecd:  c5 ff e6 65 00     vcvtpd2dq 0x0(%ebp),%xmm4
+    libdis_test+0xed2:  c5 ff e6 64 24 42  vcvtpd2dq 0x42(%esp),%xmm4
+    libdis_test+0xed8:  c5 fd 5a de        vcvtpd2ps %ymm6,%xmm3
+    libdis_test+0xedc:  c5 f9 5a c8        vcvtpd2ps %xmm0,%xmm1
+    libdis_test+0xee0:  c5 f9 5a 1e        vcvtpd2ps (%esi),%xmm3
+    libdis_test+0xee4:  c5 f9 5a 5f 42     vcvtpd2ps 0x42(%edi),%xmm3
+    libdis_test+0xee9:  c5 fd 5a f7        vcvtpd2ps %ymm7,%xmm6
+    libdis_test+0xeed:  c5 fd 5a 65 00     vcvtpd2ps 0x0(%ebp),%xmm4
+    libdis_test+0xef2:  c5 fd 5a 64 24 42  vcvtpd2ps 0x42(%esp),%xmm4
+    libdis_test+0xef8:  c5 f9 5b c8        vcvtps2dq %xmm0,%xmm1
+    libdis_test+0xefc:  c5 f9 5b 1e        vcvtps2dq (%esi),%xmm3
+    libdis_test+0xf00:  c5 f9 5b 5f 42     vcvtps2dq 0x42(%edi),%xmm3
+    libdis_test+0xf05:  c5 fd 5b f7        vcvtps2dq %ymm7,%ymm6
+    libdis_test+0xf09:  c5 fd 5b 65 00     vcvtps2dq 0x0(%ebp),%ymm4
+    libdis_test+0xf0e:  c5 fd 5b 64 24 42  vcvtps2dq 0x42(%esp),%ymm4
+    libdis_test+0xf14:  c5 f8 5a c8        vcvtps2pd %xmm0,%xmm1
+    libdis_test+0xf18:  c5 f8 5a 1e        vcvtps2pd (%esi),%xmm3
+    libdis_test+0xf1c:  c5 f8 5a 5f 42     vcvtps2pd 0x42(%edi),%xmm3
+    libdis_test+0xf21:  c5 fc 5a f7        vcvtps2pd %xmm7,%ymm6
+    libdis_test+0xf25:  c5 fc 5a 65 00     vcvtps2pd 0x0(%ebp),%ymm4
+    libdis_test+0xf2a:  c5 fc 5a 64 24 42  vcvtps2pd 0x42(%esp),%ymm4
+    libdis_test+0xf30:  c5 fb 2d c6        vcvtsd2si %xmm6,%eax
+    libdis_test+0xf34:  c5 fb 2d 03        vcvtsd2si (%ebx),%eax
+    libdis_test+0xf38:  c5 fb 2d 43 24     vcvtsd2si 0x24(%ebx),%eax
+    libdis_test+0xf3d:  c5 f3 5a d0        vcvtsd2ss %xmm0,%xmm1,%xmm2
+    libdis_test+0xf41:  c5 e3 5a 20        vcvtsd2ss (%eax),%xmm3,%xmm4
+    libdis_test+0xf45:  c5 d3 5a 71 42     vcvtsd2ss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xf4a:  c5 f2 5a d0        vcvtss2sd %xmm0,%xmm1,%xmm2
+    libdis_test+0xf4e:  c5 e2 5a 20        vcvtss2sd (%eax),%xmm3,%xmm4
+    libdis_test+0xf52:  c5 d2 5a 71 42     vcvtss2sd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xf57:  c5 fa 2d c6        vcvtss2si %xmm6,%eax
+    libdis_test+0xf5b:  c5 fa 2d 03        vcvtss2si (%ebx),%eax
+    libdis_test+0xf5f:  c5 fa 2d 43 24     vcvtss2si 0x24(%ebx),%eax
+    libdis_test+0xf64:  c5 f9 e6 e8        vcvttpd2dq %xmm0,%xmm5
+    libdis_test+0xf68:  c5 f9 e6 c8        vcvttpd2dq %xmm0,%xmm1
+    libdis_test+0xf6c:  c5 f9 e6 1e        vcvttpd2dq (%esi),%xmm3
+    libdis_test+0xf70:  c5 f9 e6 5f 42     vcvttpd2dq 0x42(%edi),%xmm3
+    libdis_test+0xf75:  c5 fd e6 f7        vcvttpd2dq %ymm7,%xmm6
+    libdis_test+0xf79:  c5 fd e6 65 00     vcvttpd2dq 0x0(%ebp),%xmm4
+    libdis_test+0xf7e:  c5 fd e6 64 24 42  vcvttpd2dq 0x42(%esp),%xmm4
+    libdis_test+0xf84:  c5 fa 5b c8        vcvttps2dq %xmm0,%xmm1
+    libdis_test+0xf88:  c5 fa 5b 1e        vcvttps2dq (%esi),%xmm3
+    libdis_test+0xf8c:  c5 fa 5b 5f 42     vcvttps2dq 0x42(%edi),%xmm3
+    libdis_test+0xf91:  c5 fe 5b f7        vcvttps2dq %ymm7,%ymm6
+    libdis_test+0xf95:  c5 fe 5b 65 00     vcvttps2dq 0x0(%ebp),%ymm4
+    libdis_test+0xf9a:  c5 fe 5b 64 24 42  vcvttps2dq 0x42(%esp),%ymm4
+    libdis_test+0xfa0:  c5 fb 2c c6        vcvttsd2si %xmm6,%eax
+    libdis_test+0xfa4:  c5 fb 2c 03        vcvttsd2si (%ebx),%eax
+    libdis_test+0xfa8:  c5 fb 2c 43 24     vcvttsd2si 0x24(%ebx),%eax
+    libdis_test+0xfad:  c5 fa 2c c6        vcvttss2si %xmm6,%eax
+    libdis_test+0xfb1:  c5 fa 2c 03        vcvttss2si (%ebx),%eax
+    libdis_test+0xfb5:  c5 fa 2c 43 24     vcvttss2si 0x24(%ebx),%eax
+    libdis_test+0xfba:  c5 f1 5e d0        vdivpd %xmm0,%xmm1,%xmm2
+    libdis_test+0xfbe:  c5 e1 5e 20        vdivpd (%eax),%xmm3,%xmm4
+    libdis_test+0xfc2:  c5 d1 5e 71 42     vdivpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xfc7:  c5 f5 5e d0        vdivpd %ymm0,%ymm1,%ymm2
+    libdis_test+0xfcb:  c5 e5 5e 23        vdivpd (%ebx),%ymm3,%ymm4
+    libdis_test+0xfcf:  c5 d5 5e 72 42     vdivpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xfd4:  c5 f0 5e d0        vdivps %xmm0,%xmm1,%xmm2
+    libdis_test+0xfd8:  c5 e0 5e 20        vdivps (%eax),%xmm3,%xmm4
+    libdis_test+0xfdc:  c5 d0 5e 71 42     vdivps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xfe1:  c5 f4 5e d0        vdivps %ymm0,%ymm1,%ymm2
+    libdis_test+0xfe5:  c5 e4 5e 23        vdivps (%ebx),%ymm3,%ymm4
+    libdis_test+0xfe9:  c5 d4 5e 72 42     vdivps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0xfee:  c5 f3 5e d0        vdivsd %xmm0,%xmm1,%xmm2
+    libdis_test+0xff2:  c5 e3 5e 20        vdivsd (%eax),%xmm3,%xmm4
+    libdis_test+0xff6:  c5 d3 5e 71 42     vdivsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0xffb:  c5 f2 5e d0        vdivss %xmm0,%xmm1,%xmm2
+    libdis_test+0xfff:  c5 e2 5e 20        vdivss (%eax),%xmm3,%xmm4
+    libdis_test+0x1003: c5 d2 5e 71 42     vdivss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1008: c4 e3 51 41 fb 48  vdppd  $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x100e: c4 e3 69 41 23 48  vdppd  $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x1014: c4 e3 71 41 73 08  vdppd  $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x101b: c4 e3 51 40 fb 48  vdpps  $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x1021: c4 e3 69 40 23 48  vdpps  $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x1027: c4 e3 71 40 73 08  vdpps  $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x102e: c4 e3 55 40 fb 48  vdpps  $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x1034: c4 e3 6d 40 23 48  vdpps  $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x103a: c4 e3 75 40 73 08  vdpps  $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x1041: c4 e3 7d 19 c1 30  vextractf128 $0x30,%ymm0,%xmm1
+    libdis_test+0x1047: c4 e3 7d 19 01 30  vextractf128 $0x30,%ymm0,(%ecx)
+    libdis_test+0x104d: c4 e3 7d 19 42 24  vextractf128 $0x30,%ymm0,0x24(%edx)
+                        30 
+    libdis_test+0x1054: c4 e3 79 17 c0 30  vextractps $0x30,%xmm0,%eax
+    libdis_test+0x105a: c4 e3 79 17 01 30  vextractps $0x30,%xmm0,(%ecx)
+    libdis_test+0x1060: c4 e3 79 17 42 24  vextractps $0x30,%xmm0,0x24(%edx)
+                        30 
+    libdis_test+0x1067: c5 f1 7c d0        vhaddpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x106b: c5 e1 7c 20        vhaddpd (%eax),%xmm3,%xmm4
+    libdis_test+0x106f: c5 d1 7c 71 42     vhaddpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1074: c5 f5 7c d0        vhaddpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1078: c5 e5 7c 23        vhaddpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x107c: c5 d5 7c 72 42     vhaddpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1081: c5 f3 7c d0        vhaddps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1085: c5 e3 7c 20        vhaddps (%eax),%xmm3,%xmm4
+    libdis_test+0x1089: c5 d3 7c 71 42     vhaddps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x108e: c5 f7 7c d0        vhaddps %ymm0,%ymm1,%ymm2
+    libdis_test+0x1092: c5 e7 7c 23        vhaddps (%ebx),%ymm3,%ymm4
+    libdis_test+0x1096: c5 d7 7c 72 42     vhaddps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x109b: c5 f1 7d d0        vhsubpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x109f: c5 e1 7d 20        vhsubpd (%eax),%xmm3,%xmm4
+    libdis_test+0x10a3: c5 d1 7d 71 42     vhsubpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x10a8: c5 f5 7d d0        vhsubpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x10ac: c5 e5 7d 23        vhsubpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x10b0: c5 d5 7d 72 42     vhsubpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x10b5: c5 f3 7d d0        vhsubps %xmm0,%xmm1,%xmm2
+    libdis_test+0x10b9: c5 e3 7d 20        vhsubps (%eax),%xmm3,%xmm4
+    libdis_test+0x10bd: c5 d3 7d 71 42     vhsubps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x10c2: c5 f7 7d d0        vhsubps %ymm0,%ymm1,%ymm2
+    libdis_test+0x10c6: c5 e7 7d 23        vhsubps (%ebx),%ymm3,%ymm4
+    libdis_test+0x10ca: c5 d7 7d 72 42     vhsubps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x10cf: c4 e3 55 18 fb 48  vinsertf128 $0x48,%xmm3,%ymm5,%ymm7
+    libdis_test+0x10d5: c4 e3 6d 18 23 48  vinsertf128 $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x10db: c4 e3 75 18 73 08  vinsertf128 $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x10e2: c4 e3 51 21 fb 48  vinsertps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x10e8: c4 e3 69 21 23 48  vinsertps $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x10ee: c4 e3 71 21 73 08  vinsertps $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x10f5: c5 fb f0 13        vlddqu (%ebx),%xmm2
+    libdis_test+0x10f9: c5 fb f0 4b 08     vlddqu 0x8(%ebx),%xmm1
+    libdis_test+0x10fe: c5 ff f0 13        vlddqu (%ebx),%ymm2
+    libdis_test+0x1102: c5 ff f0 4b 08     vlddqu 0x8(%ebx),%ymm1
+    libdis_test+0x1107: c5 f8 ae 12        vldmxcsr (%edx)
+    libdis_test+0x110b: c5 f8 ae 52 08     vldmxcsr 0x8(%edx)
+    libdis_test+0x1110: c5 f9 f7 e8        vmaskmovdqu %xmm0,%xmm5
+    libdis_test+0x1114: c4 e2 59 2d 13     vmaskmovpd (%ebx),%xmm4,%xmm2
+    libdis_test+0x1119: c4 e2 69 2d 4b 08  vmaskmovpd 0x8(%ebx),%xmm2,%xmm1
+    libdis_test+0x111f: c4 e2 5d 2c 13     vmaskmovps (%ebx),%ymm4,%ymm2
+    libdis_test+0x1124: c4 e2 65 2c 4b 08  vmaskmovps 0x8(%ebx),%ymm3,%ymm1
+    libdis_test+0x112a: c5 f1 5f d0        vmaxpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x112e: c5 e1 5f 20        vmaxpd (%eax),%xmm3,%xmm4
+    libdis_test+0x1132: c5 d1 5f 71 42     vmaxpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1137: c5 f5 5f d0        vmaxpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x113b: c5 e5 5f 23        vmaxpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x113f: c5 d5 5f 72 42     vmaxpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1144: c5 f0 5f d0        vmaxps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1148: c5 e0 5f 20        vmaxps (%eax),%xmm3,%xmm4
+    libdis_test+0x114c: c5 d0 5f 71 42     vmaxps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1151: c5 f4 5f d0        vmaxps %ymm0,%ymm1,%ymm2
+    libdis_test+0x1155: c5 e4 5f 23        vmaxps (%ebx),%ymm3,%ymm4
+    libdis_test+0x1159: c5 d4 5f 72 42     vmaxps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x115e: c5 f3 5f d0        vmaxsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1162: c5 e3 5f 20        vmaxsd (%eax),%xmm3,%xmm4
+    libdis_test+0x1166: c5 d3 5f 71 42     vmaxsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x116b: c5 f2 5f d0        vmaxss %xmm0,%xmm1,%xmm2
+    libdis_test+0x116f: c5 e2 5f 20        vmaxss (%eax),%xmm3,%xmm4
+    libdis_test+0x1173: c5 d2 5f 71 42     vmaxss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1178: c5 f1 5d d0        vminpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x117c: c5 e1 5d 20        vminpd (%eax),%xmm3,%xmm4
+    libdis_test+0x1180: c5 d1 5d 71 42     vminpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1185: c5 f5 5d d0        vminpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1189: c5 e5 5d 23        vminpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x118d: c5 d5 5d 72 42     vminpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1192: c5 f0 5d d0        vminps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1196: c5 e0 5d 20        vminps (%eax),%xmm3,%xmm4
+    libdis_test+0x119a: c5 d0 5d 71 42     vminps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x119f: c5 f4 5d d0        vminps %ymm0,%ymm1,%ymm2
+    libdis_test+0x11a3: c5 e4 5d 23        vminps (%ebx),%ymm3,%ymm4
+    libdis_test+0x11a7: c5 d4 5d 72 42     vminps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x11ac: c5 f3 5d d0        vminsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x11b0: c5 e3 5d 20        vminsd (%eax),%xmm3,%xmm4
+    libdis_test+0x11b4: c5 d3 5d 71 42     vminsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x11b9: c5 f2 5d d0        vminss %xmm0,%xmm1,%xmm2
+    libdis_test+0x11bd: c5 e2 5d 20        vminss (%eax),%xmm3,%xmm4
+    libdis_test+0x11c1: c5 d2 5d 71 42     vminss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x11c6: c5 f9 28 c8        vmovapd %xmm0,%xmm1
+    libdis_test+0x11ca: c5 f9 28 1e        vmovapd (%esi),%xmm3
+    libdis_test+0x11ce: c5 f9 28 5f 42     vmovapd 0x42(%edi),%xmm3
+    libdis_test+0x11d3: c5 fd 28 f7        vmovapd %ymm7,%ymm6
+    libdis_test+0x11d7: c5 fd 28 65 00     vmovapd 0x0(%ebp),%ymm4
+    libdis_test+0x11dc: c5 fd 28 64 24 42  vmovapd 0x42(%esp),%ymm4
+    libdis_test+0x11e2: c5 f9 28 c1        vmovapd %xmm1,%xmm0
+    libdis_test+0x11e6: c5 f9 29 1e        vmovapd %xmm3,(%esi)
+    libdis_test+0x11ea: c5 f9 29 5f 42     vmovapd %xmm3,0x42(%edi)
+    libdis_test+0x11ef: c5 fd 28 c1        vmovapd %ymm1,%ymm0
+    libdis_test+0x11f3: c5 fd 29 1e        vmovapd %ymm3,(%esi)
+    libdis_test+0x11f7: c5 fd 29 5f 42     vmovapd %ymm3,0x42(%edi)
+    libdis_test+0x11fc: c5 f8 28 c8        vmovaps %xmm0,%xmm1
+    libdis_test+0x1200: c5 f8 28 1e        vmovaps (%esi),%xmm3
+    libdis_test+0x1204: c5 f8 28 5f 42     vmovaps 0x42(%edi),%xmm3
+    libdis_test+0x1209: c5 fc 28 f7        vmovaps %ymm7,%ymm6
+    libdis_test+0x120d: c5 fc 28 65 00     vmovaps 0x0(%ebp),%ymm4
+    libdis_test+0x1212: c5 fc 28 64 24 42  vmovaps 0x42(%esp),%ymm4
+    libdis_test+0x1218: c5 f8 28 c1        vmovaps %xmm1,%xmm0
+    libdis_test+0x121c: c5 f8 29 1e        vmovaps %xmm3,(%esi)
+    libdis_test+0x1220: c5 f8 29 5f 42     vmovaps %xmm3,0x42(%edi)
+    libdis_test+0x1225: c5 fc 28 c1        vmovaps %ymm1,%ymm0
+    libdis_test+0x1229: c5 fc 29 1e        vmovaps %ymm3,(%esi)
+    libdis_test+0x122d: c5 fc 29 5f 42     vmovaps %ymm3,0x42(%edi)
+    libdis_test+0x1232: c5 f9 6e c0        vmovd  %eax,%xmm0
+    libdis_test+0x1236: c5 f9 6e 08        vmovd  (%eax),%xmm1
+    libdis_test+0x123a: c5 f9 6e 48 14     vmovd  0x14(%eax),%xmm1
+    libdis_test+0x123f: c5 fb 12 c8        vmovddup %xmm0,%xmm1
+    libdis_test+0x1243: c5 fb 12 1e        vmovddup (%esi),%xmm3
+    libdis_test+0x1247: c5 fb 12 5f 42     vmovddup 0x42(%edi),%xmm3
+    libdis_test+0x124c: c5 ff 12 f7        vmovddup %ymm7,%ymm6
+    libdis_test+0x1250: c5 ff 12 65 00     vmovddup 0x0(%ebp),%ymm4
+    libdis_test+0x1255: c5 ff 12 64 24 42  vmovddup 0x42(%esp),%ymm4
+    libdis_test+0x125b: c5 f9 6f c8        vmovdqa %xmm0,%xmm1
+    libdis_test+0x125f: c5 f9 6f 1e        vmovdqa (%esi),%xmm3
+    libdis_test+0x1263: c5 f9 6f 5f 42     vmovdqa 0x42(%edi),%xmm3
+    libdis_test+0x1268: c5 fd 6f f7        vmovdqa %ymm7,%ymm6
+    libdis_test+0x126c: c5 fd 6f 65 00     vmovdqa 0x0(%ebp),%ymm4
+    libdis_test+0x1271: c5 fd 6f 64 24 42  vmovdqa 0x42(%esp),%ymm4
+    libdis_test+0x1277: c5 f9 6f c1        vmovdqa %xmm1,%xmm0
+    libdis_test+0x127b: c5 f9 7f 1e        vmovdqa %xmm3,(%esi)
+    libdis_test+0x127f: c5 f9 7f 5f 42     vmovdqa %xmm3,0x42(%edi)
+    libdis_test+0x1284: c5 fd 6f c1        vmovdqa %ymm1,%ymm0
+    libdis_test+0x1288: c5 fd 7f 1e        vmovdqa %ymm3,(%esi)
+    libdis_test+0x128c: c5 fd 7f 5f 42     vmovdqa %ymm3,0x42(%edi)
+    libdis_test+0x1291: c5 fa 6f c8        vmovdqu %xmm0,%xmm1
+    libdis_test+0x1295: c5 fa 6f 1e        vmovdqu (%esi),%xmm3
+    libdis_test+0x1299: c5 fa 6f 5f 42     vmovdqu 0x42(%edi),%xmm3
+    libdis_test+0x129e: c5 fe 6f f7        vmovdqu %ymm7,%ymm6
+    libdis_test+0x12a2: c5 fe 6f 65 00     vmovdqu 0x0(%ebp),%ymm4
+    libdis_test+0x12a7: c5 fe 6f 64 24 42  vmovdqu 0x42(%esp),%ymm4
+    libdis_test+0x12ad: c5 fa 6f c1        vmovdqu %xmm1,%xmm0
+    libdis_test+0x12b1: c5 fa 7f 1e        vmovdqu %xmm3,(%esi)
+    libdis_test+0x12b5: c5 fa 7f 5f 42     vmovdqu %xmm3,0x42(%edi)
+    libdis_test+0x12ba: c5 fe 6f c1        vmovdqu %ymm1,%ymm0
+    libdis_test+0x12be: c5 fe 7f 1e        vmovdqu %ymm3,(%esi)
+    libdis_test+0x12c2: c5 fe 7f 5f 42     vmovdqu %ymm3,0x42(%edi)
+    libdis_test+0x12c7: c5 e8 12 e0        vmovhlps %xmm0,%xmm2,%xmm4
+    libdis_test+0x12cb: c5 d9 16 13        vmovhpd (%ebx),%xmm4,%xmm2
+    libdis_test+0x12cf: c5 e1 16 4b 08     vmovhpd 0x8(%ebx),%xmm3,%xmm1
+    libdis_test+0x12d4: c5 f9 17 1e        vmovhpd %xmm3,(%esi)
+    libdis_test+0x12d8: c5 f9 17 5f 42     vmovhpd %xmm3,0x42(%edi)
+    libdis_test+0x12dd: c5 d8 16 13        vmovhps (%ebx),%xmm4,%xmm2
+    libdis_test+0x12e1: c5 e0 16 4b 08     vmovhps 0x8(%ebx),%xmm3,%xmm1
+    libdis_test+0x12e6: c5 f8 17 1e        vmovhps %xmm3,(%esi)
+    libdis_test+0x12ea: c5 f8 17 5f 42     vmovhps %xmm3,0x42(%edi)
+    libdis_test+0x12ef: c5 e0 16 e9        vmovlhps %xmm1,%xmm3,%xmm5
+    libdis_test+0x12f3: c5 d9 12 13        vmovlpd (%ebx),%xmm4,%xmm2
+    libdis_test+0x12f7: c5 e1 12 4b 08     vmovlpd 0x8(%ebx),%xmm3,%xmm1
+    libdis_test+0x12fc: c5 f9 13 1e        vmovlpd %xmm3,(%esi)
+    libdis_test+0x1300: c5 f9 13 5f 42     vmovlpd %xmm3,0x42(%edi)
+    libdis_test+0x1305: c5 d8 12 13        vmovlps (%ebx),%xmm4,%xmm2
+    libdis_test+0x1309: c5 e0 12 4b 08     vmovlps 0x8(%ebx),%xmm3,%xmm1
+    libdis_test+0x130e: c5 f8 13 1e        vmovlps %xmm3,(%esi)
+    libdis_test+0x1312: c5 f8 13 5f 42     vmovlps %xmm3,0x42(%edi)
+    libdis_test+0x1317: c5 f9 50 c0        vmovmskpd %xmm0,%eax
+    libdis_test+0x131b: c5 fd 50 d9        vmovmskpd %ymm1,%ebx
+    libdis_test+0x131f: c5 f8 50 ca        vmovmskps %xmm2,%ecx
+    libdis_test+0x1323: c5 fc 50 d3        vmovmskps %ymm3,%edx
+    libdis_test+0x1327: c5 f9 e7 2f        vmovntdq %xmm5,(%edi)
+    libdis_test+0x132b: c5 f9 e7 6f 24     vmovntdq %xmm5,0x24(%edi)
+    libdis_test+0x1330: c5 fd e7 36        vmovntdq %ymm6,(%esi)
+    libdis_test+0x1334: c5 fd e7 76 24     vmovntdq %ymm6,0x24(%esi)
+    libdis_test+0x1339: c4 e2 79 2a 13     vmovntdqa (%ebx),%xmm2
+    libdis_test+0x133e: c4 e2 79 2a 4b 08  vmovntdqa 0x8(%ebx),%xmm1
+    libdis_test+0x1344: c4 e2 7d 2a 13     vmovntdqa (%ebx),%ymm2
+    libdis_test+0x1349: c4 e2 7d 2a 4b 08  vmovntdqa 0x8(%ebx),%ymm1
+    libdis_test+0x134f: c5 f9 2b 1e        vmovntpd %xmm3,(%esi)
+    libdis_test+0x1353: c5 f9 2b 5f 42     vmovntpd %xmm3,0x42(%edi)
+    libdis_test+0x1358: c5 fd 2b 1e        vmovntpd %ymm3,(%esi)
+    libdis_test+0x135c: c5 fd 2b 5f 42     vmovntpd %ymm3,0x42(%edi)
+    libdis_test+0x1361: c5 f8 2b 1e        vmovntps %xmm3,(%esi)
+    libdis_test+0x1365: c5 f8 2b 5f 42     vmovntps %xmm3,0x42(%edi)
+    libdis_test+0x136a: c5 fc 2b 1e        vmovntps %ymm3,(%esi)
+    libdis_test+0x136e: c5 fc 2b 5f 42     vmovntps %ymm3,0x42(%edi)
+    libdis_test+0x1373: c5 f9 d6 00        vmovq  %xmm0,(%eax)
+    libdis_test+0x1377: c5 f9 d6 40 10     vmovq  %xmm0,0x10(%eax)
+    libdis_test+0x137c: c5 fa 7e 4b 10     vmovq  0x10(%ebx),%xmm1
+    libdis_test+0x1381: c5 fa 7e 0b        vmovq  (%ebx),%xmm1
+    libdis_test+0x1385: c5 eb 10 e0        vmovsd %xmm0,%xmm2,%xmm4
+    libdis_test+0x1389: c5 fb 10 08        vmovsd (%eax),%xmm1
+    libdis_test+0x138d: c5 fb 10 50 32     vmovsd 0x32(%eax),%xmm2
+    libdis_test+0x1392: c5 fa 16 d0        vmovshdup %xmm0,%xmm2
+    libdis_test+0x1396: c5 fa 16 08        vmovshdup (%eax),%xmm1
+    libdis_test+0x139a: c5 fa 16 48 10     vmovshdup 0x10(%eax),%xmm1
+    libdis_test+0x139f: c5 fe 16 d0        vmovshdup %ymm0,%ymm2
+    libdis_test+0x13a3: c5 fe 16 0b        vmovshdup (%ebx),%ymm1
+    libdis_test+0x13a7: c5 fe 16 5b 10     vmovshdup 0x10(%ebx),%ymm3
+    libdis_test+0x13ac: c5 fa 12 d0        vmovsldup %xmm0,%xmm2
+    libdis_test+0x13b0: c5 fa 12 08        vmovsldup (%eax),%xmm1
+    libdis_test+0x13b4: c5 fa 12 48 10     vmovsldup 0x10(%eax),%xmm1
+    libdis_test+0x13b9: c5 fe 12 d0        vmovsldup %ymm0,%ymm2
+    libdis_test+0x13bd: c5 fe 12 0b        vmovsldup (%ebx),%ymm1
+    libdis_test+0x13c1: c5 fe 12 5b 10     vmovsldup 0x10(%ebx),%ymm3
+    libdis_test+0x13c6: c5 ea 10 e0        vmovss %xmm0,%xmm2,%xmm4
+    libdis_test+0x13ca: c5 fa 10 08        vmovss (%eax),%xmm1
+    libdis_test+0x13ce: c5 fa 10 50 32     vmovss 0x32(%eax),%xmm2
+    libdis_test+0x13d3: c5 f9 10 c8        vmovupd %xmm0,%xmm1
+    libdis_test+0x13d7: c5 f9 10 1e        vmovupd (%esi),%xmm3
+    libdis_test+0x13db: c5 f9 10 5f 42     vmovupd 0x42(%edi),%xmm3
+    libdis_test+0x13e0: c5 fd 10 f7        vmovupd %ymm7,%ymm6
+    libdis_test+0x13e4: c5 fd 10 65 00     vmovupd 0x0(%ebp),%ymm4
+    libdis_test+0x13e9: c5 fd 10 64 24 42  vmovupd 0x42(%esp),%ymm4
+    libdis_test+0x13ef: c5 f9 10 c1        vmovupd %xmm1,%xmm0
+    libdis_test+0x13f3: c5 f9 11 1e        vmovupd %xmm3,(%esi)
+    libdis_test+0x13f7: c5 f9 11 5f 42     vmovupd %xmm3,0x42(%edi)
+    libdis_test+0x13fc: c5 fd 10 c1        vmovupd %ymm1,%ymm0
+    libdis_test+0x1400: c5 fd 11 1e        vmovupd %ymm3,(%esi)
+    libdis_test+0x1404: c5 fd 11 5f 42     vmovupd %ymm3,0x42(%edi)
+    libdis_test+0x1409: c5 f8 10 c8        vmovups %xmm0,%xmm1
+    libdis_test+0x140d: c5 f8 10 1e        vmovups (%esi),%xmm3
+    libdis_test+0x1411: c5 f8 10 5f 42     vmovups 0x42(%edi),%xmm3
+    libdis_test+0x1416: c5 fc 10 f7        vmovups %ymm7,%ymm6
+    libdis_test+0x141a: c5 fc 10 65 00     vmovups 0x0(%ebp),%ymm4
+    libdis_test+0x141f: c5 fc 10 64 24 42  vmovups 0x42(%esp),%ymm4
+    libdis_test+0x1425: c5 f8 10 c1        vmovups %xmm1,%xmm0
+    libdis_test+0x1429: c5 f8 11 1e        vmovups %xmm3,(%esi)
+    libdis_test+0x142d: c5 f8 11 5f 42     vmovups %xmm3,0x42(%edi)
+    libdis_test+0x1432: c5 fc 10 c1        vmovups %ymm1,%ymm0
+    libdis_test+0x1436: c5 fc 11 1e        vmovups %ymm3,(%esi)
+    libdis_test+0x143a: c5 fc 11 5f 42     vmovups %ymm3,0x42(%edi)
+    libdis_test+0x143f: c4 e3 51 42 fb 48  vmpsadbw $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x1445: c4 e3 69 42 23 48  vmpsadbw $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x144b: c4 e3 71 42 73 08  vmpsadbw $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x1452: c4 e3 55 42 fb 48  vmpsadbw $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x1458: c4 e3 6d 42 23 48  vmpsadbw $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x145e: c4 e3 75 42 73 08  vmpsadbw $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x1465: c5 f1 59 d0        vmulpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1469: c5 e1 59 20        vmulpd (%eax),%xmm3,%xmm4
+    libdis_test+0x146d: c5 d1 59 71 42     vmulpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1472: c5 f5 59 d0        vmulpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1476: c5 e5 59 23        vmulpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x147a: c5 d5 59 72 42     vmulpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x147f: c5 f0 59 d0        vmulps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1483: c5 e0 59 20        vmulps (%eax),%xmm3,%xmm4
+    libdis_test+0x1487: c5 d0 59 71 42     vmulps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x148c: c5 f4 59 d0        vmulps %ymm0,%ymm1,%ymm2
+    libdis_test+0x1490: c5 e4 59 23        vmulps (%ebx),%ymm3,%ymm4
+    libdis_test+0x1494: c5 d4 59 72 42     vmulps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1499: c5 f3 59 d0        vmulsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x149d: c5 e3 59 20        vmulsd (%eax),%xmm3,%xmm4
+    libdis_test+0x14a1: c5 d3 59 71 42     vmulsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x14a6: c5 f2 59 d0        vmulss %xmm0,%xmm1,%xmm2
+    libdis_test+0x14aa: c5 e2 59 20        vmulss (%eax),%xmm3,%xmm4
+    libdis_test+0x14ae: c5 d2 59 71 42     vmulss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x14b3: c5 f1 56 d0        vorpd  %xmm0,%xmm1,%xmm2
+    libdis_test+0x14b7: c5 e1 56 20        vorpd  (%eax),%xmm3,%xmm4
+    libdis_test+0x14bb: c5 d1 56 71 42     vorpd  0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x14c0: c5 f5 56 d0        vorpd  %ymm0,%ymm1,%ymm2
+    libdis_test+0x14c4: c5 e5 56 23        vorpd  (%ebx),%ymm3,%ymm4
+    libdis_test+0x14c8: c5 d5 56 72 42     vorpd  0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x14cd: c5 f0 56 d0        vorps  %xmm0,%xmm1,%xmm2
+    libdis_test+0x14d1: c5 e0 56 20        vorps  (%eax),%xmm3,%xmm4
+    libdis_test+0x14d5: c5 d0 56 71 42     vorps  0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x14da: c5 f4 56 d0        vorps  %ymm0,%ymm1,%ymm2
+    libdis_test+0x14de: c5 e4 56 23        vorps  (%ebx),%ymm3,%ymm4
+    libdis_test+0x14e2: c5 d4 56 72 42     vorps  0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x14e7: c4 e2 79 1c c8     vpabsb %xmm0,%xmm1
+    libdis_test+0x14ec: c4 e2 79 1c 1e     vpabsb (%esi),%xmm3
+    libdis_test+0x14f1: c4 e2 79 1c 5f 42  vpabsb 0x42(%edi),%xmm3
+    libdis_test+0x14f7: c4 e2 7d 1c f7     vpabsb %ymm7,%ymm6
+    libdis_test+0x14fc: c4 e2 7d 1c 65 00  vpabsb 0x0(%ebp),%ymm4
+    libdis_test+0x1502: c4 e2 7d 1c 64 24  vpabsb 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1509: c4 e2 79 1e c8     vpabsd %xmm0,%xmm1
+    libdis_test+0x150e: c4 e2 79 1e 1e     vpabsd (%esi),%xmm3
+    libdis_test+0x1513: c4 e2 79 1e 5f 42  vpabsd 0x42(%edi),%xmm3
+    libdis_test+0x1519: c4 e2 7d 1e f7     vpabsd %ymm7,%ymm6
+    libdis_test+0x151e: c4 e2 7d 1e 65 00  vpabsd 0x0(%ebp),%ymm4
+    libdis_test+0x1524: c4 e2 7d 1e 64 24  vpabsd 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x152b: c4 e2 79 1d c8     vpabsw %xmm0,%xmm1
+    libdis_test+0x1530: c4 e2 79 1d 1e     vpabsw (%esi),%xmm3
+    libdis_test+0x1535: c4 e2 79 1d 5f 42  vpabsw 0x42(%edi),%xmm3
+    libdis_test+0x153b: c4 e2 7d 1d f7     vpabsw %ymm7,%ymm6
+    libdis_test+0x1540: c4 e2 7d 1d 65 00  vpabsw 0x0(%ebp),%ymm4
+    libdis_test+0x1546: c4 e2 7d 1d 64 24  vpabsw 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x154d: c5 f1 6b d0        vpackssdw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1551: c5 e1 6b 20        vpackssdw (%eax),%xmm3,%xmm4
+    libdis_test+0x1555: c5 d1 6b 71 42     vpackssdw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x155a: c5 f5 6b d0        vpackssdw %ymm0,%ymm1,%ymm2
+    libdis_test+0x155e: c5 e5 6b 23        vpackssdw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1562: c5 d5 6b 72 42     vpackssdw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1567: c5 f1 63 d0        vpacksswb %xmm0,%xmm1,%xmm2
+    libdis_test+0x156b: c5 e1 63 20        vpacksswb (%eax),%xmm3,%xmm4
+    libdis_test+0x156f: c5 d1 63 71 42     vpacksswb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1574: c5 f5 63 d0        vpacksswb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1578: c5 e5 63 23        vpacksswb (%ebx),%ymm3,%ymm4
+    libdis_test+0x157c: c5 d5 63 72 42     vpacksswb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1581: c4 e2 71 2b d0     vpackusdw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1586: c4 e2 61 2b 20     vpackusdw (%eax),%xmm3,%xmm4
+    libdis_test+0x158b: c4 e2 51 2b 71 42  vpackusdw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1591: c4 e2 75 2b d0     vpackusdw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1596: c4 e2 65 2b 23     vpackusdw (%ebx),%ymm3,%ymm4
+    libdis_test+0x159b: c4 e2 55 2b 72 42  vpackusdw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x15a1: c5 f1 67 d0        vpackuswb %xmm0,%xmm1,%xmm2
+    libdis_test+0x15a5: c5 e1 67 20        vpackuswb (%eax),%xmm3,%xmm4
+    libdis_test+0x15a9: c5 d1 67 71 42     vpackuswb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x15ae: c5 f5 67 d0        vpackuswb %ymm0,%ymm1,%ymm2
+    libdis_test+0x15b2: c5 e5 67 23        vpackuswb (%ebx),%ymm3,%ymm4
+    libdis_test+0x15b6: c5 d5 67 72 42     vpackuswb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x15bb: c5 f1 fc d0        vpaddb %xmm0,%xmm1,%xmm2
+    libdis_test+0x15bf: c5 e1 fc 20        vpaddb (%eax),%xmm3,%xmm4
+    libdis_test+0x15c3: c5 d1 fc 71 42     vpaddb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x15c8: c5 f5 fc d0        vpaddb %ymm0,%ymm1,%ymm2
+    libdis_test+0x15cc: c5 e5 fc 23        vpaddb (%ebx),%ymm3,%ymm4
+    libdis_test+0x15d0: c5 d5 fc 72 42     vpaddb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x15d5: c5 f1 fe d0        vpaddd %xmm0,%xmm1,%xmm2
+    libdis_test+0x15d9: c5 e1 fe 20        vpaddd (%eax),%xmm3,%xmm4
+    libdis_test+0x15dd: c5 d1 fe 71 42     vpaddd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x15e2: c5 f5 fe d0        vpaddd %ymm0,%ymm1,%ymm2
+    libdis_test+0x15e6: c5 e5 fe 23        vpaddd (%ebx),%ymm3,%ymm4
+    libdis_test+0x15ea: c5 d5 fe 72 42     vpaddd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x15ef: c5 f1 d4 d0        vpaddq %xmm0,%xmm1,%xmm2
+    libdis_test+0x15f3: c5 e1 d4 20        vpaddq (%eax),%xmm3,%xmm4
+    libdis_test+0x15f7: c5 d1 d4 71 42     vpaddq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x15fc: c5 f5 d4 d0        vpaddq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1600: c5 e5 d4 23        vpaddq (%ebx),%ymm3,%ymm4
+    libdis_test+0x1604: c5 d5 d4 72 42     vpaddq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1609: c5 f1 ec d0        vpaddsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x160d: c5 e1 ec 20        vpaddsb (%eax),%xmm3,%xmm4
+    libdis_test+0x1611: c5 d1 ec 71 42     vpaddsb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1616: c5 f5 ec d0        vpaddsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x161a: c5 e5 ec 23        vpaddsb (%ebx),%ymm3,%ymm4
+    libdis_test+0x161e: c5 d5 ec 72 42     vpaddsb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1623: c5 f1 ed d0        vpaddsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1627: c5 e1 ed 20        vpaddsw (%eax),%xmm3,%xmm4
+    libdis_test+0x162b: c5 d1 ed 71 42     vpaddsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1630: c5 f5 ed d0        vpaddsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1634: c5 e5 ed 23        vpaddsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1638: c5 d5 ed 72 42     vpaddsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x163d: c5 f1 dc d0        vpaddusb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1641: c5 e1 dc 20        vpaddusb (%eax),%xmm3,%xmm4
+    libdis_test+0x1645: c5 d1 dc 71 42     vpaddusb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x164a: c5 f5 dc d0        vpaddusb %ymm0,%ymm1,%ymm2
+    libdis_test+0x164e: c5 e5 dc 23        vpaddusb (%ebx),%ymm3,%ymm4
+    libdis_test+0x1652: c5 d5 dc 72 42     vpaddusb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1657: c5 f1 dd d0        vpaddusw %xmm0,%xmm1,%xmm2
+    libdis_test+0x165b: c5 e1 dd 20        vpaddusw (%eax),%xmm3,%xmm4
+    libdis_test+0x165f: c5 d1 dd 71 42     vpaddusw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1664: c5 f5 dd d0        vpaddusw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1668: c5 e5 dd 23        vpaddusw (%ebx),%ymm3,%ymm4
+    libdis_test+0x166c: c5 d5 dd 72 42     vpaddusw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1671: c5 f1 fd d0        vpaddw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1675: c5 e1 fd 20        vpaddw (%eax),%xmm3,%xmm4
+    libdis_test+0x1679: c5 d1 fd 71 42     vpaddw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x167e: c5 f5 fd d0        vpaddw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1682: c5 e5 fd 23        vpaddw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1686: c5 d5 fd 72 42     vpaddw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x168b: c4 e3 51 0f fb 48  vpalignr $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x1691: c4 e3 69 0f 23 48  vpalignr $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x1697: c4 e3 71 0f 73 08  vpalignr $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x169e: c4 e3 55 0f fb 48  vpalignr $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x16a4: c4 e3 6d 0f 23 48  vpalignr $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x16aa: c4 e3 75 0f 73 08  vpalignr $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x16b1: c5 f1 db d0        vpand  %xmm0,%xmm1,%xmm2
+    libdis_test+0x16b5: c5 e1 db 20        vpand  (%eax),%xmm3,%xmm4
+    libdis_test+0x16b9: c5 d1 db 71 42     vpand  0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x16be: c5 f5 db d0        vpand  %ymm0,%ymm1,%ymm2
+    libdis_test+0x16c2: c5 e5 db 23        vpand  (%ebx),%ymm3,%ymm4
+    libdis_test+0x16c6: c5 d5 db 72 42     vpand  0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x16cb: c5 f1 df d0        vpandn %xmm0,%xmm1,%xmm2
+    libdis_test+0x16cf: c5 e1 df 20        vpandn (%eax),%xmm3,%xmm4
+    libdis_test+0x16d3: c5 d1 df 71 42     vpandn 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x16d8: c5 f5 df d0        vpandn %ymm0,%ymm1,%ymm2
+    libdis_test+0x16dc: c5 e5 df 23        vpandn (%ebx),%ymm3,%ymm4
+    libdis_test+0x16e0: c5 d5 df 72 42     vpandn 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x16e5: c5 f1 e0 d0        vpavgb %xmm0,%xmm1,%xmm2
+    libdis_test+0x16e9: c5 e1 e0 20        vpavgb (%eax),%xmm3,%xmm4
+    libdis_test+0x16ed: c5 d1 e0 71 42     vpavgb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x16f2: c5 f5 e0 d0        vpavgb %ymm0,%ymm1,%ymm2
+    libdis_test+0x16f6: c5 e5 e0 23        vpavgb (%ebx),%ymm3,%ymm4
+    libdis_test+0x16fa: c5 d5 e0 72 42     vpavgb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x16ff: c5 f1 e3 d0        vpavgw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1703: c5 e1 e3 20        vpavgw (%eax),%xmm3,%xmm4
+    libdis_test+0x1707: c5 d1 e3 71 42     vpavgw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x170c: c5 f5 e3 d0        vpavgw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1710: c5 e5 e3 23        vpavgw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1714: c5 d5 e3 72 42     vpavgw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1719: c4 e3 69 4c d9 00  vpblendvb %xmm0,%xmm1,%xmm2,%xmm3
+    libdis_test+0x171f: c4 e3 69 4c 18 00  vpblendvb %xmm0,(%eax),%xmm2,%xmm3
+    libdis_test+0x1725: c4 e3 69 4c 5b 10  vpblendvb %xmm0,0x10(%ebx),%xmm2,%xmm3
+                        00 
+    libdis_test+0x172c: c4 e3 6d 4c d9 00  vpblendvb %ymm0,%ymm1,%ymm2,%ymm3
+    libdis_test+0x1732: c4 e3 6d 4c 18 00  vpblendvb %ymm0,(%eax),%ymm2,%ymm3
+    libdis_test+0x1738: c4 e3 6d 4c 5b 10  vpblendvb %ymm0,0x10(%ebx),%ymm2,%ymm3
+                        00 
+    libdis_test+0x173f: c4 e3 51 0e fb 48  vpblendw $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x1745: c4 e3 69 0e 23 48  vpblendw $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x174b: c4 e3 71 0e 73 08  vpblendw $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x1752: c4 e3 55 0e fb 48  vpblendw $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x1758: c4 e3 6d 0e 23 48  vpblendw $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x175e: c4 e3 75 0e 73 08  vpblendw $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x1765: c4 e3 51 44 fb 48  vpclmulqdq $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x176b: c4 e3 69 44 23 48  vpclmulqdq $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x1771: c4 e3 71 44 73 08  vpclmulqdq $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x1778: c5 f1 74 d0        vpcmpeqb %xmm0,%xmm1,%xmm2
+    libdis_test+0x177c: c5 e1 74 20        vpcmpeqb (%eax),%xmm3,%xmm4
+    libdis_test+0x1780: c5 d1 74 71 42     vpcmpeqb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1785: c5 f5 74 d0        vpcmpeqb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1789: c5 e5 74 23        vpcmpeqb (%ebx),%ymm3,%ymm4
+    libdis_test+0x178d: c5 d5 74 72 42     vpcmpeqb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1792: c5 f1 76 d0        vpcmpeqd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1796: c5 e1 76 20        vpcmpeqd (%eax),%xmm3,%xmm4
+    libdis_test+0x179a: c5 d1 76 71 42     vpcmpeqd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x179f: c5 f5 76 d0        vpcmpeqd %ymm0,%ymm1,%ymm2
+    libdis_test+0x17a3: c5 e5 76 23        vpcmpeqd (%ebx),%ymm3,%ymm4
+    libdis_test+0x17a7: c5 d5 76 72 42     vpcmpeqd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x17ac: c4 e2 71 29 d0     vpcmpeqq %xmm0,%xmm1,%xmm2
+    libdis_test+0x17b1: c4 e2 61 29 20     vpcmpeqq (%eax),%xmm3,%xmm4
+    libdis_test+0x17b6: c4 e2 51 29 71 42  vpcmpeqq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x17bc: c4 e2 75 29 d0     vpcmpeqq %ymm0,%ymm1,%ymm2
+    libdis_test+0x17c1: c4 e2 65 29 23     vpcmpeqq (%ebx),%ymm3,%ymm4
+    libdis_test+0x17c6: c4 e2 55 29 72 42  vpcmpeqq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x17cc: c5 f1 75 d0        vpcmpeqw %xmm0,%xmm1,%xmm2
+    libdis_test+0x17d0: c5 e1 75 20        vpcmpeqw (%eax),%xmm3,%xmm4
+    libdis_test+0x17d4: c5 d1 75 71 42     vpcmpeqw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x17d9: c5 f5 75 d0        vpcmpeqw %ymm0,%ymm1,%ymm2
+    libdis_test+0x17dd: c5 e5 75 23        vpcmpeqw (%ebx),%ymm3,%ymm4
+    libdis_test+0x17e1: c5 d5 75 72 42     vpcmpeqw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x17e6: c4 e3 79 61 c8 42  vpcmpestri $0x42,%xmm0,%xmm1
+    libdis_test+0x17ec: c4 e3 79 61 1e 23  vpcmpestri $0x23,(%esi),%xmm3
+    libdis_test+0x17f2: c4 e3 79 61 5f 42  vpcmpestri $0x42,0x42(%edi),%xmm3
+                        42 
+    libdis_test+0x17f9: c4 e3 79 60 c8 42  vpcmpestrm $0x42,%xmm0,%xmm1
+    libdis_test+0x17ff: c4 e3 79 60 1e 23  vpcmpestrm $0x23,(%esi),%xmm3
+    libdis_test+0x1805: c4 e3 79 60 5f 42  vpcmpestrm $0x42,0x42(%edi),%xmm3
+                        42 
+    libdis_test+0x180c: c5 f1 64 d0        vpcmpgtb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1810: c5 e1 64 20        vpcmpgtb (%eax),%xmm3,%xmm4
+    libdis_test+0x1814: c5 d1 64 71 42     vpcmpgtb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1819: c5 f5 64 d0        vpcmpgtb %ymm0,%ymm1,%ymm2
+    libdis_test+0x181d: c5 e5 64 23        vpcmpgtb (%ebx),%ymm3,%ymm4
+    libdis_test+0x1821: c5 d5 64 72 42     vpcmpgtb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1826: c5 f1 66 d0        vpcmpgtd %xmm0,%xmm1,%xmm2
+    libdis_test+0x182a: c5 e1 66 20        vpcmpgtd (%eax),%xmm3,%xmm4
+    libdis_test+0x182e: c5 d1 66 71 42     vpcmpgtd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1833: c5 f5 66 d0        vpcmpgtd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1837: c5 e5 66 23        vpcmpgtd (%ebx),%ymm3,%ymm4
+    libdis_test+0x183b: c5 d5 66 72 42     vpcmpgtd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1840: c4 e2 71 37 d0     vpcmpgtq %xmm0,%xmm1,%xmm2
+    libdis_test+0x1845: c4 e2 61 37 20     vpcmpgtq (%eax),%xmm3,%xmm4
+    libdis_test+0x184a: c4 e2 51 37 71 42  vpcmpgtq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1850: c4 e2 75 37 d0     vpcmpgtq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1855: c4 e2 65 37 23     vpcmpgtq (%ebx),%ymm3,%ymm4
+    libdis_test+0x185a: c4 e2 55 37 72 42  vpcmpgtq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1860: c5 f1 65 d0        vpcmpgtw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1864: c5 e1 65 20        vpcmpgtw (%eax),%xmm3,%xmm4
+    libdis_test+0x1868: c5 d1 65 71 42     vpcmpgtw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x186d: c5 f5 65 d0        vpcmpgtw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1871: c5 e5 65 23        vpcmpgtw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1875: c5 d5 65 72 42     vpcmpgtw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x187a: c4 e3 79 63 c8 42  vpcmpistri $0x42,%xmm0,%xmm1
+    libdis_test+0x1880: c4 e3 79 63 1e 23  vpcmpistri $0x23,(%esi),%xmm3
+    libdis_test+0x1886: c4 e3 79 63 5f 42  vpcmpistri $0x42,0x42(%edi),%xmm3
+                        42 
+    libdis_test+0x188d: c4 e3 79 62 c8 42  vpcmpistrm $0x42,%xmm0,%xmm1
+    libdis_test+0x1893: c4 e3 79 62 1e 23  vpcmpistrm $0x23,(%esi),%xmm3
+    libdis_test+0x1899: c4 e3 79 62 5f 42  vpcmpistrm $0x42,0x42(%edi),%xmm3
+                        42 
+    libdis_test+0x18a0: c4 e3 55 06 fb 48  vperm2f128 $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x18a6: c4 e3 6d 06 23 48  vperm2f128 $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x18ac: c4 e3 75 06 73 08  vperm2f128 $0x48,0x8(%ebx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x18b3: c4 e2 71 0d d0     vpermilpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x18b8: c4 e2 61 0d 20     vpermilpd (%eax),%xmm3,%xmm4
+    libdis_test+0x18bd: c4 e2 51 0d 71 42  vpermilpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x18c3: c4 e2 75 0d d0     vpermilpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x18c8: c4 e2 65 0d 23     vpermilpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x18cd: c4 e2 55 0d 72 42  vpermilpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x18d3: c4 e3 7d 05 c8 42  vpermilpd $0x42,%ymm0,%ymm1
+    libdis_test+0x18d9: c4 e3 7d 05 1e 23  vpermilpd $0x23,(%esi),%ymm3
+    libdis_test+0x18df: c4 e3 7d 05 5f 42  vpermilpd $0x42,0x42(%edi),%ymm3
+                        42 
+    libdis_test+0x18e6: c4 e2 71 0c d0     vpermilps %xmm0,%xmm1,%xmm2
+    libdis_test+0x18eb: c4 e2 61 0c 20     vpermilps (%eax),%xmm3,%xmm4
+    libdis_test+0x18f0: c4 e2 51 0c 71 42  vpermilps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x18f6: c4 e2 75 0c d0     vpermilps %ymm0,%ymm1,%ymm2
+    libdis_test+0x18fb: c4 e2 65 0c 23     vpermilps (%ebx),%ymm3,%ymm4
+    libdis_test+0x1900: c4 e2 55 0c 72 42  vpermilps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1906: c4 e3 7d 04 c8 42  vpermilps $0x42,%ymm0,%ymm1
+    libdis_test+0x190c: c4 e3 7d 04 1e 23  vpermilps $0x23,(%esi),%ymm3
+    libdis_test+0x1912: c4 e3 7d 04 5f 42  vpermilps $0x42,0x42(%edi),%ymm3
+                        42 
+    libdis_test+0x1919: c4 e3 79 14 c0 23  vpextrb $0x23,%xmm0,%eax
+    libdis_test+0x191f: c4 e3 79 14 0b 23  vpextrb $0x23,%xmm1,(%ebx)
+    libdis_test+0x1925: c4 e3 79 14 51 16  vpextrb $0x23,%xmm2,0x16(%ecx)
+                        23 
+    libdis_test+0x192c: c4 e3 79 16 c0 23  vpextrd $0x23,%xmm0,%eax
+    libdis_test+0x1932: c4 e3 79 16 0b 23  vpextrd $0x23,%xmm1,(%ebx)
+    libdis_test+0x1938: c4 e3 79 16 51 16  vpextrd $0x23,%xmm2,0x16(%ecx)
+                        23 
+    libdis_test+0x193f: 62 f3              boundl %ebx,%esi
+    libdis_test+0x1941: fd                 std    
+    libdis_test+0x1942: 08 16              orb    %dl,(%esi)
+    libdis_test+0x1944: 0b 23              orl    (%ebx),%esp
+    libdis_test+0x1946: 62 f3              boundl %ebx,%esi
+    libdis_test+0x1948: fd                 std    
+    libdis_test+0x1949: 08 16              orb    %dl,(%esi)
+    libdis_test+0x194b: 91                 xchgl  %ecx,%eax
+    libdis_test+0x194c: 16                 pushl  %ss
+    libdis_test+0x194d: 00 00              addb   %al,(%eax)
+    libdis_test+0x194f: 00 23              addb   %ah,(%ebx)
+    libdis_test+0x1951: c5 f9 c5 c0 23     vpextrw $0x23,%xmm0,%eax
+    libdis_test+0x1956: c4 e3 79 15 0b 23  vpextrw $0x23,%xmm1,(%ebx)
+    libdis_test+0x195c: c4 e3 79 15 51 16  vpextrw $0x23,%xmm2,0x16(%ecx)
+                        23 
+    libdis_test+0x1963: c4 e2 71 02 d0     vphaddd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1968: c4 e2 61 02 20     vphaddd (%eax),%xmm3,%xmm4
+    libdis_test+0x196d: c4 e2 51 02 71 42  vphaddd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1973: c4 e2 75 02 d0     vphaddd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1978: c4 e2 65 02 23     vphaddd (%ebx),%ymm3,%ymm4
+    libdis_test+0x197d: c4 e2 55 02 72 42  vphaddd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1983: c4 e2 71 03 d0     vphaddsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1988: c4 e2 61 03 20     vphaddsw (%eax),%xmm3,%xmm4
+    libdis_test+0x198d: c4 e2 51 03 71 42  vphaddsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1993: c4 e2 75 03 d0     vphaddsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1998: c4 e2 65 03 23     vphaddsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x199d: c4 e2 55 03 72 42  vphaddsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x19a3: c4 e2 71 01 d0     vphaddw %xmm0,%xmm1,%xmm2
+    libdis_test+0x19a8: c4 e2 61 01 20     vphaddw (%eax),%xmm3,%xmm4
+    libdis_test+0x19ad: c4 e2 51 01 71 42  vphaddw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x19b3: c4 e2 75 01 d0     vphaddw %ymm0,%ymm1,%ymm2
+    libdis_test+0x19b8: c4 e2 65 01 23     vphaddw (%ebx),%ymm3,%ymm4
+    libdis_test+0x19bd: c4 e2 55 01 72 42  vphaddw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x19c3: c4 e2 79 41 c8     vphminposuw %xmm0,%xmm1
+    libdis_test+0x19c8: c4 e2 79 41 1e     vphminposuw (%esi),%xmm3
+    libdis_test+0x19cd: c4 e2 79 41 5f 42  vphminposuw 0x42(%edi),%xmm3
+    libdis_test+0x19d3: c4 e2 71 06 d0     vphsubd %xmm0,%xmm1,%xmm2
+    libdis_test+0x19d8: c4 e2 61 06 20     vphsubd (%eax),%xmm3,%xmm4
+    libdis_test+0x19dd: c4 e2 51 06 71 42  vphsubd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x19e3: c4 e2 75 06 d0     vphsubd %ymm0,%ymm1,%ymm2
+    libdis_test+0x19e8: c4 e2 65 06 23     vphsubd (%ebx),%ymm3,%ymm4
+    libdis_test+0x19ed: c4 e2 55 06 72 42  vphsubd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x19f3: c4 e2 71 07 d0     vphsubsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x19f8: c4 e2 61 07 20     vphsubsw (%eax),%xmm3,%xmm4
+    libdis_test+0x19fd: c4 e2 51 07 71 42  vphsubsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1a03: c4 e2 75 07 d0     vphsubsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1a08: c4 e2 65 07 23     vphsubsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1a0d: c4 e2 55 07 72 42  vphsubsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1a13: c4 e2 71 05 d0     vphsubw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1a18: c4 e2 61 05 20     vphsubw (%eax),%xmm3,%xmm4
+    libdis_test+0x1a1d: c4 e2 51 05 71 42  vphsubw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1a23: c4 e2 75 05 d0     vphsubw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1a28: c4 e2 65 05 23     vphsubw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1a2d: c4 e2 55 05 72 42  vphsubw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1a33: c4 e3 79 20 c8 20  vpinsrb $0x20,%eax,%xmm0,%xmm1
+    libdis_test+0x1a39: c4 e3 69 20 1b 20  vpinsrb $0x20,(%ebx),%xmm2,%xmm3
+    libdis_test+0x1a3f: c4 e3 69 20 5b 10  vpinsrb $0x20,0x10(%ebx),%xmm2,%xmm3
+                        20 
+    libdis_test+0x1a46: c4 e3 79 22 c8 20  vpinsrd $0x20,%eax,%xmm0,%xmm1
+    libdis_test+0x1a4c: c4 e3 69 22 1b 20  vpinsrd $0x20,(%ebx),%xmm2,%xmm3
+    libdis_test+0x1a52: c4 e3 69 22 5b 10  vpinsrd $0x20,0x10(%ebx),%xmm2,%xmm3
+                        20 
+    libdis_test+0x1a59: 62 f3              boundl %ebx,%esi
+    libdis_test+0x1a5b: ed                 inl    (%dx)
+    libdis_test+0x1a5c: 08 22              orb    %ah,(%edx)
+    libdis_test+0x1a5e: 1b 20              sbbl   (%eax),%esp
+    libdis_test+0x1a60: 62 f3              boundl %ebx,%esi
+    libdis_test+0x1a62: ed                 inl    (%dx)
+    libdis_test+0x1a63: 08 22              orb    %ah,(%edx)
+    libdis_test+0x1a65: 5b                 popl   %ebx
+    libdis_test+0x1a66: 02 20              addb   (%eax),%ah
+    libdis_test+0x1a68: c5 f9 c4 c8 20     vpinsrw $0x20,%eax,%xmm0,%xmm1
+    libdis_test+0x1a6d: c5 e9 c4 1b 20     vpinsrw $0x20,(%ebx),%xmm2,%xmm3
+    libdis_test+0x1a72: c5 e9 c4 5b 10 20  vpinsrw $0x20,0x10(%ebx),%xmm2,%xmm3
+    libdis_test+0x1a78: c4 e2 71 04 d0     vpmaddubsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1a7d: c4 e2 61 04 20     vpmaddubsw (%eax),%xmm3,%xmm4
+    libdis_test+0x1a82: c4 e2 51 04 71 42  vpmaddubsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1a88: c4 e2 75 04 d0     vpmaddubsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1a8d: c4 e2 65 04 23     vpmaddubsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1a92: c4 e2 55 04 72 42  vpmaddubsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1a98: c5 f1 f5 d0        vpmaddwd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1a9c: c5 e1 f5 20        vpmaddwd (%eax),%xmm3,%xmm4
+    libdis_test+0x1aa0: c5 d1 f5 71 42     vpmaddwd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1aa5: c5 f5 f5 d0        vpmaddwd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1aa9: c5 e5 f5 23        vpmaddwd (%ebx),%ymm3,%ymm4
+    libdis_test+0x1aad: c5 d5 f5 72 42     vpmaddwd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1ab2: c4 e2 71 3c d0     vpmaxsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ab7: c4 e2 61 3c 20     vpmaxsb (%eax),%xmm3,%xmm4
+    libdis_test+0x1abc: c4 e2 51 3c 71 42  vpmaxsb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1ac2: c4 e2 75 3c d0     vpmaxsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ac7: c4 e2 65 3c 23     vpmaxsb (%ebx),%ymm3,%ymm4
+    libdis_test+0x1acc: c4 e2 55 3c 72 42  vpmaxsb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1ad2: c4 e2 71 3d d0     vpmaxsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ad7: c4 e2 61 3d 20     vpmaxsd (%eax),%xmm3,%xmm4
+    libdis_test+0x1adc: c4 e2 51 3d 71 42  vpmaxsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1ae2: c4 e2 75 3d d0     vpmaxsd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ae7: c4 e2 65 3d 23     vpmaxsd (%ebx),%ymm3,%ymm4
+    libdis_test+0x1aec: c4 e2 55 3d 72 42  vpmaxsd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1af2: c5 f1 ee d0        vpmaxsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1af6: c5 e1 ee 20        vpmaxsw (%eax),%xmm3,%xmm4
+    libdis_test+0x1afa: c5 d1 ee 71 42     vpmaxsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1aff: c5 f5 ee d0        vpmaxsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b03: c5 e5 ee 23        vpmaxsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1b07: c5 d5 ee 72 42     vpmaxsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1b0c: c5 f1 de d0        vpmaxub %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b10: c5 e1 de 20        vpmaxub (%eax),%xmm3,%xmm4
+    libdis_test+0x1b14: c5 d1 de 71 42     vpmaxub 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1b19: c5 f5 de d0        vpmaxub %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b1d: c5 e5 de 23        vpmaxub (%ebx),%ymm3,%ymm4
+    libdis_test+0x1b21: c5 d5 de 72 42     vpmaxub 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1b26: c4 e2 71 3f d0     vpmaxud %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b2b: c4 e2 61 3f 20     vpmaxud (%eax),%xmm3,%xmm4
+    libdis_test+0x1b30: c4 e2 51 3f 71 42  vpmaxud 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1b36: c4 e2 75 3f d0     vpmaxud %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b3b: c4 e2 65 3f 23     vpmaxud (%ebx),%ymm3,%ymm4
+    libdis_test+0x1b40: c4 e2 55 3f 72 42  vpmaxud 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1b46: c4 e2 71 3e d0     vpmaxuw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b4b: c4 e2 61 3e 20     vpmaxuw (%eax),%xmm3,%xmm4
+    libdis_test+0x1b50: c4 e2 51 3e 71 42  vpmaxuw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1b56: c4 e2 75 3e d0     vpmaxuw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b5b: c4 e2 65 3e 23     vpmaxuw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1b60: c4 e2 55 3e 72 42  vpmaxuw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1b66: c4 e2 71 38 d0     vpminsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b6b: c4 e2 61 38 20     vpminsb (%eax),%xmm3,%xmm4
+    libdis_test+0x1b70: c4 e2 51 38 71 42  vpminsb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1b76: c4 e2 75 38 d0     vpminsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b7b: c4 e2 65 38 23     vpminsb (%ebx),%ymm3,%ymm4
+    libdis_test+0x1b80: c4 e2 55 38 72 42  vpminsb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1b86: c4 e2 71 39 d0     vpminsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b8b: c4 e2 61 39 20     vpminsd (%eax),%xmm3,%xmm4
+    libdis_test+0x1b90: c4 e2 51 39 71 42  vpminsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1b96: c4 e2 75 39 d0     vpminsd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b9b: c4 e2 65 39 23     vpminsd (%ebx),%ymm3,%ymm4
+    libdis_test+0x1ba0: c4 e2 55 39 72 42  vpminsd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1ba6: c5 f1 ea d0        vpminsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1baa: c5 e1 ea 20        vpminsw (%eax),%xmm3,%xmm4
+    libdis_test+0x1bae: c5 d1 ea 71 42     vpminsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1bb3: c5 f5 ea d0        vpminsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1bb7: c5 e5 ea 23        vpminsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1bbb: c5 d5 ea 72 42     vpminsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1bc0: c5 f1 da d0        vpminub %xmm0,%xmm1,%xmm2
+    libdis_test+0x1bc4: c5 e1 da 20        vpminub (%eax),%xmm3,%xmm4
+    libdis_test+0x1bc8: c5 d1 da 71 42     vpminub 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1bcd: c5 f5 da d0        vpminub %ymm0,%ymm1,%ymm2
+    libdis_test+0x1bd1: c5 e5 da 23        vpminub (%ebx),%ymm3,%ymm4
+    libdis_test+0x1bd5: c5 d5 da 72 42     vpminub 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1bda: c4 e2 71 3b d0     vpminud %xmm0,%xmm1,%xmm2
+    libdis_test+0x1bdf: c4 e2 61 3b 20     vpminud (%eax),%xmm3,%xmm4
+    libdis_test+0x1be4: c4 e2 51 3b 71 42  vpminud 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1bea: c4 e2 75 3b d0     vpminud %ymm0,%ymm1,%ymm2
+    libdis_test+0x1bef: c4 e2 65 3b 23     vpminud (%ebx),%ymm3,%ymm4
+    libdis_test+0x1bf4: c4 e2 55 3b 72 42  vpminud 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1bfa: c4 e2 71 3a d0     vpminuw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1bff: c4 e2 61 3a 20     vpminuw (%eax),%xmm3,%xmm4
+    libdis_test+0x1c04: c4 e2 51 3a 71 42  vpminuw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1c0a: c4 e2 75 3a d0     vpminuw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1c0f: c4 e2 65 3a 23     vpminuw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1c14: c4 e2 55 3a 72 42  vpminuw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1c1a: c5 f9 d7 c0        vpmovmskb %xmm0,%eax
+    libdis_test+0x1c1e: c5 fd d7 d9        vpmovmskb %ymm1,%ebx
+    libdis_test+0x1c22: c4 e2 79 21 c8     vpmovsxbd %xmm0,%xmm1
+    libdis_test+0x1c27: c4 e2 79 21 1e     vpmovsxbd (%esi),%xmm3
+    libdis_test+0x1c2c: c4 e2 79 21 5f 42  vpmovsxbd 0x42(%edi),%xmm3
+    libdis_test+0x1c32: c4 e2 7d 21 f7     vpmovsxbd %ymm7,%ymm6
+    libdis_test+0x1c37: c4 e2 7d 21 65 00  vpmovsxbd 0x0(%ebp),%ymm4
+    libdis_test+0x1c3d: c4 e2 7d 21 64 24  vpmovsxbd 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1c44: c4 e2 79 22 c8     vpmovsxbq %xmm0,%xmm1
+    libdis_test+0x1c49: c4 e2 79 22 1e     vpmovsxbq (%esi),%xmm3
+    libdis_test+0x1c4e: c4 e2 79 22 5f 42  vpmovsxbq 0x42(%edi),%xmm3
+    libdis_test+0x1c54: c4 e2 7d 22 f7     vpmovsxbq %ymm7,%ymm6
+    libdis_test+0x1c59: c4 e2 7d 22 65 00  vpmovsxbq 0x0(%ebp),%ymm4
+    libdis_test+0x1c5f: c4 e2 7d 22 64 24  vpmovsxbq 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1c66: c4 e2 79 20 c8     vpmovsxbw %xmm0,%xmm1
+    libdis_test+0x1c6b: c4 e2 79 20 1e     vpmovsxbw (%esi),%xmm3
+    libdis_test+0x1c70: c4 e2 79 20 5f 42  vpmovsxbw 0x42(%edi),%xmm3
+    libdis_test+0x1c76: c4 e2 7d 20 f7     vpmovsxbw %ymm7,%ymm6
+    libdis_test+0x1c7b: c4 e2 7d 20 65 00  vpmovsxbw 0x0(%ebp),%ymm4
+    libdis_test+0x1c81: c4 e2 7d 20 64 24  vpmovsxbw 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1c88: c4 e2 79 25 c8     vpmovsxdq %xmm0,%xmm1
+    libdis_test+0x1c8d: c4 e2 79 25 1e     vpmovsxdq (%esi),%xmm3
+    libdis_test+0x1c92: c4 e2 79 25 5f 42  vpmovsxdq 0x42(%edi),%xmm3
+    libdis_test+0x1c98: c4 e2 7d 25 f7     vpmovsxdq %ymm7,%ymm6
+    libdis_test+0x1c9d: c4 e2 7d 25 65 00  vpmovsxdq 0x0(%ebp),%ymm4
+    libdis_test+0x1ca3: c4 e2 7d 25 64 24  vpmovsxdq 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1caa: c4 e2 79 23 c8     vpmovsxwd %xmm0,%xmm1
+    libdis_test+0x1caf: c4 e2 79 23 1e     vpmovsxwd (%esi),%xmm3
+    libdis_test+0x1cb4: c4 e2 79 23 5f 42  vpmovsxwd 0x42(%edi),%xmm3
+    libdis_test+0x1cba: c4 e2 7d 23 f7     vpmovsxwd %ymm7,%ymm6
+    libdis_test+0x1cbf: c4 e2 7d 23 65 00  vpmovsxwd 0x0(%ebp),%ymm4
+    libdis_test+0x1cc5: c4 e2 7d 23 64 24  vpmovsxwd 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1ccc: c4 e2 79 24 c8     vpmovsxwq %xmm0,%xmm1
+    libdis_test+0x1cd1: c4 e2 79 24 1e     vpmovsxwq (%esi),%xmm3
+    libdis_test+0x1cd6: c4 e2 79 24 5f 42  vpmovsxwq 0x42(%edi),%xmm3
+    libdis_test+0x1cdc: c4 e2 7d 24 f7     vpmovsxwq %ymm7,%ymm6
+    libdis_test+0x1ce1: c4 e2 7d 24 65 00  vpmovsxwq 0x0(%ebp),%ymm4
+    libdis_test+0x1ce7: c4 e2 7d 24 64 24  vpmovsxwq 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1cee: c4 e2 79 31 c8     vpmovzxbd %xmm0,%xmm1
+    libdis_test+0x1cf3: c4 e2 79 31 1e     vpmovzxbd (%esi),%xmm3
+    libdis_test+0x1cf8: c4 e2 79 31 5f 42  vpmovzxbd 0x42(%edi),%xmm3
+    libdis_test+0x1cfe: c4 e2 7d 31 f7     vpmovzxbd %ymm7,%ymm6
+    libdis_test+0x1d03: c4 e2 7d 31 65 00  vpmovzxbd 0x0(%ebp),%ymm4
+    libdis_test+0x1d09: c4 e2 7d 31 64 24  vpmovzxbd 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1d10: c4 e2 79 32 c8     vpmovzxbq %xmm0,%xmm1
+    libdis_test+0x1d15: c4 e2 79 32 1e     vpmovzxbq (%esi),%xmm3
+    libdis_test+0x1d1a: c4 e2 79 32 5f 42  vpmovzxbq 0x42(%edi),%xmm3
+    libdis_test+0x1d20: c4 e2 7d 32 f7     vpmovzxbq %ymm7,%ymm6
+    libdis_test+0x1d25: c4 e2 7d 32 65 00  vpmovzxbq 0x0(%ebp),%ymm4
+    libdis_test+0x1d2b: c4 e2 7d 32 64 24  vpmovzxbq 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1d32: c4 e2 79 30 c8     vpmovzxbw %xmm0,%xmm1
+    libdis_test+0x1d37: c4 e2 79 30 1e     vpmovzxbw (%esi),%xmm3
+    libdis_test+0x1d3c: c4 e2 79 30 5f 42  vpmovzxbw 0x42(%edi),%xmm3
+    libdis_test+0x1d42: c4 e2 7d 30 f7     vpmovzxbw %ymm7,%ymm6
+    libdis_test+0x1d47: c4 e2 7d 30 65 00  vpmovzxbw 0x0(%ebp),%ymm4
+    libdis_test+0x1d4d: c4 e2 7d 30 64 24  vpmovzxbw 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1d54: c4 e2 79 35 c8     vpmovzxdq %xmm0,%xmm1
+    libdis_test+0x1d59: c4 e2 79 35 1e     vpmovzxdq (%esi),%xmm3
+    libdis_test+0x1d5e: c4 e2 79 35 5f 42  vpmovzxdq 0x42(%edi),%xmm3
+    libdis_test+0x1d64: c4 e2 7d 35 f7     vpmovzxdq %ymm7,%ymm6
+    libdis_test+0x1d69: c4 e2 7d 35 65 00  vpmovzxdq 0x0(%ebp),%ymm4
+    libdis_test+0x1d6f: c4 e2 7d 35 64 24  vpmovzxdq 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1d76: c4 e2 79 33 c8     vpmovzxwd %xmm0,%xmm1
+    libdis_test+0x1d7b: c4 e2 79 33 1e     vpmovzxwd (%esi),%xmm3
+    libdis_test+0x1d80: c4 e2 79 33 5f 42  vpmovzxwd 0x42(%edi),%xmm3
+    libdis_test+0x1d86: c4 e2 7d 33 f7     vpmovzxwd %ymm7,%ymm6
+    libdis_test+0x1d8b: c4 e2 7d 33 65 00  vpmovzxwd 0x0(%ebp),%ymm4
+    libdis_test+0x1d91: c4 e2 7d 33 64 24  vpmovzxwd 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1d98: c4 e2 79 34 c8     vpmovzxwq %xmm0,%xmm1
+    libdis_test+0x1d9d: c4 e2 79 34 1e     vpmovzxwq (%esi),%xmm3
+    libdis_test+0x1da2: c4 e2 79 34 5f 42  vpmovzxwq 0x42(%edi),%xmm3
+    libdis_test+0x1da8: c4 e2 7d 34 f7     vpmovzxwq %ymm7,%ymm6
+    libdis_test+0x1dad: c4 e2 7d 34 65 00  vpmovzxwq 0x0(%ebp),%ymm4
+    libdis_test+0x1db3: c4 e2 7d 34 64 24  vpmovzxwq 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x1dba: c4 e2 71 28 d0     vpmuldq %xmm0,%xmm1,%xmm2
+    libdis_test+0x1dbf: c4 e2 61 28 20     vpmuldq (%eax),%xmm3,%xmm4
+    libdis_test+0x1dc4: c4 e2 51 28 71 42  vpmuldq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1dca: c4 e2 75 28 d0     vpmuldq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1dcf: c4 e2 65 28 23     vpmuldq (%ebx),%ymm3,%ymm4
+    libdis_test+0x1dd4: c4 e2 55 28 72 42  vpmuldq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1dda: c4 e2 71 0b d0     vpmulhrsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ddf: c4 e2 61 0b 20     vpmulhrsw (%eax),%xmm3,%xmm4
+    libdis_test+0x1de4: c4 e2 51 0b 71 42  vpmulhrsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1dea: c4 e2 75 0b d0     vpmulhrsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1def: c4 e2 65 0b 23     vpmulhrsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1df4: c4 e2 55 0b 72 42  vpmulhrsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1dfa: c5 f1 e4 d0        vpmulhuw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1dfe: c5 e1 e4 20        vpmulhuw (%eax),%xmm3,%xmm4
+    libdis_test+0x1e02: c5 d1 e4 71 42     vpmulhuw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1e07: c5 f5 e4 d0        vpmulhuw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e0b: c5 e5 e4 23        vpmulhuw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1e0f: c5 d5 e4 72 42     vpmulhuw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1e14: c5 f1 e5 d0        vpmulhw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e18: c5 e1 e5 20        vpmulhw (%eax),%xmm3,%xmm4
+    libdis_test+0x1e1c: c5 d1 e5 71 42     vpmulhw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1e21: c5 f5 e5 d0        vpmulhw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e25: c5 e5 e5 23        vpmulhw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1e29: c5 d5 e5 72 42     vpmulhw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1e2e: c4 e2 71 40 d0     vpmulld %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e33: c4 e2 61 40 20     vpmulld (%eax),%xmm3,%xmm4
+    libdis_test+0x1e38: c4 e2 51 40 71 42  vpmulld 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1e3e: c4 e2 75 40 d0     vpmulld %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e43: c4 e2 65 40 23     vpmulld (%ebx),%ymm3,%ymm4
+    libdis_test+0x1e48: c4 e2 55 40 72 42  vpmulld 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1e4e: c5 f1 d5 d0        vpmullw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e52: c5 e1 d5 20        vpmullw (%eax),%xmm3,%xmm4
+    libdis_test+0x1e56: c5 d1 d5 71 42     vpmullw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1e5b: c5 f5 d5 d0        vpmullw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e5f: c5 e5 d5 23        vpmullw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1e63: c5 d5 d5 72 42     vpmullw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1e68: c5 f1 f4 d0        vpmuludq %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e6c: c5 e1 f4 20        vpmuludq (%eax),%xmm3,%xmm4
+    libdis_test+0x1e70: c5 d1 f4 71 42     vpmuludq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1e75: c5 f5 f4 d0        vpmuludq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e79: c5 e5 f4 23        vpmuludq (%ebx),%ymm3,%ymm4
+    libdis_test+0x1e7d: c5 d5 f4 72 42     vpmuludq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1e82: c5 f1 eb d0        vpor   %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e86: c5 e1 eb 20        vpor   (%eax),%xmm3,%xmm4
+    libdis_test+0x1e8a: c5 d1 eb 71 42     vpor   0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1e8f: c5 f5 eb d0        vpor   %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e93: c5 e5 eb 23        vpor   (%ebx),%ymm3,%ymm4
+    libdis_test+0x1e97: c5 d5 eb 72 42     vpor   0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1e9c: c5 f1 f6 d0        vpsadbw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ea0: c5 e1 f6 20        vpsadbw (%eax),%xmm3,%xmm4
+    libdis_test+0x1ea4: c5 d1 f6 71 42     vpsadbw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1ea9: c5 f5 f6 d0        vpsadbw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ead: c5 e5 f6 23        vpsadbw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1eb1: c5 d5 f6 72 42     vpsadbw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1eb6: c4 e2 71 00 d0     vpshufb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ebb: c4 e2 61 00 20     vpshufb (%eax),%xmm3,%xmm4
+    libdis_test+0x1ec0: c4 e2 51 00 71 42  vpshufb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1ec6: c4 e2 75 00 d0     vpshufb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ecb: c4 e2 65 00 23     vpshufb (%ebx),%ymm3,%ymm4
+    libdis_test+0x1ed0: c4 e2 55 00 72 42  vpshufb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1ed6: c5 f9 70 c8 42     vpshufd $0x42,%xmm0,%xmm1
+    libdis_test+0x1edb: c5 f9 70 1e 23     vpshufd $0x23,(%esi),%xmm3
+    libdis_test+0x1ee0: c5 f9 70 5f 42 42  vpshufd $0x42,0x42(%edi),%xmm3
+    libdis_test+0x1ee6: c5 fd 70 c8 42     vpshufd $0x42,%ymm0,%ymm1
+    libdis_test+0x1eeb: c5 fd 70 1e 23     vpshufd $0x23,(%esi),%ymm3
+    libdis_test+0x1ef0: c5 fd 70 5f 42 42  vpshufd $0x42,0x42(%edi),%ymm3
+    libdis_test+0x1ef6: c5 fa 70 c8 42     vpshufhw $0x42,%xmm0,%xmm1
+    libdis_test+0x1efb: c5 fa 70 1e 23     vpshufhw $0x23,(%esi),%xmm3
+    libdis_test+0x1f00: c5 fa 70 5f 42 42  vpshufhw $0x42,0x42(%edi),%xmm3
+    libdis_test+0x1f06: c5 fe 70 c8 42     vpshufhw $0x42,%ymm0,%ymm1
+    libdis_test+0x1f0b: c5 fe 70 1e 23     vpshufhw $0x23,(%esi),%ymm3
+    libdis_test+0x1f10: c5 fe 70 5f 42 42  vpshufhw $0x42,0x42(%edi),%ymm3
+    libdis_test+0x1f16: c5 fb 70 c8 42     vpshuflw $0x42,%xmm0,%xmm1
+    libdis_test+0x1f1b: c5 fb 70 1e 23     vpshuflw $0x23,(%esi),%xmm3
+    libdis_test+0x1f20: c5 fb 70 5f 42 42  vpshuflw $0x42,0x42(%edi),%xmm3
+    libdis_test+0x1f26: c5 ff 70 c8 42     vpshuflw $0x42,%ymm0,%ymm1
+    libdis_test+0x1f2b: c5 ff 70 1e 23     vpshuflw $0x23,(%esi),%ymm3
+    libdis_test+0x1f30: c5 ff 70 5f 42 42  vpshuflw $0x42,0x42(%edi),%ymm3
+    libdis_test+0x1f36: c4 e2 71 08 d0     vpsignb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1f3b: c4 e2 61 08 20     vpsignb (%eax),%xmm3,%xmm4
+    libdis_test+0x1f40: c4 e2 51 08 71 42  vpsignb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1f46: c4 e2 75 08 d0     vpsignb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1f4b: c4 e2 65 08 23     vpsignb (%ebx),%ymm3,%ymm4
+    libdis_test+0x1f50: c4 e2 55 08 72 42  vpsignb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1f56: c4 e2 71 0a d0     vpsignd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1f5b: c4 e2 61 0a 20     vpsignd (%eax),%xmm3,%xmm4
+    libdis_test+0x1f60: c4 e2 51 0a 71 42  vpsignd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1f66: c4 e2 75 0a d0     vpsignd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1f6b: c4 e2 65 0a 23     vpsignd (%ebx),%ymm3,%ymm4
+    libdis_test+0x1f70: c4 e2 55 0a 72 42  vpsignd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1f76: c4 e2 71 09 d0     vpsignw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1f7b: c4 e2 61 09 20     vpsignw (%eax),%xmm3,%xmm4
+    libdis_test+0x1f80: c4 e2 51 09 71 42  vpsignw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x1f86: c4 e2 75 09 d0     vpsignw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1f8b: c4 e2 65 09 23     vpsignw (%ebx),%ymm3,%ymm4
+    libdis_test+0x1f90: c4 e2 55 09 72 42  vpsignw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x1f96: c5 f1 f2 d0        vpslld %xmm0,%xmm1,%xmm2
+    libdis_test+0x1f9a: c5 e1 f2 20        vpslld (%eax),%xmm3,%xmm4
+    libdis_test+0x1f9e: c5 d9 f2 6b 10     vpslld 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x1fa3: c5 c1 72 f6 04     vpslld $0x4,%xmm6,%xmm7
+    libdis_test+0x1fa8: c5 f5 f2 d0        vpslld %ymm0,%ymm1,%ymm2
+    libdis_test+0x1fac: c5 e5 f2 20        vpslld (%eax),%ymm3,%ymm4
+    libdis_test+0x1fb0: c5 dd f2 6b 10     vpslld 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x1fb5: c5 c5 72 f6 04     vpslld $0x4,%ymm6,%ymm7
+    libdis_test+0x1fba: c5 f1 73 f8 07     vpslldq $0x7,%xmm0,%xmm1
+    libdis_test+0x1fbf: c5 f5 73 f8 07     vpslldq $0x7,%ymm0,%ymm1
+    libdis_test+0x1fc4: c5 f1 f3 d0        vpsllq %xmm0,%xmm1,%xmm2
+    libdis_test+0x1fc8: c5 e1 f3 20        vpsllq (%eax),%xmm3,%xmm4
+    libdis_test+0x1fcc: c5 d9 f3 6b 10     vpsllq 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x1fd1: c5 c1 73 f6 04     vpsllq $0x4,%xmm6,%xmm7
+    libdis_test+0x1fd6: c5 f5 f3 d0        vpsllq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1fda: c5 e5 f3 20        vpsllq (%eax),%ymm3,%ymm4
+    libdis_test+0x1fde: c5 dd f3 6b 10     vpsllq 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x1fe3: c5 c5 73 f6 04     vpsllq $0x4,%ymm6,%ymm7
+    libdis_test+0x1fe8: c5 f1 f1 d0        vpsllw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1fec: c5 e1 f1 20        vpsllw (%eax),%xmm3,%xmm4
+    libdis_test+0x1ff0: c5 d9 f1 6b 10     vpsllw 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x1ff5: c5 c1 71 f6 04     vpsllw $0x4,%xmm6,%xmm7
+    libdis_test+0x1ffa: c5 f5 f1 d0        vpsllw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ffe: c5 e5 f1 20        vpsllw (%eax),%ymm3,%ymm4
+    libdis_test+0x2002: c5 dd f1 6b 10     vpsllw 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x2007: c5 c5 71 f6 04     vpsllw $0x4,%ymm6,%ymm7
+    libdis_test+0x200c: c5 f1 e2 d0        vpsrad %xmm0,%xmm1,%xmm2
+    libdis_test+0x2010: c5 e1 e2 20        vpsrad (%eax),%xmm3,%xmm4
+    libdis_test+0x2014: c5 d9 e2 6b 10     vpsrad 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x2019: c5 c1 72 e6 04     vpsrad $0x4,%xmm6,%xmm7
+    libdis_test+0x201e: c5 f5 e2 d0        vpsrad %ymm0,%ymm1,%ymm2
+    libdis_test+0x2022: c5 e5 e2 20        vpsrad (%eax),%ymm3,%ymm4
+    libdis_test+0x2026: c5 dd e2 6b 10     vpsrad 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x202b: c5 c5 72 e6 04     vpsrad $0x4,%ymm6,%ymm7
+    libdis_test+0x2030: c5 f1 e1 d0        vpsraw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2034: c5 e1 e1 20        vpsraw (%eax),%xmm3,%xmm4
+    libdis_test+0x2038: c5 d9 e1 6b 10     vpsraw 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x203d: c5 c1 71 e6 04     vpsraw $0x4,%xmm6,%xmm7
+    libdis_test+0x2042: c5 f5 e1 d0        vpsraw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2046: c5 e5 e1 20        vpsraw (%eax),%ymm3,%ymm4
+    libdis_test+0x204a: c5 dd e1 6b 10     vpsraw 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x204f: c5 c5 71 e6 04     vpsraw $0x4,%ymm6,%ymm7
+    libdis_test+0x2054: c5 f1 d2 d0        vpsrld %xmm0,%xmm1,%xmm2
+    libdis_test+0x2058: c5 e1 d2 20        vpsrld (%eax),%xmm3,%xmm4
+    libdis_test+0x205c: c5 d9 d2 6b 10     vpsrld 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x2061: c5 c1 72 d6 04     vpsrld $0x4,%xmm6,%xmm7
+    libdis_test+0x2066: c5 f5 d2 d0        vpsrld %ymm0,%ymm1,%ymm2
+    libdis_test+0x206a: c5 e5 d2 20        vpsrld (%eax),%ymm3,%ymm4
+    libdis_test+0x206e: c5 dd d2 6b 10     vpsrld 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x2073: c5 c5 72 d6 04     vpsrld $0x4,%ymm6,%ymm7
+    libdis_test+0x2078: c5 f1 73 d8 07     vpsrldq $0x7,%xmm0,%xmm1
+    libdis_test+0x207d: c5 f5 73 d8 07     vpsrldq $0x7,%ymm0,%ymm1
+    libdis_test+0x2082: c5 f1 d3 d0        vpsrlq %xmm0,%xmm1,%xmm2
+    libdis_test+0x2086: c5 e1 d3 20        vpsrlq (%eax),%xmm3,%xmm4
+    libdis_test+0x208a: c5 d9 d3 6b 10     vpsrlq 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x208f: c5 c1 73 d6 04     vpsrlq $0x4,%xmm6,%xmm7
+    libdis_test+0x2094: c5 f5 d3 d0        vpsrlq %ymm0,%ymm1,%ymm2
+    libdis_test+0x2098: c5 e5 d3 20        vpsrlq (%eax),%ymm3,%ymm4
+    libdis_test+0x209c: c5 dd d3 6b 10     vpsrlq 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x20a1: c5 c5 73 d6 04     vpsrlq $0x4,%ymm6,%ymm7
+    libdis_test+0x20a6: c5 f1 d1 d0        vpsrlw %xmm0,%xmm1,%xmm2
+    libdis_test+0x20aa: c5 e1 d1 20        vpsrlw (%eax),%xmm3,%xmm4
+    libdis_test+0x20ae: c5 d9 d1 6b 10     vpsrlw 0x10(%ebx),%xmm4,%xmm5
+    libdis_test+0x20b3: c5 c1 71 d6 04     vpsrlw $0x4,%xmm6,%xmm7
+    libdis_test+0x20b8: c5 f5 d1 d0        vpsrlw %ymm0,%ymm1,%ymm2
+    libdis_test+0x20bc: c5 e5 d1 20        vpsrlw (%eax),%ymm3,%ymm4
+    libdis_test+0x20c0: c5 dd d1 6b 10     vpsrlw 0x10(%ebx),%ymm4,%ymm5
+    libdis_test+0x20c5: c5 c5 71 d6 04     vpsrlw $0x4,%ymm6,%ymm7
+    libdis_test+0x20ca: c5 f1 f8 d0        vpsubb %xmm0,%xmm1,%xmm2
+    libdis_test+0x20ce: c5 e1 f8 20        vpsubb (%eax),%xmm3,%xmm4
+    libdis_test+0x20d2: c5 d1 f8 71 42     vpsubb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x20d7: c5 f5 f8 d0        vpsubb %ymm0,%ymm1,%ymm2
+    libdis_test+0x20db: c5 e5 f8 23        vpsubb (%ebx),%ymm3,%ymm4
+    libdis_test+0x20df: c5 d5 f8 72 42     vpsubb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x20e4: c5 f1 fa d0        vpsubd %xmm0,%xmm1,%xmm2
+    libdis_test+0x20e8: c5 e1 fa 20        vpsubd (%eax),%xmm3,%xmm4
+    libdis_test+0x20ec: c5 d1 fa 71 42     vpsubd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x20f1: c5 f5 fa d0        vpsubd %ymm0,%ymm1,%ymm2
+    libdis_test+0x20f5: c5 e5 fa 23        vpsubd (%ebx),%ymm3,%ymm4
+    libdis_test+0x20f9: c5 d5 fa 72 42     vpsubd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x20fe: c5 f1 fb d0        vpsubq %xmm0,%xmm1,%xmm2
+    libdis_test+0x2102: c5 e1 fb 20        vpsubq (%eax),%xmm3,%xmm4
+    libdis_test+0x2106: c5 d1 fb 71 42     vpsubq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x210b: c5 f5 fb d0        vpsubq %ymm0,%ymm1,%ymm2
+    libdis_test+0x210f: c5 e5 fb 23        vpsubq (%ebx),%ymm3,%ymm4
+    libdis_test+0x2113: c5 d5 fb 72 42     vpsubq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2118: c5 f1 e8 d0        vpsubsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x211c: c5 e1 e8 20        vpsubsb (%eax),%xmm3,%xmm4
+    libdis_test+0x2120: c5 d1 e8 71 42     vpsubsb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2125: c5 f5 e8 d0        vpsubsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x2129: c5 e5 e8 23        vpsubsb (%ebx),%ymm3,%ymm4
+    libdis_test+0x212d: c5 d5 e8 72 42     vpsubsb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2132: c5 f1 e9 d0        vpsubsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2136: c5 e1 e9 20        vpsubsw (%eax),%xmm3,%xmm4
+    libdis_test+0x213a: c5 d1 e9 71 42     vpsubsw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x213f: c5 f5 e9 d0        vpsubsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2143: c5 e5 e9 23        vpsubsw (%ebx),%ymm3,%ymm4
+    libdis_test+0x2147: c5 d5 e9 72 42     vpsubsw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x214c: c5 f1 d8 d0        vpsubusb %xmm0,%xmm1,%xmm2
+    libdis_test+0x2150: c5 e1 d8 20        vpsubusb (%eax),%xmm3,%xmm4
+    libdis_test+0x2154: c5 d1 d8 71 42     vpsubusb 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2159: c5 f5 d8 d0        vpsubusb %ymm0,%ymm1,%ymm2
+    libdis_test+0x215d: c5 e5 d8 23        vpsubusb (%ebx),%ymm3,%ymm4
+    libdis_test+0x2161: c5 d5 d8 72 42     vpsubusb 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2166: c5 f1 d9 d0        vpsubusw %xmm0,%xmm1,%xmm2
+    libdis_test+0x216a: c5 e1 d9 20        vpsubusw (%eax),%xmm3,%xmm4
+    libdis_test+0x216e: c5 d1 d9 71 42     vpsubusw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2173: c5 f5 d9 d0        vpsubusw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2177: c5 e5 d9 23        vpsubusw (%ebx),%ymm3,%ymm4
+    libdis_test+0x217b: c5 d5 d9 72 42     vpsubusw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2180: c5 f1 f9 d0        vpsubw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2184: c5 e1 f9 20        vpsubw (%eax),%xmm3,%xmm4
+    libdis_test+0x2188: c5 d1 f9 71 42     vpsubw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x218d: c5 f5 f9 d0        vpsubw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2191: c5 e5 f9 23        vpsubw (%ebx),%ymm3,%ymm4
+    libdis_test+0x2195: c5 d5 f9 72 42     vpsubw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x219a: c4 e2 79 17 c8     vptest %xmm0,%xmm1
+    libdis_test+0x219f: c4 e2 79 17 1e     vptest (%esi),%xmm3
+    libdis_test+0x21a4: c4 e2 79 17 5f 42  vptest 0x42(%edi),%xmm3
+    libdis_test+0x21aa: c4 e2 7d 17 f7     vptest %ymm7,%ymm6
+    libdis_test+0x21af: c4 e2 7d 17 65 00  vptest 0x0(%ebp),%ymm4
+    libdis_test+0x21b5: c4 e2 7d 17 64 24  vptest 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x21bc: c5 f1 68 d0        vpunpckhbw %xmm0,%xmm1,%xmm2
+    libdis_test+0x21c0: c5 e1 68 20        vpunpckhbw (%eax),%xmm3,%xmm4
+    libdis_test+0x21c4: c5 d1 68 71 42     vpunpckhbw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x21c9: c5 f5 68 d0        vpunpckhbw %ymm0,%ymm1,%ymm2
+    libdis_test+0x21cd: c5 e5 68 23        vpunpckhbw (%ebx),%ymm3,%ymm4
+    libdis_test+0x21d1: c5 d5 68 72 42     vpunpckhbw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x21d6: c5 f1 6a d0        vpunpckhdq %xmm0,%xmm1,%xmm2
+    libdis_test+0x21da: c5 e1 6a 20        vpunpckhdq (%eax),%xmm3,%xmm4
+    libdis_test+0x21de: c5 d1 6a 71 42     vpunpckhdq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x21e3: c5 f5 6a d0        vpunpckhdq %ymm0,%ymm1,%ymm2
+    libdis_test+0x21e7: c5 e5 6a 23        vpunpckhdq (%ebx),%ymm3,%ymm4
+    libdis_test+0x21eb: c5 d5 6a 72 42     vpunpckhdq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x21f0: c5 f1 6d d0        vpunpckhqdq %xmm0,%xmm1,%xmm2
+    libdis_test+0x21f4: c5 e1 6d 20        vpunpckhqdq (%eax),%xmm3,%xmm4
+    libdis_test+0x21f8: c5 d1 6d 71 42     vpunpckhqdq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x21fd: c5 f5 6d d0        vpunpckhqdq %ymm0,%ymm1,%ymm2
+    libdis_test+0x2201: c5 e5 6d 23        vpunpckhqdq (%ebx),%ymm3,%ymm4
+    libdis_test+0x2205: c5 d5 6d 72 42     vpunpckhqdq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x220a: c5 f1 69 d0        vpunpckhwd %xmm0,%xmm1,%xmm2
+    libdis_test+0x220e: c5 e1 69 20        vpunpckhwd (%eax),%xmm3,%xmm4
+    libdis_test+0x2212: c5 d1 69 71 42     vpunpckhwd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2217: c5 f5 69 d0        vpunpckhwd %ymm0,%ymm1,%ymm2
+    libdis_test+0x221b: c5 e5 69 23        vpunpckhwd (%ebx),%ymm3,%ymm4
+    libdis_test+0x221f: c5 d5 69 72 42     vpunpckhwd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2224: c5 f1 60 d0        vpunpcklbw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2228: c5 e1 60 20        vpunpcklbw (%eax),%xmm3,%xmm4
+    libdis_test+0x222c: c5 d1 60 71 42     vpunpcklbw 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2231: c5 f5 60 d0        vpunpcklbw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2235: c5 e5 60 23        vpunpcklbw (%ebx),%ymm3,%ymm4
+    libdis_test+0x2239: c5 d5 60 72 42     vpunpcklbw 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x223e: c5 f1 62 d0        vpunpckldq %xmm0,%xmm1,%xmm2
+    libdis_test+0x2242: c5 e1 62 20        vpunpckldq (%eax),%xmm3,%xmm4
+    libdis_test+0x2246: c5 d1 62 71 42     vpunpckldq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x224b: c5 f5 62 d0        vpunpckldq %ymm0,%ymm1,%ymm2
+    libdis_test+0x224f: c5 e5 62 23        vpunpckldq (%ebx),%ymm3,%ymm4
+    libdis_test+0x2253: c5 d5 62 72 42     vpunpckldq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2258: c5 f1 6c d0        vpunpcklqdq %xmm0,%xmm1,%xmm2
+    libdis_test+0x225c: c5 e1 6c 20        vpunpcklqdq (%eax),%xmm3,%xmm4
+    libdis_test+0x2260: c5 d1 6c 71 42     vpunpcklqdq 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2265: c5 f5 6c d0        vpunpcklqdq %ymm0,%ymm1,%ymm2
+    libdis_test+0x2269: c5 e5 6c 23        vpunpcklqdq (%ebx),%ymm3,%ymm4
+    libdis_test+0x226d: c5 d5 6c 72 42     vpunpcklqdq 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2272: c5 f1 61 d0        vpunpcklwd %xmm0,%xmm1,%xmm2
+    libdis_test+0x2276: c5 e1 61 20        vpunpcklwd (%eax),%xmm3,%xmm4
+    libdis_test+0x227a: c5 d1 61 71 42     vpunpcklwd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x227f: c5 f5 61 d0        vpunpcklwd %ymm0,%ymm1,%ymm2
+    libdis_test+0x2283: c5 e5 61 23        vpunpcklwd (%ebx),%ymm3,%ymm4
+    libdis_test+0x2287: c5 d5 61 72 42     vpunpcklwd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x228c: c5 f1 ef d0        vpxor  %xmm0,%xmm1,%xmm2
+    libdis_test+0x2290: c5 e1 ef 20        vpxor  (%eax),%xmm3,%xmm4
+    libdis_test+0x2294: c5 d1 ef 71 42     vpxor  0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2299: c5 f5 ef d0        vpxor  %ymm0,%ymm1,%ymm2
+    libdis_test+0x229d: c5 e5 ef 23        vpxor  (%ebx),%ymm3,%ymm4
+    libdis_test+0x22a1: c5 d5 ef 72 42     vpxor  0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x22a6: c5 f8 53 c8        vrcpps %xmm0,%xmm1
+    libdis_test+0x22aa: c5 f8 53 1e        vrcpps (%esi),%xmm3
+    libdis_test+0x22ae: c5 f8 53 5f 42     vrcpps 0x42(%edi),%xmm3
+    libdis_test+0x22b3: c5 fc 53 f7        vrcpps %ymm7,%ymm6
+    libdis_test+0x22b7: c5 fc 53 65 00     vrcpps 0x0(%ebp),%ymm4
+    libdis_test+0x22bc: c5 fc 53 64 24 42  vrcpps 0x42(%esp),%ymm4
+    libdis_test+0x22c2: c5 f2 53 d0        vrcpss %xmm0,%xmm1,%xmm2
+    libdis_test+0x22c6: c5 e2 53 20        vrcpss (%eax),%xmm3,%xmm4
+    libdis_test+0x22ca: c5 d2 53 71 42     vrcpss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x22cf: c4 e3 79 09 c8 42  vroundpd $0x42,%xmm0,%xmm1
+    libdis_test+0x22d5: c4 e3 79 09 1e 23  vroundpd $0x23,(%esi),%xmm3
+    libdis_test+0x22db: c4 e3 79 09 5f 42  vroundpd $0x42,0x42(%edi),%xmm3
+                        42 
+    libdis_test+0x22e2: c4 e3 7d 09 c8 42  vroundpd $0x42,%ymm0,%ymm1
+    libdis_test+0x22e8: c4 e3 7d 09 1e 23  vroundpd $0x23,(%esi),%ymm3
+    libdis_test+0x22ee: c4 e3 7d 09 5f 42  vroundpd $0x42,0x42(%edi),%ymm3
+                        42 
+    libdis_test+0x22f5: c4 e3 79 08 c8 42  vroundps $0x42,%xmm0,%xmm1
+    libdis_test+0x22fb: c4 e3 79 08 1e 23  vroundps $0x23,(%esi),%xmm3
+    libdis_test+0x2301: c4 e3 79 08 5f 42  vroundps $0x42,0x42(%edi),%xmm3
+                        42 
+    libdis_test+0x2308: c4 e3 7d 08 c8 42  vroundps $0x42,%ymm0,%ymm1
+    libdis_test+0x230e: c4 e3 7d 08 1e 23  vroundps $0x23,(%esi),%ymm3
+    libdis_test+0x2314: c4 e3 7d 08 5f 42  vroundps $0x42,0x42(%edi),%ymm3
+                        42 
+    libdis_test+0x231b: c4 e3 51 0b fb 48  vroundsd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x2321: c4 e3 69 0b 23 48  vroundsd $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x2327: c4 e3 71 0b 73 08  vroundsd $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x232e: c4 e3 51 0a fb 48  vroundss $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x2334: c4 e3 69 0a 23 48  vroundss $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x233a: c4 e3 71 0a 73 08  vroundss $0x48,0x8(%ebx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x2341: c5 f8 52 c8        vrsqrtps %xmm0,%xmm1
+    libdis_test+0x2345: c5 f8 52 1e        vrsqrtps (%esi),%xmm3
+    libdis_test+0x2349: c5 f8 52 5f 42     vrsqrtps 0x42(%edi),%xmm3
+    libdis_test+0x234e: c5 fc 52 f7        vrsqrtps %ymm7,%ymm6
+    libdis_test+0x2352: c5 fc 52 65 00     vrsqrtps 0x0(%ebp),%ymm4
+    libdis_test+0x2357: c5 fc 52 64 24 42  vrsqrtps 0x42(%esp),%ymm4
+    libdis_test+0x235d: c5 f2 52 d0        vrsqrtss %xmm0,%xmm1,%xmm2
+    libdis_test+0x2361: c5 e2 52 20        vrsqrtss (%eax),%xmm3,%xmm4
+    libdis_test+0x2365: c5 d2 52 71 42     vrsqrtss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x236a: c5 d1 c6 fb 48     vshufpd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x236f: c5 e9 c6 23 48     vshufpd $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x2374: c5 f1 c6 73 08 48  vshufpd $0x48,0x8(%ebx),%xmm1,%xmm6
+    libdis_test+0x237a: c5 d5 c6 fb 48     vshufpd $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x237f: c5 ed c6 23 48     vshufpd $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x2384: c5 f5 c6 73 08 48  vshufpd $0x48,0x8(%ebx),%ymm1,%ymm6
+    libdis_test+0x238a: c5 d0 c6 fb 48     vshufps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x238f: c5 e8 c6 23 48     vshufps $0x48,(%ebx),%xmm2,%xmm4
+    libdis_test+0x2394: c5 f0 c6 73 08 48  vshufps $0x48,0x8(%ebx),%xmm1,%xmm6
+    libdis_test+0x239a: c5 d4 c6 fb 48     vshufps $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x239f: c5 ec c6 23 48     vshufps $0x48,(%ebx),%ymm2,%ymm4
+    libdis_test+0x23a4: c5 f4 c6 73 08 48  vshufps $0x48,0x8(%ebx),%ymm1,%ymm6
+    libdis_test+0x23aa: c5 f9 51 c8        vsqrtpd %xmm0,%xmm1
+    libdis_test+0x23ae: c5 f9 51 1e        vsqrtpd (%esi),%xmm3
+    libdis_test+0x23b2: c5 f9 51 5f 42     vsqrtpd 0x42(%edi),%xmm3
+    libdis_test+0x23b7: c5 fd 51 f7        vsqrtpd %ymm7,%ymm6
+    libdis_test+0x23bb: c5 fd 51 65 00     vsqrtpd 0x0(%ebp),%ymm4
+    libdis_test+0x23c0: c5 fd 51 64 24 42  vsqrtpd 0x42(%esp),%ymm4
+    libdis_test+0x23c6: c5 f8 51 c8        vsqrtps %xmm0,%xmm1
+    libdis_test+0x23ca: c5 f8 51 1e        vsqrtps (%esi),%xmm3
+    libdis_test+0x23ce: c5 f8 51 5f 42     vsqrtps 0x42(%edi),%xmm3
+    libdis_test+0x23d3: c5 fc 51 f7        vsqrtps %ymm7,%ymm6
+    libdis_test+0x23d7: c5 fc 51 65 00     vsqrtps 0x0(%ebp),%ymm4
+    libdis_test+0x23dc: c5 fc 51 64 24 42  vsqrtps 0x42(%esp),%ymm4
+    libdis_test+0x23e2: c5 f3 51 d0        vsqrtsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x23e6: c5 e3 51 20        vsqrtsd (%eax),%xmm3,%xmm4
+    libdis_test+0x23ea: c5 d3 51 71 42     vsqrtsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x23ef: c5 f2 51 d0        vsqrtss %xmm0,%xmm1,%xmm2
+    libdis_test+0x23f3: c5 e2 51 20        vsqrtss (%eax),%xmm3,%xmm4
+    libdis_test+0x23f7: c5 d2 51 71 42     vsqrtss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x23fc: c5 f8 ae 1a        vstmxcsr (%edx)
+    libdis_test+0x2400: c5 f8 ae 5a 08     vstmxcsr 0x8(%edx)
+    libdis_test+0x2405: c5 f1 5c d0        vsubpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x2409: c5 e1 5c 20        vsubpd (%eax),%xmm3,%xmm4
+    libdis_test+0x240d: c5 d1 5c 71 42     vsubpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2412: c5 f5 5c d0        vsubpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x2416: c5 e5 5c 23        vsubpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x241a: c5 d5 5c 72 42     vsubpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x241f: c5 f0 5c d0        vsubps %xmm0,%xmm1,%xmm2
+    libdis_test+0x2423: c5 e0 5c 20        vsubps (%eax),%xmm3,%xmm4
+    libdis_test+0x2427: c5 d0 5c 71 42     vsubps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x242c: c5 f4 5c d0        vsubps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2430: c5 e4 5c 23        vsubps (%ebx),%ymm3,%ymm4
+    libdis_test+0x2434: c5 d4 5c 72 42     vsubps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2439: c5 f3 5c d0        vsubsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x243d: c5 e3 5c 20        vsubsd (%eax),%xmm3,%xmm4
+    libdis_test+0x2441: c5 d3 5c 71 42     vsubsd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2446: c5 f2 5c d0        vsubss %xmm0,%xmm1,%xmm2
+    libdis_test+0x244a: c5 e2 5c 20        vsubss (%eax),%xmm3,%xmm4
+    libdis_test+0x244e: c5 d2 5c 71 42     vsubss 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2453: c4 e2 79 0f c8     vtestpd %xmm0,%xmm1
+    libdis_test+0x2458: c4 e2 79 0f 1e     vtestpd (%esi),%xmm3
+    libdis_test+0x245d: c4 e2 79 0f 5f 42  vtestpd 0x42(%edi),%xmm3
+    libdis_test+0x2463: c4 e2 7d 0f f7     vtestpd %ymm7,%ymm6
+    libdis_test+0x2468: c4 e2 7d 0f 65 00  vtestpd 0x0(%ebp),%ymm4
+    libdis_test+0x246e: c4 e2 7d 0f 64 24  vtestpd 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x2475: c4 e2 79 0e c8     vtestps %xmm0,%xmm1
+    libdis_test+0x247a: c4 e2 79 0e 1e     vtestps (%esi),%xmm3
+    libdis_test+0x247f: c4 e2 79 0e 5f 42  vtestps 0x42(%edi),%xmm3
+    libdis_test+0x2485: c4 e2 7d 0e f7     vtestps %ymm7,%ymm6
+    libdis_test+0x248a: c4 e2 7d 0e 65 00  vtestps 0x0(%ebp),%ymm4
+    libdis_test+0x2490: c4 e2 7d 0e 64 24  vtestps 0x42(%esp),%ymm4
+                        42 
+    libdis_test+0x2497: c5 f9 2e c8        vucomisd %xmm0,%xmm1
+    libdis_test+0x249b: c5 f9 2e 1e        vucomisd (%esi),%xmm3
+    libdis_test+0x249f: c5 f9 2e 5f 42     vucomisd 0x42(%edi),%xmm3
+    libdis_test+0x24a4: c5 f8 2e c8        vucomiss %xmm0,%xmm1
+    libdis_test+0x24a8: c5 f8 2e 1e        vucomiss (%esi),%xmm3
+    libdis_test+0x24ac: c5 f8 2e 5f 42     vucomiss 0x42(%edi),%xmm3
+    libdis_test+0x24b1: c5 f1 15 d0        vunpckhpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x24b5: c5 e1 15 20        vunpckhpd (%eax),%xmm3,%xmm4
+    libdis_test+0x24b9: c5 d1 15 71 42     vunpckhpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x24be: c5 f5 15 d0        vunpckhpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x24c2: c5 e5 15 23        vunpckhpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x24c6: c5 d5 15 72 42     vunpckhpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x24cb: c5 f0 15 d0        vunpckhps %xmm0,%xmm1,%xmm2
+    libdis_test+0x24cf: c5 e0 15 20        vunpckhps (%eax),%xmm3,%xmm4
+    libdis_test+0x24d3: c5 d0 15 71 42     vunpckhps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x24d8: c5 f4 15 d0        vunpckhps %ymm0,%ymm1,%ymm2
+    libdis_test+0x24dc: c5 e4 15 23        vunpckhps (%ebx),%ymm3,%ymm4
+    libdis_test+0x24e0: c5 d4 15 72 42     vunpckhps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x24e5: c5 f1 14 d0        vunpcklpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x24e9: c5 e1 14 20        vunpcklpd (%eax),%xmm3,%xmm4
+    libdis_test+0x24ed: c5 d1 14 71 42     vunpcklpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x24f2: c5 f5 14 d0        vunpcklpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x24f6: c5 e5 14 23        vunpcklpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x24fa: c5 d5 14 72 42     vunpcklpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x24ff: c5 f0 14 d0        vunpcklps %xmm0,%xmm1,%xmm2
+    libdis_test+0x2503: c5 e0 14 20        vunpcklps (%eax),%xmm3,%xmm4
+    libdis_test+0x2507: c5 d0 14 71 42     vunpcklps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x250c: c5 f4 14 d0        vunpcklps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2510: c5 e4 14 23        vunpcklps (%ebx),%ymm3,%ymm4
+    libdis_test+0x2514: c5 d4 14 72 42     vunpcklps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2519: c5 f1 57 d0        vxorpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x251d: c5 e1 57 20        vxorpd (%eax),%xmm3,%xmm4
+    libdis_test+0x2521: c5 d1 57 71 42     vxorpd 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2526: c5 f5 57 d0        vxorpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x252a: c5 e5 57 23        vxorpd (%ebx),%ymm3,%ymm4
+    libdis_test+0x252e: c5 d5 57 72 42     vxorpd 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x2533: c5 f0 57 d0        vxorps %xmm0,%xmm1,%xmm2
+    libdis_test+0x2537: c5 e0 57 20        vxorps (%eax),%xmm3,%xmm4
+    libdis_test+0x253b: c5 d0 57 71 42     vxorps 0x42(%ecx),%xmm5,%xmm6
+    libdis_test+0x2540: c5 f4 57 d0        vxorps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2544: c5 e4 57 23        vxorps (%ebx),%ymm3,%ymm4
+    libdis_test+0x2548: c5 d4 57 72 42     vxorps 0x42(%edx),%ymm5,%ymm6
+    libdis_test+0x254d: c5 fc 77           vzeroall 
+    libdis_test+0x2550: c5 f8 77           vzeroupper 
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.avx.s b/usr/src/test/util-tests/tests/dis/i386/32.avx.s
new file mode 100644
index 0000000000..5c1a523539
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.avx.s
@@ -0,0 +1,2322 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test AVX related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vaddpd	%xmm0, %xmm1, %xmm2
+	vaddpd	(%eax), %xmm3, %xmm4
+	vaddpd	0x42(%ecx), %xmm5, %xmm6
+	vaddpd	%ymm0, %ymm1, %ymm2
+	vaddpd	(%ebx), %ymm3, %ymm4
+	vaddpd	0x42(%edx), %ymm5, %ymm6
+
+	vaddps	%xmm0, %xmm1, %xmm2
+	vaddps	(%eax), %xmm3, %xmm4
+	vaddps	0x42(%ecx), %xmm5, %xmm6
+	vaddps	%ymm0, %ymm1, %ymm2
+	vaddps	(%ebx), %ymm3, %ymm4
+	vaddps	0x42(%edx), %ymm5, %ymm6
+
+	vaddsd	%xmm0, %xmm1, %xmm2
+	vaddsd	(%eax), %xmm3, %xmm4
+	vaddsd	0x42(%ecx), %xmm5, %xmm6
+
+	vaddss	%xmm0, %xmm1, %xmm2
+	vaddss	(%eax), %xmm3, %xmm4
+	vaddss	0x42(%ecx), %xmm5, %xmm6
+
+	vaddsubpd	%xmm0, %xmm1, %xmm2
+	vaddsubpd	(%eax), %xmm3, %xmm4
+	vaddsubpd	0x42(%ecx), %xmm5, %xmm6
+	vaddsubpd	%ymm0, %ymm1, %ymm2
+	vaddsubpd	(%ebx), %ymm3, %ymm4
+	vaddsubpd	0x42(%edx), %ymm5, %ymm6
+
+	vaddsubps	%xmm0, %xmm1, %xmm2
+	vaddsubps	(%eax), %xmm3, %xmm4
+	vaddsubps	0x42(%ecx), %xmm5, %xmm6
+	vaddsubps	%ymm0, %ymm1, %ymm2
+	vaddsubps	(%ebx), %ymm3, %ymm4
+	vaddsubps	0x42(%edx), %ymm5, %ymm6
+
+	vaesdec	%xmm0, %xmm1, %xmm2
+	vaesdec	(%eax), %xmm3, %xmm4
+	vaesdec	0x42(%ecx), %xmm5, %xmm6
+
+	vaesdeclast	%xmm0, %xmm1, %xmm2
+	vaesdeclast	(%eax), %xmm3, %xmm4
+	vaesdeclast	0x42(%ecx), %xmm5, %xmm6
+
+	vaesenc	%xmm0, %xmm1, %xmm2
+	vaesenc	(%eax), %xmm3, %xmm4
+	vaesenc	0x42(%ecx), %xmm5, %xmm6
+
+	vaesenclast	%xmm0, %xmm1, %xmm2
+	vaesenclast	(%eax), %xmm3, %xmm4
+	vaesenclast	0x42(%ecx), %xmm5, %xmm6
+
+	vaesimc	%xmm0, %xmm1
+	vaesimc	(%esi), %xmm3
+	vaesimc	0x42(%edi), %xmm3
+
+	vaeskeygenassist	$0x42, %xmm0, %xmm1
+	vaeskeygenassist	$0x23, 	(%esi), %xmm3
+	vaeskeygenassist	$0x42, 0x42(%edi), %xmm3
+
+	vandnpd	%xmm0, %xmm1, %xmm2
+	vandnpd	(%eax), %xmm3, %xmm4
+	vandnpd	0x42(%ecx), %xmm5, %xmm6
+	vandnpd	%ymm0, %ymm1, %ymm2
+	vandnpd	(%ebx), %ymm3, %ymm4
+	vandnpd	0x42(%edx), %ymm5, %ymm6
+
+	vandnps	%xmm0, %xmm1, %xmm2
+	vandnps	(%eax), %xmm3, %xmm4
+	vandnps	0x42(%ecx), %xmm5, %xmm6
+	vandnps	%ymm0, %ymm1, %ymm2
+	vandnps	(%ebx), %ymm3, %ymm4
+	vandnps	0x42(%edx), %ymm5, %ymm6
+
+	vandpd	%xmm0, %xmm1, %xmm2
+	vandpd	(%eax), %xmm3, %xmm4
+	vandpd	0x42(%ecx), %xmm5, %xmm6
+	vandpd	%ymm0, %ymm1, %ymm2
+	vandpd	(%ebx), %ymm3, %ymm4
+	vandpd	0x42(%edx), %ymm5, %ymm6
+
+	vandps	%xmm0, %xmm1, %xmm2
+	vandps	(%eax), %xmm3, %xmm4
+	vandps	0x42(%ecx), %xmm5, %xmm6
+	vandps	%ymm0, %ymm1, %ymm2
+	vandps	(%ebx), %ymm3, %ymm4
+	vandps	0x42(%edx), %ymm5, %ymm6
+
+	vblendpd	$0x48, %xmm3, %xmm5, %xmm7
+	vblendpd	$0x48, (%ebx), %xmm2, %xmm4
+	vblendpd	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vblendpd	$0x48, %ymm3, %ymm5, %ymm7
+	vblendpd	$0x48, (%ebx), %ymm2, %ymm4
+	vblendpd	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vblendps	$0x48, %xmm3, %xmm5, %xmm7
+	vblendps	$0x48, (%ebx), %xmm2, %xmm4
+	vblendps	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vblendps	$0x48, %ymm3, %ymm5, %ymm7
+	vblendps	$0x48, (%ebx), %ymm2, %ymm4
+	vblendps	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vblendvpd	%xmm0, %xmm1, %xmm2, %xmm3
+	vblendvpd	%xmm0, (%eax), %xmm2, %xmm3
+	vblendvpd	%xmm0, 0x10(%ebx), %xmm2, %xmm3
+	vblendvpd	%ymm0, %ymm1, %ymm2, %ymm3
+	vblendvpd	%ymm0, (%eax), %ymm2, %ymm3
+	vblendvpd	%ymm0, 0x10(%ebx), %ymm2, %ymm3
+
+	vblendvps	%xmm0, %xmm1, %xmm2, %xmm3
+	vblendvps	%xmm0, (%eax), %xmm2, %xmm3
+	vblendvps	%xmm0, 0x10(%ebx), %xmm2, %xmm3
+	vblendvps	%ymm0, %ymm1, %ymm2, %ymm3
+	vblendvps	%ymm0, (%eax), %ymm2, %ymm3
+	vblendvps	%ymm0, 0x10(%ebx), %ymm2, %ymm3
+
+	vbroadcastf128	(%eax), %ymm0
+	vbroadcastf128	0x42(%eax), %ymm0
+
+	vbroadcastsd	(%eax), %ymm0
+	vbroadcastsd	0x42(%eax), %ymm0
+
+	vbroadcastss	(%eax), %ymm0
+	vbroadcastss	0x42(%eax), %ymm0
+
+	vcmpeq_ospd	%xmm0, %xmm1, %xmm2
+	vcmpeq_ospd	(%eax), %xmm3, %xmm4
+	vcmpeq_ospd	0x42(%ecx), %xmm5, %xmm6
+	vcmpeq_ospd	%ymm0, %ymm1, %ymm2
+	vcmpeq_ospd	(%ebx), %ymm3, %ymm4
+	vcmpeq_ospd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeq_osps	%xmm0, %xmm1, %xmm2
+	vcmpeq_osps	(%eax), %xmm3, %xmm4
+	vcmpeq_osps	0x42(%ecx), %xmm5, %xmm6
+	vcmpeq_osps	%ymm0, %ymm1, %ymm2
+	vcmpeq_osps	(%ebx), %ymm3, %ymm4
+	vcmpeq_osps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeq_ossd	%xmm0, %xmm1, %xmm2
+	vcmpeq_ossd	(%eax), %xmm3, %xmm4
+	vcmpeq_ossd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpeq_osss	%xmm0, %xmm1, %xmm2
+	vcmpeq_osss	(%eax), %xmm3, %xmm4
+	vcmpeq_osss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpeq_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqpd	(%eax), %xmm3, %xmm4
+	vcmpeq_uqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpeq_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpeq_uqpd	(%ebx), %ymm3, %ymm4
+	vcmpeq_uqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeq_uqps	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqps	(%eax), %xmm3, %xmm4
+	vcmpeq_uqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpeq_uqps	%ymm0, %ymm1, %ymm2
+	vcmpeq_uqps	(%ebx), %ymm3, %ymm4
+	vcmpeq_uqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeq_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqsd	(%eax), %xmm3, %xmm4
+	vcmpeq_uqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpeq_uqss	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqss	(%eax), %xmm3, %xmm4
+	vcmpeq_uqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpeq_uspd	%xmm0, %xmm1, %xmm2
+	vcmpeq_uspd	(%eax), %xmm3, %xmm4
+	vcmpeq_uspd	0x42(%ecx), %xmm5, %xmm6
+	vcmpeq_uspd	%ymm0, %ymm1, %ymm2
+	vcmpeq_uspd	(%ebx), %ymm3, %ymm4
+	vcmpeq_uspd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeq_usps	%xmm0, %xmm1, %xmm2
+	vcmpeq_usps	(%eax), %xmm3, %xmm4
+	vcmpeq_usps	0x42(%ecx), %xmm5, %xmm6
+	vcmpeq_usps	%ymm0, %ymm1, %ymm2
+	vcmpeq_usps	(%ebx), %ymm3, %ymm4
+	vcmpeq_usps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeq_ussd	%xmm0, %xmm1, %xmm2
+	vcmpeq_ussd	(%eax), %xmm3, %xmm4
+	vcmpeq_ussd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpeq_usss	%xmm0, %xmm1, %xmm2
+	vcmpeq_usss	(%eax), %xmm3, %xmm4
+	vcmpeq_usss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpeqpd	%xmm0, %xmm1, %xmm2
+	vcmpeqpd	(%eax), %xmm3, %xmm4
+	vcmpeqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpeqpd	%ymm0, %ymm1, %ymm2
+	vcmpeqpd	(%ebx), %ymm3, %ymm4
+	vcmpeqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeqps	%xmm0, %xmm1, %xmm2
+	vcmpeqps	(%eax), %xmm3, %xmm4
+	vcmpeqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpeqps	%ymm0, %ymm1, %ymm2
+	vcmpeqps	(%ebx), %ymm3, %ymm4
+	vcmpeqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpeqsd	%xmm0, %xmm1, %xmm2
+	vcmpeqsd	(%eax), %xmm3, %xmm4
+	vcmpeqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpeqss	%xmm0, %xmm1, %xmm2
+	vcmpeqss	(%eax), %xmm3, %xmm4
+	vcmpeqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpfalse_ospd	%xmm0, %xmm1, %xmm2
+	vcmpfalse_ospd	(%eax), %xmm3, %xmm4
+	vcmpfalse_ospd	0x42(%ecx), %xmm5, %xmm6
+	vcmpfalse_ospd	%ymm0, %ymm1, %ymm2
+	vcmpfalse_ospd	(%ebx), %ymm3, %ymm4
+	vcmpfalse_ospd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpfalse_osps	%xmm0, %xmm1, %xmm2
+	vcmpfalse_osps	(%eax), %xmm3, %xmm4
+	vcmpfalse_osps	0x42(%ecx), %xmm5, %xmm6
+	vcmpfalse_osps	%ymm0, %ymm1, %ymm2
+	vcmpfalse_osps	(%ebx), %ymm3, %ymm4
+	vcmpfalse_osps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpfalse_ossd	%xmm0, %xmm1, %xmm2
+	vcmpfalse_ossd	(%eax), %xmm3, %xmm4
+	vcmpfalse_ossd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpfalse_osss	%xmm0, %xmm1, %xmm2
+	vcmpfalse_osss	(%eax), %xmm3, %xmm4
+	vcmpfalse_osss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpfalsepd	%xmm0, %xmm1, %xmm2
+	vcmpfalsepd	(%eax), %xmm3, %xmm4
+	vcmpfalsepd	0x42(%ecx), %xmm5, %xmm6
+	vcmpfalsepd	%ymm0, %ymm1, %ymm2
+	vcmpfalsepd	(%ebx), %ymm3, %ymm4
+	vcmpfalsepd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpfalseps	%xmm0, %xmm1, %xmm2
+	vcmpfalseps	(%eax), %xmm3, %xmm4
+	vcmpfalseps	0x42(%ecx), %xmm5, %xmm6
+	vcmpfalseps	%ymm0, %ymm1, %ymm2
+	vcmpfalseps	(%ebx), %ymm3, %ymm4
+	vcmpfalseps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpfalsesd	%xmm0, %xmm1, %xmm2
+	vcmpfalsesd	(%eax), %xmm3, %xmm4
+	vcmpfalsesd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpfalsess	%xmm0, %xmm1, %xmm2
+	vcmpfalsess	(%eax), %xmm3, %xmm4
+	vcmpfalsess	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpge_oqpd	%xmm0, %xmm1, %xmm2
+	vcmpge_oqpd	(%eax), %xmm3, %xmm4
+	vcmpge_oqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpge_oqpd	%ymm0, %ymm1, %ymm2
+	vcmpge_oqpd	(%ebx), %ymm3, %ymm4
+	vcmpge_oqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpge_oqps	%xmm0, %xmm1, %xmm2
+	vcmpge_oqps	(%eax), %xmm3, %xmm4
+	vcmpge_oqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpge_oqps	%ymm0, %ymm1, %ymm2
+	vcmpge_oqps	(%ebx), %ymm3, %ymm4
+	vcmpge_oqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpge_oqsd	%xmm0, %xmm1, %xmm2
+	vcmpge_oqsd	(%eax), %xmm3, %xmm4
+	vcmpge_oqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpge_oqss	%xmm0, %xmm1, %xmm2
+	vcmpge_oqss	(%eax), %xmm3, %xmm4
+	vcmpge_oqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpgepd	%xmm0, %xmm1, %xmm2
+	vcmpgepd	(%eax), %xmm3, %xmm4
+	vcmpgepd	0x42(%ecx), %xmm5, %xmm6
+	vcmpgepd	%ymm0, %ymm1, %ymm2
+	vcmpgepd	(%ebx), %ymm3, %ymm4
+	vcmpgepd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpgeps	%xmm0, %xmm1, %xmm2
+	vcmpgeps	(%eax), %xmm3, %xmm4
+	vcmpgeps	0x42(%ecx), %xmm5, %xmm6
+	vcmpgeps	%ymm0, %ymm1, %ymm2
+	vcmpgeps	(%ebx), %ymm3, %ymm4
+	vcmpgeps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpgesd	%xmm0, %xmm1, %xmm2
+	vcmpgesd	(%eax), %xmm3, %xmm4
+	vcmpgesd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpgess	%xmm0, %xmm1, %xmm2
+	vcmpgess	(%eax), %xmm3, %xmm4
+	vcmpgess	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpgt_oqpd	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqpd	(%eax), %xmm3, %xmm4
+	vcmpgt_oqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpgt_oqpd	%ymm0, %ymm1, %ymm2
+	vcmpgt_oqpd	(%ebx), %ymm3, %ymm4
+	vcmpgt_oqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpgt_oqps	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqps	(%eax), %xmm3, %xmm4
+	vcmpgt_oqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpgt_oqps	%ymm0, %ymm1, %ymm2
+	vcmpgt_oqps	(%ebx), %ymm3, %ymm4
+	vcmpgt_oqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpgt_oqsd	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqsd	(%eax), %xmm3, %xmm4
+	vcmpgt_oqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpgt_oqss	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqss	(%eax), %xmm3, %xmm4
+	vcmpgt_oqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpgtpd	%xmm0, %xmm1, %xmm2
+	vcmpgtpd	(%eax), %xmm3, %xmm4
+	vcmpgtpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpgtpd	%ymm0, %ymm1, %ymm2
+	vcmpgtpd	(%ebx), %ymm3, %ymm4
+	vcmpgtpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpgtps	%xmm0, %xmm1, %xmm2
+	vcmpgtps	(%eax), %xmm3, %xmm4
+	vcmpgtps	0x42(%ecx), %xmm5, %xmm6
+	vcmpgtps	%ymm0, %ymm1, %ymm2
+	vcmpgtps	(%ebx), %ymm3, %ymm4
+	vcmpgtps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpgtsd	%xmm0, %xmm1, %xmm2
+	vcmpgtsd	(%eax), %xmm3, %xmm4
+	vcmpgtsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpgtss	%xmm0, %xmm1, %xmm2
+	vcmpgtss	(%eax), %xmm3, %xmm4
+	vcmpgtss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmple_oqpd	%xmm0, %xmm1, %xmm2
+	vcmple_oqpd	(%eax), %xmm3, %xmm4
+	vcmple_oqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmple_oqpd	%ymm0, %ymm1, %ymm2
+	vcmple_oqpd	(%ebx), %ymm3, %ymm4
+	vcmple_oqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmple_oqps	%xmm0, %xmm1, %xmm2
+	vcmple_oqps	(%eax), %xmm3, %xmm4
+	vcmple_oqps	0x42(%ecx), %xmm5, %xmm6
+	vcmple_oqps	%ymm0, %ymm1, %ymm2
+	vcmple_oqps	(%ebx), %ymm3, %ymm4
+	vcmple_oqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmple_oqsd	%xmm0, %xmm1, %xmm2
+	vcmple_oqsd	(%eax), %xmm3, %xmm4
+	vcmple_oqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmple_oqss	%xmm0, %xmm1, %xmm2
+	vcmple_oqss	(%eax), %xmm3, %xmm4
+	vcmple_oqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmplepd	%xmm0, %xmm1, %xmm2
+	vcmplepd	(%eax), %xmm3, %xmm4
+	vcmplepd	0x42(%ecx), %xmm5, %xmm6
+	vcmplepd	%ymm0, %ymm1, %ymm2
+	vcmplepd	(%ebx), %ymm3, %ymm4
+	vcmplepd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpleps	%xmm0, %xmm1, %xmm2
+	vcmpleps	(%eax), %xmm3, %xmm4
+	vcmpleps	0x42(%ecx), %xmm5, %xmm6
+	vcmpleps	%ymm0, %ymm1, %ymm2
+	vcmpleps	(%ebx), %ymm3, %ymm4
+	vcmpleps	0x42(%edx), %ymm5, %ymm6
+
+	vcmplesd	%xmm0, %xmm1, %xmm2
+	vcmplesd	(%eax), %xmm3, %xmm4
+	vcmplesd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpless	%xmm0, %xmm1, %xmm2
+	vcmpless	(%eax), %xmm3, %xmm4
+	vcmpless	0x42(%ecx), %xmm5, %xmm6
+
+	vcmplt_oqpd	%xmm0, %xmm1, %xmm2
+	vcmplt_oqpd	(%eax), %xmm3, %xmm4
+	vcmplt_oqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmplt_oqpd	%ymm0, %ymm1, %ymm2
+	vcmplt_oqpd	(%ebx), %ymm3, %ymm4
+	vcmplt_oqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmplt_oqps	%xmm0, %xmm1, %xmm2
+	vcmplt_oqps	(%eax), %xmm3, %xmm4
+	vcmplt_oqps	0x42(%ecx), %xmm5, %xmm6
+	vcmplt_oqps	%ymm0, %ymm1, %ymm2
+	vcmplt_oqps	(%ebx), %ymm3, %ymm4
+	vcmplt_oqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmplt_oqsd	%xmm0, %xmm1, %xmm2
+	vcmplt_oqsd	(%eax), %xmm3, %xmm4
+	vcmplt_oqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmplt_oqss	%xmm0, %xmm1, %xmm2
+	vcmplt_oqss	(%eax), %xmm3, %xmm4
+	vcmplt_oqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpltpd	%xmm0, %xmm1, %xmm2
+	vcmpltpd	(%eax), %xmm3, %xmm4
+	vcmpltpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpltpd	%ymm0, %ymm1, %ymm2
+	vcmpltpd	(%ebx), %ymm3, %ymm4
+	vcmpltpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpltps	%xmm0, %xmm1, %xmm2
+	vcmpltps	(%eax), %xmm3, %xmm4
+	vcmpltps	0x42(%ecx), %xmm5, %xmm6
+	vcmpltps	%ymm0, %ymm1, %ymm2
+	vcmpltps	(%ebx), %ymm3, %ymm4
+	vcmpltps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpltsd	%xmm0, %xmm1, %xmm2
+	vcmpltsd	(%eax), %xmm3, %xmm4
+	vcmpltsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpltss	%xmm0, %xmm1, %xmm2
+	vcmpltss	(%eax), %xmm3, %xmm4
+	vcmpltss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneq_oqpd	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqpd	(%eax), %xmm3, %xmm4
+	vcmpneq_oqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpneq_oqpd	%ymm0, %ymm1, %ymm2
+	vcmpneq_oqpd	(%ebx), %ymm3, %ymm4
+	vcmpneq_oqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneq_oqps	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqps	(%eax), %xmm3, %xmm4
+	vcmpneq_oqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpneq_oqps	%ymm0, %ymm1, %ymm2
+	vcmpneq_oqps	(%ebx), %ymm3, %ymm4
+	vcmpneq_oqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneq_oqsd	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqsd	(%eax), %xmm3, %xmm4
+	vcmpneq_oqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneq_oqss	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqss	(%eax), %xmm3, %xmm4
+	vcmpneq_oqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneq_ospd	%xmm0, %xmm1, %xmm2
+	vcmpneq_ospd	(%eax), %xmm3, %xmm4
+	vcmpneq_ospd	0x42(%ecx), %xmm5, %xmm6
+	vcmpneq_ospd	%ymm0, %ymm1, %ymm2
+	vcmpneq_ospd	(%ebx), %ymm3, %ymm4
+	vcmpneq_ospd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneq_osps	%xmm0, %xmm1, %xmm2
+	vcmpneq_osps	(%eax), %xmm3, %xmm4
+	vcmpneq_osps	0x42(%ecx), %xmm5, %xmm6
+	vcmpneq_osps	%ymm0, %ymm1, %ymm2
+	vcmpneq_osps	(%ebx), %ymm3, %ymm4
+	vcmpneq_osps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneq_ossd	%xmm0, %xmm1, %xmm2
+	vcmpneq_ossd	(%eax), %xmm3, %xmm4
+	vcmpneq_ossd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneq_osss	%xmm0, %xmm1, %xmm2
+	vcmpneq_osss	(%eax), %xmm3, %xmm4
+	vcmpneq_osss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneq_uspd	%xmm0, %xmm1, %xmm2
+	vcmpneq_uspd	(%eax), %xmm3, %xmm4
+	vcmpneq_uspd	0x42(%ecx), %xmm5, %xmm6
+	vcmpneq_uspd	%ymm0, %ymm1, %ymm2
+	vcmpneq_uspd	(%ebx), %ymm3, %ymm4
+	vcmpneq_uspd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneq_usps	%xmm0, %xmm1, %xmm2
+	vcmpneq_usps	(%eax), %xmm3, %xmm4
+	vcmpneq_usps	0x42(%ecx), %xmm5, %xmm6
+	vcmpneq_usps	%ymm0, %ymm1, %ymm2
+	vcmpneq_usps	(%ebx), %ymm3, %ymm4
+	vcmpneq_usps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneq_ussd	%xmm0, %xmm1, %xmm2
+	vcmpneq_ussd	(%eax), %xmm3, %xmm4
+	vcmpneq_ussd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneq_usss	%xmm0, %xmm1, %xmm2
+	vcmpneq_usss	(%eax), %xmm3, %xmm4
+	vcmpneq_usss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneqpd	%xmm0, %xmm1, %xmm2
+	vcmpneqpd	(%eax), %xmm3, %xmm4
+	vcmpneqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpneqpd	%ymm0, %ymm1, %ymm2
+	vcmpneqpd	(%ebx), %ymm3, %ymm4
+	vcmpneqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneqps	%xmm0, %xmm1, %xmm2
+	vcmpneqps	(%eax), %xmm3, %xmm4
+	vcmpneqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpneqps	%ymm0, %ymm1, %ymm2
+	vcmpneqps	(%ebx), %ymm3, %ymm4
+	vcmpneqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpneqsd	%xmm0, %xmm1, %xmm2
+	vcmpneqsd	(%eax), %xmm3, %xmm4
+	vcmpneqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpneqss	%xmm0, %xmm1, %xmm2
+	vcmpneqss	(%eax), %xmm3, %xmm4
+	vcmpneqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnge_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqpd	(%eax), %xmm3, %xmm4
+	vcmpnge_uqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpnge_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpnge_uqpd	(%ebx), %ymm3, %ymm4
+	vcmpnge_uqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnge_uqps	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqps	(%eax), %xmm3, %xmm4
+	vcmpnge_uqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpnge_uqps	%ymm0, %ymm1, %ymm2
+	vcmpnge_uqps	(%ebx), %ymm3, %ymm4
+	vcmpnge_uqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnge_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqsd	(%eax), %xmm3, %xmm4
+	vcmpnge_uqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnge_uqss	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqss	(%eax), %xmm3, %xmm4
+	vcmpnge_uqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpngepd	%xmm0, %xmm1, %xmm2
+	vcmpngepd	(%eax), %xmm3, %xmm4
+	vcmpngepd	0x42(%ecx), %xmm5, %xmm6
+	vcmpngepd	%ymm0, %ymm1, %ymm2
+	vcmpngepd	(%ebx), %ymm3, %ymm4
+	vcmpngepd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpngeps	%xmm0, %xmm1, %xmm2
+	vcmpngeps	(%eax), %xmm3, %xmm4
+	vcmpngeps	0x42(%ecx), %xmm5, %xmm6
+	vcmpngeps	%ymm0, %ymm1, %ymm2
+	vcmpngeps	(%ebx), %ymm3, %ymm4
+	vcmpngeps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpngesd	%xmm0, %xmm1, %xmm2
+	vcmpngesd	(%eax), %xmm3, %xmm4
+	vcmpngesd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpngess	%xmm0, %xmm1, %xmm2
+	vcmpngess	(%eax), %xmm3, %xmm4
+	vcmpngess	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpngt_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqpd	(%eax), %xmm3, %xmm4
+	vcmpngt_uqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpngt_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpngt_uqpd	(%ebx), %ymm3, %ymm4
+	vcmpngt_uqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpngt_uqps	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqps	(%eax), %xmm3, %xmm4
+	vcmpngt_uqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpngt_uqps	%ymm0, %ymm1, %ymm2
+	vcmpngt_uqps	(%ebx), %ymm3, %ymm4
+	vcmpngt_uqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpngt_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqsd	(%eax), %xmm3, %xmm4
+	vcmpngt_uqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpngt_uqss	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqss	(%eax), %xmm3, %xmm4
+	vcmpngt_uqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpngtpd	%xmm0, %xmm1, %xmm2
+	vcmpngtpd	(%eax), %xmm3, %xmm4
+	vcmpngtpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpngtpd	%ymm0, %ymm1, %ymm2
+	vcmpngtpd	(%ebx), %ymm3, %ymm4
+	vcmpngtpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpngtps	%xmm0, %xmm1, %xmm2
+	vcmpngtps	(%eax), %xmm3, %xmm4
+	vcmpngtps	0x42(%ecx), %xmm5, %xmm6
+	vcmpngtps	%ymm0, %ymm1, %ymm2
+	vcmpngtps	(%ebx), %ymm3, %ymm4
+	vcmpngtps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpngtsd	%xmm0, %xmm1, %xmm2
+	vcmpngtsd	(%eax), %xmm3, %xmm4
+	vcmpngtsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpngtss	%xmm0, %xmm1, %xmm2
+	vcmpngtss	(%eax), %xmm3, %xmm4
+	vcmpngtss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnle_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqpd	(%eax), %xmm3, %xmm4
+	vcmpnle_uqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpnle_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpnle_uqpd	(%ebx), %ymm3, %ymm4
+	vcmpnle_uqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnle_uqps	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqps	(%eax), %xmm3, %xmm4
+	vcmpnle_uqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpnle_uqps	%ymm0, %ymm1, %ymm2
+	vcmpnle_uqps	(%ebx), %ymm3, %ymm4
+	vcmpnle_uqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnle_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqsd	(%eax), %xmm3, %xmm4
+	vcmpnle_uqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnle_uqss	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqss	(%eax), %xmm3, %xmm4
+	vcmpnle_uqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnlepd	%xmm0, %xmm1, %xmm2
+	vcmpnlepd	(%eax), %xmm3, %xmm4
+	vcmpnlepd	0x42(%ecx), %xmm5, %xmm6
+	vcmpnlepd	%ymm0, %ymm1, %ymm2
+	vcmpnlepd	(%ebx), %ymm3, %ymm4
+	vcmpnlepd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnleps	%xmm0, %xmm1, %xmm2
+	vcmpnleps	(%eax), %xmm3, %xmm4
+	vcmpnleps	0x42(%ecx), %xmm5, %xmm6
+	vcmpnleps	%ymm0, %ymm1, %ymm2
+	vcmpnleps	(%ebx), %ymm3, %ymm4
+	vcmpnleps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnlesd	%xmm0, %xmm1, %xmm2
+	vcmpnlesd	(%eax), %xmm3, %xmm4
+	vcmpnlesd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnless	%xmm0, %xmm1, %xmm2
+	vcmpnless	(%eax), %xmm3, %xmm4
+	vcmpnless	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnlt_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqpd	(%eax), %xmm3, %xmm4
+	vcmpnlt_uqpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpnlt_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpnlt_uqpd	(%ebx), %ymm3, %ymm4
+	vcmpnlt_uqpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnlt_uqps	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqps	(%eax), %xmm3, %xmm4
+	vcmpnlt_uqps	0x42(%ecx), %xmm5, %xmm6
+	vcmpnlt_uqps	%ymm0, %ymm1, %ymm2
+	vcmpnlt_uqps	(%ebx), %ymm3, %ymm4
+	vcmpnlt_uqps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnlt_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqsd	(%eax), %xmm3, %xmm4
+	vcmpnlt_uqsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnlt_uqss	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqss	(%eax), %xmm3, %xmm4
+	vcmpnlt_uqss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnltpd	%xmm0, %xmm1, %xmm2
+	vcmpnltpd	(%eax), %xmm3, %xmm4
+	vcmpnltpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpnltpd	%ymm0, %ymm1, %ymm2
+	vcmpnltpd	(%ebx), %ymm3, %ymm4
+	vcmpnltpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnltps	%xmm0, %xmm1, %xmm2
+	vcmpnltps	(%eax), %xmm3, %xmm4
+	vcmpnltps	0x42(%ecx), %xmm5, %xmm6
+	vcmpnltps	%ymm0, %ymm1, %ymm2
+	vcmpnltps	(%ebx), %ymm3, %ymm4
+	vcmpnltps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpnltsd	%xmm0, %xmm1, %xmm2
+	vcmpnltsd	(%eax), %xmm3, %xmm4
+	vcmpnltsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpnltss	%xmm0, %xmm1, %xmm2
+	vcmpnltss	(%eax), %xmm3, %xmm4
+	vcmpnltss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpord_spd	%xmm0, %xmm1, %xmm2
+	vcmpord_spd	(%eax), %xmm3, %xmm4
+	vcmpord_spd	0x42(%ecx), %xmm5, %xmm6
+	vcmpord_spd	%ymm0, %ymm1, %ymm2
+	vcmpord_spd	(%ebx), %ymm3, %ymm4
+	vcmpord_spd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpord_sps	%xmm0, %xmm1, %xmm2
+	vcmpord_sps	(%eax), %xmm3, %xmm4
+	vcmpord_sps	0x42(%ecx), %xmm5, %xmm6
+	vcmpord_sps	%ymm0, %ymm1, %ymm2
+	vcmpord_sps	(%ebx), %ymm3, %ymm4
+	vcmpord_sps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpord_ssd	%xmm0, %xmm1, %xmm2
+	vcmpord_ssd	(%eax), %xmm3, %xmm4
+	vcmpord_ssd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpord_sss	%xmm0, %xmm1, %xmm2
+	vcmpord_sss	(%eax), %xmm3, %xmm4
+	vcmpord_sss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpordpd	%xmm0, %xmm1, %xmm2
+	vcmpordpd	(%eax), %xmm3, %xmm4
+	vcmpordpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpordpd	%ymm0, %ymm1, %ymm2
+	vcmpordpd	(%ebx), %ymm3, %ymm4
+	vcmpordpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpordps	%xmm0, %xmm1, %xmm2
+	vcmpordps	(%eax), %xmm3, %xmm4
+	vcmpordps	0x42(%ecx), %xmm5, %xmm6
+	vcmpordps	%ymm0, %ymm1, %ymm2
+	vcmpordps	(%ebx), %ymm3, %ymm4
+	vcmpordps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpordsd	%xmm0, %xmm1, %xmm2
+	vcmpordsd	(%eax), %xmm3, %xmm4
+	vcmpordsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpordss	%xmm0, %xmm1, %xmm2
+	vcmpordss	(%eax), %xmm3, %xmm4
+	vcmpordss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmppd	$0x48, %xmm3, %xmm5, %xmm7
+	vcmppd	$0x48, (%ebx), %xmm2, %xmm4
+	vcmppd	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vcmppd	$0x48, %ymm3, %ymm5, %ymm7
+	vcmppd	$0x48, (%ebx), %ymm2, %ymm4
+	vcmppd	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vcmpps	$0x48, %xmm3, %xmm5, %xmm7
+	vcmpps	$0x48, (%ebx), %xmm2, %xmm4
+	vcmpps	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vcmpps	$0x48, %ymm3, %ymm5, %ymm7
+	vcmpps	$0x48, (%ebx), %ymm2, %ymm4
+	vcmpps	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vcmpsd	$0x48, %xmm3, %xmm5, %xmm7
+	vcmpsd	$0x48, (%ebx), %xmm2, %xmm4
+	vcmpsd	$0x48, 0x8(%ebx), %xmm1, %xmm6
+
+	vcmpss	$0x48, %xmm3, %xmm5, %xmm7
+	vcmpss	$0x48, (%ebx), %xmm2, %xmm4
+	vcmpss	$0x48, 0x8(%ebx), %xmm1, %xmm6
+
+	vcmptrue_uspd	%xmm0, %xmm1, %xmm2
+	vcmptrue_uspd	(%eax), %xmm3, %xmm4
+	vcmptrue_uspd	0x42(%ecx), %xmm5, %xmm6
+	vcmptrue_uspd	%ymm0, %ymm1, %ymm2
+	vcmptrue_uspd	(%ebx), %ymm3, %ymm4
+	vcmptrue_uspd	0x42(%edx), %ymm5, %ymm6
+
+	vcmptrue_usps	%xmm0, %xmm1, %xmm2
+	vcmptrue_usps	(%eax), %xmm3, %xmm4
+	vcmptrue_usps	0x42(%ecx), %xmm5, %xmm6
+	vcmptrue_usps	%ymm0, %ymm1, %ymm2
+	vcmptrue_usps	(%ebx), %ymm3, %ymm4
+	vcmptrue_usps	0x42(%edx), %ymm5, %ymm6
+
+	vcmptrue_ussd	%xmm0, %xmm1, %xmm2
+	vcmptrue_ussd	(%eax), %xmm3, %xmm4
+	vcmptrue_ussd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmptrue_usss	%xmm0, %xmm1, %xmm2
+	vcmptrue_usss	(%eax), %xmm3, %xmm4
+	vcmptrue_usss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmptruepd	%xmm0, %xmm1, %xmm2
+	vcmptruepd	(%eax), %xmm3, %xmm4
+	vcmptruepd	0x42(%ecx), %xmm5, %xmm6
+	vcmptruepd	%ymm0, %ymm1, %ymm2
+	vcmptruepd	(%ebx), %ymm3, %ymm4
+	vcmptruepd	0x42(%edx), %ymm5, %ymm6
+
+	vcmptrueps	%xmm0, %xmm1, %xmm2
+	vcmptrueps	(%eax), %xmm3, %xmm4
+	vcmptrueps	0x42(%ecx), %xmm5, %xmm6
+	vcmptrueps	%ymm0, %ymm1, %ymm2
+	vcmptrueps	(%ebx), %ymm3, %ymm4
+	vcmptrueps	0x42(%edx), %ymm5, %ymm6
+
+	vcmptruesd	%xmm0, %xmm1, %xmm2
+	vcmptruesd	(%eax), %xmm3, %xmm4
+	vcmptruesd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmptruess	%xmm0, %xmm1, %xmm2
+	vcmptruess	(%eax), %xmm3, %xmm4
+	vcmptruess	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpunord_spd	%xmm0, %xmm1, %xmm2
+	vcmpunord_spd	(%eax), %xmm3, %xmm4
+	vcmpunord_spd	0x42(%ecx), %xmm5, %xmm6
+	vcmpunord_spd	%ymm0, %ymm1, %ymm2
+	vcmpunord_spd	(%ebx), %ymm3, %ymm4
+	vcmpunord_spd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpunord_sps	%xmm0, %xmm1, %xmm2
+	vcmpunord_sps	(%eax), %xmm3, %xmm4
+	vcmpunord_sps	0x42(%ecx), %xmm5, %xmm6
+	vcmpunord_sps	%ymm0, %ymm1, %ymm2
+	vcmpunord_sps	(%ebx), %ymm3, %ymm4
+	vcmpunord_sps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpunord_ssd	%xmm0, %xmm1, %xmm2
+	vcmpunord_ssd	(%eax), %xmm3, %xmm4
+	vcmpunord_ssd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpunord_sss	%xmm0, %xmm1, %xmm2
+	vcmpunord_sss	(%eax), %xmm3, %xmm4
+	vcmpunord_sss	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpunordpd	%xmm0, %xmm1, %xmm2
+	vcmpunordpd	(%eax), %xmm3, %xmm4
+	vcmpunordpd	0x42(%ecx), %xmm5, %xmm6
+	vcmpunordpd	%ymm0, %ymm1, %ymm2
+	vcmpunordpd	(%ebx), %ymm3, %ymm4
+	vcmpunordpd	0x42(%edx), %ymm5, %ymm6
+
+	vcmpunordps	%xmm0, %xmm1, %xmm2
+	vcmpunordps	(%eax), %xmm3, %xmm4
+	vcmpunordps	0x42(%ecx), %xmm5, %xmm6
+	vcmpunordps	%ymm0, %ymm1, %ymm2
+	vcmpunordps	(%ebx), %ymm3, %ymm4
+	vcmpunordps	0x42(%edx), %ymm5, %ymm6
+
+	vcmpunordsd	%xmm0, %xmm1, %xmm2
+	vcmpunordsd	(%eax), %xmm3, %xmm4
+	vcmpunordsd	0x42(%ecx), %xmm5, %xmm6
+
+	vcmpunordss	%xmm0, %xmm1, %xmm2
+	vcmpunordss	(%eax), %xmm3, %xmm4
+	vcmpunordss	0x42(%ecx), %xmm5, %xmm6
+
+	vcomisd	%xmm0, %xmm1
+	vcomisd	(%esi), %xmm3
+	vcomisd	0x42(%edi), %xmm3
+
+	vcomiss	%xmm0, %xmm1
+	vcomiss	(%esi), %xmm3
+	vcomiss	0x42(%edi), %xmm3
+
+	vcvtdq2pd	%xmm0, %xmm1
+	vcvtdq2pd	(%esi), %xmm3
+	vcvtdq2pd	0x42(%edi), %xmm3
+	vcvtdq2pd	%xmm7, %ymm6
+	vcvtdq2pd	(%ebp), %ymm4
+	vcvtdq2pd	0x42(%esp), %ymm4
+
+	vcvtdq2ps	%xmm0, %xmm1
+	vcvtdq2ps	(%esi), %xmm3
+	vcvtdq2ps	0x42(%edi), %xmm3
+	vcvtdq2ps	%ymm7, %ymm6
+	vcvtdq2ps	(%ebp), %ymm4
+	vcvtdq2ps	0x42(%esp), %ymm4
+
+	vcvtpd2dq	%ymm6, %xmm3
+
+	vcvtpd2dqx	%xmm0, %xmm1
+	vcvtpd2dqx	(%esi), %xmm3
+	vcvtpd2dqx	0x42(%edi), %xmm3
+
+	vcvtpd2dqy	%ymm7, %xmm6
+	vcvtpd2dqy	(%ebp), %xmm4
+	vcvtpd2dqy	0x42(%esp), %xmm4
+
+	vcvtpd2ps	%ymm6, %xmm3
+
+	vcvtpd2psx	%xmm0, %xmm1
+	vcvtpd2psx	(%esi), %xmm3
+	vcvtpd2psx	0x42(%edi), %xmm3
+
+	vcvtpd2psy	%ymm7, %xmm6
+	vcvtpd2psy	(%ebp), %xmm4
+	vcvtpd2psy	0x42(%esp), %xmm4
+
+	vcvtps2dq	%xmm0, %xmm1
+	vcvtps2dq	(%esi), %xmm3
+	vcvtps2dq	0x42(%edi), %xmm3
+	vcvtps2dq	%ymm7, %ymm6
+	vcvtps2dq	(%ebp), %ymm4
+	vcvtps2dq	0x42(%esp), %ymm4
+
+	vcvtps2pd	%xmm0, %xmm1
+	vcvtps2pd	(%esi), %xmm3
+	vcvtps2pd	0x42(%edi), %xmm3
+	vcvtps2pd	%xmm7, %ymm6
+	vcvtps2pd	(%ebp), %ymm4
+	vcvtps2pd	0x42(%esp), %ymm4
+
+	vcvtsd2si	%xmm6, %eax
+	vcvtsd2si	(%ebx), %eax
+	vcvtsd2si	0x24(%ebx), %eax
+
+	vcvtsd2ss	%xmm0, %xmm1, %xmm2
+	vcvtsd2ss	(%eax), %xmm3, %xmm4
+	vcvtsd2ss	0x42(%ecx), %xmm5, %xmm6
+
+	vcvtss2sd	%xmm0, %xmm1, %xmm2
+	vcvtss2sd	(%eax), %xmm3, %xmm4
+	vcvtss2sd	0x42(%ecx), %xmm5, %xmm6
+
+	vcvtss2si	%xmm6, %eax
+	vcvtss2si	(%ebx), %eax
+	vcvtss2si	0x24(%ebx), %eax
+
+	vcvttpd2dq	%xmm0, %xmm5
+
+	vcvttpd2dqx	%xmm0, %xmm1
+	vcvttpd2dqx	(%esi), %xmm3
+	vcvttpd2dqx	0x42(%edi), %xmm3
+
+	vcvttpd2dqy	%ymm7, %xmm6
+	vcvttpd2dqy	(%ebp), %xmm4
+	vcvttpd2dqy	0x42(%esp), %xmm4
+
+	vcvttps2dq	%xmm0, %xmm1
+	vcvttps2dq	(%esi), %xmm3
+	vcvttps2dq	0x42(%edi), %xmm3
+	vcvttps2dq	%ymm7, %ymm6
+	vcvttps2dq	(%ebp), %ymm4
+	vcvttps2dq	0x42(%esp), %ymm4
+
+	vcvttsd2si	%xmm6, %eax
+	vcvttsd2si	(%ebx), %eax
+	vcvttsd2si	0x24(%ebx), %eax
+
+	vcvttss2si	%xmm6, %eax
+	vcvttss2si	(%ebx), %eax
+	vcvttss2si	0x24(%ebx), %eax
+
+	vdivpd	%xmm0, %xmm1, %xmm2
+	vdivpd	(%eax), %xmm3, %xmm4
+	vdivpd	0x42(%ecx), %xmm5, %xmm6
+	vdivpd	%ymm0, %ymm1, %ymm2
+	vdivpd	(%ebx), %ymm3, %ymm4
+	vdivpd	0x42(%edx), %ymm5, %ymm6
+
+	vdivps	%xmm0, %xmm1, %xmm2
+	vdivps	(%eax), %xmm3, %xmm4
+	vdivps	0x42(%ecx), %xmm5, %xmm6
+	vdivps	%ymm0, %ymm1, %ymm2
+	vdivps	(%ebx), %ymm3, %ymm4
+	vdivps	0x42(%edx), %ymm5, %ymm6
+
+	vdivsd	%xmm0, %xmm1, %xmm2
+	vdivsd	(%eax), %xmm3, %xmm4
+	vdivsd	0x42(%ecx), %xmm5, %xmm6
+
+	vdivss	%xmm0, %xmm1, %xmm2
+	vdivss	(%eax), %xmm3, %xmm4
+	vdivss	0x42(%ecx), %xmm5, %xmm6
+
+	vdppd	$0x48, %xmm3, %xmm5, %xmm7
+	vdppd	$0x48, (%ebx), %xmm2, %xmm4
+	vdppd	$0x48, 0x8(%ebx), %xmm1, %xmm6
+
+	vdpps	$0x48, %xmm3, %xmm5, %xmm7
+	vdpps	$0x48, (%ebx), %xmm2, %xmm4
+	vdpps	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vdpps	$0x48, %ymm3, %ymm5, %ymm7
+	vdpps	$0x48, (%ebx), %ymm2, %ymm4
+	vdpps	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vextractf128	$0x30, %ymm0, %xmm1
+	vextractf128	$0x30, %ymm0, (%ecx)
+	vextractf128	$0x30, %ymm0, 0x24(%edx)
+
+	vextractps	$0x30, %xmm0, %eax
+	vextractps	$0x30, %xmm0, (%ecx)
+	vextractps	$0x30, %xmm0, 0x24(%edx)
+
+	vhaddpd	%xmm0, %xmm1, %xmm2
+	vhaddpd	(%eax), %xmm3, %xmm4
+	vhaddpd	0x42(%ecx), %xmm5, %xmm6
+	vhaddpd	%ymm0, %ymm1, %ymm2
+	vhaddpd	(%ebx), %ymm3, %ymm4
+	vhaddpd	0x42(%edx), %ymm5, %ymm6
+
+	vhaddps	%xmm0, %xmm1, %xmm2
+	vhaddps	(%eax), %xmm3, %xmm4
+	vhaddps	0x42(%ecx), %xmm5, %xmm6
+	vhaddps	%ymm0, %ymm1, %ymm2
+	vhaddps	(%ebx), %ymm3, %ymm4
+	vhaddps	0x42(%edx), %ymm5, %ymm6
+
+	vhsubpd	%xmm0, %xmm1, %xmm2
+	vhsubpd	(%eax), %xmm3, %xmm4
+	vhsubpd	0x42(%ecx), %xmm5, %xmm6
+	vhsubpd	%ymm0, %ymm1, %ymm2
+	vhsubpd	(%ebx), %ymm3, %ymm4
+	vhsubpd	0x42(%edx), %ymm5, %ymm6
+
+	vhsubps	%xmm0, %xmm1, %xmm2
+	vhsubps	(%eax), %xmm3, %xmm4
+	vhsubps	0x42(%ecx), %xmm5, %xmm6
+	vhsubps	%ymm0, %ymm1, %ymm2
+	vhsubps	(%ebx), %ymm3, %ymm4
+	vhsubps	0x42(%edx), %ymm5, %ymm6
+
+	vinsertf128	$0x48, %xmm3, %ymm5, %ymm7
+	vinsertf128	$0x48, (%ebx), %ymm2, %ymm4
+	vinsertf128	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vinsertps	$0x48, %xmm3, %xmm5, %xmm7
+	vinsertps	$0x48, (%ebx), %xmm2, %xmm4
+	vinsertps	$0x48, 0x8(%ebx), %xmm1, %xmm6
+
+	vlddqu	(%ebx), %xmm2
+	vlddqu	0x8(%ebx), %xmm1
+	vlddqu	(%ebx), %ymm2
+	vlddqu	0x8(%ebx), %ymm1
+
+	vldmxcsr	(%edx)
+	vldmxcsr	0x8(%edx)
+
+	vmaskmovdqu	%xmm0, %xmm5
+
+	vmaskmovpd	(%ebx), %xmm4, %xmm2
+	vmaskmovpd	0x8(%ebx), %xmm2, %xmm1
+
+	vmaskmovps	(%ebx), %ymm4, %ymm2
+	vmaskmovps	0x8(%ebx), %ymm3, %ymm1
+
+	vmaxpd	%xmm0, %xmm1, %xmm2
+	vmaxpd	(%eax), %xmm3, %xmm4
+	vmaxpd	0x42(%ecx), %xmm5, %xmm6
+	vmaxpd	%ymm0, %ymm1, %ymm2
+	vmaxpd	(%ebx), %ymm3, %ymm4
+	vmaxpd	0x42(%edx), %ymm5, %ymm6
+
+	vmaxps	%xmm0, %xmm1, %xmm2
+	vmaxps	(%eax), %xmm3, %xmm4
+	vmaxps	0x42(%ecx), %xmm5, %xmm6
+	vmaxps	%ymm0, %ymm1, %ymm2
+	vmaxps	(%ebx), %ymm3, %ymm4
+	vmaxps	0x42(%edx), %ymm5, %ymm6
+
+	vmaxsd	%xmm0, %xmm1, %xmm2
+	vmaxsd	(%eax), %xmm3, %xmm4
+	vmaxsd	0x42(%ecx), %xmm5, %xmm6
+
+	vmaxss	%xmm0, %xmm1, %xmm2
+	vmaxss	(%eax), %xmm3, %xmm4
+	vmaxss	0x42(%ecx), %xmm5, %xmm6
+
+	vminpd	%xmm0, %xmm1, %xmm2
+	vminpd	(%eax), %xmm3, %xmm4
+	vminpd	0x42(%ecx), %xmm5, %xmm6
+	vminpd	%ymm0, %ymm1, %ymm2
+	vminpd	(%ebx), %ymm3, %ymm4
+	vminpd	0x42(%edx), %ymm5, %ymm6
+
+	vminps	%xmm0, %xmm1, %xmm2
+	vminps	(%eax), %xmm3, %xmm4
+	vminps	0x42(%ecx), %xmm5, %xmm6
+	vminps	%ymm0, %ymm1, %ymm2
+	vminps	(%ebx), %ymm3, %ymm4
+	vminps	0x42(%edx), %ymm5, %ymm6
+
+	vminsd	%xmm0, %xmm1, %xmm2
+	vminsd	(%eax), %xmm3, %xmm4
+	vminsd	0x42(%ecx), %xmm5, %xmm6
+
+	vminss	%xmm0, %xmm1, %xmm2
+	vminss	(%eax), %xmm3, %xmm4
+	vminss	0x42(%ecx), %xmm5, %xmm6
+
+	vmovapd	%xmm0, %xmm1
+	vmovapd	(%esi), %xmm3
+	vmovapd	0x42(%edi), %xmm3
+	vmovapd	%ymm7, %ymm6
+	vmovapd	(%ebp), %ymm4
+	vmovapd	0x42(%esp), %ymm4
+	vmovapd	%xmm1, %xmm0
+	vmovapd	%xmm3, (%esi)
+	vmovapd	%xmm3, 0x42(%edi)
+	vmovapd	%ymm1, %ymm0
+	vmovapd	%ymm3, (%esi)
+	vmovapd	%ymm3, 0x42(%edi)
+
+	vmovaps	%xmm0, %xmm1
+	vmovaps	(%esi), %xmm3
+	vmovaps	0x42(%edi), %xmm3
+	vmovaps	%ymm7, %ymm6
+	vmovaps	(%ebp), %ymm4
+	vmovaps	0x42(%esp), %ymm4
+	vmovaps	%xmm1, %xmm0
+	vmovaps	%xmm3, (%esi)
+	vmovaps	%xmm3, 0x42(%edi)
+	vmovaps	%ymm1, %ymm0
+	vmovaps	%ymm3, (%esi)
+	vmovaps	%ymm3, 0x42(%edi)
+
+	vmovd	%eax, %xmm0
+	vmovd	(%eax), %xmm1
+	vmovd	0x14(%eax), %xmm1
+
+	vmovddup	%xmm0, %xmm1
+	vmovddup	(%esi), %xmm3
+	vmovddup	0x42(%edi), %xmm3
+	vmovddup	%ymm7, %ymm6
+	vmovddup	(%ebp), %ymm4
+	vmovddup	0x42(%esp), %ymm4
+
+	vmovdqa	%xmm0, %xmm1
+	vmovdqa	(%esi), %xmm3
+	vmovdqa	0x42(%edi), %xmm3
+	vmovdqa	%ymm7, %ymm6
+	vmovdqa	(%ebp), %ymm4
+	vmovdqa	0x42(%esp), %ymm4
+	vmovdqa	%xmm1, %xmm0
+	vmovdqa	%xmm3, (%esi)
+	vmovdqa	%xmm3, 0x42(%edi)
+	vmovdqa	%ymm1, %ymm0
+	vmovdqa	%ymm3, (%esi)
+	vmovdqa	%ymm3, 0x42(%edi)
+
+	vmovdqu	%xmm0, %xmm1
+	vmovdqu	(%esi), %xmm3
+	vmovdqu	0x42(%edi), %xmm3
+	vmovdqu	%ymm7, %ymm6
+	vmovdqu	(%ebp), %ymm4
+	vmovdqu	0x42(%esp), %ymm4
+	vmovdqu	%xmm1, %xmm0
+	vmovdqu	%xmm3, (%esi)
+	vmovdqu	%xmm3, 0x42(%edi)
+	vmovdqu	%ymm1, %ymm0
+	vmovdqu	%ymm3, (%esi)
+	vmovdqu	%ymm3, 0x42(%edi)
+
+	vmovhlps	%xmm0, %xmm2, %xmm4
+
+	vmovhpd	(%ebx), %xmm4, %xmm2
+	vmovhpd	0x8(%ebx), %xmm3, %xmm1
+	vmovhpd	%xmm3, (%esi)
+	vmovhpd	%xmm3, 0x42(%edi)
+
+	vmovhps	(%ebx), %xmm4, %xmm2
+	vmovhps	0x8(%ebx), %xmm3, %xmm1
+	vmovhps	%xmm3, (%esi)
+	vmovhps	%xmm3, 0x42(%edi)
+
+	vmovlhps	%xmm1, %xmm3, %xmm5
+
+	vmovlpd	(%ebx), %xmm4, %xmm2
+	vmovlpd	0x8(%ebx), %xmm3, %xmm1
+	vmovlpd	%xmm3, (%esi)
+	vmovlpd	%xmm3, 0x42(%edi)
+
+	vmovlps	(%ebx), %xmm4, %xmm2
+	vmovlps	0x8(%ebx), %xmm3, %xmm1
+	vmovlps	%xmm3, (%esi)
+	vmovlps	%xmm3, 0x42(%edi)
+
+	vmovmskpd	%xmm0, %eax
+	vmovmskpd	%ymm1, %ebx
+
+	vmovmskps	%xmm2, %ecx
+	vmovmskps	%ymm3, %edx
+
+	vmovntdq	%xmm5, (%edi)
+	vmovntdq	%xmm5, 0x24(%edi)
+	vmovntdq	%ymm6, (%esi)
+	vmovntdq	%ymm6, 0x24(%esi)
+
+	vmovntdqa	(%ebx), %xmm2
+	vmovntdqa	0x8(%ebx), %xmm1
+	vmovntdqa	(%ebx), %ymm2
+	vmovntdqa	0x8(%ebx), %ymm1
+
+	vmovntpd	%xmm3, (%esi)
+	vmovntpd	%xmm3, 0x42(%edi)
+	vmovntpd	%ymm3, (%esi)
+	vmovntpd	%ymm3, 0x42(%edi)
+
+	vmovntps	%xmm3, (%esi)
+	vmovntps	%xmm3, 0x42(%edi)
+	vmovntps	%ymm3, (%esi)
+	vmovntps	%ymm3, 0x42(%edi)
+
+	vmovq	%xmm0, (%eax)
+	vmovq	%xmm0, 0x10(%eax)
+	vmovq	0x10(%ebx), %xmm1
+	vmovq	(%ebx), %xmm1
+
+	vmovsd	%xmm0, %xmm2, %xmm4
+	vmovsd	(%eax), %xmm1
+	vmovsd	0x32(%eax), %xmm2
+
+	vmovshdup	%xmm0, %xmm2
+	vmovshdup	(%eax), %xmm1
+	vmovshdup	0x10(%eax), %xmm1
+	vmovshdup	%ymm0, %ymm2
+	vmovshdup	(%ebx), %ymm1
+	vmovshdup	0x10(%ebx), %ymm3
+
+	vmovsldup	%xmm0, %xmm2
+	vmovsldup	(%eax), %xmm1
+	vmovsldup	0x10(%eax), %xmm1
+	vmovsldup	%ymm0, %ymm2
+	vmovsldup	(%ebx), %ymm1
+	vmovsldup	0x10(%ebx), %ymm3
+
+	vmovss	%xmm0, %xmm2, %xmm4
+	vmovss	(%eax), %xmm1
+	vmovss	0x32(%eax), %xmm2
+
+	vmovupd	%xmm0, %xmm1
+	vmovupd	(%esi), %xmm3
+	vmovupd	0x42(%edi), %xmm3
+	vmovupd	%ymm7, %ymm6
+	vmovupd	(%ebp), %ymm4
+	vmovupd	0x42(%esp), %ymm4
+	vmovupd	%xmm1, %xmm0
+	vmovupd	%xmm3, (%esi)
+	vmovupd	%xmm3, 0x42(%edi)
+	vmovupd	%ymm1, %ymm0
+	vmovupd	%ymm3, (%esi)
+	vmovupd	%ymm3, 0x42(%edi)
+
+	vmovups	%xmm0, %xmm1
+	vmovups	(%esi), %xmm3
+	vmovups	0x42(%edi), %xmm3
+	vmovups	%ymm7, %ymm6
+	vmovups	(%ebp), %ymm4
+	vmovups	0x42(%esp), %ymm4
+	vmovups	%xmm1, %xmm0
+	vmovups	%xmm3, (%esi)
+	vmovups	%xmm3, 0x42(%edi)
+	vmovups	%ymm1, %ymm0
+	vmovups	%ymm3, (%esi)
+	vmovups	%ymm3, 0x42(%edi)
+
+	vmpsadbw	$0x48, %xmm3, %xmm5, %xmm7
+	vmpsadbw	$0x48, (%ebx), %xmm2, %xmm4
+	vmpsadbw	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vmpsadbw	$0x48, %ymm3, %ymm5, %ymm7
+	vmpsadbw	$0x48, (%ebx), %ymm2, %ymm4
+	vmpsadbw	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vmulpd	%xmm0, %xmm1, %xmm2
+	vmulpd	(%eax), %xmm3, %xmm4
+	vmulpd	0x42(%ecx), %xmm5, %xmm6
+	vmulpd	%ymm0, %ymm1, %ymm2
+	vmulpd	(%ebx), %ymm3, %ymm4
+	vmulpd	0x42(%edx), %ymm5, %ymm6
+
+	vmulps	%xmm0, %xmm1, %xmm2
+	vmulps	(%eax), %xmm3, %xmm4
+	vmulps	0x42(%ecx), %xmm5, %xmm6
+	vmulps	%ymm0, %ymm1, %ymm2
+	vmulps	(%ebx), %ymm3, %ymm4
+	vmulps	0x42(%edx), %ymm5, %ymm6
+
+	vmulsd	%xmm0, %xmm1, %xmm2
+	vmulsd	(%eax), %xmm3, %xmm4
+	vmulsd	0x42(%ecx), %xmm5, %xmm6
+
+	vmulss	%xmm0, %xmm1, %xmm2
+	vmulss	(%eax), %xmm3, %xmm4
+	vmulss	0x42(%ecx), %xmm5, %xmm6
+
+	vorpd	%xmm0, %xmm1, %xmm2
+	vorpd	(%eax), %xmm3, %xmm4
+	vorpd	0x42(%ecx), %xmm5, %xmm6
+	vorpd	%ymm0, %ymm1, %ymm2
+	vorpd	(%ebx), %ymm3, %ymm4
+	vorpd	0x42(%edx), %ymm5, %ymm6
+
+	vorps	%xmm0, %xmm1, %xmm2
+	vorps	(%eax), %xmm3, %xmm4
+	vorps	0x42(%ecx), %xmm5, %xmm6
+	vorps	%ymm0, %ymm1, %ymm2
+	vorps	(%ebx), %ymm3, %ymm4
+	vorps	0x42(%edx), %ymm5, %ymm6
+
+	vpabsb	%xmm0, %xmm1
+	vpabsb	(%esi), %xmm3
+	vpabsb	0x42(%edi), %xmm3
+	vpabsb	%ymm7, %ymm6
+	vpabsb	(%ebp), %ymm4
+	vpabsb	0x42(%esp), %ymm4
+
+	vpabsd	%xmm0, %xmm1
+	vpabsd	(%esi), %xmm3
+	vpabsd	0x42(%edi), %xmm3
+	vpabsd	%ymm7, %ymm6
+	vpabsd	(%ebp), %ymm4
+	vpabsd	0x42(%esp), %ymm4
+
+	vpabsw	%xmm0, %xmm1
+	vpabsw	(%esi), %xmm3
+	vpabsw	0x42(%edi), %xmm3
+	vpabsw	%ymm7, %ymm6
+	vpabsw	(%ebp), %ymm4
+	vpabsw	0x42(%esp), %ymm4
+
+	vpackssdw	%xmm0, %xmm1, %xmm2
+	vpackssdw	(%eax), %xmm3, %xmm4
+	vpackssdw	0x42(%ecx), %xmm5, %xmm6
+	vpackssdw	%ymm0, %ymm1, %ymm2
+	vpackssdw	(%ebx), %ymm3, %ymm4
+	vpackssdw	0x42(%edx), %ymm5, %ymm6
+
+	vpacksswb	%xmm0, %xmm1, %xmm2
+	vpacksswb	(%eax), %xmm3, %xmm4
+	vpacksswb	0x42(%ecx), %xmm5, %xmm6
+	vpacksswb	%ymm0, %ymm1, %ymm2
+	vpacksswb	(%ebx), %ymm3, %ymm4
+	vpacksswb	0x42(%edx), %ymm5, %ymm6
+
+	vpackusdw	%xmm0, %xmm1, %xmm2
+	vpackusdw	(%eax), %xmm3, %xmm4
+	vpackusdw	0x42(%ecx), %xmm5, %xmm6
+	vpackusdw	%ymm0, %ymm1, %ymm2
+	vpackusdw	(%ebx), %ymm3, %ymm4
+	vpackusdw	0x42(%edx), %ymm5, %ymm6
+
+	vpackuswb	%xmm0, %xmm1, %xmm2
+	vpackuswb	(%eax), %xmm3, %xmm4
+	vpackuswb	0x42(%ecx), %xmm5, %xmm6
+	vpackuswb	%ymm0, %ymm1, %ymm2
+	vpackuswb	(%ebx), %ymm3, %ymm4
+	vpackuswb	0x42(%edx), %ymm5, %ymm6
+
+	vpaddb	%xmm0, %xmm1, %xmm2
+	vpaddb	(%eax), %xmm3, %xmm4
+	vpaddb	0x42(%ecx), %xmm5, %xmm6
+	vpaddb	%ymm0, %ymm1, %ymm2
+	vpaddb	(%ebx), %ymm3, %ymm4
+	vpaddb	0x42(%edx), %ymm5, %ymm6
+
+	vpaddd	%xmm0, %xmm1, %xmm2
+	vpaddd	(%eax), %xmm3, %xmm4
+	vpaddd	0x42(%ecx), %xmm5, %xmm6
+	vpaddd	%ymm0, %ymm1, %ymm2
+	vpaddd	(%ebx), %ymm3, %ymm4
+	vpaddd	0x42(%edx), %ymm5, %ymm6
+
+	vpaddq	%xmm0, %xmm1, %xmm2
+	vpaddq	(%eax), %xmm3, %xmm4
+	vpaddq	0x42(%ecx), %xmm5, %xmm6
+	vpaddq	%ymm0, %ymm1, %ymm2
+	vpaddq	(%ebx), %ymm3, %ymm4
+	vpaddq	0x42(%edx), %ymm5, %ymm6
+
+	vpaddsb	%xmm0, %xmm1, %xmm2
+	vpaddsb	(%eax), %xmm3, %xmm4
+	vpaddsb	0x42(%ecx), %xmm5, %xmm6
+	vpaddsb	%ymm0, %ymm1, %ymm2
+	vpaddsb	(%ebx), %ymm3, %ymm4
+	vpaddsb	0x42(%edx), %ymm5, %ymm6
+
+	vpaddsw	%xmm0, %xmm1, %xmm2
+	vpaddsw	(%eax), %xmm3, %xmm4
+	vpaddsw	0x42(%ecx), %xmm5, %xmm6
+	vpaddsw	%ymm0, %ymm1, %ymm2
+	vpaddsw	(%ebx), %ymm3, %ymm4
+	vpaddsw	0x42(%edx), %ymm5, %ymm6
+
+	vpaddusb	%xmm0, %xmm1, %xmm2
+	vpaddusb	(%eax), %xmm3, %xmm4
+	vpaddusb	0x42(%ecx), %xmm5, %xmm6
+	vpaddusb	%ymm0, %ymm1, %ymm2
+	vpaddusb	(%ebx), %ymm3, %ymm4
+	vpaddusb	0x42(%edx), %ymm5, %ymm6
+
+	vpaddusw	%xmm0, %xmm1, %xmm2
+	vpaddusw	(%eax), %xmm3, %xmm4
+	vpaddusw	0x42(%ecx), %xmm5, %xmm6
+	vpaddusw	%ymm0, %ymm1, %ymm2
+	vpaddusw	(%ebx), %ymm3, %ymm4
+	vpaddusw	0x42(%edx), %ymm5, %ymm6
+
+	vpaddw	%xmm0, %xmm1, %xmm2
+	vpaddw	(%eax), %xmm3, %xmm4
+	vpaddw	0x42(%ecx), %xmm5, %xmm6
+	vpaddw	%ymm0, %ymm1, %ymm2
+	vpaddw	(%ebx), %ymm3, %ymm4
+	vpaddw	0x42(%edx), %ymm5, %ymm6
+
+	vpalignr	$0x48, %xmm3, %xmm5, %xmm7
+	vpalignr	$0x48, (%ebx), %xmm2, %xmm4
+	vpalignr	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vpalignr	$0x48, %ymm3, %ymm5, %ymm7
+	vpalignr	$0x48, (%ebx), %ymm2, %ymm4
+	vpalignr	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vpand	%xmm0, %xmm1, %xmm2
+	vpand	(%eax), %xmm3, %xmm4
+	vpand	0x42(%ecx), %xmm5, %xmm6
+	vpand	%ymm0, %ymm1, %ymm2
+	vpand	(%ebx), %ymm3, %ymm4
+	vpand	0x42(%edx), %ymm5, %ymm6
+
+	vpandn	%xmm0, %xmm1, %xmm2
+	vpandn	(%eax), %xmm3, %xmm4
+	vpandn	0x42(%ecx), %xmm5, %xmm6
+	vpandn	%ymm0, %ymm1, %ymm2
+	vpandn	(%ebx), %ymm3, %ymm4
+	vpandn	0x42(%edx), %ymm5, %ymm6
+
+	vpavgb	%xmm0, %xmm1, %xmm2
+	vpavgb	(%eax), %xmm3, %xmm4
+	vpavgb	0x42(%ecx), %xmm5, %xmm6
+	vpavgb	%ymm0, %ymm1, %ymm2
+	vpavgb	(%ebx), %ymm3, %ymm4
+	vpavgb	0x42(%edx), %ymm5, %ymm6
+
+	vpavgw	%xmm0, %xmm1, %xmm2
+	vpavgw	(%eax), %xmm3, %xmm4
+	vpavgw	0x42(%ecx), %xmm5, %xmm6
+	vpavgw	%ymm0, %ymm1, %ymm2
+	vpavgw	(%ebx), %ymm3, %ymm4
+	vpavgw	0x42(%edx), %ymm5, %ymm6
+
+	vpblendvb	%xmm0, %xmm1, %xmm2, %xmm3
+	vpblendvb	%xmm0, (%eax), %xmm2, %xmm3
+	vpblendvb	%xmm0, 0x10(%ebx), %xmm2, %xmm3
+	vpblendvb	%ymm0, %ymm1, %ymm2, %ymm3
+	vpblendvb	%ymm0, (%eax), %ymm2, %ymm3
+	vpblendvb	%ymm0, 0x10(%ebx), %ymm2, %ymm3
+
+	vpblendw	$0x48, %xmm3, %xmm5, %xmm7
+	vpblendw	$0x48, (%ebx), %xmm2, %xmm4
+	vpblendw	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vpblendw	$0x48, %ymm3, %ymm5, %ymm7
+	vpblendw	$0x48, (%ebx), %ymm2, %ymm4
+	vpblendw	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vpclmulqdq	$0x48, %xmm3, %xmm5, %xmm7
+	vpclmulqdq	$0x48, (%ebx), %xmm2, %xmm4
+	vpclmulqdq	$0x48, 0x8(%ebx), %xmm1, %xmm6
+
+	vpcmpeqb	%xmm0, %xmm1, %xmm2
+	vpcmpeqb	(%eax), %xmm3, %xmm4
+	vpcmpeqb	0x42(%ecx), %xmm5, %xmm6
+	vpcmpeqb	%ymm0, %ymm1, %ymm2
+	vpcmpeqb	(%ebx), %ymm3, %ymm4
+	vpcmpeqb	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpeqd	%xmm0, %xmm1, %xmm2
+	vpcmpeqd	(%eax), %xmm3, %xmm4
+	vpcmpeqd	0x42(%ecx), %xmm5, %xmm6
+	vpcmpeqd	%ymm0, %ymm1, %ymm2
+	vpcmpeqd	(%ebx), %ymm3, %ymm4
+	vpcmpeqd	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpeqq	%xmm0, %xmm1, %xmm2
+	vpcmpeqq	(%eax), %xmm3, %xmm4
+	vpcmpeqq	0x42(%ecx), %xmm5, %xmm6
+	vpcmpeqq	%ymm0, %ymm1, %ymm2
+	vpcmpeqq	(%ebx), %ymm3, %ymm4
+	vpcmpeqq	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpeqw	%xmm0, %xmm1, %xmm2
+	vpcmpeqw	(%eax), %xmm3, %xmm4
+	vpcmpeqw	0x42(%ecx), %xmm5, %xmm6
+	vpcmpeqw	%ymm0, %ymm1, %ymm2
+	vpcmpeqw	(%ebx), %ymm3, %ymm4
+	vpcmpeqw	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpestri	$0x42, %xmm0, %xmm1
+	vpcmpestri	$0x23, 	(%esi), %xmm3
+	vpcmpestri	$0x42, 0x42(%edi), %xmm3
+
+	vpcmpestrm	$0x42, %xmm0, %xmm1
+	vpcmpestrm	$0x23, 	(%esi), %xmm3
+	vpcmpestrm	$0x42, 0x42(%edi), %xmm3
+
+	vpcmpgtb	%xmm0, %xmm1, %xmm2
+	vpcmpgtb	(%eax), %xmm3, %xmm4
+	vpcmpgtb	0x42(%ecx), %xmm5, %xmm6
+	vpcmpgtb	%ymm0, %ymm1, %ymm2
+	vpcmpgtb	(%ebx), %ymm3, %ymm4
+	vpcmpgtb	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpgtd	%xmm0, %xmm1, %xmm2
+	vpcmpgtd	(%eax), %xmm3, %xmm4
+	vpcmpgtd	0x42(%ecx), %xmm5, %xmm6
+	vpcmpgtd	%ymm0, %ymm1, %ymm2
+	vpcmpgtd	(%ebx), %ymm3, %ymm4
+	vpcmpgtd	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpgtq	%xmm0, %xmm1, %xmm2
+	vpcmpgtq	(%eax), %xmm3, %xmm4
+	vpcmpgtq	0x42(%ecx), %xmm5, %xmm6
+	vpcmpgtq	%ymm0, %ymm1, %ymm2
+	vpcmpgtq	(%ebx), %ymm3, %ymm4
+	vpcmpgtq	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpgtw	%xmm0, %xmm1, %xmm2
+	vpcmpgtw	(%eax), %xmm3, %xmm4
+	vpcmpgtw	0x42(%ecx), %xmm5, %xmm6
+	vpcmpgtw	%ymm0, %ymm1, %ymm2
+	vpcmpgtw	(%ebx), %ymm3, %ymm4
+	vpcmpgtw	0x42(%edx), %ymm5, %ymm6
+
+	vpcmpistri	$0x42, %xmm0, %xmm1
+	vpcmpistri	$0x23, 	(%esi), %xmm3
+	vpcmpistri	$0x42, 0x42(%edi), %xmm3
+
+	vpcmpistrm	$0x42, %xmm0, %xmm1
+	vpcmpistrm	$0x23, 	(%esi), %xmm3
+	vpcmpistrm	$0x42, 0x42(%edi), %xmm3
+
+	vperm2f128	$0x48, %ymm3, %ymm5, %ymm7
+	vperm2f128	$0x48, (%ebx), %ymm2, %ymm4
+	vperm2f128	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vpermilpd	%xmm0, %xmm1, %xmm2
+	vpermilpd	(%eax), %xmm3, %xmm4
+	vpermilpd	0x42(%ecx), %xmm5, %xmm6
+	vpermilpd	%ymm0, %ymm1, %ymm2
+	vpermilpd	(%ebx), %ymm3, %ymm4
+	vpermilpd	0x42(%edx), %ymm5, %ymm6
+	vpermilpd	$0x42, %ymm0, %ymm1
+	vpermilpd	$0x23, 	(%esi), %ymm3
+	vpermilpd	$0x42, 0x42(%edi), %ymm3
+
+	vpermilps	%xmm0, %xmm1, %xmm2
+	vpermilps	(%eax), %xmm3, %xmm4
+	vpermilps	0x42(%ecx), %xmm5, %xmm6
+	vpermilps	%ymm0, %ymm1, %ymm2
+	vpermilps	(%ebx), %ymm3, %ymm4
+	vpermilps	0x42(%edx), %ymm5, %ymm6
+	vpermilps	$0x42, %ymm0, %ymm1
+	vpermilps	$0x23, 	(%esi), %ymm3
+	vpermilps	$0x42, 0x42(%edi), %ymm3
+
+	vpextrb	$0x23, %xmm0, %eax
+	vpextrb	$0x23, %xmm1, (%ebx)
+	vpextrb	$0x23, %xmm2, 0x16(%ecx)
+
+	vpextrd	$0x23, %xmm0, %eax
+	vpextrd	$0x23, %xmm1, (%ebx)
+	vpextrd	$0x23, %xmm2, 0x16(%ecx)
+
+	vpextrq	$0x23, %xmm1, (%ebx)
+	vpextrq	$0x23, %xmm2, 0x16(%ecx)
+
+	vpextrw	$0x23, %xmm0, %eax
+	vpextrw	$0x23, %xmm1, (%ebx)
+	vpextrw	$0x23, %xmm2, 0x16(%ecx)
+
+	vphaddd	%xmm0, %xmm1, %xmm2
+	vphaddd	(%eax), %xmm3, %xmm4
+	vphaddd	0x42(%ecx), %xmm5, %xmm6
+	vphaddd	%ymm0, %ymm1, %ymm2
+	vphaddd	(%ebx), %ymm3, %ymm4
+	vphaddd	0x42(%edx), %ymm5, %ymm6
+
+	vphaddsw	%xmm0, %xmm1, %xmm2
+	vphaddsw	(%eax), %xmm3, %xmm4
+	vphaddsw	0x42(%ecx), %xmm5, %xmm6
+	vphaddsw	%ymm0, %ymm1, %ymm2
+	vphaddsw	(%ebx), %ymm3, %ymm4
+	vphaddsw	0x42(%edx), %ymm5, %ymm6
+
+	vphaddw	%xmm0, %xmm1, %xmm2
+	vphaddw	(%eax), %xmm3, %xmm4
+	vphaddw	0x42(%ecx), %xmm5, %xmm6
+	vphaddw	%ymm0, %ymm1, %ymm2
+	vphaddw	(%ebx), %ymm3, %ymm4
+	vphaddw	0x42(%edx), %ymm5, %ymm6
+
+	vphminposuw	%xmm0, %xmm1
+	vphminposuw	(%esi), %xmm3
+	vphminposuw	0x42(%edi), %xmm3
+
+	vphsubd	%xmm0, %xmm1, %xmm2
+	vphsubd	(%eax), %xmm3, %xmm4
+	vphsubd	0x42(%ecx), %xmm5, %xmm6
+	vphsubd	%ymm0, %ymm1, %ymm2
+	vphsubd	(%ebx), %ymm3, %ymm4
+	vphsubd	0x42(%edx), %ymm5, %ymm6
+
+	vphsubsw	%xmm0, %xmm1, %xmm2
+	vphsubsw	(%eax), %xmm3, %xmm4
+	vphsubsw	0x42(%ecx), %xmm5, %xmm6
+	vphsubsw	%ymm0, %ymm1, %ymm2
+	vphsubsw	(%ebx), %ymm3, %ymm4
+	vphsubsw	0x42(%edx), %ymm5, %ymm6
+
+	vphsubw	%xmm0, %xmm1, %xmm2
+	vphsubw	(%eax), %xmm3, %xmm4
+	vphsubw	0x42(%ecx), %xmm5, %xmm6
+	vphsubw	%ymm0, %ymm1, %ymm2
+	vphsubw	(%ebx), %ymm3, %ymm4
+	vphsubw	0x42(%edx), %ymm5, %ymm6
+
+	vpinsrb	$0x20, %eax, %xmm0, %xmm1
+	vpinsrb	$0x20, (%ebx), %xmm2, %xmm3
+	vpinsrb	$0x20, 0x10(%ebx), %xmm2, %xmm3
+
+	vpinsrd	$0x20, %eax, %xmm0, %xmm1
+	vpinsrd	$0x20, (%ebx), %xmm2, %xmm3
+	vpinsrd	$0x20, 0x10(%ebx), %xmm2, %xmm3
+
+	vpinsrq	$0x20, (%ebx), %xmm2, %xmm3
+	vpinsrq	$0x20, 0x10(%ebx), %xmm2, %xmm3
+
+	vpinsrw	$0x20, %eax, %xmm0, %xmm1
+	vpinsrw	$0x20, (%ebx), %xmm2, %xmm3
+	vpinsrw	$0x20, 0x10(%ebx), %xmm2, %xmm3
+
+	vpmaddubsw	%xmm0, %xmm1, %xmm2
+	vpmaddubsw	(%eax), %xmm3, %xmm4
+	vpmaddubsw	0x42(%ecx), %xmm5, %xmm6
+	vpmaddubsw	%ymm0, %ymm1, %ymm2
+	vpmaddubsw	(%ebx), %ymm3, %ymm4
+	vpmaddubsw	0x42(%edx), %ymm5, %ymm6
+
+	vpmaddwd	%xmm0, %xmm1, %xmm2
+	vpmaddwd	(%eax), %xmm3, %xmm4
+	vpmaddwd	0x42(%ecx), %xmm5, %xmm6
+	vpmaddwd	%ymm0, %ymm1, %ymm2
+	vpmaddwd	(%ebx), %ymm3, %ymm4
+	vpmaddwd	0x42(%edx), %ymm5, %ymm6
+
+	vpmaxsb	%xmm0, %xmm1, %xmm2
+	vpmaxsb	(%eax), %xmm3, %xmm4
+	vpmaxsb	0x42(%ecx), %xmm5, %xmm6
+	vpmaxsb	%ymm0, %ymm1, %ymm2
+	vpmaxsb	(%ebx), %ymm3, %ymm4
+	vpmaxsb	0x42(%edx), %ymm5, %ymm6
+
+	vpmaxsd	%xmm0, %xmm1, %xmm2
+	vpmaxsd	(%eax), %xmm3, %xmm4
+	vpmaxsd	0x42(%ecx), %xmm5, %xmm6
+	vpmaxsd	%ymm0, %ymm1, %ymm2
+	vpmaxsd	(%ebx), %ymm3, %ymm4
+	vpmaxsd	0x42(%edx), %ymm5, %ymm6
+
+	vpmaxsw	%xmm0, %xmm1, %xmm2
+	vpmaxsw	(%eax), %xmm3, %xmm4
+	vpmaxsw	0x42(%ecx), %xmm5, %xmm6
+	vpmaxsw	%ymm0, %ymm1, %ymm2
+	vpmaxsw	(%ebx), %ymm3, %ymm4
+	vpmaxsw	0x42(%edx), %ymm5, %ymm6
+
+	vpmaxub	%xmm0, %xmm1, %xmm2
+	vpmaxub	(%eax), %xmm3, %xmm4
+	vpmaxub	0x42(%ecx), %xmm5, %xmm6
+	vpmaxub	%ymm0, %ymm1, %ymm2
+	vpmaxub	(%ebx), %ymm3, %ymm4
+	vpmaxub	0x42(%edx), %ymm5, %ymm6
+
+	vpmaxud	%xmm0, %xmm1, %xmm2
+	vpmaxud	(%eax), %xmm3, %xmm4
+	vpmaxud	0x42(%ecx), %xmm5, %xmm6
+	vpmaxud	%ymm0, %ymm1, %ymm2
+	vpmaxud	(%ebx), %ymm3, %ymm4
+	vpmaxud	0x42(%edx), %ymm5, %ymm6
+
+	vpmaxuw	%xmm0, %xmm1, %xmm2
+	vpmaxuw	(%eax), %xmm3, %xmm4
+	vpmaxuw	0x42(%ecx), %xmm5, %xmm6
+	vpmaxuw	%ymm0, %ymm1, %ymm2
+	vpmaxuw	(%ebx), %ymm3, %ymm4
+	vpmaxuw	0x42(%edx), %ymm5, %ymm6
+
+	vpminsb	%xmm0, %xmm1, %xmm2
+	vpminsb	(%eax), %xmm3, %xmm4
+	vpminsb	0x42(%ecx), %xmm5, %xmm6
+	vpminsb	%ymm0, %ymm1, %ymm2
+	vpminsb	(%ebx), %ymm3, %ymm4
+	vpminsb	0x42(%edx), %ymm5, %ymm6
+
+	vpminsd	%xmm0, %xmm1, %xmm2
+	vpminsd	(%eax), %xmm3, %xmm4
+	vpminsd	0x42(%ecx), %xmm5, %xmm6
+	vpminsd	%ymm0, %ymm1, %ymm2
+	vpminsd	(%ebx), %ymm3, %ymm4
+	vpminsd	0x42(%edx), %ymm5, %ymm6
+
+	vpminsw	%xmm0, %xmm1, %xmm2
+	vpminsw	(%eax), %xmm3, %xmm4
+	vpminsw	0x42(%ecx), %xmm5, %xmm6
+	vpminsw	%ymm0, %ymm1, %ymm2
+	vpminsw	(%ebx), %ymm3, %ymm4
+	vpminsw	0x42(%edx), %ymm5, %ymm6
+
+	vpminub	%xmm0, %xmm1, %xmm2
+	vpminub	(%eax), %xmm3, %xmm4
+	vpminub	0x42(%ecx), %xmm5, %xmm6
+	vpminub	%ymm0, %ymm1, %ymm2
+	vpminub	(%ebx), %ymm3, %ymm4
+	vpminub	0x42(%edx), %ymm5, %ymm6
+
+	vpminud	%xmm0, %xmm1, %xmm2
+	vpminud	(%eax), %xmm3, %xmm4
+	vpminud	0x42(%ecx), %xmm5, %xmm6
+	vpminud	%ymm0, %ymm1, %ymm2
+	vpminud	(%ebx), %ymm3, %ymm4
+	vpminud	0x42(%edx), %ymm5, %ymm6
+
+	vpminuw	%xmm0, %xmm1, %xmm2
+	vpminuw	(%eax), %xmm3, %xmm4
+	vpminuw	0x42(%ecx), %xmm5, %xmm6
+	vpminuw	%ymm0, %ymm1, %ymm2
+	vpminuw	(%ebx), %ymm3, %ymm4
+	vpminuw	0x42(%edx), %ymm5, %ymm6
+
+	vpmovmskb	%xmm0, %eax
+	vpmovmskb	%ymm1, %ebx
+
+	vpmovsxbd	%xmm0, %xmm1
+	vpmovsxbd	(%esi), %xmm3
+	vpmovsxbd	0x42(%edi), %xmm3
+	vpmovsxbd	%xmm7, %ymm6
+	vpmovsxbd	(%ebp), %ymm4
+	vpmovsxbd	0x42(%esp), %ymm4
+
+	vpmovsxbq	%xmm0, %xmm1
+	vpmovsxbq	(%esi), %xmm3
+	vpmovsxbq	0x42(%edi), %xmm3
+	vpmovsxbq	%xmm7, %ymm6
+	vpmovsxbq	(%ebp), %ymm4
+	vpmovsxbq	0x42(%esp), %ymm4
+
+	vpmovsxbw	%xmm0, %xmm1
+	vpmovsxbw	(%esi), %xmm3
+	vpmovsxbw	0x42(%edi), %xmm3
+	vpmovsxbw	%xmm7, %ymm6
+	vpmovsxbw	(%ebp), %ymm4
+	vpmovsxbw	0x42(%esp), %ymm4
+
+	vpmovsxdq	%xmm0, %xmm1
+	vpmovsxdq	(%esi), %xmm3
+	vpmovsxdq	0x42(%edi), %xmm3
+	vpmovsxdq	%xmm7, %ymm6
+	vpmovsxdq	(%ebp), %ymm4
+	vpmovsxdq	0x42(%esp), %ymm4
+
+	vpmovsxwd	%xmm0, %xmm1
+	vpmovsxwd	(%esi), %xmm3
+	vpmovsxwd	0x42(%edi), %xmm3
+	vpmovsxwd	%xmm7, %ymm6
+	vpmovsxwd	(%ebp), %ymm4
+	vpmovsxwd	0x42(%esp), %ymm4
+
+	vpmovsxwq	%xmm0, %xmm1
+	vpmovsxwq	(%esi), %xmm3
+	vpmovsxwq	0x42(%edi), %xmm3
+	vpmovsxwq	%xmm7, %ymm6
+	vpmovsxwq	(%ebp), %ymm4
+	vpmovsxwq	0x42(%esp), %ymm4
+
+	vpmovzxbd	%xmm0, %xmm1
+	vpmovzxbd	(%esi), %xmm3
+	vpmovzxbd	0x42(%edi), %xmm3
+	vpmovzxbd	%xmm7, %ymm6
+	vpmovzxbd	(%ebp), %ymm4
+	vpmovzxbd	0x42(%esp), %ymm4
+
+	vpmovzxbq	%xmm0, %xmm1
+	vpmovzxbq	(%esi), %xmm3
+	vpmovzxbq	0x42(%edi), %xmm3
+	vpmovzxbq	%xmm7, %ymm6
+	vpmovzxbq	(%ebp), %ymm4
+	vpmovzxbq	0x42(%esp), %ymm4
+
+	vpmovzxbw	%xmm0, %xmm1
+	vpmovzxbw	(%esi), %xmm3
+	vpmovzxbw	0x42(%edi), %xmm3
+	vpmovzxbw	%xmm7, %ymm6
+	vpmovzxbw	(%ebp), %ymm4
+	vpmovzxbw	0x42(%esp), %ymm4
+
+	vpmovzxdq	%xmm0, %xmm1
+	vpmovzxdq	(%esi), %xmm3
+	vpmovzxdq	0x42(%edi), %xmm3
+	vpmovzxdq	%xmm7, %ymm6
+	vpmovzxdq	(%ebp), %ymm4
+	vpmovzxdq	0x42(%esp), %ymm4
+
+	vpmovzxwd	%xmm0, %xmm1
+	vpmovzxwd	(%esi), %xmm3
+	vpmovzxwd	0x42(%edi), %xmm3
+	vpmovzxwd	%xmm7, %ymm6
+	vpmovzxwd	(%ebp), %ymm4
+	vpmovzxwd	0x42(%esp), %ymm4
+
+	vpmovzxwq	%xmm0, %xmm1
+	vpmovzxwq	(%esi), %xmm3
+	vpmovzxwq	0x42(%edi), %xmm3
+	vpmovzxwq	%xmm7, %ymm6
+	vpmovzxwq	(%ebp), %ymm4
+	vpmovzxwq	0x42(%esp), %ymm4
+
+	vpmuldq	%xmm0, %xmm1, %xmm2
+	vpmuldq	(%eax), %xmm3, %xmm4
+	vpmuldq	0x42(%ecx), %xmm5, %xmm6
+	vpmuldq	%ymm0, %ymm1, %ymm2
+	vpmuldq	(%ebx), %ymm3, %ymm4
+	vpmuldq	0x42(%edx), %ymm5, %ymm6
+
+	vpmulhrsw	%xmm0, %xmm1, %xmm2
+	vpmulhrsw	(%eax), %xmm3, %xmm4
+	vpmulhrsw	0x42(%ecx), %xmm5, %xmm6
+	vpmulhrsw	%ymm0, %ymm1, %ymm2
+	vpmulhrsw	(%ebx), %ymm3, %ymm4
+	vpmulhrsw	0x42(%edx), %ymm5, %ymm6
+
+	vpmulhuw	%xmm0, %xmm1, %xmm2
+	vpmulhuw	(%eax), %xmm3, %xmm4
+	vpmulhuw	0x42(%ecx), %xmm5, %xmm6
+	vpmulhuw	%ymm0, %ymm1, %ymm2
+	vpmulhuw	(%ebx), %ymm3, %ymm4
+	vpmulhuw	0x42(%edx), %ymm5, %ymm6
+
+	vpmulhw	%xmm0, %xmm1, %xmm2
+	vpmulhw	(%eax), %xmm3, %xmm4
+	vpmulhw	0x42(%ecx), %xmm5, %xmm6
+	vpmulhw	%ymm0, %ymm1, %ymm2
+	vpmulhw	(%ebx), %ymm3, %ymm4
+	vpmulhw	0x42(%edx), %ymm5, %ymm6
+
+	vpmulld	%xmm0, %xmm1, %xmm2
+	vpmulld	(%eax), %xmm3, %xmm4
+	vpmulld	0x42(%ecx), %xmm5, %xmm6
+	vpmulld	%ymm0, %ymm1, %ymm2
+	vpmulld	(%ebx), %ymm3, %ymm4
+	vpmulld	0x42(%edx), %ymm5, %ymm6
+
+	vpmullw	%xmm0, %xmm1, %xmm2
+	vpmullw	(%eax), %xmm3, %xmm4
+	vpmullw	0x42(%ecx), %xmm5, %xmm6
+	vpmullw	%ymm0, %ymm1, %ymm2
+	vpmullw	(%ebx), %ymm3, %ymm4
+	vpmullw	0x42(%edx), %ymm5, %ymm6
+
+	vpmuludq	%xmm0, %xmm1, %xmm2
+	vpmuludq	(%eax), %xmm3, %xmm4
+	vpmuludq	0x42(%ecx), %xmm5, %xmm6
+	vpmuludq	%ymm0, %ymm1, %ymm2
+	vpmuludq	(%ebx), %ymm3, %ymm4
+	vpmuludq	0x42(%edx), %ymm5, %ymm6
+
+	vpor	%xmm0, %xmm1, %xmm2
+	vpor	(%eax), %xmm3, %xmm4
+	vpor	0x42(%ecx), %xmm5, %xmm6
+	vpor	%ymm0, %ymm1, %ymm2
+	vpor	(%ebx), %ymm3, %ymm4
+	vpor	0x42(%edx), %ymm5, %ymm6
+
+	vpsadbw	%xmm0, %xmm1, %xmm2
+	vpsadbw	(%eax), %xmm3, %xmm4
+	vpsadbw	0x42(%ecx), %xmm5, %xmm6
+	vpsadbw	%ymm0, %ymm1, %ymm2
+	vpsadbw	(%ebx), %ymm3, %ymm4
+	vpsadbw	0x42(%edx), %ymm5, %ymm6
+
+	vpshufb	%xmm0, %xmm1, %xmm2
+	vpshufb	(%eax), %xmm3, %xmm4
+	vpshufb	0x42(%ecx), %xmm5, %xmm6
+	vpshufb	%ymm0, %ymm1, %ymm2
+	vpshufb	(%ebx), %ymm3, %ymm4
+	vpshufb	0x42(%edx), %ymm5, %ymm6
+
+	vpshufd	$0x42, %xmm0, %xmm1
+	vpshufd	$0x23, 	(%esi), %xmm3
+	vpshufd	$0x42, 0x42(%edi), %xmm3
+	vpshufd	$0x42, %ymm0, %ymm1
+	vpshufd	$0x23, 	(%esi), %ymm3
+	vpshufd	$0x42, 0x42(%edi), %ymm3
+
+	vpshufhw	$0x42, %xmm0, %xmm1
+	vpshufhw	$0x23, 	(%esi), %xmm3
+	vpshufhw	$0x42, 0x42(%edi), %xmm3
+	vpshufhw	$0x42, %ymm0, %ymm1
+	vpshufhw	$0x23, 	(%esi), %ymm3
+	vpshufhw	$0x42, 0x42(%edi), %ymm3
+
+	vpshuflw	$0x42, %xmm0, %xmm1
+	vpshuflw	$0x23, 	(%esi), %xmm3
+	vpshuflw	$0x42, 0x42(%edi), %xmm3
+	vpshuflw	$0x42, %ymm0, %ymm1
+	vpshuflw	$0x23, 	(%esi), %ymm3
+	vpshuflw	$0x42, 0x42(%edi), %ymm3
+
+	vpsignb	%xmm0, %xmm1, %xmm2
+	vpsignb	(%eax), %xmm3, %xmm4
+	vpsignb	0x42(%ecx), %xmm5, %xmm6
+	vpsignb	%ymm0, %ymm1, %ymm2
+	vpsignb	(%ebx), %ymm3, %ymm4
+	vpsignb	0x42(%edx), %ymm5, %ymm6
+
+	vpsignd	%xmm0, %xmm1, %xmm2
+	vpsignd	(%eax), %xmm3, %xmm4
+	vpsignd	0x42(%ecx), %xmm5, %xmm6
+	vpsignd	%ymm0, %ymm1, %ymm2
+	vpsignd	(%ebx), %ymm3, %ymm4
+	vpsignd	0x42(%edx), %ymm5, %ymm6
+
+	vpsignw	%xmm0, %xmm1, %xmm2
+	vpsignw	(%eax), %xmm3, %xmm4
+	vpsignw	0x42(%ecx), %xmm5, %xmm6
+	vpsignw	%ymm0, %ymm1, %ymm2
+	vpsignw	(%ebx), %ymm3, %ymm4
+	vpsignw	0x42(%edx), %ymm5, %ymm6
+
+	vpslld	%xmm0, %xmm1, %xmm2
+	vpslld	(%eax), %xmm3, %xmm4
+	vpslld	0x10(%ebx), %xmm4, %xmm5
+	vpslld	$0x4, %xmm6, %xmm7
+	vpslld	%xmm0, %ymm1, %ymm2
+	vpslld	(%eax), %ymm3, %ymm4
+	vpslld	0x10(%ebx), %ymm4, %ymm5
+	vpslld	$0x4, %ymm6, %ymm7
+
+	vpslldq	$0x7, %xmm0, %xmm1
+	vpslldq	$0x7, %ymm0, %ymm1
+
+	vpsllq	%xmm0, %xmm1, %xmm2
+	vpsllq	(%eax), %xmm3, %xmm4
+	vpsllq	0x10(%ebx), %xmm4, %xmm5
+	vpsllq	$0x4, %xmm6, %xmm7
+	vpsllq	%xmm0, %ymm1, %ymm2
+	vpsllq	(%eax), %ymm3, %ymm4
+	vpsllq	0x10(%ebx), %ymm4, %ymm5
+	vpsllq	$0x4, %ymm6, %ymm7
+
+	vpsllw	%xmm0, %xmm1, %xmm2
+	vpsllw	(%eax), %xmm3, %xmm4
+	vpsllw	0x10(%ebx), %xmm4, %xmm5
+	vpsllw	$0x4, %xmm6, %xmm7
+	vpsllw	%xmm0, %ymm1, %ymm2
+	vpsllw	(%eax), %ymm3, %ymm4
+	vpsllw	0x10(%ebx), %ymm4, %ymm5
+	vpsllw	$0x4, %ymm6, %ymm7
+
+	vpsrad	%xmm0, %xmm1, %xmm2
+	vpsrad	(%eax), %xmm3, %xmm4
+	vpsrad	0x10(%ebx), %xmm4, %xmm5
+	vpsrad	$0x4, %xmm6, %xmm7
+	vpsrad	%xmm0, %ymm1, %ymm2
+	vpsrad	(%eax), %ymm3, %ymm4
+	vpsrad	0x10(%ebx), %ymm4, %ymm5
+	vpsrad	$0x4, %ymm6, %ymm7
+
+	vpsraw	%xmm0, %xmm1, %xmm2
+	vpsraw	(%eax), %xmm3, %xmm4
+	vpsraw	0x10(%ebx), %xmm4, %xmm5
+	vpsraw	$0x4, %xmm6, %xmm7
+	vpsraw	%xmm0, %ymm1, %ymm2
+	vpsraw	(%eax), %ymm3, %ymm4
+	vpsraw	0x10(%ebx), %ymm4, %ymm5
+	vpsraw	$0x4, %ymm6, %ymm7
+
+	vpsrld	%xmm0, %xmm1, %xmm2
+	vpsrld	(%eax), %xmm3, %xmm4
+	vpsrld	0x10(%ebx), %xmm4, %xmm5
+	vpsrld	$0x4, %xmm6, %xmm7
+	vpsrld	%xmm0, %ymm1, %ymm2
+	vpsrld	(%eax), %ymm3, %ymm4
+	vpsrld	0x10(%ebx), %ymm4, %ymm5
+	vpsrld	$0x4, %ymm6, %ymm7
+
+	vpsrldq	$0x7, %xmm0, %xmm1
+	vpsrldq	$0x7, %ymm0, %ymm1
+
+	vpsrlq	%xmm0, %xmm1, %xmm2
+	vpsrlq	(%eax), %xmm3, %xmm4
+	vpsrlq	0x10(%ebx), %xmm4, %xmm5
+	vpsrlq	$0x4, %xmm6, %xmm7
+	vpsrlq	%xmm0, %ymm1, %ymm2
+	vpsrlq	(%eax), %ymm3, %ymm4
+	vpsrlq	0x10(%ebx), %ymm4, %ymm5
+	vpsrlq	$0x4, %ymm6, %ymm7
+
+	vpsrlw	%xmm0, %xmm1, %xmm2
+	vpsrlw	(%eax), %xmm3, %xmm4
+	vpsrlw	0x10(%ebx), %xmm4, %xmm5
+	vpsrlw	$0x4, %xmm6, %xmm7
+	vpsrlw	%xmm0, %ymm1, %ymm2
+	vpsrlw	(%eax), %ymm3, %ymm4
+	vpsrlw	0x10(%ebx), %ymm4, %ymm5
+	vpsrlw	$0x4, %ymm6, %ymm7
+
+	vpsubb	%xmm0, %xmm1, %xmm2
+	vpsubb	(%eax), %xmm3, %xmm4
+	vpsubb	0x42(%ecx), %xmm5, %xmm6
+	vpsubb	%ymm0, %ymm1, %ymm2
+	vpsubb	(%ebx), %ymm3, %ymm4
+	vpsubb	0x42(%edx), %ymm5, %ymm6
+
+	vpsubd	%xmm0, %xmm1, %xmm2
+	vpsubd	(%eax), %xmm3, %xmm4
+	vpsubd	0x42(%ecx), %xmm5, %xmm6
+	vpsubd	%ymm0, %ymm1, %ymm2
+	vpsubd	(%ebx), %ymm3, %ymm4
+	vpsubd	0x42(%edx), %ymm5, %ymm6
+
+	vpsubq	%xmm0, %xmm1, %xmm2
+	vpsubq	(%eax), %xmm3, %xmm4
+	vpsubq	0x42(%ecx), %xmm5, %xmm6
+	vpsubq	%ymm0, %ymm1, %ymm2
+	vpsubq	(%ebx), %ymm3, %ymm4
+	vpsubq	0x42(%edx), %ymm5, %ymm6
+
+	vpsubsb	%xmm0, %xmm1, %xmm2
+	vpsubsb	(%eax), %xmm3, %xmm4
+	vpsubsb	0x42(%ecx), %xmm5, %xmm6
+	vpsubsb	%ymm0, %ymm1, %ymm2
+	vpsubsb	(%ebx), %ymm3, %ymm4
+	vpsubsb	0x42(%edx), %ymm5, %ymm6
+
+	vpsubsw	%xmm0, %xmm1, %xmm2
+	vpsubsw	(%eax), %xmm3, %xmm4
+	vpsubsw	0x42(%ecx), %xmm5, %xmm6
+	vpsubsw	%ymm0, %ymm1, %ymm2
+	vpsubsw	(%ebx), %ymm3, %ymm4
+	vpsubsw	0x42(%edx), %ymm5, %ymm6
+
+	vpsubusb	%xmm0, %xmm1, %xmm2
+	vpsubusb	(%eax), %xmm3, %xmm4
+	vpsubusb	0x42(%ecx), %xmm5, %xmm6
+	vpsubusb	%ymm0, %ymm1, %ymm2
+	vpsubusb	(%ebx), %ymm3, %ymm4
+	vpsubusb	0x42(%edx), %ymm5, %ymm6
+
+	vpsubusw	%xmm0, %xmm1, %xmm2
+	vpsubusw	(%eax), %xmm3, %xmm4
+	vpsubusw	0x42(%ecx), %xmm5, %xmm6
+	vpsubusw	%ymm0, %ymm1, %ymm2
+	vpsubusw	(%ebx), %ymm3, %ymm4
+	vpsubusw	0x42(%edx), %ymm5, %ymm6
+
+	vpsubw	%xmm0, %xmm1, %xmm2
+	vpsubw	(%eax), %xmm3, %xmm4
+	vpsubw	0x42(%ecx), %xmm5, %xmm6
+	vpsubw	%ymm0, %ymm1, %ymm2
+	vpsubw	(%ebx), %ymm3, %ymm4
+	vpsubw	0x42(%edx), %ymm5, %ymm6
+
+	vptest	%xmm0, %xmm1
+	vptest	(%esi), %xmm3
+	vptest	0x42(%edi), %xmm3
+	vptest	%ymm7, %ymm6
+	vptest	(%ebp), %ymm4
+	vptest	0x42(%esp), %ymm4
+
+	vpunpckhbw	%xmm0, %xmm1, %xmm2
+	vpunpckhbw	(%eax), %xmm3, %xmm4
+	vpunpckhbw	0x42(%ecx), %xmm5, %xmm6
+	vpunpckhbw	%ymm0, %ymm1, %ymm2
+	vpunpckhbw	(%ebx), %ymm3, %ymm4
+	vpunpckhbw	0x42(%edx), %ymm5, %ymm6
+
+	vpunpckhdq	%xmm0, %xmm1, %xmm2
+	vpunpckhdq	(%eax), %xmm3, %xmm4
+	vpunpckhdq	0x42(%ecx), %xmm5, %xmm6
+	vpunpckhdq	%ymm0, %ymm1, %ymm2
+	vpunpckhdq	(%ebx), %ymm3, %ymm4
+	vpunpckhdq	0x42(%edx), %ymm5, %ymm6
+
+	vpunpckhqdq	%xmm0, %xmm1, %xmm2
+	vpunpckhqdq	(%eax), %xmm3, %xmm4
+	vpunpckhqdq	0x42(%ecx), %xmm5, %xmm6
+	vpunpckhqdq	%ymm0, %ymm1, %ymm2
+	vpunpckhqdq	(%ebx), %ymm3, %ymm4
+	vpunpckhqdq	0x42(%edx), %ymm5, %ymm6
+
+	vpunpckhwd	%xmm0, %xmm1, %xmm2
+	vpunpckhwd	(%eax), %xmm3, %xmm4
+	vpunpckhwd	0x42(%ecx), %xmm5, %xmm6
+	vpunpckhwd	%ymm0, %ymm1, %ymm2
+	vpunpckhwd	(%ebx), %ymm3, %ymm4
+	vpunpckhwd	0x42(%edx), %ymm5, %ymm6
+
+	vpunpcklbw	%xmm0, %xmm1, %xmm2
+	vpunpcklbw	(%eax), %xmm3, %xmm4
+	vpunpcklbw	0x42(%ecx), %xmm5, %xmm6
+	vpunpcklbw	%ymm0, %ymm1, %ymm2
+	vpunpcklbw	(%ebx), %ymm3, %ymm4
+	vpunpcklbw	0x42(%edx), %ymm5, %ymm6
+
+	vpunpckldq	%xmm0, %xmm1, %xmm2
+	vpunpckldq	(%eax), %xmm3, %xmm4
+	vpunpckldq	0x42(%ecx), %xmm5, %xmm6
+	vpunpckldq	%ymm0, %ymm1, %ymm2
+	vpunpckldq	(%ebx), %ymm3, %ymm4
+	vpunpckldq	0x42(%edx), %ymm5, %ymm6
+
+	vpunpcklqdq	%xmm0, %xmm1, %xmm2
+	vpunpcklqdq	(%eax), %xmm3, %xmm4
+	vpunpcklqdq	0x42(%ecx), %xmm5, %xmm6
+	vpunpcklqdq	%ymm0, %ymm1, %ymm2
+	vpunpcklqdq	(%ebx), %ymm3, %ymm4
+	vpunpcklqdq	0x42(%edx), %ymm5, %ymm6
+
+	vpunpcklwd	%xmm0, %xmm1, %xmm2
+	vpunpcklwd	(%eax), %xmm3, %xmm4
+	vpunpcklwd	0x42(%ecx), %xmm5, %xmm6
+	vpunpcklwd	%ymm0, %ymm1, %ymm2
+	vpunpcklwd	(%ebx), %ymm3, %ymm4
+	vpunpcklwd	0x42(%edx), %ymm5, %ymm6
+
+	vpxor	%xmm0, %xmm1, %xmm2
+	vpxor	(%eax), %xmm3, %xmm4
+	vpxor	0x42(%ecx), %xmm5, %xmm6
+	vpxor	%ymm0, %ymm1, %ymm2
+	vpxor	(%ebx), %ymm3, %ymm4
+	vpxor	0x42(%edx), %ymm5, %ymm6
+
+	vrcpps	%xmm0, %xmm1
+	vrcpps	(%esi), %xmm3
+	vrcpps	0x42(%edi), %xmm3
+	vrcpps	%ymm7, %ymm6
+	vrcpps	(%ebp), %ymm4
+	vrcpps	0x42(%esp), %ymm4
+
+	vrcpss	%xmm0, %xmm1, %xmm2
+	vrcpss	(%eax), %xmm3, %xmm4
+	vrcpss	0x42(%ecx), %xmm5, %xmm6
+
+	vroundpd	$0x42, %xmm0, %xmm1
+	vroundpd	$0x23, 	(%esi), %xmm3
+	vroundpd	$0x42, 0x42(%edi), %xmm3
+	vroundpd	$0x42, %ymm0, %ymm1
+	vroundpd	$0x23, 	(%esi), %ymm3
+	vroundpd	$0x42, 0x42(%edi), %ymm3
+
+	vroundps	$0x42, %xmm0, %xmm1
+	vroundps	$0x23, 	(%esi), %xmm3
+	vroundps	$0x42, 0x42(%edi), %xmm3
+	vroundps	$0x42, %ymm0, %ymm1
+	vroundps	$0x23, 	(%esi), %ymm3
+	vroundps	$0x42, 0x42(%edi), %ymm3
+
+	vroundsd	$0x48, %xmm3, %xmm5, %xmm7
+	vroundsd	$0x48, (%ebx), %xmm2, %xmm4
+	vroundsd	$0x48, 0x8(%ebx), %xmm1, %xmm6
+
+	vroundss	$0x48, %xmm3, %xmm5, %xmm7
+	vroundss	$0x48, (%ebx), %xmm2, %xmm4
+	vroundss	$0x48, 0x8(%ebx), %xmm1, %xmm6
+
+	vrsqrtps	%xmm0, %xmm1
+	vrsqrtps	(%esi), %xmm3
+	vrsqrtps	0x42(%edi), %xmm3
+	vrsqrtps	%ymm7, %ymm6
+	vrsqrtps	(%ebp), %ymm4
+	vrsqrtps	0x42(%esp), %ymm4
+
+	vrsqrtss	%xmm0, %xmm1, %xmm2
+	vrsqrtss	(%eax), %xmm3, %xmm4
+	vrsqrtss	0x42(%ecx), %xmm5, %xmm6
+
+	vshufpd	$0x48, %xmm3, %xmm5, %xmm7
+	vshufpd	$0x48, (%ebx), %xmm2, %xmm4
+	vshufpd	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vshufpd	$0x48, %ymm3, %ymm5, %ymm7
+	vshufpd	$0x48, (%ebx), %ymm2, %ymm4
+	vshufpd	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vshufps	$0x48, %xmm3, %xmm5, %xmm7
+	vshufps	$0x48, (%ebx), %xmm2, %xmm4
+	vshufps	$0x48, 0x8(%ebx), %xmm1, %xmm6
+	vshufps	$0x48, %ymm3, %ymm5, %ymm7
+	vshufps	$0x48, (%ebx), %ymm2, %ymm4
+	vshufps	$0x48, 0x8(%ebx), %ymm1, %ymm6
+
+	vsqrtpd	%xmm0, %xmm1
+	vsqrtpd	(%esi), %xmm3
+	vsqrtpd	0x42(%edi), %xmm3
+	vsqrtpd	%ymm7, %ymm6
+	vsqrtpd	(%ebp), %ymm4
+	vsqrtpd	0x42(%esp), %ymm4
+
+	vsqrtps	%xmm0, %xmm1
+	vsqrtps	(%esi), %xmm3
+	vsqrtps	0x42(%edi), %xmm3
+	vsqrtps	%ymm7, %ymm6
+	vsqrtps	(%ebp), %ymm4
+	vsqrtps	0x42(%esp), %ymm4
+
+	vsqrtsd	%xmm0, %xmm1, %xmm2
+	vsqrtsd	(%eax), %xmm3, %xmm4
+	vsqrtsd	0x42(%ecx), %xmm5, %xmm6
+
+	vsqrtss	%xmm0, %xmm1, %xmm2
+	vsqrtss	(%eax), %xmm3, %xmm4
+	vsqrtss	0x42(%ecx), %xmm5, %xmm6
+
+	vstmxcsr	(%edx)
+	vstmxcsr	0x8(%edx)
+
+	vsubpd	%xmm0, %xmm1, %xmm2
+	vsubpd	(%eax), %xmm3, %xmm4
+	vsubpd	0x42(%ecx), %xmm5, %xmm6
+	vsubpd	%ymm0, %ymm1, %ymm2
+	vsubpd	(%ebx), %ymm3, %ymm4
+	vsubpd	0x42(%edx), %ymm5, %ymm6
+
+	vsubps	%xmm0, %xmm1, %xmm2
+	vsubps	(%eax), %xmm3, %xmm4
+	vsubps	0x42(%ecx), %xmm5, %xmm6
+	vsubps	%ymm0, %ymm1, %ymm2
+	vsubps	(%ebx), %ymm3, %ymm4
+	vsubps	0x42(%edx), %ymm5, %ymm6
+
+	vsubsd	%xmm0, %xmm1, %xmm2
+	vsubsd	(%eax), %xmm3, %xmm4
+	vsubsd	0x42(%ecx), %xmm5, %xmm6
+
+	vsubss	%xmm0, %xmm1, %xmm2
+	vsubss	(%eax), %xmm3, %xmm4
+	vsubss	0x42(%ecx), %xmm5, %xmm6
+
+	vtestpd	%xmm0, %xmm1
+	vtestpd	(%esi), %xmm3
+	vtestpd	0x42(%edi), %xmm3
+	vtestpd	%ymm7, %ymm6
+	vtestpd	(%ebp), %ymm4
+	vtestpd	0x42(%esp), %ymm4
+
+	vtestps	%xmm0, %xmm1
+	vtestps	(%esi), %xmm3
+	vtestps	0x42(%edi), %xmm3
+	vtestps	%ymm7, %ymm6
+	vtestps	(%ebp), %ymm4
+	vtestps	0x42(%esp), %ymm4
+
+	vucomisd	%xmm0, %xmm1
+	vucomisd	(%esi), %xmm3
+	vucomisd	0x42(%edi), %xmm3
+
+	vucomiss	%xmm0, %xmm1
+	vucomiss	(%esi), %xmm3
+	vucomiss	0x42(%edi), %xmm3
+
+	vunpckhpd	%xmm0, %xmm1, %xmm2
+	vunpckhpd	(%eax), %xmm3, %xmm4
+	vunpckhpd	0x42(%ecx), %xmm5, %xmm6
+	vunpckhpd	%ymm0, %ymm1, %ymm2
+	vunpckhpd	(%ebx), %ymm3, %ymm4
+	vunpckhpd	0x42(%edx), %ymm5, %ymm6
+
+	vunpckhps	%xmm0, %xmm1, %xmm2
+	vunpckhps	(%eax), %xmm3, %xmm4
+	vunpckhps	0x42(%ecx), %xmm5, %xmm6
+	vunpckhps	%ymm0, %ymm1, %ymm2
+	vunpckhps	(%ebx), %ymm3, %ymm4
+	vunpckhps	0x42(%edx), %ymm5, %ymm6
+
+	vunpcklpd	%xmm0, %xmm1, %xmm2
+	vunpcklpd	(%eax), %xmm3, %xmm4
+	vunpcklpd	0x42(%ecx), %xmm5, %xmm6
+	vunpcklpd	%ymm0, %ymm1, %ymm2
+	vunpcklpd	(%ebx), %ymm3, %ymm4
+	vunpcklpd	0x42(%edx), %ymm5, %ymm6
+
+	vunpcklps	%xmm0, %xmm1, %xmm2
+	vunpcklps	(%eax), %xmm3, %xmm4
+	vunpcklps	0x42(%ecx), %xmm5, %xmm6
+	vunpcklps	%ymm0, %ymm1, %ymm2
+	vunpcklps	(%ebx), %ymm3, %ymm4
+	vunpcklps	0x42(%edx), %ymm5, %ymm6
+
+	vxorpd	%xmm0, %xmm1, %xmm2
+	vxorpd	(%eax), %xmm3, %xmm4
+	vxorpd	0x42(%ecx), %xmm5, %xmm6
+	vxorpd	%ymm0, %ymm1, %ymm2
+	vxorpd	(%ebx), %ymm3, %ymm4
+	vxorpd	0x42(%edx), %ymm5, %ymm6
+
+	vxorps	%xmm0, %xmm1, %xmm2
+	vxorps	(%eax), %xmm3, %xmm4
+	vxorps	0x42(%ecx), %xmm5, %xmm6
+	vxorps	%ymm0, %ymm1, %ymm2
+	vxorps	(%ebx), %ymm3, %ymm4
+	vxorps	0x42(%edx), %ymm5, %ymm6
+
+	vzeroall
+
+	vzeroupper
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.avx2-gather.out b/usr/src/test/util-tests/tests/dis/i386/32.avx2-gather.out
new file mode 100644
index 0000000000..c434239327
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.avx2-gather.out
@@ -0,0 +1,48 @@
+    libdis_test:       c4 e2 f9 92 14 88  vgatherdpd %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0x6:   c4 e2 f9 92 14 8d  vgatherdpd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x10:  c4 e2 fd 92 14 88  vgatherdpd %ymm0,(%eax,%xmm1,4),%ymm2
+    libdis_test+0x16:  c4 e2 fd 92 14 8d  vgatherdpd %ymm0,0x42(,%xmm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0x20:  c4 e2 79 92 14 88  vgatherdps %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0x26:  c4 e2 79 92 14 8d  vgatherdps %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x30:  c4 e2 7d 92 14 88  vgatherdps %ymm0,(%eax,%ymm1,4),%ymm2
+    libdis_test+0x36:  c4 e2 7d 92 14 8d  vgatherdps %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0x40:  c4 e2 f9 93 14 88  vgatherqpd %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0x46:  c4 e2 f9 93 14 8d  vgatherqpd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x50:  c4 e2 fd 93 14 88  vgatherqpd %ymm0,(%eax,%ymm1,4),%ymm2
+    libdis_test+0x56:  c4 e2 fd 93 14 8d  vgatherqpd %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0x60:  c4 e2 79 93 14 88  vgatherqps %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0x66:  c4 e2 79 93 14 8d  vgatherqps %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x70:  c4 e2 7d 93 14 88  vgatherqps %xmm0,(%eax,%ymm1,4),%xmm2
+    libdis_test+0x76:  c4 e2 7d 93 14 8d  vgatherqps %xmm0,0x42(,%ymm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x80:  c4 e2 79 90 14 88  vpgatherdd %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0x86:  c4 e2 79 90 14 8d  vpgatherdd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x90:  c4 e2 7d 90 14 88  vpgatherdd %ymm0,(%eax,%ymm1,4),%ymm2
+    libdis_test+0x96:  c4 e2 7d 90 14 8d  vpgatherdd %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0xa0:  c4 e2 f9 90 14 88  vpgatherdq %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0xa6:  c4 e2 f9 90 14 8d  vpgatherdq %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xb0:  c4 e2 fd 90 14 88  vpgatherdq %ymm0,(%eax,%xmm1,4),%ymm2
+    libdis_test+0xb6:  c4 e2 fd 90 14 8d  vpgatherdq %ymm0,0x42(,%xmm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0xc0:  c4 e2 79 91 14 88  vpgatherqd %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0xc6:  c4 e2 79 91 14 8d  vpgatherqd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xd0:  c4 e2 7d 91 14 88  vpgatherqd %xmm0,(%eax,%ymm1,4),%xmm2
+    libdis_test+0xd6:  c4 e2 7d 91 14 8d  vpgatherqd %xmm0,0x42(,%ymm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xe0:  c4 e2 f9 91 14 88  vpgatherqq %xmm0,(%eax,%xmm1,4),%xmm2
+    libdis_test+0xe6:  c4 e2 f9 91 14 8d  vpgatherqq %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xf0:  c4 e2 fd 91 14 88  vpgatherqq %ymm0,(%eax,%ymm1,4),%ymm2
+    libdis_test+0xf6:  c4 e2 fd 91 14 8d  vpgatherqq %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.avx2-gather.s b/usr/src/test/util-tests/tests/dis/i386/32.avx2-gather.s
new file mode 100644
index 0000000000..149b2ac8fc
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.avx2-gather.s
@@ -0,0 +1,57 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test AVX2 Gather related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vgatherdpd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherdpd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherdpd	%ymm0, (%eax, %xmm1, 4), %ymm2
+	vgatherdpd	%ymm0, 0x42(, %xmm1, 4), %ymm2
+	vgatherdps	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherdps	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherdps	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vgatherdps	%ymm0, 0x42(, %ymm1, 4), %ymm2
+	vgatherqpd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherqpd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherqpd	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vgatherqpd	%ymm0, 0x42(, %ymm1, 4), %ymm2
+	vgatherqps	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherqps	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherqps	%xmm0, (%eax, %ymm1, 4), %xmm2
+	vgatherqps	%xmm0, 0x42(, %ymm1, 4), %xmm2
+	vpgatherdd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherdd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherdd	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vpgatherdd	%ymm0, 0x42(, %ymm1, 4), %ymm2
+	vpgatherdq	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherdq	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherdq	%ymm0, (%eax, %xmm1, 4), %ymm2
+	vpgatherdq	%ymm0, 0x42(, %xmm1, 4), %ymm2
+	vpgatherqd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherqd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherqd	%xmm0, (%eax, %ymm1, 4), %xmm2
+	vpgatherqd	%xmm0, 0x42(, %ymm1, 4), %xmm2
+	vpgatherqq	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherqq	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherqq	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vpgatherqq	%ymm0, 0x42(, %ymm1, 4), %ymm2
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.avx2.out b/usr/src/test/util-tests/tests/dis/i386/32.avx2.out
new file mode 100644
index 0000000000..2d9f62f1e2
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.avx2.out
@@ -0,0 +1,59 @@
+    libdis_test:       c4 e2 7d 5a 00     vbroadcasti128 (%eax),%ymm0
+    libdis_test+0x5:   c4 e3 7d 39 dc 23  vextracti128 $0x23,%ymm3,%xmm4
+    libdis_test+0xb:   c4 e3 7d 39 1b 23  vextracti128 $0x23,%ymm3,(%ebx)
+    libdis_test+0x11:  c4 e3 65 38 e2 42  vinserti128 $0x42,%ymm2,%ymm3,%ymm4
+    libdis_test+0x17:  c4 e3 65 38 20 42  vinserti128 $0x42,(%eax),%ymm3,%ymm4
+    libdis_test+0x1d:  c4 e2 7d 2a 00     vmovntdqa (%eax),%ymm0
+    libdis_test+0x22:  c4 e3 61 02 e2 42  vpblendd $0x42,%xmm2,%xmm3,%xmm4
+    libdis_test+0x28:  c4 e3 61 02 20 42  vpblendd $0x42,(%eax),%xmm3,%xmm4
+    libdis_test+0x2e:  c4 e3 65 02 e2 42  vpblendd $0x42,%ymm2,%ymm3,%ymm4
+    libdis_test+0x34:  c4 e3 65 02 20 42  vpblendd $0x42,(%eax),%ymm3,%ymm4
+    libdis_test+0x3a:  c4 e2 79 78 c8     vpbroadcastb %xmm0,%xmm1
+    libdis_test+0x3f:  c4 e2 79 78 10     vpbroadcastb (%eax),%xmm2
+    libdis_test+0x44:  c4 e2 7d 78 c8     vpbroadcastb %xmm0,%ymm1
+    libdis_test+0x49:  c4 e2 7d 78 10     vpbroadcastb (%eax),%ymm2
+    libdis_test+0x4e:  c4 e2 79 58 c8     vpbroadcastd %xmm0,%xmm1
+    libdis_test+0x53:  c4 e2 79 58 10     vpbroadcastd (%eax),%xmm2
+    libdis_test+0x58:  c4 e2 7d 58 c8     vpbroadcastd %xmm0,%ymm1
+    libdis_test+0x5d:  c4 e2 7d 58 10     vpbroadcastd (%eax),%ymm2
+    libdis_test+0x62:  c4 e2 79 59 c8     vpbroadcastq %xmm0,%xmm1
+    libdis_test+0x67:  c4 e2 79 59 10     vpbroadcastq (%eax),%xmm2
+    libdis_test+0x6c:  c4 e2 7d 59 c8     vpbroadcastq %xmm0,%ymm1
+    libdis_test+0x71:  c4 e2 7d 59 10     vpbroadcastq (%eax),%ymm2
+    libdis_test+0x76:  c4 e2 79 79 c8     vpbroadcastw %xmm0,%xmm1
+    libdis_test+0x7b:  c4 e2 79 79 10     vpbroadcastw (%eax),%xmm2
+    libdis_test+0x80:  c4 e2 7d 79 c8     vpbroadcastw %xmm0,%ymm1
+    libdis_test+0x85:  c4 e2 7d 79 10     vpbroadcastw (%eax),%ymm2
+    libdis_test+0x8a:  c4 e3 65 46 e2 42  vperm2i128 $0x42,%ymm2,%ymm3,%ymm4
+    libdis_test+0x90:  c4 e3 65 46 20 42  vperm2i128 $0x42,(%eax),%ymm3,%ymm4
+    libdis_test+0x96:  c4 e2 65 36 e2     vpermd %ymm2,%ymm3,%ymm4
+    libdis_test+0x9b:  c4 e2 65 36 20     vpermd (%eax),%ymm3,%ymm4
+    libdis_test+0xa0:  c4 e3 fd 01 da 42  vpermpd $0x42,%ymm2,%ymm3
+    libdis_test+0xa6:  c4 e3 fd 01 18 42  vpermpd $0x42,(%eax),%ymm3
+    libdis_test+0xac:  c4 e2 6d 16 d9     vpermps %ymm1,%ymm2,%ymm3
+    libdis_test+0xb1:  c4 e2 6d 16 18     vpermps (%eax),%ymm2,%ymm3
+    libdis_test+0xb6:  c4 e3 fd 00 da 42  vpermq $0x42,%ymm2,%ymm3
+    libdis_test+0xbc:  c4 e3 fd 00 18 42  vpermq $0x42,(%eax),%ymm3
+    libdis_test+0xc2:  c4 e2 6d 8c 18     vpmaskmovd (%eax),%ymm2,%ymm3
+    libdis_test+0xc7:  c4 e2 e9 8c 18     vpmaskmovq (%eax),%xmm2,%xmm3
+    libdis_test+0xcc:  c4 e2 ed 8c 18     vpmaskmovq (%eax),%ymm2,%ymm3
+    libdis_test+0xd1:  c4 e2 69 47 d9     vpsllvd %xmm1,%xmm2,%xmm3
+    libdis_test+0xd6:  c4 e2 69 47 18     vpsllvd (%eax),%xmm2,%xmm3
+    libdis_test+0xdb:  c4 e2 6d 47 d9     vpsllvd %ymm1,%ymm2,%ymm3
+    libdis_test+0xe0:  c4 e2 6d 47 18     vpsllvd (%eax),%ymm2,%ymm3
+    libdis_test+0xe5:  c4 e2 e9 47 d9     vpsllvq %xmm1,%xmm2,%xmm3
+    libdis_test+0xea:  c4 e2 e9 47 18     vpsllvq (%eax),%xmm2,%xmm3
+    libdis_test+0xef:  c4 e2 ed 47 d9     vpsllvq %ymm1,%ymm2,%ymm3
+    libdis_test+0xf4:  c4 e2 ed 47 18     vpsllvq (%eax),%ymm2,%ymm3
+    libdis_test+0xf9:  c4 e2 69 46 d9     vpsravd %xmm1,%xmm2,%xmm3
+    libdis_test+0xfe:  c4 e2 69 46 18     vpsravd (%eax),%xmm2,%xmm3
+    libdis_test+0x103: c4 e2 6d 46 d9     vpsravd %ymm1,%ymm2,%ymm3
+    libdis_test+0x108: c4 e2 6d 46 18     vpsravd (%eax),%ymm2,%ymm3
+    libdis_test+0x10d: c4 e2 69 45 d9     vpsrlvd %xmm1,%xmm2,%xmm3
+    libdis_test+0x112: c4 e2 69 45 18     vpsrlvd (%eax),%xmm2,%xmm3
+    libdis_test+0x117: c4 e2 6d 45 d9     vpsrlvd %ymm1,%ymm2,%ymm3
+    libdis_test+0x11c: c4 e2 6d 45 18     vpsrlvd (%eax),%ymm2,%ymm3
+    libdis_test+0x121: c4 e2 e9 45 d9     vpsrlvq %xmm1,%xmm2,%xmm3
+    libdis_test+0x126: c4 e2 e9 45 18     vpsrlvq (%eax),%xmm2,%xmm3
+    libdis_test+0x12b: c4 e2 ed 45 d9     vpsrlvq %ymm1,%ymm2,%ymm3
+    libdis_test+0x130: c4 e2 ed 45 18     vpsrlvq (%eax),%ymm2,%ymm3
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.avx2.s b/usr/src/test/util-tests/tests/dis/i386/32.avx2.s
new file mode 100644
index 0000000000..9cbf71cbd1
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.avx2.s
@@ -0,0 +1,84 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test AVX2 related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vbroadcasti128	(%eax), %ymm0
+	vextracti128	$0x23, %ymm3, %xmm4
+	vextracti128	$0x23, %ymm3, (%ebx)
+	vinserti128	$0x42, %xmm2, %ymm3, %ymm4
+	vinserti128	$0x42, (%eax), %ymm3, %ymm4
+	vmovntdqa	(%eax), %ymm0
+	vpblendd	$0x42, %xmm2, %xmm3, %xmm4
+	vpblendd	$0x42, (%eax), %xmm3, %xmm4
+	vpblendd	$0x42, %ymm2, %ymm3, %ymm4
+	vpblendd	$0x42, (%eax), %ymm3, %ymm4
+	vpbroadcastb	%xmm0, %xmm1
+	vpbroadcastb	(%eax), %xmm2
+	vpbroadcastb	%xmm0, %ymm1
+	vpbroadcastb	(%eax), %ymm2
+	vpbroadcastd	%xmm0, %xmm1
+	vpbroadcastd	(%eax), %xmm2
+	vpbroadcastd	%xmm0, %ymm1
+	vpbroadcastd	(%eax), %ymm2
+	vpbroadcastq	%xmm0, %xmm1
+	vpbroadcastq	(%eax), %xmm2
+	vpbroadcastq	%xmm0, %ymm1
+	vpbroadcastq	(%eax), %ymm2
+	vpbroadcastw	%xmm0, %xmm1
+	vpbroadcastw	(%eax), %xmm2
+	vpbroadcastw	%xmm0, %ymm1
+	vpbroadcastw	(%eax), %ymm2
+	vperm2i128	$0x42, %ymm2, %ymm3, %ymm4
+	vperm2i128	$0x42, (%eax), %ymm3, %ymm4
+	vpermd		%ymm2, %ymm3, %ymm4
+	vpermd		(%eax), %ymm3, %ymm4
+	vpermpd		$0x42, %ymm2, %ymm3
+	vpermpd		$0x42, (%eax), %ymm3
+	vpermps		%ymm1, %ymm2, %ymm3
+	vpermps		(%eax), %ymm2, %ymm3
+	vpermq		$0x42, %ymm2, %ymm3
+	vpermq		$0x42, (%eax), %ymm3
+	vpmaskmovd	(%eax), %ymm2, %ymm3
+	vpmaskmovq	(%eax), %xmm2, %xmm3
+	vpmaskmovq	(%eax), %ymm2, %ymm3
+	vpsllvd		%xmm1, %xmm2, %xmm3
+	vpsllvd		(%eax), %xmm2, %xmm3
+	vpsllvd		%ymm1, %ymm2, %ymm3
+	vpsllvd		(%eax), %ymm2, %ymm3
+	vpsllvq		%xmm1, %xmm2, %xmm3
+	vpsllvq		(%eax), %xmm2, %xmm3
+	vpsllvq		%ymm1, %ymm2, %ymm3
+	vpsllvq		(%eax), %ymm2, %ymm3
+	vpsravd		%xmm1, %xmm2, %xmm3
+	vpsravd		(%eax), %xmm2, %xmm3
+	vpsravd		%ymm1, %ymm2, %ymm3
+	vpsravd		(%eax), %ymm2, %ymm3
+	vpsrlvd		%xmm1, %xmm2, %xmm3
+	vpsrlvd		(%eax), %xmm2, %xmm3
+	vpsrlvd		%ymm1, %ymm2, %ymm3
+	vpsrlvd		(%eax), %ymm2, %ymm3
+	vpsrlvq		%xmm1, %xmm2, %xmm3
+	vpsrlvq		(%eax), %xmm2, %xmm3
+	vpsrlvq		%ymm1, %ymm2, %ymm3
+	vpsrlvq		(%eax), %ymm2, %ymm3
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.f16c.out b/usr/src/test/util-tests/tests/dis/i386/32.f16c.out
new file mode 100644
index 0000000000..8e0e60498d
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.f16c.out
@@ -0,0 +1,14 @@
+    libdis_test:      c4 e2 79 13 c8     vcvtph2ps %xmm0,%xmm1
+    libdis_test+0x5:  c4 e2 79 13 08     vcvtph2ps (%eax),%xmm1
+    libdis_test+0xa:  c4 e2 79 13 48 24  vcvtph2ps 0x24(%eax),%xmm1
+    libdis_test+0x10: c4 e2 7d 13 c8     vcvtph2ps %xmm0,%ymm1
+    libdis_test+0x15: c4 e2 7d 13 08     vcvtph2ps (%eax),%ymm1
+    libdis_test+0x1a: c4 e2 7d 13 48 24  vcvtph2ps 0x24(%eax),%ymm1
+    libdis_test+0x20: c4 e3 79 1d c1 10  vcvtps2ph $0x10,%xmm0,%xmm1
+    libdis_test+0x26: c4 e3 79 1d 1b 10  vcvtps2ph $0x10,%xmm3,(%ebx)
+    libdis_test+0x2c: c4 e3 79 1d 61 10  vcvtps2ph $0x10,%xmm4,0x10(%ecx)
+                      10 
+    libdis_test+0x33: c4 e3 7d 1d c1 10  vcvtps2ph $0x10,%ymm0,%xmm1
+    libdis_test+0x39: c4 e3 7d 1d 1b 10  vcvtps2ph $0x10,%ymm3,(%ebx)
+    libdis_test+0x3f: c4 e3 7d 1d 61 10  vcvtps2ph $0x10,%ymm4,0x10(%ecx)
+                      10 
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.f16c.s b/usr/src/test/util-tests/tests/dis/i386/32.f16c.s
new file mode 100644
index 0000000000..4d9bcecc05
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.f16c.s
@@ -0,0 +1,38 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test F16C related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vcvtph2ps	%xmm0, %xmm1
+	vcvtph2ps	(%eax), %xmm1
+	vcvtph2ps	0x24(%eax), %xmm1
+	vcvtph2ps	%xmm0, %ymm1
+	vcvtph2ps	(%eax), %ymm1
+	vcvtph2ps	0x24(%eax), %ymm1
+
+	vcvtps2ph	$0x10, %xmm0, %xmm1
+	vcvtps2ph	$0x10, %xmm3, (%ebx)
+	vcvtps2ph	$0x10, %xmm4, 0x10(%ecx)
+	vcvtps2ph	$0x10, %ymm0, %xmm1
+	vcvtps2ph	$0x10, %ymm3, (%ebx)
+	vcvtps2ph	$0x10, %ymm4, 0x10(%ecx)
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.fma-sd.s b/usr/src/test/util-tests/tests/dis/i386/32.fma-sd.s
index 25f60a53ad..9b018aca73 100644
--- a/usr/src/test/util-tests/tests/dis/i386/32.fma-sd.s
+++ b/usr/src/test/util-tests/tests/dis/i386/32.fma-sd.s
@@ -14,7 +14,7 @@
  */
 
 /*
- * Test ADX related instructions
+ * Test FMA3 -SD related instructions
  */
 
 .text
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.fma-ss.s b/usr/src/test/util-tests/tests/dis/i386/32.fma-ss.s
index 2c9fff552e..d9a8129de8 100644
--- a/usr/src/test/util-tests/tests/dis/i386/32.fma-ss.s
+++ b/usr/src/test/util-tests/tests/dis/i386/32.fma-ss.s
@@ -14,7 +14,7 @@
  */
 
 /*
- * Test ADX related instructions
+ * Test FMA3 -SS related instructions
  */
 
 .text
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.movbe.out b/usr/src/test/util-tests/tests/dis/i386/32.movbe.out
new file mode 100644
index 0000000000..d00cb5f3b5
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.movbe.out
@@ -0,0 +1,4 @@
+    libdis_test:      66 0f 38 f1 03     movbew %ax,(%ebx)
+    libdis_test+0x5:  0f 38 f1 03        movbel %eax,(%ebx)
+    libdis_test+0x9:  66 0f 38 f0 18     movbew (%eax),%bx
+    libdis_test+0xe:  0f 38 f0 18        movbel (%eax),%ebx
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.movbe.s b/usr/src/test/util-tests/tests/dis/i386/32.movbe.s
new file mode 100644
index 0000000000..8eb664b321
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.movbe.s
@@ -0,0 +1,29 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test MOVBE related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	movbew	%ax, (%ebx)
+	movbel	%eax, (%ebx)
+	movbew	(%eax), %bx
+	movbel	(%eax), %ebx
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.pclmulqdq.out b/usr/src/test/util-tests/tests/dis/i386/32.pclmulqdq.out
new file mode 100644
index 0000000000..455fe8f6f1
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.pclmulqdq.out
@@ -0,0 +1,20 @@
+    libdis_test:      66 0f 3a 44 c8 02  pclmulqdq $0x2,%xmm0,%xmm1
+    libdis_test+0x6:  66 0f 3a 44 10 02  pclmulqdq $0x2,(%eax),%xmm2
+    libdis_test+0xc:  66 0f 3a 44 5b 10  pclmulqdq $0x2,0x10(%ebx),%xmm3
+                      02 
+    libdis_test+0x13: 66 0f 3a 44 c8 00  pclmullqlqdq %xmm0,%xmm1
+    libdis_test+0x19: 66 0f 3a 44 10 00  pclmullqlqdq (%eax),%xmm2
+    libdis_test+0x1f: 66 0f 3a 44 53 04  pclmullqlqdq 0x4(%ebx),%xmm2
+                      00 
+    libdis_test+0x26: 66 0f 3a 44 c8 01  pclmulhqlqdq %xmm0,%xmm1
+    libdis_test+0x2c: 66 0f 3a 44 10 01  pclmulhqlqdq (%eax),%xmm2
+    libdis_test+0x32: 66 0f 3a 44 53 04  pclmulhqlqdq 0x4(%ebx),%xmm2
+                      01 
+    libdis_test+0x39: 66 0f 3a 44 c8 10  pclmullqhqdq %xmm0,%xmm1
+    libdis_test+0x3f: 66 0f 3a 44 10 10  pclmullqhqdq (%eax),%xmm2
+    libdis_test+0x45: 66 0f 3a 44 53 04  pclmullqhqdq 0x4(%ebx),%xmm2
+                      10 
+    libdis_test+0x4c: 66 0f 3a 44 c8 11  pclmulhqhqdq %xmm0,%xmm1
+    libdis_test+0x52: 66 0f 3a 44 10 11  pclmulhqhqdq (%eax),%xmm2
+    libdis_test+0x58: 66 0f 3a 44 53 04  pclmulhqhqdq 0x4(%ebx),%xmm2
+                      11 
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.pclmulqdq.s b/usr/src/test/util-tests/tests/dis/i386/32.pclmulqdq.s
new file mode 100644
index 0000000000..69e87bc12b
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.pclmulqdq.s
@@ -0,0 +1,44 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test PCLMULQDQ related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	pclmulqdq	$0x2, %xmm0, %xmm1
+	pclmulqdq	$0x2, (%eax), %xmm2
+	pclmulqdq	$0x2, 0x10(%ebx), %xmm3
+
+	pclmullqlqdq	%xmm0, %xmm1
+	pclmullqlqdq	(%eax), %xmm2
+	pclmullqlqdq	0x4(%ebx), %xmm2
+
+	pclmulhqlqdq	%xmm0, %xmm1
+	pclmulhqlqdq	(%eax), %xmm2
+	pclmulhqlqdq	0x4(%ebx), %xmm2
+
+	pclmullqhqdq	%xmm0, %xmm1
+	pclmullqhqdq	(%eax), %xmm2
+	pclmullqhqdq	0x4(%ebx), %xmm2
+
+	pclmulhqhqdq	%xmm0, %xmm1
+	pclmulhqhqdq	(%eax), %xmm2
+	pclmulhqhqdq	0x4(%ebx), %xmm2
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.sha.out b/usr/src/test/util-tests/tests/dis/i386/32.sha.out
new file mode 100644
index 0000000000..5c5decc25d
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.sha.out
@@ -0,0 +1,28 @@
+    libdis_test:      0f 3a cc c8 01     sha1rnds4 $0x1,%xmm0,%xmm1
+    libdis_test+0x5:  0f 3a cc 0b 02     sha1rnds4 $0x2,(%ebx),%xmm1
+    libdis_test+0xa:  0f 3a cc 4b 23 03  sha1rnds4 $0x3,0x23(%ebx),%xmm1
+    libdis_test+0x10: 0f 3a cc 0c 8b 02  sha1rnds4 $0x2,(%ebx,%ecx,4),%xmm1
+    libdis_test+0x16: 0f 38 c8 c8        sha1nexte %xmm0,%xmm1
+    libdis_test+0x1a: 0f 38 c8 0b        sha1nexte (%ebx),%xmm1
+    libdis_test+0x1e: 0f 38 c8 4b 23     sha1nexte 0x23(%ebx),%xmm1
+    libdis_test+0x23: 0f 38 c8 0c 8b     sha1nexte (%ebx,%ecx,4),%xmm1
+    libdis_test+0x28: 0f 38 c9 c8        sha1msg1 %xmm0,%xmm1
+    libdis_test+0x2c: 0f 38 c9 0b        sha1msg1 (%ebx),%xmm1
+    libdis_test+0x30: 0f 38 c9 4b 23     sha1msg1 0x23(%ebx),%xmm1
+    libdis_test+0x35: 0f 38 c9 0c 8b     sha1msg1 (%ebx,%ecx,4),%xmm1
+    libdis_test+0x3a: 0f 38 ca c8        sha1msg2 %xmm0,%xmm1
+    libdis_test+0x3e: 0f 38 ca 0b        sha1msg2 (%ebx),%xmm1
+    libdis_test+0x42: 0f 38 ca 4b 23     sha1msg2 0x23(%ebx),%xmm1
+    libdis_test+0x47: 0f 38 ca 0c 8b     sha1msg2 (%ebx,%ecx,4),%xmm1
+    libdis_test+0x4c: 0f 38 cb ec        sha256rnds2 %xmm4,%xmm5
+    libdis_test+0x50: 0f 38 cb 2b        sha256rnds2 (%ebx),%xmm5
+    libdis_test+0x54: 0f 38 cb 6b 23     sha256rnds2 0x23(%ebx),%xmm5
+    libdis_test+0x59: 0f 38 cb 2c 8b     sha256rnds2 (%ebx,%ecx,4),%xmm5
+    libdis_test+0x5e: 0f 38 cc c8        sha256msg1 %xmm0,%xmm1
+    libdis_test+0x62: 0f 38 cc 0b        sha256msg1 (%ebx),%xmm1
+    libdis_test+0x66: 0f 38 cc 4b 23     sha256msg1 0x23(%ebx),%xmm1
+    libdis_test+0x6b: 0f 38 cc 0c 8b     sha256msg1 (%ebx,%ecx,4),%xmm1
+    libdis_test+0x70: 0f 38 cd c8        sha256msg2 %xmm0,%xmm1
+    libdis_test+0x74: 0f 38 cd 0b        sha256msg2 (%ebx),%xmm1
+    libdis_test+0x78: 0f 38 cd 4b 23     sha256msg2 0x23(%ebx),%xmm1
+    libdis_test+0x7d: 0f 38 cd 0c 8b     sha256msg2 (%ebx,%ecx,4),%xmm1
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.sha.s b/usr/src/test/util-tests/tests/dis/i386/32.sha.s
new file mode 100644
index 0000000000..e6d9a32050
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.sha.s
@@ -0,0 +1,53 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test SHA related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	sha1rnds4	$0x1, %xmm0, %xmm1
+	sha1rnds4	$0x2, (%ebx), %xmm1
+	sha1rnds4	$0x3, 0x23(%ebx), %xmm1
+	sha1rnds4	$0x2, (%ebx, %ecx, 4), %xmm1
+	sha1nexte	%xmm0, %xmm1
+	sha1nexte	(%ebx), %xmm1
+	sha1nexte	0x23(%ebx), %xmm1
+	sha1nexte	(%ebx, %ecx, 4), %xmm1
+	sha1msg1	%xmm0, %xmm1
+	sha1msg1	(%ebx), %xmm1
+	sha1msg1	0x23(%ebx), %xmm1
+	sha1msg1	(%ebx, %ecx, 4), %xmm1
+	sha1msg2	%xmm0, %xmm1
+	sha1msg2	(%ebx), %xmm1
+	sha1msg2	0x23(%ebx), %xmm1
+	sha1msg2	(%ebx, %ecx, 4), %xmm1
+	sha256rnds2	%xmm4, %xmm5
+	sha256rnds2	(%ebx), %xmm5
+	sha256rnds2	0x23(%ebx), %xmm5
+	sha256rnds2	(%ebx, %ecx, 4), %xmm5
+	sha256msg1	%xmm0, %xmm1
+	sha256msg1	(%ebx), %xmm1
+	sha256msg1	0x23(%ebx), %xmm1
+	sha256msg1	(%ebx, %ecx, 4), %xmm1
+	sha256msg2	%xmm0, %xmm1
+	sha256msg2	(%ebx), %xmm1
+	sha256msg2	0x23(%ebx), %xmm1
+	sha256msg2	(%ebx, %ecx, 4), %xmm1
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.sse-3.out b/usr/src/test/util-tests/tests/dis/i386/32.sse-3.out
new file mode 100644
index 0000000000..829f52afdf
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.sse-3.out
@@ -0,0 +1,31 @@
+    libdis_test:      66 0f d0 c8        addsubpd %xmm0,%xmm1
+    libdis_test+0x4:  66 0f d0 12        addsubpd (%edx),%xmm2
+    libdis_test+0x8:  66 0f d0 54 24 23  addsubpd 0x23(%esp),%xmm2
+    libdis_test+0xe:  f2 0f d0 c8        addsubps %xmm0,%xmm1
+    libdis_test+0x12: f2 0f d0 12        addsubps (%edx),%xmm2
+    libdis_test+0x16: f2 0f d0 54 24 23  addsubps 0x23(%esp),%xmm2
+    libdis_test+0x1c: 66 0f 7c c8        haddpd %xmm0,%xmm1
+    libdis_test+0x20: 66 0f 7c 12        haddpd (%edx),%xmm2
+    libdis_test+0x24: 66 0f 7c 54 24 23  haddpd 0x23(%esp),%xmm2
+    libdis_test+0x2a: f2 0f 7c c8        haddps %xmm0,%xmm1
+    libdis_test+0x2e: f2 0f 7c 12        haddps (%edx),%xmm2
+    libdis_test+0x32: f2 0f 7c 54 24 23  haddps 0x23(%esp),%xmm2
+    libdis_test+0x38: 66 0f 7d c8        hsubpd %xmm0,%xmm1
+    libdis_test+0x3c: 66 0f 7d 12        hsubpd (%edx),%xmm2
+    libdis_test+0x40: 66 0f 7d 54 24 23  hsubpd 0x23(%esp),%xmm2
+    libdis_test+0x46: f2 0f 7d c8        hsubps %xmm0,%xmm1
+    libdis_test+0x4a: f2 0f 7d 12        hsubps (%edx),%xmm2
+    libdis_test+0x4e: f2 0f 7d 54 24 23  hsubps 0x23(%esp),%xmm2
+    libdis_test+0x54: f2 0f f0 18        lddqu  (%eax),%xmm3
+    libdis_test+0x58: f2 0f 12 ec        movddup %xmm4,%xmm5
+    libdis_test+0x5c: f2 0f 12 30        movddup (%eax),%xmm6
+    libdis_test+0x60: f2 0f 12 7b 42     movddup 0x42(%ebx),%xmm7
+    libdis_test+0x65: f3 0f 16 ec        movshdup %xmm4,%xmm5
+    libdis_test+0x69: f3 0f 16 30        movshdup (%eax),%xmm6
+    libdis_test+0x6d: f3 0f 16 7b 42     movshdup 0x42(%ebx),%xmm7
+    libdis_test+0x72: f3 0f 12 ec        movsldup %xmm4,%xmm5
+    libdis_test+0x76: f3 0f 12 30        movsldup (%eax),%xmm6
+    libdis_test+0x7a: f3 0f 12 7b 42     movsldup 0x42(%ebx),%xmm7
+    libdis_test+0x7f: df 88 34 12 00 00  fisttp 0x1234(%eax)
+    libdis_test+0x85: db 88 34 12 00 00  tisttpl 0x1234(%eax)
+    libdis_test+0x8b: dd 88 34 12 00 00  fisttpll 0x1234(%eax)
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.sse-3.s b/usr/src/test/util-tests/tests/dis/i386/32.sse-3.s
new file mode 100644
index 0000000000..30fbe88c47
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.sse-3.s
@@ -0,0 +1,56 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test SSE 3 related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	addsubpd	%xmm0, %xmm1
+	addsubpd	(%edx), %xmm2
+	addsubpd	0x23(%esp), %xmm2
+	addsubps	%xmm0, %xmm1
+	addsubps	(%edx), %xmm2
+	addsubps	0x23(%esp), %xmm2
+	haddpd		%xmm0, %xmm1
+	haddpd		(%edx), %xmm2
+	haddpd		0x23(%esp), %xmm2
+	haddps		%xmm0, %xmm1
+	haddps		(%edx), %xmm2
+	haddps		0x23(%esp), %xmm2
+	hsubpd		%xmm0, %xmm1
+	hsubpd		(%edx), %xmm2
+	hsubpd		0x23(%esp), %xmm2
+	hsubps		%xmm0, %xmm1
+	hsubps		(%edx), %xmm2
+	hsubps		0x23(%esp), %xmm2
+	lddqu		(%eax), %xmm3
+	movddup		%xmm4, %xmm5
+	movddup		(%eax), %xmm6
+	movddup		0x42(%ebx), %xmm7
+	movshdup	%xmm4, %xmm5
+	movshdup	(%eax), %xmm6
+	movshdup	0x42(%ebx), %xmm7
+	movsldup	%xmm4, %xmm5
+	movsldup	(%eax), %xmm6
+	movsldup	0x42(%ebx), %xmm7
+	fisttp		0x1234(%eax)
+	fisttpl		0x1234(%eax)
+	fisttpll	0x1234(%eax)
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.sse-4.1.out b/usr/src/test/util-tests/tests/dis/i386/32.sse-4.1.out
new file mode 100644
index 0000000000..84c13a2e5b
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.sse-4.1.out
@@ -0,0 +1,140 @@
+    libdis_test:       66 0f 3a 0d c8 42  blendpd $0x42,%xmm0,%xmm1
+    libdis_test+0x6:   66 0f 3a 0d 0b 42  blendpd $0x42,(%ebx),%xmm1
+    libdis_test+0xc:   66 0f 3a 0c c8 42  blendps $0x42,%xmm0,%xmm1
+    libdis_test+0x12:  66 0f 3a 0c 0b 42  blendps $0x42,(%ebx),%xmm1
+    libdis_test+0x18:  66 0f 38 15 d1     blendvpd %xmm1,%xmm2
+    libdis_test+0x1d:  66 0f 38 15 13     blendvpd (%ebx),%xmm2
+    libdis_test+0x22:  66 0f 38 15 53 42  blendvpd 0x42(%ebx),%xmm2
+    libdis_test+0x28:  66 0f 38 14 d1     blendvps %xmm1,%xmm2
+    libdis_test+0x2d:  66 0f 38 14 13     blendvps (%ebx),%xmm2
+    libdis_test+0x32:  66 0f 38 14 53 42  blendvps 0x42(%ebx),%xmm2
+    libdis_test+0x38:  66 0f 3a 41 c8 42  dppd   $0x42,%xmm0,%xmm1
+    libdis_test+0x3e:  66 0f 3a 41 0b 42  dppd   $0x42,(%ebx),%xmm1
+    libdis_test+0x44:  66 0f 3a 40 c8 42  dpps   $0x42,%xmm0,%xmm1
+    libdis_test+0x4a:  66 0f 3a 40 0b 42  dpps   $0x42,(%ebx),%xmm1
+    libdis_test+0x50:  66 0f 3a 17 f3 23  extractps $0x23,%xmm6,%ebx
+    libdis_test+0x56:  66 0f 3a 17 33 23  extractps $0x23,%xmm6,(%ebx)
+    libdis_test+0x5c:  66 0f 3a 21 d1 23  insertps $0x23,%xmm1,%xmm2
+    libdis_test+0x62:  66 0f 3a 21 13 23  insertps $0x23,(%ebx),%xmm2
+    libdis_test+0x68:  66 0f 3a 21 53 42  insertps $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0x6f:  66 0f 38 2a 03     movntdqa (%ebx),%xmm0
+    libdis_test+0x74:  66 0f 3a 42 d1 23  mpsadbw $0x23,%xmm1,%xmm2
+    libdis_test+0x7a:  66 0f 3a 42 13 23  mpsadbw $0x23,(%ebx),%xmm2
+    libdis_test+0x80:  66 0f 3a 42 53 42  mpsadbw $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0x87:  66 0f 38 2b d1     packusdw %xmm1,%xmm2
+    libdis_test+0x8c:  66 0f 38 2b 13     packusdw (%ebx),%xmm2
+    libdis_test+0x91:  66 0f 38 2b 53 42  packusdw 0x42(%ebx),%xmm2
+    libdis_test+0x97:  66 0f 38 10 d1     pblendvb %xmm1,%xmm2
+    libdis_test+0x9c:  66 0f 38 10 13     pblendvb (%ebx),%xmm2
+    libdis_test+0xa1:  66 0f 38 10 53 42  pblendvb 0x42(%ebx),%xmm2
+    libdis_test+0xa7:  66 0f 3a 0e d1 23  pblendw $0x23,%xmm1,%xmm2
+    libdis_test+0xad:  66 0f 3a 0e 13 23  pblendw $0x23,(%ebx),%xmm2
+    libdis_test+0xb3:  66 0f 3a 0e 53 42  pblendw $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0xba:  66 0f 38 29 d1     pcmpeqq %xmm1,%xmm2
+    libdis_test+0xbf:  66 0f 38 29 13     pcmpeqq (%ebx),%xmm2
+    libdis_test+0xc4:  66 0f 38 29 53 42  pcmpeqq 0x42(%ebx),%xmm2
+    libdis_test+0xca:  66 0f 3a 14 e2 23  pextrb $0x23,%xmm4,%edx
+    libdis_test+0xd0:  66 0f 3a 14 22 23  pextrb $0x23,%xmm4,(%edx)
+    libdis_test+0xd6:  66 0f 3a 16 e2 23  pextrd $0x23,%xmm4,%edx
+    libdis_test+0xdc:  66 0f 3a 16 22 23  pextrd $0x23,%xmm4,(%edx)
+    libdis_test+0xe2:  66 0f c5 d4 23     pextrw $0x23,%xmm4,%edx
+    libdis_test+0xe7:  66 0f 3a 15 22 23  pextrw $0x23,%xmm4,(%edx)
+    libdis_test+0xed:  66 0f 38 41 d1     phminposuw %xmm1,%xmm2
+    libdis_test+0xf2:  66 0f 38 41 13     phminposuw (%ebx),%xmm2
+    libdis_test+0xf7:  66 0f 38 41 53 42  phminposuw 0x42(%ebx),%xmm2
+    libdis_test+0xfd:  66 0f 3a 20 d3 23  pinsrb $0x23,%ebx,%xmm2
+    libdis_test+0x103: 66 0f 3a 20 13 23  pinsrb $0x23,(%ebx),%xmm2
+    libdis_test+0x109: 66 0f 3a 20 53 42  pinsrb $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0x110: 66 0f 3a 22 d3 23  pinsrd $0x23,%ebx,%xmm2
+    libdis_test+0x116: 66 0f 3a 22 13 23  pinsrd $0x23,(%ebx),%xmm2
+    libdis_test+0x11c: 66 0f 3a 22 53 42  pinsrd $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0x123: 66 0f 38 3c d1     pmaxsb %xmm1,%xmm2
+    libdis_test+0x128: 66 0f 38 3c 13     pmaxsb (%ebx),%xmm2
+    libdis_test+0x12d: 66 0f 38 3c 53 42  pmaxsb 0x42(%ebx),%xmm2
+    libdis_test+0x133: 66 0f 38 3d d1     pmaxsd %xmm1,%xmm2
+    libdis_test+0x138: 66 0f 38 3d 13     pmaxsd (%ebx),%xmm2
+    libdis_test+0x13d: 66 0f 38 3d 53 42  pmaxsd 0x42(%ebx),%xmm2
+    libdis_test+0x143: 66 0f 38 3f d1     pmaxud %xmm1,%xmm2
+    libdis_test+0x148: 66 0f 38 3f 13     pmaxud (%ebx),%xmm2
+    libdis_test+0x14d: 66 0f 38 3f 53 42  pmaxud 0x42(%ebx),%xmm2
+    libdis_test+0x153: 66 0f 38 3e d1     pmaxuw %xmm1,%xmm2
+    libdis_test+0x158: 66 0f 38 3e 13     pmaxuw (%ebx),%xmm2
+    libdis_test+0x15d: 66 0f 38 3e 53 42  pmaxuw 0x42(%ebx),%xmm2
+    libdis_test+0x163: 66 0f 38 38 d1     pminsb %xmm1,%xmm2
+    libdis_test+0x168: 66 0f 38 38 13     pminsb (%ebx),%xmm2
+    libdis_test+0x16d: 66 0f 38 38 53 42  pminsb 0x42(%ebx),%xmm2
+    libdis_test+0x173: 66 0f 38 39 d1     pminsd %xmm1,%xmm2
+    libdis_test+0x178: 66 0f 38 39 13     pminsd (%ebx),%xmm2
+    libdis_test+0x17d: 66 0f 38 39 53 42  pminsd 0x42(%ebx),%xmm2
+    libdis_test+0x183: 66 0f 38 3b d1     pminud %xmm1,%xmm2
+    libdis_test+0x188: 66 0f 38 3b 13     pminud (%ebx),%xmm2
+    libdis_test+0x18d: 66 0f 38 3b 53 42  pminud 0x42(%ebx),%xmm2
+    libdis_test+0x193: 66 0f 38 3a d1     pminuw %xmm1,%xmm2
+    libdis_test+0x198: 66 0f 38 3a 13     pminuw (%ebx),%xmm2
+    libdis_test+0x19d: 66 0f 38 3a 53 42  pminuw 0x42(%ebx),%xmm2
+    libdis_test+0x1a3: 66 0f 38 21 d1     pmovsxbd %xmm1,%xmm2
+    libdis_test+0x1a8: 66 0f 38 21 13     pmovsxbd (%ebx),%xmm2
+    libdis_test+0x1ad: 66 0f 38 21 53 42  pmovsxbd 0x42(%ebx),%xmm2
+    libdis_test+0x1b3: 66 0f 38 22 d1     pmovsxbq %xmm1,%xmm2
+    libdis_test+0x1b8: 66 0f 38 22 13     pmovsxbq (%ebx),%xmm2
+    libdis_test+0x1bd: 66 0f 38 22 53 42  pmovsxbq 0x42(%ebx),%xmm2
+    libdis_test+0x1c3: 66 0f 38 20 d1     pmovsxbw %xmm1,%xmm2
+    libdis_test+0x1c8: 66 0f 38 20 13     pmovsxbw (%ebx),%xmm2
+    libdis_test+0x1cd: 66 0f 38 20 53 42  pmovsxbw 0x42(%ebx),%xmm2
+    libdis_test+0x1d3: 66 0f 38 25 d1     pmovsxdq %xmm1,%xmm2
+    libdis_test+0x1d8: 66 0f 38 25 13     pmovsxdq (%ebx),%xmm2
+    libdis_test+0x1dd: 66 0f 38 25 53 42  pmovsxdq 0x42(%ebx),%xmm2
+    libdis_test+0x1e3: 66 0f 38 23 d1     pmovsxwd %xmm1,%xmm2
+    libdis_test+0x1e8: 66 0f 38 23 13     pmovsxwd (%ebx),%xmm2
+    libdis_test+0x1ed: 66 0f 38 23 53 42  pmovsxwd 0x42(%ebx),%xmm2
+    libdis_test+0x1f3: 66 0f 38 24 d1     pmovsxwq %xmm1,%xmm2
+    libdis_test+0x1f8: 66 0f 38 24 13     pmovsxwq (%ebx),%xmm2
+    libdis_test+0x1fd: 66 0f 38 24 53 42  pmovsxwq 0x42(%ebx),%xmm2
+    libdis_test+0x203: 66 0f 38 31 d1     pmovzxbd %xmm1,%xmm2
+    libdis_test+0x208: 66 0f 38 31 13     pmovzxbd (%ebx),%xmm2
+    libdis_test+0x20d: 66 0f 38 31 53 42  pmovzxbd 0x42(%ebx),%xmm2
+    libdis_test+0x213: 66 0f 38 32 d1     pmovzxbq %xmm1,%xmm2
+    libdis_test+0x218: 66 0f 38 32 13     pmovzxbq (%ebx),%xmm2
+    libdis_test+0x21d: 66 0f 38 32 53 42  pmovzxbq 0x42(%ebx),%xmm2
+    libdis_test+0x223: 66 0f 38 30 d1     pmovzxbw %xmm1,%xmm2
+    libdis_test+0x228: 66 0f 38 30 13     pmovzxbw (%ebx),%xmm2
+    libdis_test+0x22d: 66 0f 38 30 53 42  pmovzxbw 0x42(%ebx),%xmm2
+    libdis_test+0x233: 66 0f 38 35 d1     pmovzxdq %xmm1,%xmm2
+    libdis_test+0x238: 66 0f 38 35 13     pmovzxdq (%ebx),%xmm2
+    libdis_test+0x23d: 66 0f 38 35 53 42  pmovzxdq 0x42(%ebx),%xmm2
+    libdis_test+0x243: 66 0f 38 33 d1     pmovzxwd %xmm1,%xmm2
+    libdis_test+0x248: 66 0f 38 33 13     pmovzxwd (%ebx),%xmm2
+    libdis_test+0x24d: 66 0f 38 33 53 42  pmovzxwd 0x42(%ebx),%xmm2
+    libdis_test+0x253: 66 0f 38 34 d1     pmovzxwq %xmm1,%xmm2
+    libdis_test+0x258: 66 0f 38 34 13     pmovzxwq (%ebx),%xmm2
+    libdis_test+0x25d: 66 0f 38 34 53 42  pmovzxwq 0x42(%ebx),%xmm2
+    libdis_test+0x263: 66 0f 38 28 d1     pmuldq %xmm1,%xmm2
+    libdis_test+0x268: 66 0f 38 28 13     pmuldq (%ebx),%xmm2
+    libdis_test+0x26d: 66 0f 38 28 53 42  pmuldq 0x42(%ebx),%xmm2
+    libdis_test+0x273: 66 0f 38 40 d1     pmulld %xmm1,%xmm2
+    libdis_test+0x278: 66 0f 38 40 13     pmulld (%ebx),%xmm2
+    libdis_test+0x27d: 66 0f 38 40 53 42  pmulld 0x42(%ebx),%xmm2
+    libdis_test+0x283: 66 0f 38 17 d1     ptest  %xmm1,%xmm2
+    libdis_test+0x288: 66 0f 38 17 13     ptest  (%ebx),%xmm2
+    libdis_test+0x28d: 66 0f 38 17 53 42  ptest  0x42(%ebx),%xmm2
+    libdis_test+0x293: 66 0f 3a 09 d1 23  roundpd $0x23,%xmm1,%xmm2
+    libdis_test+0x299: 66 0f 3a 09 13 23  roundpd $0x23,(%ebx),%xmm2
+    libdis_test+0x29f: 66 0f 3a 09 53 42  roundpd $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0x2a6: 66 0f 3a 08 d1 23  roundps $0x23,%xmm1,%xmm2
+    libdis_test+0x2ac: 66 0f 3a 08 13 23  roundps $0x23,(%ebx),%xmm2
+    libdis_test+0x2b2: 66 0f 3a 08 53 42  roundps $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0x2b9: 66 0f 3a 0b d1 23  roundsd $0x23,%xmm1,%xmm2
+    libdis_test+0x2bf: 66 0f 3a 0b 13 23  roundsd $0x23,(%ebx),%xmm2
+    libdis_test+0x2c5: 66 0f 3a 0b 53 42  roundsd $0x23,0x42(%ebx),%xmm2
+                       23 
+    libdis_test+0x2cc: 66 0f 3a 0a d1 23  roundss $0x23,%xmm1,%xmm2
+    libdis_test+0x2d2: 66 0f 3a 0a 13 23  roundss $0x23,(%ebx),%xmm2
+    libdis_test+0x2d8: 66 0f 3a 0a 53 42  roundss $0x23,0x42(%ebx),%xmm2
+                       23 
diff --git a/usr/src/test/util-tests/tests/dis/i386/32.sse-4.1.s b/usr/src/test/util-tests/tests/dis/i386/32.sse-4.1.s
new file mode 100644
index 0000000000..4e9a1d0751
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/32.sse-4.1.s
@@ -0,0 +1,156 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test SSE 4.2 related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	blendpd		$0x42, %xmm0, %xmm1
+	blendpd		$0x42, (%ebx), %xmm1
+	blendps		$0x42, %xmm0, %xmm1
+	blendps		$0x42, (%ebx), %xmm1
+	blendvpd	%xmm1, %xmm2
+	blendvpd	(%ebx), %xmm2
+	blendvpd	0x42(%ebx), %xmm2
+	blendvps	%xmm1, %xmm2
+	blendvps	(%ebx), %xmm2
+	blendvps	0x42(%ebx), %xmm2
+	dppd		$0x42, %xmm0, %xmm1
+	dppd		$0x42, (%ebx), %xmm1
+	dpps		$0x42, %xmm0, %xmm1
+	dpps		$0x42, (%ebx), %xmm1
+	extractps	$0x23, %xmm6, %ebx
+	extractps	$0x23, %xmm6, (%ebx)
+	insertps	$0x23, %xmm1, %xmm2
+	insertps	$0x23, (%ebx), %xmm2
+	insertps	$0x23, 0x42(%ebx), %xmm2
+	movntdqa	(%ebx), %xmm0
+	mpsadbw		$0x23, %xmm1, %xmm2
+	mpsadbw		$0x23, (%ebx), %xmm2
+	mpsadbw		$0x23, 0x42(%ebx), %xmm2
+	packusdw	%xmm1, %xmm2
+	packusdw	(%ebx), %xmm2
+	packusdw	0x42(%ebx), %xmm2
+	pblendvb	%xmm1, %xmm2
+	pblendvb	(%ebx), %xmm2
+	pblendvb	0x42(%ebx), %xmm2
+	pblendw		$0x23, %xmm1, %xmm2
+	pblendw		$0x23, (%ebx), %xmm2
+	pblendw		$0x23, 0x42(%ebx), %xmm2
+	pcmpeqq		%xmm1, %xmm2
+	pcmpeqq		(%ebx), %xmm2
+	pcmpeqq		0x42(%ebx), %xmm2
+	pextrb		$0x23, %xmm4, %edx
+	pextrb		$0x23, %xmm4, (%edx)
+	pextrd		$0x23, %xmm4, %edx
+	pextrd		$0x23, %xmm4, (%edx)
+	pextrw		$0x23, %xmm4, %edx
+	pextrw		$0x23, %xmm4, (%edx)
+	phminposuw	%xmm1, %xmm2
+	phminposuw	(%ebx), %xmm2
+	phminposuw	0x42(%ebx), %xmm2
+	pinsrb		$0x23, %ebx, %xmm2
+	pinsrb		$0x23, (%ebx), %xmm2
+	pinsrb		$0x23, 0x42(%ebx), %xmm2
+	pinsrd		$0x23, %ebx, %xmm2
+	pinsrd		$0x23, (%ebx), %xmm2
+	pinsrd		$0x23, 0x42(%ebx), %xmm2
+	pmaxsb		%xmm1, %xmm2
+	pmaxsb		(%ebx), %xmm2
+	pmaxsb		0x42(%ebx), %xmm2
+	pmaxsd		%xmm1, %xmm2
+	pmaxsd		(%ebx), %xmm2
+	pmaxsd		0x42(%ebx), %xmm2
+	pmaxud		%xmm1, %xmm2
+	pmaxud		(%ebx), %xmm2
+	pmaxud		0x42(%ebx), %xmm2
+	pmaxuw		%xmm1, %xmm2
+	pmaxuw		(%ebx), %xmm2
+	pmaxuw		0x42(%ebx), %xmm2
+	pminsb		%xmm1, %xmm2
+	pminsb		(%ebx), %xmm2
+	pminsb		0x42(%ebx), %xmm2
+	pminsd		%xmm1, %xmm2
+	pminsd		(%ebx), %xmm2
+	pminsd		0x42(%ebx), %xmm2
+	pminud		%xmm1, %xmm2
+	pminud		(%ebx), %xmm2
+	pminud		0x42(%ebx), %xmm2
+	pminuw		%xmm1, %xmm2
+	pminuw		(%ebx), %xmm2
+	pminuw		0x42(%ebx), %xmm2
+	pmovsxbd	%xmm1, %xmm2
+	pmovsxbd	(%ebx), %xmm2
+	pmovsxbd	0x42(%ebx), %xmm2
+	pmovsxbq	%xmm1, %xmm2
+	pmovsxbq	(%ebx), %xmm2
+	pmovsxbq	0x42(%ebx), %xmm2
+	pmovsxbw	%xmm1, %xmm2
+	pmovsxbw	(%ebx), %xmm2
+	pmovsxbw	0x42(%ebx), %xmm2
+	pmovsxdq	%xmm1, %xmm2
+	pmovsxdq	(%ebx), %xmm2
+	pmovsxdq	0x42(%ebx), %xmm2
+	pmovsxwd	%xmm1, %xmm2
+	pmovsxwd	(%ebx), %xmm2
+	pmovsxwd	0x42(%ebx), %xmm2
+	pmovsxwq	%xmm1, %xmm2
+	pmovsxwq	(%ebx), %xmm2
+	pmovsxwq	0x42(%ebx), %xmm2
+	pmovzxbd	%xmm1, %xmm2
+	pmovzxbd	(%ebx), %xmm2
+	pmovzxbd	0x42(%ebx), %xmm2
+	pmovzxbq	%xmm1, %xmm2
+	pmovzxbq	(%ebx), %xmm2
+	pmovzxbq	0x42(%ebx), %xmm2
+	pmovzxbw	%xmm1, %xmm2
+	pmovzxbw	(%ebx), %xmm2
+	pmovzxbw	0x42(%ebx), %xmm2
+	pmovzxdq	%xmm1, %xmm2
+	pmovzxdq	(%ebx), %xmm2
+	pmovzxdq	0x42(%ebx), %xmm2
+	pmovzxwd	%xmm1, %xmm2
+	pmovzxwd	(%ebx), %xmm2
+	pmovzxwd	0x42(%ebx), %xmm2
+	pmovzxwq	%xmm1, %xmm2
+	pmovzxwq	(%ebx), %xmm2
+	pmovzxwq	0x42(%ebx), %xmm2
+	pmuldq		%xmm1, %xmm2
+	pmuldq		(%ebx), %xmm2
+	pmuldq		0x42(%ebx), %xmm2
+	pmulld		%xmm1, %xmm2
+	pmulld		(%ebx), %xmm2
+	pmulld		0x42(%ebx), %xmm2
+	ptest		%xmm1, %xmm2
+	ptest		(%ebx), %xmm2
+	ptest		0x42(%ebx), %xmm2
+	roundpd		$0x23, %xmm1, %xmm2
+	roundpd		$0x23, (%ebx), %xmm2
+	roundpd		$0x23, 0x42(%ebx), %xmm2
+	roundps		$0x23, %xmm1, %xmm2
+	roundps		$0x23, (%ebx), %xmm2
+	roundps		$0x23, 0x42(%ebx), %xmm2
+	roundsd		$0x23, %xmm1, %xmm2
+	roundsd		$0x23, (%ebx), %xmm2
+	roundsd		$0x23, 0x42(%ebx), %xmm2
+	roundss		$0x23, %xmm1, %xmm2
+	roundss		$0x23, (%ebx), %xmm2
+	roundss		$0x23, 0x42(%ebx), %xmm2
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.avx.out b/usr/src/test/util-tests/tests/dis/i386/64.avx.out
new file mode 100644
index 0000000000..b69fb0144c
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.avx.out
@@ -0,0 +1,1972 @@
+    libdis_test:        c5 f1 58 d0        vaddpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x4:    c5 e1 58 20        vaddpd (%rax),%xmm3,%xmm4
+    libdis_test+0x8:    c5 d1 58 71 42     vaddpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xd:    c5 f5 58 d0        vaddpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x11:   c5 e5 58 23        vaddpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x15:   c5 d5 58 72 42     vaddpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1a:   c5 f0 58 d0        vaddps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e:   c5 e0 58 20        vaddps (%rax),%xmm3,%xmm4
+    libdis_test+0x22:   c5 d0 58 71 42     vaddps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x27:   c5 f4 58 d0        vaddps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2b:   c5 e4 58 23        vaddps (%rbx),%ymm3,%ymm4
+    libdis_test+0x2f:   c5 d4 58 72 42     vaddps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x34:   c5 f3 58 d0        vaddsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x38:   c5 e3 58 20        vaddsd (%rax),%xmm3,%xmm4
+    libdis_test+0x3c:   c5 d3 58 71 42     vaddsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x41:   c5 f2 58 d0        vaddss %xmm0,%xmm1,%xmm2
+    libdis_test+0x45:   c5 e2 58 20        vaddss (%rax),%xmm3,%xmm4
+    libdis_test+0x49:   c5 d2 58 71 42     vaddss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x4e:   c5 f1 d0 d0        vaddsubpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x52:   c5 e1 d0 20        vaddsubpd (%rax),%xmm3,%xmm4
+    libdis_test+0x56:   c5 d1 d0 71 42     vaddsubpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x5b:   c5 f5 d0 d0        vaddsubpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x5f:   c5 e5 d0 23        vaddsubpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x63:   c5 d5 d0 72 42     vaddsubpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x68:   c5 f3 d0 d0        vaddsubps %xmm0,%xmm1,%xmm2
+    libdis_test+0x6c:   c5 e3 d0 20        vaddsubps (%rax),%xmm3,%xmm4
+    libdis_test+0x70:   c5 d3 d0 71 42     vaddsubps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x75:   c5 f7 d0 d0        vaddsubps %ymm0,%ymm1,%ymm2
+    libdis_test+0x79:   c5 e7 d0 23        vaddsubps (%rbx),%ymm3,%ymm4
+    libdis_test+0x7d:   c5 d7 d0 72 42     vaddsubps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x82:   c4 e2 71 de d0     vaesdec %xmm0,%xmm1,%xmm2
+    libdis_test+0x87:   c4 e2 61 de 20     vaesdec (%rax),%xmm3,%xmm4
+    libdis_test+0x8c:   c4 e2 51 de 71 42  vaesdec 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x92:   c4 e2 71 df d0     vaesdeclast %xmm0,%xmm1,%xmm2
+    libdis_test+0x97:   c4 e2 61 df 20     vaesdeclast (%rax),%xmm3,%xmm4
+    libdis_test+0x9c:   c4 e2 51 df 71 42  vaesdeclast 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xa2:   c4 e2 71 dc d0     vaesenc %xmm0,%xmm1,%xmm2
+    libdis_test+0xa7:   c4 e2 61 dc 20     vaesenc (%rax),%xmm3,%xmm4
+    libdis_test+0xac:   c4 e2 51 dc 71 42  vaesenc 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb2:   c4 e2 71 dd d0     vaesenclast %xmm0,%xmm1,%xmm2
+    libdis_test+0xb7:   c4 e2 61 dd 20     vaesenclast (%rax),%xmm3,%xmm4
+    libdis_test+0xbc:   c4 e2 51 dd 71 42  vaesenclast 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xc2:   c4 e2 79 db c8     vaesimc %xmm0,%xmm1
+    libdis_test+0xc7:   c4 e2 79 db 1e     vaesimc (%rsi),%xmm3
+    libdis_test+0xcc:   c4 e2 79 db 5f 42  vaesimc 0x42(%rdi),%xmm3
+    libdis_test+0xd2:   c4 e3 79 df c8 42  vaeskeygenassist $0x42,%xmm0,%xmm1
+    libdis_test+0xd8:   c4 e3 79 df 1e 23  vaeskeygenassist $0x23,(%rsi),%xmm3
+    libdis_test+0xde:   c4 e3 79 df 5f 42  vaeskeygenassist $0x42,0x42(%rdi),%xmm3
+                        42 
+    libdis_test+0xe5:   c5 f1 55 d0        vandnpd %xmm0,%xmm1,%xmm2
+    libdis_test+0xe9:   c5 e1 55 20        vandnpd (%rax),%xmm3,%xmm4
+    libdis_test+0xed:   c5 d1 55 71 42     vandnpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xf2:   c5 f5 55 d0        vandnpd %ymm0,%ymm1,%ymm2
+    libdis_test+0xf6:   c5 e5 55 23        vandnpd (%rbx),%ymm3,%ymm4
+    libdis_test+0xfa:   c5 d5 55 72 42     vandnpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xff:   c5 f0 55 d0        vandnps %xmm0,%xmm1,%xmm2
+    libdis_test+0x103:  c5 e0 55 20        vandnps (%rax),%xmm3,%xmm4
+    libdis_test+0x107:  c5 d0 55 71 42     vandnps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x10c:  c5 f4 55 d0        vandnps %ymm0,%ymm1,%ymm2
+    libdis_test+0x110:  c5 e4 55 23        vandnps (%rbx),%ymm3,%ymm4
+    libdis_test+0x114:  c5 d4 55 72 42     vandnps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x119:  c5 f1 54 d0        vandpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x11d:  c5 e1 54 20        vandpd (%rax),%xmm3,%xmm4
+    libdis_test+0x121:  c5 d1 54 71 42     vandpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x126:  c5 f5 54 d0        vandpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x12a:  c5 e5 54 23        vandpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x12e:  c5 d5 54 72 42     vandpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x133:  c5 f0 54 d0        vandps %xmm0,%xmm1,%xmm2
+    libdis_test+0x137:  c5 e0 54 20        vandps (%rax),%xmm3,%xmm4
+    libdis_test+0x13b:  c5 d0 54 71 42     vandps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x140:  c5 f4 54 d0        vandps %ymm0,%ymm1,%ymm2
+    libdis_test+0x144:  c5 e4 54 23        vandps (%rbx),%ymm3,%ymm4
+    libdis_test+0x148:  c5 d4 54 72 42     vandps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x14d:  c4 e3 51 0d fb 48  vblendpd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x153:  c4 e3 69 0d 23 48  vblendpd $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x159:  c4 e3 71 0d 73 08  vblendpd $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x160:  c4 e3 55 0d fb 48  vblendpd $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x166:  c4 e3 6d 0d 23 48  vblendpd $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x16c:  c4 e3 75 0d 73 08  vblendpd $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x173:  c4 e3 51 0c fb 48  vblendps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x179:  c4 e3 69 0c 23 48  vblendps $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x17f:  c4 e3 71 0c 73 08  vblendps $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x186:  c4 e3 55 0c fb 48  vblendps $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x18c:  c4 e3 6d 0c 23 48  vblendps $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x192:  c4 e3 75 0c 73 08  vblendps $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x199:  c4 e3 69 4b d9 00  vblendvpd %xmm0,%xmm1,%xmm2,%xmm3
+    libdis_test+0x19f:  c4 e3 69 4b 18 00  vblendvpd %xmm0,(%rax),%xmm2,%xmm3
+    libdis_test+0x1a5:  c4 e3 69 4b 5b 10  vblendvpd %xmm0,0x10(%rbx),%xmm2,%xmm3
+                        00 
+    libdis_test+0x1ac:  c4 e3 6d 4b d9 00  vblendvpd %ymm0,%ymm1,%ymm2,%ymm3
+    libdis_test+0x1b2:  c4 e3 6d 4b 18 00  vblendvpd %ymm0,(%rax),%ymm2,%ymm3
+    libdis_test+0x1b8:  c4 e3 6d 4b 5b 10  vblendvpd %ymm0,0x10(%rbx),%ymm2,%ymm3
+                        00 
+    libdis_test+0x1bf:  c4 e3 69 4a d9 00  vblendvps %xmm0,%xmm1,%xmm2,%xmm3
+    libdis_test+0x1c5:  c4 e3 69 4a 18 00  vblendvps %xmm0,(%rax),%xmm2,%xmm3
+    libdis_test+0x1cb:  c4 e3 69 4a 5b 10  vblendvps %xmm0,0x10(%rbx),%xmm2,%xmm3
+                        00 
+    libdis_test+0x1d2:  c4 e3 6d 4a d9 00  vblendvps %ymm0,%ymm1,%ymm2,%ymm3
+    libdis_test+0x1d8:  c4 e3 6d 4a 18 00  vblendvps %ymm0,(%rax),%ymm2,%ymm3
+    libdis_test+0x1de:  c4 e3 6d 4a 5b 10  vblendvps %ymm0,0x10(%rbx),%ymm2,%ymm3
+                        00 
+    libdis_test+0x1e5:  c4 e2 7d 1a 00     vbroadcastf128 (%rax),%ymm0
+    libdis_test+0x1ea:  c4 e2 7d 1a 40 42  vbroadcastf128 0x42(%rax),%ymm0
+    libdis_test+0x1f0:  c4 e2 7d 19 00     vbroadcastsd (%rax),%ymm0
+    libdis_test+0x1f5:  c4 e2 7d 19 40 42  vbroadcastsd 0x42(%rax),%ymm0
+    libdis_test+0x1fb:  c4 e2 7d 18 00     vbroadcastss (%rax),%ymm0
+    libdis_test+0x200:  c4 e2 7d 18 40 42  vbroadcastss 0x42(%rax),%ymm0
+    libdis_test+0x206:  c5 f1 c2 d0 10     vcmppd $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x20b:  c5 e1 c2 20 10     vcmppd $0x10,(%rax),%xmm3,%xmm4
+    libdis_test+0x210:  c5 d1 c2 71 42 10  vcmppd $0x10,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x216:  c5 f5 c2 d0 10     vcmppd $0x10,%ymm0,%ymm1,%ymm2
+    libdis_test+0x21b:  c5 e5 c2 23 10     vcmppd $0x10,(%rbx),%ymm3,%ymm4
+    libdis_test+0x220:  c5 d5 c2 72 42 10  vcmppd $0x10,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x226:  c5 f0 c2 d0 10     vcmpps $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x22b:  c5 e0 c2 20 10     vcmpps $0x10,(%rax),%xmm3,%xmm4
+    libdis_test+0x230:  c5 d0 c2 71 42 10  vcmpps $0x10,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x236:  c5 f4 c2 d0 10     vcmpps $0x10,%ymm0,%ymm1,%ymm2
+    libdis_test+0x23b:  c5 e4 c2 23 10     vcmpps $0x10,(%rbx),%ymm3,%ymm4
+    libdis_test+0x240:  c5 d4 c2 72 42 10  vcmpps $0x10,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x246:  c5 f3 c2 d0 10     vcmpsd $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x24b:  c5 e3 c2 20 10     vcmpsd $0x10,(%rax),%xmm3,%xmm4
+    libdis_test+0x250:  c5 d3 c2 71 42 10  vcmpsd $0x10,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x256:  c5 f2 c2 d0 10     vcmpss $0x10,%xmm0,%xmm1,%xmm2
+    libdis_test+0x25b:  c5 e2 c2 20 10     vcmpss $0x10,(%rax),%xmm3,%xmm4
+    libdis_test+0x260:  c5 d2 c2 71 42 10  vcmpss $0x10,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x266:  c5 f1 c2 d0 08     vcmppd $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x26b:  c5 e1 c2 20 08     vcmppd $0x8,(%rax),%xmm3,%xmm4
+    libdis_test+0x270:  c5 d1 c2 71 42 08  vcmppd $0x8,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x276:  c5 f5 c2 d0 08     vcmppd $0x8,%ymm0,%ymm1,%ymm2
+    libdis_test+0x27b:  c5 e5 c2 23 08     vcmppd $0x8,(%rbx),%ymm3,%ymm4
+    libdis_test+0x280:  c5 d5 c2 72 42 08  vcmppd $0x8,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x286:  c5 f0 c2 d0 08     vcmpps $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x28b:  c5 e0 c2 20 08     vcmpps $0x8,(%rax),%xmm3,%xmm4
+    libdis_test+0x290:  c5 d0 c2 71 42 08  vcmpps $0x8,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x296:  c5 f4 c2 d0 08     vcmpps $0x8,%ymm0,%ymm1,%ymm2
+    libdis_test+0x29b:  c5 e4 c2 23 08     vcmpps $0x8,(%rbx),%ymm3,%ymm4
+    libdis_test+0x2a0:  c5 d4 c2 72 42 08  vcmpps $0x8,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2a6:  c5 f3 c2 d0 08     vcmpsd $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2ab:  c5 e3 c2 20 08     vcmpsd $0x8,(%rax),%xmm3,%xmm4
+    libdis_test+0x2b0:  c5 d3 c2 71 42 08  vcmpsd $0x8,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2b6:  c5 f2 c2 d0 08     vcmpss $0x8,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2bb:  c5 e2 c2 20 08     vcmpss $0x8,(%rax),%xmm3,%xmm4
+    libdis_test+0x2c0:  c5 d2 c2 71 42 08  vcmpss $0x8,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2c6:  c5 f1 c2 d0 18     vcmppd $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2cb:  c5 e1 c2 20 18     vcmppd $0x18,(%rax),%xmm3,%xmm4
+    libdis_test+0x2d0:  c5 d1 c2 71 42 18  vcmppd $0x18,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2d6:  c5 f5 c2 d0 18     vcmppd $0x18,%ymm0,%ymm1,%ymm2
+    libdis_test+0x2db:  c5 e5 c2 23 18     vcmppd $0x18,(%rbx),%ymm3,%ymm4
+    libdis_test+0x2e0:  c5 d5 c2 72 42 18  vcmppd $0x18,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2e6:  c5 f0 c2 d0 18     vcmpps $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x2eb:  c5 e0 c2 20 18     vcmpps $0x18,(%rax),%xmm3,%xmm4
+    libdis_test+0x2f0:  c5 d0 c2 71 42 18  vcmpps $0x18,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2f6:  c5 f4 c2 d0 18     vcmpps $0x18,%ymm0,%ymm1,%ymm2
+    libdis_test+0x2fb:  c5 e4 c2 23 18     vcmpps $0x18,(%rbx),%ymm3,%ymm4
+    libdis_test+0x300:  c5 d4 c2 72 42 18  vcmpps $0x18,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x306:  c5 f3 c2 d0 18     vcmpsd $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x30b:  c5 e3 c2 20 18     vcmpsd $0x18,(%rax),%xmm3,%xmm4
+    libdis_test+0x310:  c5 d3 c2 71 42 18  vcmpsd $0x18,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x316:  c5 f2 c2 d0 18     vcmpss $0x18,%xmm0,%xmm1,%xmm2
+    libdis_test+0x31b:  c5 e2 c2 20 18     vcmpss $0x18,(%rax),%xmm3,%xmm4
+    libdis_test+0x320:  c5 d2 c2 71 42 18  vcmpss $0x18,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x326:  c5 f1 c2 d0 00     vcmppd $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x32b:  c5 e1 c2 20 00     vcmppd $0x0,(%rax),%xmm3,%xmm4
+    libdis_test+0x330:  c5 d1 c2 71 42 00  vcmppd $0x0,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x336:  c5 f5 c2 d0 00     vcmppd $0x0,%ymm0,%ymm1,%ymm2
+    libdis_test+0x33b:  c5 e5 c2 23 00     vcmppd $0x0,(%rbx),%ymm3,%ymm4
+    libdis_test+0x340:  c5 d5 c2 72 42 00  vcmppd $0x0,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x346:  c5 f0 c2 d0 00     vcmpps $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x34b:  c5 e0 c2 20 00     vcmpps $0x0,(%rax),%xmm3,%xmm4
+    libdis_test+0x350:  c5 d0 c2 71 42 00  vcmpps $0x0,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x356:  c5 f4 c2 d0 00     vcmpps $0x0,%ymm0,%ymm1,%ymm2
+    libdis_test+0x35b:  c5 e4 c2 23 00     vcmpps $0x0,(%rbx),%ymm3,%ymm4
+    libdis_test+0x360:  c5 d4 c2 72 42 00  vcmpps $0x0,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x366:  c5 f3 c2 d0 00     vcmpsd $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x36b:  c5 e3 c2 20 00     vcmpsd $0x0,(%rax),%xmm3,%xmm4
+    libdis_test+0x370:  c5 d3 c2 71 42 00  vcmpsd $0x0,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x376:  c5 f2 c2 d0 00     vcmpss $0x0,%xmm0,%xmm1,%xmm2
+    libdis_test+0x37b:  c5 e2 c2 20 00     vcmpss $0x0,(%rax),%xmm3,%xmm4
+    libdis_test+0x380:  c5 d2 c2 71 42 00  vcmpss $0x0,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x386:  c5 f1 c2 d0 1b     vcmppd $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x38b:  c5 e1 c2 20 1b     vcmppd $0x1b,(%rax),%xmm3,%xmm4
+    libdis_test+0x390:  c5 d1 c2 71 42 1b  vcmppd $0x1b,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x396:  c5 f5 c2 d0 1b     vcmppd $0x1b,%ymm0,%ymm1,%ymm2
+    libdis_test+0x39b:  c5 e5 c2 23 1b     vcmppd $0x1b,(%rbx),%ymm3,%ymm4
+    libdis_test+0x3a0:  c5 d5 c2 72 42 1b  vcmppd $0x1b,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x3a6:  c5 f0 c2 d0 1b     vcmpps $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3ab:  c5 e0 c2 20 1b     vcmpps $0x1b,(%rax),%xmm3,%xmm4
+    libdis_test+0x3b0:  c5 d0 c2 71 42 1b  vcmpps $0x1b,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x3b6:  c5 f4 c2 d0 1b     vcmpps $0x1b,%ymm0,%ymm1,%ymm2
+    libdis_test+0x3bb:  c5 e4 c2 23 1b     vcmpps $0x1b,(%rbx),%ymm3,%ymm4
+    libdis_test+0x3c0:  c5 d4 c2 72 42 1b  vcmpps $0x1b,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x3c6:  c5 f3 c2 d0 1b     vcmpsd $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3cb:  c5 e3 c2 20 1b     vcmpsd $0x1b,(%rax),%xmm3,%xmm4
+    libdis_test+0x3d0:  c5 d3 c2 71 42 1b  vcmpsd $0x1b,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x3d6:  c5 f2 c2 d0 1b     vcmpss $0x1b,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3db:  c5 e2 c2 20 1b     vcmpss $0x1b,(%rax),%xmm3,%xmm4
+    libdis_test+0x3e0:  c5 d2 c2 71 42 1b  vcmpss $0x1b,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x3e6:  c5 f1 c2 d0 0b     vcmppd $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x3eb:  c5 e1 c2 20 0b     vcmppd $0xb,(%rax),%xmm3,%xmm4
+    libdis_test+0x3f0:  c5 d1 c2 71 42 0b  vcmppd $0xb,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x3f6:  c5 f5 c2 d0 0b     vcmppd $0xb,%ymm0,%ymm1,%ymm2
+    libdis_test+0x3fb:  c5 e5 c2 23 0b     vcmppd $0xb,(%rbx),%ymm3,%ymm4
+    libdis_test+0x400:  c5 d5 c2 72 42 0b  vcmppd $0xb,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x406:  c5 f0 c2 d0 0b     vcmpps $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x40b:  c5 e0 c2 20 0b     vcmpps $0xb,(%rax),%xmm3,%xmm4
+    libdis_test+0x410:  c5 d0 c2 71 42 0b  vcmpps $0xb,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x416:  c5 f4 c2 d0 0b     vcmpps $0xb,%ymm0,%ymm1,%ymm2
+    libdis_test+0x41b:  c5 e4 c2 23 0b     vcmpps $0xb,(%rbx),%ymm3,%ymm4
+    libdis_test+0x420:  c5 d4 c2 72 42 0b  vcmpps $0xb,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x426:  c5 f3 c2 d0 0b     vcmpsd $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x42b:  c5 e3 c2 20 0b     vcmpsd $0xb,(%rax),%xmm3,%xmm4
+    libdis_test+0x430:  c5 d3 c2 71 42 0b  vcmpsd $0xb,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x436:  c5 f2 c2 d0 0b     vcmpss $0xb,%xmm0,%xmm1,%xmm2
+    libdis_test+0x43b:  c5 e2 c2 20 0b     vcmpss $0xb,(%rax),%xmm3,%xmm4
+    libdis_test+0x440:  c5 d2 c2 71 42 0b  vcmpss $0xb,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x446:  c5 f1 c2 d0 1d     vcmppd $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x44b:  c5 e1 c2 20 1d     vcmppd $0x1d,(%rax),%xmm3,%xmm4
+    libdis_test+0x450:  c5 d1 c2 71 42 1d  vcmppd $0x1d,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x456:  c5 f5 c2 d0 1d     vcmppd $0x1d,%ymm0,%ymm1,%ymm2
+    libdis_test+0x45b:  c5 e5 c2 23 1d     vcmppd $0x1d,(%rbx),%ymm3,%ymm4
+    libdis_test+0x460:  c5 d5 c2 72 42 1d  vcmppd $0x1d,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x466:  c5 f0 c2 d0 1d     vcmpps $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x46b:  c5 e0 c2 20 1d     vcmpps $0x1d,(%rax),%xmm3,%xmm4
+    libdis_test+0x470:  c5 d0 c2 71 42 1d  vcmpps $0x1d,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x476:  c5 f4 c2 d0 1d     vcmpps $0x1d,%ymm0,%ymm1,%ymm2
+    libdis_test+0x47b:  c5 e4 c2 23 1d     vcmpps $0x1d,(%rbx),%ymm3,%ymm4
+    libdis_test+0x480:  c5 d4 c2 72 42 1d  vcmpps $0x1d,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x486:  c5 f3 c2 d0 1d     vcmpsd $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x48b:  c5 e3 c2 20 1d     vcmpsd $0x1d,(%rax),%xmm3,%xmm4
+    libdis_test+0x490:  c5 d3 c2 71 42 1d  vcmpsd $0x1d,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x496:  c5 f2 c2 d0 1d     vcmpss $0x1d,%xmm0,%xmm1,%xmm2
+    libdis_test+0x49b:  c5 e2 c2 20 1d     vcmpss $0x1d,(%rax),%xmm3,%xmm4
+    libdis_test+0x4a0:  c5 d2 c2 71 42 1d  vcmpss $0x1d,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x4a6:  c5 f1 c2 d0 0d     vcmppd $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4ab:  c5 e1 c2 20 0d     vcmppd $0xd,(%rax),%xmm3,%xmm4
+    libdis_test+0x4b0:  c5 d1 c2 71 42 0d  vcmppd $0xd,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x4b6:  c5 f5 c2 d0 0d     vcmppd $0xd,%ymm0,%ymm1,%ymm2
+    libdis_test+0x4bb:  c5 e5 c2 23 0d     vcmppd $0xd,(%rbx),%ymm3,%ymm4
+    libdis_test+0x4c0:  c5 d5 c2 72 42 0d  vcmppd $0xd,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x4c6:  c5 f0 c2 d0 0d     vcmpps $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4cb:  c5 e0 c2 20 0d     vcmpps $0xd,(%rax),%xmm3,%xmm4
+    libdis_test+0x4d0:  c5 d0 c2 71 42 0d  vcmpps $0xd,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x4d6:  c5 f4 c2 d0 0d     vcmpps $0xd,%ymm0,%ymm1,%ymm2
+    libdis_test+0x4db:  c5 e4 c2 23 0d     vcmpps $0xd,(%rbx),%ymm3,%ymm4
+    libdis_test+0x4e0:  c5 d4 c2 72 42 0d  vcmpps $0xd,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x4e6:  c5 f3 c2 d0 0d     vcmpsd $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4eb:  c5 e3 c2 20 0d     vcmpsd $0xd,(%rax),%xmm3,%xmm4
+    libdis_test+0x4f0:  c5 d3 c2 71 42 0d  vcmpsd $0xd,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x4f6:  c5 f2 c2 d0 0d     vcmpss $0xd,%xmm0,%xmm1,%xmm2
+    libdis_test+0x4fb:  c5 e2 c2 20 0d     vcmpss $0xd,(%rax),%xmm3,%xmm4
+    libdis_test+0x500:  c5 d2 c2 71 42 0d  vcmpss $0xd,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x506:  c5 f1 c2 d0 1e     vcmppd $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x50b:  c5 e1 c2 20 1e     vcmppd $0x1e,(%rax),%xmm3,%xmm4
+    libdis_test+0x510:  c5 d1 c2 71 42 1e  vcmppd $0x1e,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x516:  c5 f5 c2 d0 1e     vcmppd $0x1e,%ymm0,%ymm1,%ymm2
+    libdis_test+0x51b:  c5 e5 c2 23 1e     vcmppd $0x1e,(%rbx),%ymm3,%ymm4
+    libdis_test+0x520:  c5 d5 c2 72 42 1e  vcmppd $0x1e,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x526:  c5 f0 c2 d0 1e     vcmpps $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x52b:  c5 e0 c2 20 1e     vcmpps $0x1e,(%rax),%xmm3,%xmm4
+    libdis_test+0x530:  c5 d0 c2 71 42 1e  vcmpps $0x1e,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x536:  c5 f4 c2 d0 1e     vcmpps $0x1e,%ymm0,%ymm1,%ymm2
+    libdis_test+0x53b:  c5 e4 c2 23 1e     vcmpps $0x1e,(%rbx),%ymm3,%ymm4
+    libdis_test+0x540:  c5 d4 c2 72 42 1e  vcmpps $0x1e,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x546:  c5 f3 c2 d0 1e     vcmpsd $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x54b:  c5 e3 c2 20 1e     vcmpsd $0x1e,(%rax),%xmm3,%xmm4
+    libdis_test+0x550:  c5 d3 c2 71 42 1e  vcmpsd $0x1e,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x556:  c5 f2 c2 d0 1e     vcmpss $0x1e,%xmm0,%xmm1,%xmm2
+    libdis_test+0x55b:  c5 e2 c2 20 1e     vcmpss $0x1e,(%rax),%xmm3,%xmm4
+    libdis_test+0x560:  c5 d2 c2 71 42 1e  vcmpss $0x1e,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x566:  c5 f1 c2 d0 0e     vcmppd $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x56b:  c5 e1 c2 20 0e     vcmppd $0xe,(%rax),%xmm3,%xmm4
+    libdis_test+0x570:  c5 d1 c2 71 42 0e  vcmppd $0xe,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x576:  c5 f5 c2 d0 0e     vcmppd $0xe,%ymm0,%ymm1,%ymm2
+    libdis_test+0x57b:  c5 e5 c2 23 0e     vcmppd $0xe,(%rbx),%ymm3,%ymm4
+    libdis_test+0x580:  c5 d5 c2 72 42 0e  vcmppd $0xe,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x586:  c5 f0 c2 d0 0e     vcmpps $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x58b:  c5 e0 c2 20 0e     vcmpps $0xe,(%rax),%xmm3,%xmm4
+    libdis_test+0x590:  c5 d0 c2 71 42 0e  vcmpps $0xe,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x596:  c5 f4 c2 d0 0e     vcmpps $0xe,%ymm0,%ymm1,%ymm2
+    libdis_test+0x59b:  c5 e4 c2 23 0e     vcmpps $0xe,(%rbx),%ymm3,%ymm4
+    libdis_test+0x5a0:  c5 d4 c2 72 42 0e  vcmpps $0xe,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x5a6:  c5 f3 c2 d0 0e     vcmpsd $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5ab:  c5 e3 c2 20 0e     vcmpsd $0xe,(%rax),%xmm3,%xmm4
+    libdis_test+0x5b0:  c5 d3 c2 71 42 0e  vcmpsd $0xe,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x5b6:  c5 f2 c2 d0 0e     vcmpss $0xe,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5bb:  c5 e2 c2 20 0e     vcmpss $0xe,(%rax),%xmm3,%xmm4
+    libdis_test+0x5c0:  c5 d2 c2 71 42 0e  vcmpss $0xe,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x5c6:  c5 f1 c2 d0 12     vcmppd $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5cb:  c5 e1 c2 20 12     vcmppd $0x12,(%rax),%xmm3,%xmm4
+    libdis_test+0x5d0:  c5 d1 c2 71 42 12  vcmppd $0x12,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x5d6:  c5 f5 c2 d0 12     vcmppd $0x12,%ymm0,%ymm1,%ymm2
+    libdis_test+0x5db:  c5 e5 c2 23 12     vcmppd $0x12,(%rbx),%ymm3,%ymm4
+    libdis_test+0x5e0:  c5 d5 c2 72 42 12  vcmppd $0x12,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x5e6:  c5 f0 c2 d0 12     vcmpps $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x5eb:  c5 e0 c2 20 12     vcmpps $0x12,(%rax),%xmm3,%xmm4
+    libdis_test+0x5f0:  c5 d0 c2 71 42 12  vcmpps $0x12,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x5f6:  c5 f4 c2 d0 12     vcmpps $0x12,%ymm0,%ymm1,%ymm2
+    libdis_test+0x5fb:  c5 e4 c2 23 12     vcmpps $0x12,(%rbx),%ymm3,%ymm4
+    libdis_test+0x600:  c5 d4 c2 72 42 12  vcmpps $0x12,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x606:  c5 f3 c2 d0 12     vcmpsd $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x60b:  c5 e3 c2 20 12     vcmpsd $0x12,(%rax),%xmm3,%xmm4
+    libdis_test+0x610:  c5 d3 c2 71 42 12  vcmpsd $0x12,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x616:  c5 f2 c2 d0 12     vcmpss $0x12,%xmm0,%xmm1,%xmm2
+    libdis_test+0x61b:  c5 e2 c2 20 12     vcmpss $0x12,(%rax),%xmm3,%xmm4
+    libdis_test+0x620:  c5 d2 c2 71 42 12  vcmpss $0x12,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x626:  c5 f1 c2 d0 02     vcmppd $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x62b:  c5 e1 c2 20 02     vcmppd $0x2,(%rax),%xmm3,%xmm4
+    libdis_test+0x630:  c5 d1 c2 71 42 02  vcmppd $0x2,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x636:  c5 f5 c2 d0 02     vcmppd $0x2,%ymm0,%ymm1,%ymm2
+    libdis_test+0x63b:  c5 e5 c2 23 02     vcmppd $0x2,(%rbx),%ymm3,%ymm4
+    libdis_test+0x640:  c5 d5 c2 72 42 02  vcmppd $0x2,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x646:  c5 f0 c2 d0 02     vcmpps $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x64b:  c5 e0 c2 20 02     vcmpps $0x2,(%rax),%xmm3,%xmm4
+    libdis_test+0x650:  c5 d0 c2 71 42 02  vcmpps $0x2,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x656:  c5 f4 c2 d0 02     vcmpps $0x2,%ymm0,%ymm1,%ymm2
+    libdis_test+0x65b:  c5 e4 c2 23 02     vcmpps $0x2,(%rbx),%ymm3,%ymm4
+    libdis_test+0x660:  c5 d4 c2 72 42 02  vcmpps $0x2,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x666:  c5 f3 c2 d0 02     vcmpsd $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x66b:  c5 e3 c2 20 02     vcmpsd $0x2,(%rax),%xmm3,%xmm4
+    libdis_test+0x670:  c5 d3 c2 71 42 02  vcmpsd $0x2,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x676:  c5 f2 c2 d0 02     vcmpss $0x2,%xmm0,%xmm1,%xmm2
+    libdis_test+0x67b:  c5 e2 c2 20 02     vcmpss $0x2,(%rax),%xmm3,%xmm4
+    libdis_test+0x680:  c5 d2 c2 71 42 02  vcmpss $0x2,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x686:  c5 f1 c2 d0 11     vcmppd $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x68b:  c5 e1 c2 20 11     vcmppd $0x11,(%rax),%xmm3,%xmm4
+    libdis_test+0x690:  c5 d1 c2 71 42 11  vcmppd $0x11,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x696:  c5 f5 c2 d0 11     vcmppd $0x11,%ymm0,%ymm1,%ymm2
+    libdis_test+0x69b:  c5 e5 c2 23 11     vcmppd $0x11,(%rbx),%ymm3,%ymm4
+    libdis_test+0x6a0:  c5 d5 c2 72 42 11  vcmppd $0x11,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x6a6:  c5 f0 c2 d0 11     vcmpps $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6ab:  c5 e0 c2 20 11     vcmpps $0x11,(%rax),%xmm3,%xmm4
+    libdis_test+0x6b0:  c5 d0 c2 71 42 11  vcmpps $0x11,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x6b6:  c5 f4 c2 d0 11     vcmpps $0x11,%ymm0,%ymm1,%ymm2
+    libdis_test+0x6bb:  c5 e4 c2 23 11     vcmpps $0x11,(%rbx),%ymm3,%ymm4
+    libdis_test+0x6c0:  c5 d4 c2 72 42 11  vcmpps $0x11,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x6c6:  c5 f3 c2 d0 11     vcmpsd $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6cb:  c5 e3 c2 20 11     vcmpsd $0x11,(%rax),%xmm3,%xmm4
+    libdis_test+0x6d0:  c5 d3 c2 71 42 11  vcmpsd $0x11,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x6d6:  c5 f2 c2 d0 11     vcmpss $0x11,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6db:  c5 e2 c2 20 11     vcmpss $0x11,(%rax),%xmm3,%xmm4
+    libdis_test+0x6e0:  c5 d2 c2 71 42 11  vcmpss $0x11,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x6e6:  c5 f1 c2 d0 01     vcmppd $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x6eb:  c5 e1 c2 20 01     vcmppd $0x1,(%rax),%xmm3,%xmm4
+    libdis_test+0x6f0:  c5 d1 c2 71 42 01  vcmppd $0x1,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x6f6:  c5 f5 c2 d0 01     vcmppd $0x1,%ymm0,%ymm1,%ymm2
+    libdis_test+0x6fb:  c5 e5 c2 23 01     vcmppd $0x1,(%rbx),%ymm3,%ymm4
+    libdis_test+0x700:  c5 d5 c2 72 42 01  vcmppd $0x1,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x706:  c5 f0 c2 d0 01     vcmpps $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x70b:  c5 e0 c2 20 01     vcmpps $0x1,(%rax),%xmm3,%xmm4
+    libdis_test+0x710:  c5 d0 c2 71 42 01  vcmpps $0x1,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x716:  c5 f4 c2 d0 01     vcmpps $0x1,%ymm0,%ymm1,%ymm2
+    libdis_test+0x71b:  c5 e4 c2 23 01     vcmpps $0x1,(%rbx),%ymm3,%ymm4
+    libdis_test+0x720:  c5 d4 c2 72 42 01  vcmpps $0x1,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x726:  c5 f3 c2 d0 01     vcmpsd $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x72b:  c5 e3 c2 20 01     vcmpsd $0x1,(%rax),%xmm3,%xmm4
+    libdis_test+0x730:  c5 d3 c2 71 42 01  vcmpsd $0x1,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x736:  c5 f2 c2 d0 01     vcmpss $0x1,%xmm0,%xmm1,%xmm2
+    libdis_test+0x73b:  c5 e2 c2 20 01     vcmpss $0x1,(%rax),%xmm3,%xmm4
+    libdis_test+0x740:  c5 d2 c2 71 42 01  vcmpss $0x1,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x746:  c5 f1 c2 d0 0c     vcmppd $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x74b:  c5 e1 c2 20 0c     vcmppd $0xc,(%rax),%xmm3,%xmm4
+    libdis_test+0x750:  c5 d1 c2 71 42 0c  vcmppd $0xc,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x756:  c5 f5 c2 d0 0c     vcmppd $0xc,%ymm0,%ymm1,%ymm2
+    libdis_test+0x75b:  c5 e5 c2 23 0c     vcmppd $0xc,(%rbx),%ymm3,%ymm4
+    libdis_test+0x760:  c5 d5 c2 72 42 0c  vcmppd $0xc,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x766:  c5 f0 c2 d0 0c     vcmpps $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x76b:  c5 e0 c2 20 0c     vcmpps $0xc,(%rax),%xmm3,%xmm4
+    libdis_test+0x770:  c5 d0 c2 71 42 0c  vcmpps $0xc,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x776:  c5 f4 c2 d0 0c     vcmpps $0xc,%ymm0,%ymm1,%ymm2
+    libdis_test+0x77b:  c5 e4 c2 23 0c     vcmpps $0xc,(%rbx),%ymm3,%ymm4
+    libdis_test+0x780:  c5 d4 c2 72 42 0c  vcmpps $0xc,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x786:  c5 f3 c2 d0 0c     vcmpsd $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x78b:  c5 e3 c2 20 0c     vcmpsd $0xc,(%rax),%xmm3,%xmm4
+    libdis_test+0x790:  c5 d3 c2 71 42 0c  vcmpsd $0xc,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x796:  c5 f2 c2 d0 0c     vcmpss $0xc,%xmm0,%xmm1,%xmm2
+    libdis_test+0x79b:  c5 e2 c2 20 0c     vcmpss $0xc,(%rax),%xmm3,%xmm4
+    libdis_test+0x7a0:  c5 d2 c2 71 42 0c  vcmpss $0xc,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x7a6:  c5 f1 c2 d0 1c     vcmppd $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7ab:  c5 e1 c2 20 1c     vcmppd $0x1c,(%rax),%xmm3,%xmm4
+    libdis_test+0x7b0:  c5 d1 c2 71 42 1c  vcmppd $0x1c,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x7b6:  c5 f5 c2 d0 1c     vcmppd $0x1c,%ymm0,%ymm1,%ymm2
+    libdis_test+0x7bb:  c5 e5 c2 23 1c     vcmppd $0x1c,(%rbx),%ymm3,%ymm4
+    libdis_test+0x7c0:  c5 d5 c2 72 42 1c  vcmppd $0x1c,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x7c6:  c5 f0 c2 d0 1c     vcmpps $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7cb:  c5 e0 c2 20 1c     vcmpps $0x1c,(%rax),%xmm3,%xmm4
+    libdis_test+0x7d0:  c5 d0 c2 71 42 1c  vcmpps $0x1c,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x7d6:  c5 f4 c2 d0 1c     vcmpps $0x1c,%ymm0,%ymm1,%ymm2
+    libdis_test+0x7db:  c5 e4 c2 23 1c     vcmpps $0x1c,(%rbx),%ymm3,%ymm4
+    libdis_test+0x7e0:  c5 d4 c2 72 42 1c  vcmpps $0x1c,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x7e6:  c5 f3 c2 d0 1c     vcmpsd $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7eb:  c5 e3 c2 20 1c     vcmpsd $0x1c,(%rax),%xmm3,%xmm4
+    libdis_test+0x7f0:  c5 d3 c2 71 42 1c  vcmpsd $0x1c,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x7f6:  c5 f2 c2 d0 1c     vcmpss $0x1c,%xmm0,%xmm1,%xmm2
+    libdis_test+0x7fb:  c5 e2 c2 20 1c     vcmpss $0x1c,(%rax),%xmm3,%xmm4
+    libdis_test+0x800:  c5 d2 c2 71 42 1c  vcmpss $0x1c,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x806:  c5 f1 c2 d0 14     vcmppd $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x80b:  c5 e1 c2 20 14     vcmppd $0x14,(%rax),%xmm3,%xmm4
+    libdis_test+0x810:  c5 d1 c2 71 42 14  vcmppd $0x14,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x816:  c5 f5 c2 d0 14     vcmppd $0x14,%ymm0,%ymm1,%ymm2
+    libdis_test+0x81b:  c5 e5 c2 23 14     vcmppd $0x14,(%rbx),%ymm3,%ymm4
+    libdis_test+0x820:  c5 d5 c2 72 42 14  vcmppd $0x14,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x826:  c5 f0 c2 d0 14     vcmpps $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x82b:  c5 e0 c2 20 14     vcmpps $0x14,(%rax),%xmm3,%xmm4
+    libdis_test+0x830:  c5 d0 c2 71 42 14  vcmpps $0x14,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x836:  c5 f4 c2 d0 14     vcmpps $0x14,%ymm0,%ymm1,%ymm2
+    libdis_test+0x83b:  c5 e4 c2 23 14     vcmpps $0x14,(%rbx),%ymm3,%ymm4
+    libdis_test+0x840:  c5 d4 c2 72 42 14  vcmpps $0x14,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x846:  c5 f3 c2 d0 14     vcmpsd $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x84b:  c5 e3 c2 20 14     vcmpsd $0x14,(%rax),%xmm3,%xmm4
+    libdis_test+0x850:  c5 d3 c2 71 42 14  vcmpsd $0x14,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x856:  c5 f2 c2 d0 14     vcmpss $0x14,%xmm0,%xmm1,%xmm2
+    libdis_test+0x85b:  c5 e2 c2 20 14     vcmpss $0x14,(%rax),%xmm3,%xmm4
+    libdis_test+0x860:  c5 d2 c2 71 42 14  vcmpss $0x14,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x866:  c5 f1 c2 d0 04     vcmppd $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x86b:  c5 e1 c2 20 04     vcmppd $0x4,(%rax),%xmm3,%xmm4
+    libdis_test+0x870:  c5 d1 c2 71 42 04  vcmppd $0x4,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x876:  c5 f5 c2 d0 04     vcmppd $0x4,%ymm0,%ymm1,%ymm2
+    libdis_test+0x87b:  c5 e5 c2 23 04     vcmppd $0x4,(%rbx),%ymm3,%ymm4
+    libdis_test+0x880:  c5 d5 c2 72 42 04  vcmppd $0x4,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x886:  c5 f0 c2 d0 04     vcmpps $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x88b:  c5 e0 c2 20 04     vcmpps $0x4,(%rax),%xmm3,%xmm4
+    libdis_test+0x890:  c5 d0 c2 71 42 04  vcmpps $0x4,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x896:  c5 f4 c2 d0 04     vcmpps $0x4,%ymm0,%ymm1,%ymm2
+    libdis_test+0x89b:  c5 e4 c2 23 04     vcmpps $0x4,(%rbx),%ymm3,%ymm4
+    libdis_test+0x8a0:  c5 d4 c2 72 42 04  vcmpps $0x4,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x8a6:  c5 f3 c2 d0 04     vcmpsd $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8ab:  c5 e3 c2 20 04     vcmpsd $0x4,(%rax),%xmm3,%xmm4
+    libdis_test+0x8b0:  c5 d3 c2 71 42 04  vcmpsd $0x4,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x8b6:  c5 f2 c2 d0 04     vcmpss $0x4,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8bb:  c5 e2 c2 20 04     vcmpss $0x4,(%rax),%xmm3,%xmm4
+    libdis_test+0x8c0:  c5 d2 c2 71 42 04  vcmpss $0x4,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x8c6:  c5 f1 c2 d0 19     vcmppd $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8cb:  c5 e1 c2 20 19     vcmppd $0x19,(%rax),%xmm3,%xmm4
+    libdis_test+0x8d0:  c5 d1 c2 71 42 19  vcmppd $0x19,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x8d6:  c5 f5 c2 d0 19     vcmppd $0x19,%ymm0,%ymm1,%ymm2
+    libdis_test+0x8db:  c5 e5 c2 23 19     vcmppd $0x19,(%rbx),%ymm3,%ymm4
+    libdis_test+0x8e0:  c5 d5 c2 72 42 19  vcmppd $0x19,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x8e6:  c5 f0 c2 d0 19     vcmpps $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x8eb:  c5 e0 c2 20 19     vcmpps $0x19,(%rax),%xmm3,%xmm4
+    libdis_test+0x8f0:  c5 d0 c2 71 42 19  vcmpps $0x19,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x8f6:  c5 f4 c2 d0 19     vcmpps $0x19,%ymm0,%ymm1,%ymm2
+    libdis_test+0x8fb:  c5 e4 c2 23 19     vcmpps $0x19,(%rbx),%ymm3,%ymm4
+    libdis_test+0x900:  c5 d4 c2 72 42 19  vcmpps $0x19,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x906:  c5 f3 c2 d0 19     vcmpsd $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x90b:  c5 e3 c2 20 19     vcmpsd $0x19,(%rax),%xmm3,%xmm4
+    libdis_test+0x910:  c5 d3 c2 71 42 19  vcmpsd $0x19,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x916:  c5 f2 c2 d0 19     vcmpss $0x19,%xmm0,%xmm1,%xmm2
+    libdis_test+0x91b:  c5 e2 c2 20 19     vcmpss $0x19,(%rax),%xmm3,%xmm4
+    libdis_test+0x920:  c5 d2 c2 71 42 19  vcmpss $0x19,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x926:  c5 f1 c2 d0 09     vcmppd $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x92b:  c5 e1 c2 20 09     vcmppd $0x9,(%rax),%xmm3,%xmm4
+    libdis_test+0x930:  c5 d1 c2 71 42 09  vcmppd $0x9,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x936:  c5 f5 c2 d0 09     vcmppd $0x9,%ymm0,%ymm1,%ymm2
+    libdis_test+0x93b:  c5 e5 c2 23 09     vcmppd $0x9,(%rbx),%ymm3,%ymm4
+    libdis_test+0x940:  c5 d5 c2 72 42 09  vcmppd $0x9,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x946:  c5 f0 c2 d0 09     vcmpps $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x94b:  c5 e0 c2 20 09     vcmpps $0x9,(%rax),%xmm3,%xmm4
+    libdis_test+0x950:  c5 d0 c2 71 42 09  vcmpps $0x9,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x956:  c5 f4 c2 d0 09     vcmpps $0x9,%ymm0,%ymm1,%ymm2
+    libdis_test+0x95b:  c5 e4 c2 23 09     vcmpps $0x9,(%rbx),%ymm3,%ymm4
+    libdis_test+0x960:  c5 d4 c2 72 42 09  vcmpps $0x9,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x966:  c5 f3 c2 d0 09     vcmpsd $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x96b:  c5 e3 c2 20 09     vcmpsd $0x9,(%rax),%xmm3,%xmm4
+    libdis_test+0x970:  c5 d3 c2 71 42 09  vcmpsd $0x9,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x976:  c5 f2 c2 d0 09     vcmpss $0x9,%xmm0,%xmm1,%xmm2
+    libdis_test+0x97b:  c5 e2 c2 20 09     vcmpss $0x9,(%rax),%xmm3,%xmm4
+    libdis_test+0x980:  c5 d2 c2 71 42 09  vcmpss $0x9,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x986:  c5 f1 c2 d0 1a     vcmppd $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x98b:  c5 e1 c2 20 1a     vcmppd $0x1a,(%rax),%xmm3,%xmm4
+    libdis_test+0x990:  c5 d1 c2 71 42 1a  vcmppd $0x1a,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x996:  c5 f5 c2 d0 1a     vcmppd $0x1a,%ymm0,%ymm1,%ymm2
+    libdis_test+0x99b:  c5 e5 c2 23 1a     vcmppd $0x1a,(%rbx),%ymm3,%ymm4
+    libdis_test+0x9a0:  c5 d5 c2 72 42 1a  vcmppd $0x1a,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x9a6:  c5 f0 c2 d0 1a     vcmpps $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9ab:  c5 e0 c2 20 1a     vcmpps $0x1a,(%rax),%xmm3,%xmm4
+    libdis_test+0x9b0:  c5 d0 c2 71 42 1a  vcmpps $0x1a,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x9b6:  c5 f4 c2 d0 1a     vcmpps $0x1a,%ymm0,%ymm1,%ymm2
+    libdis_test+0x9bb:  c5 e4 c2 23 1a     vcmpps $0x1a,(%rbx),%ymm3,%ymm4
+    libdis_test+0x9c0:  c5 d4 c2 72 42 1a  vcmpps $0x1a,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x9c6:  c5 f3 c2 d0 1a     vcmpsd $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9cb:  c5 e3 c2 20 1a     vcmpsd $0x1a,(%rax),%xmm3,%xmm4
+    libdis_test+0x9d0:  c5 d3 c2 71 42 1a  vcmpsd $0x1a,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x9d6:  c5 f2 c2 d0 1a     vcmpss $0x1a,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9db:  c5 e2 c2 20 1a     vcmpss $0x1a,(%rax),%xmm3,%xmm4
+    libdis_test+0x9e0:  c5 d2 c2 71 42 1a  vcmpss $0x1a,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x9e6:  c5 f1 c2 d0 0a     vcmppd $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0x9eb:  c5 e1 c2 20 0a     vcmppd $0xa,(%rax),%xmm3,%xmm4
+    libdis_test+0x9f0:  c5 d1 c2 71 42 0a  vcmppd $0xa,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x9f6:  c5 f5 c2 d0 0a     vcmppd $0xa,%ymm0,%ymm1,%ymm2
+    libdis_test+0x9fb:  c5 e5 c2 23 0a     vcmppd $0xa,(%rbx),%ymm3,%ymm4
+    libdis_test+0xa00:  c5 d5 c2 72 42 0a  vcmppd $0xa,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xa06:  c5 f0 c2 d0 0a     vcmpps $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa0b:  c5 e0 c2 20 0a     vcmpps $0xa,(%rax),%xmm3,%xmm4
+    libdis_test+0xa10:  c5 d0 c2 71 42 0a  vcmpps $0xa,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xa16:  c5 f4 c2 d0 0a     vcmpps $0xa,%ymm0,%ymm1,%ymm2
+    libdis_test+0xa1b:  c5 e4 c2 23 0a     vcmpps $0xa,(%rbx),%ymm3,%ymm4
+    libdis_test+0xa20:  c5 d4 c2 72 42 0a  vcmpps $0xa,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xa26:  c5 f3 c2 d0 0a     vcmpsd $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa2b:  c5 e3 c2 20 0a     vcmpsd $0xa,(%rax),%xmm3,%xmm4
+    libdis_test+0xa30:  c5 d3 c2 71 42 0a  vcmpsd $0xa,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xa36:  c5 f2 c2 d0 0a     vcmpss $0xa,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa3b:  c5 e2 c2 20 0a     vcmpss $0xa,(%rax),%xmm3,%xmm4
+    libdis_test+0xa40:  c5 d2 c2 71 42 0a  vcmpss $0xa,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xa46:  c5 f1 c2 d0 16     vcmppd $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa4b:  c5 e1 c2 20 16     vcmppd $0x16,(%rax),%xmm3,%xmm4
+    libdis_test+0xa50:  c5 d1 c2 71 42 16  vcmppd $0x16,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xa56:  c5 f5 c2 d0 16     vcmppd $0x16,%ymm0,%ymm1,%ymm2
+    libdis_test+0xa5b:  c5 e5 c2 23 16     vcmppd $0x16,(%rbx),%ymm3,%ymm4
+    libdis_test+0xa60:  c5 d5 c2 72 42 16  vcmppd $0x16,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xa66:  c5 f0 c2 d0 16     vcmpps $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa6b:  c5 e0 c2 20 16     vcmpps $0x16,(%rax),%xmm3,%xmm4
+    libdis_test+0xa70:  c5 d0 c2 71 42 16  vcmpps $0x16,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xa76:  c5 f4 c2 d0 16     vcmpps $0x16,%ymm0,%ymm1,%ymm2
+    libdis_test+0xa7b:  c5 e4 c2 23 16     vcmpps $0x16,(%rbx),%ymm3,%ymm4
+    libdis_test+0xa80:  c5 d4 c2 72 42 16  vcmpps $0x16,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xa86:  c5 f3 c2 d0 16     vcmpsd $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa8b:  c5 e3 c2 20 16     vcmpsd $0x16,(%rax),%xmm3,%xmm4
+    libdis_test+0xa90:  c5 d3 c2 71 42 16  vcmpsd $0x16,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xa96:  c5 f2 c2 d0 16     vcmpss $0x16,%xmm0,%xmm1,%xmm2
+    libdis_test+0xa9b:  c5 e2 c2 20 16     vcmpss $0x16,(%rax),%xmm3,%xmm4
+    libdis_test+0xaa0:  c5 d2 c2 71 42 16  vcmpss $0x16,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xaa6:  c5 f1 c2 d0 06     vcmppd $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xaab:  c5 e1 c2 20 06     vcmppd $0x6,(%rax),%xmm3,%xmm4
+    libdis_test+0xab0:  c5 d1 c2 71 42 06  vcmppd $0x6,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xab6:  c5 f5 c2 d0 06     vcmppd $0x6,%ymm0,%ymm1,%ymm2
+    libdis_test+0xabb:  c5 e5 c2 23 06     vcmppd $0x6,(%rbx),%ymm3,%ymm4
+    libdis_test+0xac0:  c5 d5 c2 72 42 06  vcmppd $0x6,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xac6:  c5 f0 c2 d0 06     vcmpps $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xacb:  c5 e0 c2 20 06     vcmpps $0x6,(%rax),%xmm3,%xmm4
+    libdis_test+0xad0:  c5 d0 c2 71 42 06  vcmpps $0x6,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xad6:  c5 f4 c2 d0 06     vcmpps $0x6,%ymm0,%ymm1,%ymm2
+    libdis_test+0xadb:  c5 e4 c2 23 06     vcmpps $0x6,(%rbx),%ymm3,%ymm4
+    libdis_test+0xae0:  c5 d4 c2 72 42 06  vcmpps $0x6,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xae6:  c5 f3 c2 d0 06     vcmpsd $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xaeb:  c5 e3 c2 20 06     vcmpsd $0x6,(%rax),%xmm3,%xmm4
+    libdis_test+0xaf0:  c5 d3 c2 71 42 06  vcmpsd $0x6,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xaf6:  c5 f2 c2 d0 06     vcmpss $0x6,%xmm0,%xmm1,%xmm2
+    libdis_test+0xafb:  c5 e2 c2 20 06     vcmpss $0x6,(%rax),%xmm3,%xmm4
+    libdis_test+0xb00:  c5 d2 c2 71 42 06  vcmpss $0x6,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb06:  c5 f1 c2 d0 15     vcmppd $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb0b:  c5 e1 c2 20 15     vcmppd $0x15,(%rax),%xmm3,%xmm4
+    libdis_test+0xb10:  c5 d1 c2 71 42 15  vcmppd $0x15,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb16:  c5 f5 c2 d0 15     vcmppd $0x15,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb1b:  c5 e5 c2 23 15     vcmppd $0x15,(%rbx),%ymm3,%ymm4
+    libdis_test+0xb20:  c5 d5 c2 72 42 15  vcmppd $0x15,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xb26:  c5 f0 c2 d0 15     vcmpps $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb2b:  c5 e0 c2 20 15     vcmpps $0x15,(%rax),%xmm3,%xmm4
+    libdis_test+0xb30:  c5 d0 c2 71 42 15  vcmpps $0x15,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb36:  c5 f4 c2 d0 15     vcmpps $0x15,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb3b:  c5 e4 c2 23 15     vcmpps $0x15,(%rbx),%ymm3,%ymm4
+    libdis_test+0xb40:  c5 d4 c2 72 42 15  vcmpps $0x15,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xb46:  c5 f3 c2 d0 15     vcmpsd $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb4b:  c5 e3 c2 20 15     vcmpsd $0x15,(%rax),%xmm3,%xmm4
+    libdis_test+0xb50:  c5 d3 c2 71 42 15  vcmpsd $0x15,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb56:  c5 f2 c2 d0 15     vcmpss $0x15,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb5b:  c5 e2 c2 20 15     vcmpss $0x15,(%rax),%xmm3,%xmm4
+    libdis_test+0xb60:  c5 d2 c2 71 42 15  vcmpss $0x15,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb66:  c5 f1 c2 d0 05     vcmppd $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb6b:  c5 e1 c2 20 05     vcmppd $0x5,(%rax),%xmm3,%xmm4
+    libdis_test+0xb70:  c5 d1 c2 71 42 05  vcmppd $0x5,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb76:  c5 f5 c2 d0 05     vcmppd $0x5,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb7b:  c5 e5 c2 23 05     vcmppd $0x5,(%rbx),%ymm3,%ymm4
+    libdis_test+0xb80:  c5 d5 c2 72 42 05  vcmppd $0x5,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xb86:  c5 f0 c2 d0 05     vcmpps $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xb8b:  c5 e0 c2 20 05     vcmpps $0x5,(%rax),%xmm3,%xmm4
+    libdis_test+0xb90:  c5 d0 c2 71 42 05  vcmpps $0x5,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xb96:  c5 f4 c2 d0 05     vcmpps $0x5,%ymm0,%ymm1,%ymm2
+    libdis_test+0xb9b:  c5 e4 c2 23 05     vcmpps $0x5,(%rbx),%ymm3,%ymm4
+    libdis_test+0xba0:  c5 d4 c2 72 42 05  vcmpps $0x5,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xba6:  c5 f3 c2 d0 05     vcmpsd $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbab:  c5 e3 c2 20 05     vcmpsd $0x5,(%rax),%xmm3,%xmm4
+    libdis_test+0xbb0:  c5 d3 c2 71 42 05  vcmpsd $0x5,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xbb6:  c5 f2 c2 d0 05     vcmpss $0x5,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbbb:  c5 e2 c2 20 05     vcmpss $0x5,(%rax),%xmm3,%xmm4
+    libdis_test+0xbc0:  c5 d2 c2 71 42 05  vcmpss $0x5,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xbc6:  c5 f1 c2 d0 17     vcmppd $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbcb:  c5 e1 c2 20 17     vcmppd $0x17,(%rax),%xmm3,%xmm4
+    libdis_test+0xbd0:  c5 d1 c2 71 42 17  vcmppd $0x17,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xbd6:  c5 f5 c2 d0 17     vcmppd $0x17,%ymm0,%ymm1,%ymm2
+    libdis_test+0xbdb:  c5 e5 c2 23 17     vcmppd $0x17,(%rbx),%ymm3,%ymm4
+    libdis_test+0xbe0:  c5 d5 c2 72 42 17  vcmppd $0x17,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xbe6:  c5 f0 c2 d0 17     vcmpps $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xbeb:  c5 e0 c2 20 17     vcmpps $0x17,(%rax),%xmm3,%xmm4
+    libdis_test+0xbf0:  c5 d0 c2 71 42 17  vcmpps $0x17,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xbf6:  c5 f4 c2 d0 17     vcmpps $0x17,%ymm0,%ymm1,%ymm2
+    libdis_test+0xbfb:  c5 e4 c2 23 17     vcmpps $0x17,(%rbx),%ymm3,%ymm4
+    libdis_test+0xc00:  c5 d4 c2 72 42 17  vcmpps $0x17,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xc06:  c5 f3 c2 d0 17     vcmpsd $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc0b:  c5 e3 c2 20 17     vcmpsd $0x17,(%rax),%xmm3,%xmm4
+    libdis_test+0xc10:  c5 d3 c2 71 42 17  vcmpsd $0x17,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xc16:  c5 f2 c2 d0 17     vcmpss $0x17,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc1b:  c5 e2 c2 20 17     vcmpss $0x17,(%rax),%xmm3,%xmm4
+    libdis_test+0xc20:  c5 d2 c2 71 42 17  vcmpss $0x17,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xc26:  c5 f1 c2 d0 07     vcmppd $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc2b:  c5 e1 c2 20 07     vcmppd $0x7,(%rax),%xmm3,%xmm4
+    libdis_test+0xc30:  c5 d1 c2 71 42 07  vcmppd $0x7,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xc36:  c5 f5 c2 d0 07     vcmppd $0x7,%ymm0,%ymm1,%ymm2
+    libdis_test+0xc3b:  c5 e5 c2 23 07     vcmppd $0x7,(%rbx),%ymm3,%ymm4
+    libdis_test+0xc40:  c5 d5 c2 72 42 07  vcmppd $0x7,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xc46:  c5 f0 c2 d0 07     vcmpps $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc4b:  c5 e0 c2 20 07     vcmpps $0x7,(%rax),%xmm3,%xmm4
+    libdis_test+0xc50:  c5 d0 c2 71 42 07  vcmpps $0x7,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xc56:  c5 f4 c2 d0 07     vcmpps $0x7,%ymm0,%ymm1,%ymm2
+    libdis_test+0xc5b:  c5 e4 c2 23 07     vcmpps $0x7,(%rbx),%ymm3,%ymm4
+    libdis_test+0xc60:  c5 d4 c2 72 42 07  vcmpps $0x7,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xc66:  c5 f3 c2 d0 07     vcmpsd $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc6b:  c5 e3 c2 20 07     vcmpsd $0x7,(%rax),%xmm3,%xmm4
+    libdis_test+0xc70:  c5 d3 c2 71 42 07  vcmpsd $0x7,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xc76:  c5 f2 c2 d0 07     vcmpss $0x7,%xmm0,%xmm1,%xmm2
+    libdis_test+0xc7b:  c5 e2 c2 20 07     vcmpss $0x7,(%rax),%xmm3,%xmm4
+    libdis_test+0xc80:  c5 d2 c2 71 42 07  vcmpss $0x7,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xc86:  c5 d1 c2 fb 48     vcmppd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xc8b:  c5 e9 c2 23 48     vcmppd $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0xc90:  c5 f1 c2 73 08 48  vcmppd $0x48,0x8(%rbx),%xmm1,%xmm6
+    libdis_test+0xc96:  c5 d5 c2 fb 48     vcmppd $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0xc9b:  c5 ed c2 23 48     vcmppd $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0xca0:  c5 f5 c2 73 08 48  vcmppd $0x48,0x8(%rbx),%ymm1,%ymm6
+    libdis_test+0xca6:  c5 d0 c2 fb 48     vcmpps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xcab:  c5 e8 c2 23 48     vcmpps $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0xcb0:  c5 f0 c2 73 08 48  vcmpps $0x48,0x8(%rbx),%xmm1,%xmm6
+    libdis_test+0xcb6:  c5 d4 c2 fb 48     vcmpps $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0xcbb:  c5 ec c2 23 48     vcmpps $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0xcc0:  c5 f4 c2 73 08 48  vcmpps $0x48,0x8(%rbx),%ymm1,%ymm6
+    libdis_test+0xcc6:  c5 d3 c2 fb 48     vcmpsd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xccb:  c5 eb c2 23 48     vcmpsd $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0xcd0:  c5 f3 c2 73 08 48  vcmpsd $0x48,0x8(%rbx),%xmm1,%xmm6
+    libdis_test+0xcd6:  c5 d2 c2 fb 48     vcmpss $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0xcdb:  c5 ea c2 23 48     vcmpss $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0xce0:  c5 f2 c2 73 08 48  vcmpss $0x48,0x8(%rbx),%xmm1,%xmm6
+    libdis_test+0xce6:  c5 f1 c2 d0 1f     vcmppd $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xceb:  c5 e1 c2 20 1f     vcmppd $0x1f,(%rax),%xmm3,%xmm4
+    libdis_test+0xcf0:  c5 d1 c2 71 42 1f  vcmppd $0x1f,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xcf6:  c5 f5 c2 d0 1f     vcmppd $0x1f,%ymm0,%ymm1,%ymm2
+    libdis_test+0xcfb:  c5 e5 c2 23 1f     vcmppd $0x1f,(%rbx),%ymm3,%ymm4
+    libdis_test+0xd00:  c5 d5 c2 72 42 1f  vcmppd $0x1f,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xd06:  c5 f0 c2 d0 1f     vcmpps $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd0b:  c5 e0 c2 20 1f     vcmpps $0x1f,(%rax),%xmm3,%xmm4
+    libdis_test+0xd10:  c5 d0 c2 71 42 1f  vcmpps $0x1f,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xd16:  c5 f4 c2 d0 1f     vcmpps $0x1f,%ymm0,%ymm1,%ymm2
+    libdis_test+0xd1b:  c5 e4 c2 23 1f     vcmpps $0x1f,(%rbx),%ymm3,%ymm4
+    libdis_test+0xd20:  c5 d4 c2 72 42 1f  vcmpps $0x1f,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xd26:  c5 f3 c2 d0 1f     vcmpsd $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd2b:  c5 e3 c2 20 1f     vcmpsd $0x1f,(%rax),%xmm3,%xmm4
+    libdis_test+0xd30:  c5 d3 c2 71 42 1f  vcmpsd $0x1f,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xd36:  c5 f2 c2 d0 1f     vcmpss $0x1f,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd3b:  c5 e2 c2 20 1f     vcmpss $0x1f,(%rax),%xmm3,%xmm4
+    libdis_test+0xd40:  c5 d2 c2 71 42 1f  vcmpss $0x1f,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xd46:  c5 f1 c2 d0 0f     vcmppd $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd4b:  c5 e1 c2 20 0f     vcmppd $0xf,(%rax),%xmm3,%xmm4
+    libdis_test+0xd50:  c5 d1 c2 71 42 0f  vcmppd $0xf,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xd56:  c5 f5 c2 d0 0f     vcmppd $0xf,%ymm0,%ymm1,%ymm2
+    libdis_test+0xd5b:  c5 e5 c2 23 0f     vcmppd $0xf,(%rbx),%ymm3,%ymm4
+    libdis_test+0xd60:  c5 d5 c2 72 42 0f  vcmppd $0xf,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xd66:  c5 f0 c2 d0 0f     vcmpps $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd6b:  c5 e0 c2 20 0f     vcmpps $0xf,(%rax),%xmm3,%xmm4
+    libdis_test+0xd70:  c5 d0 c2 71 42 0f  vcmpps $0xf,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xd76:  c5 f4 c2 d0 0f     vcmpps $0xf,%ymm0,%ymm1,%ymm2
+    libdis_test+0xd7b:  c5 e4 c2 23 0f     vcmpps $0xf,(%rbx),%ymm3,%ymm4
+    libdis_test+0xd80:  c5 d4 c2 72 42 0f  vcmpps $0xf,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xd86:  c5 f3 c2 d0 0f     vcmpsd $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd8b:  c5 e3 c2 20 0f     vcmpsd $0xf,(%rax),%xmm3,%xmm4
+    libdis_test+0xd90:  c5 d3 c2 71 42 0f  vcmpsd $0xf,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xd96:  c5 f2 c2 d0 0f     vcmpss $0xf,%xmm0,%xmm1,%xmm2
+    libdis_test+0xd9b:  c5 e2 c2 20 0f     vcmpss $0xf,(%rax),%xmm3,%xmm4
+    libdis_test+0xda0:  c5 d2 c2 71 42 0f  vcmpss $0xf,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xda6:  c5 f1 c2 d0 13     vcmppd $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdab:  c5 e1 c2 20 13     vcmppd $0x13,(%rax),%xmm3,%xmm4
+    libdis_test+0xdb0:  c5 d1 c2 71 42 13  vcmppd $0x13,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xdb6:  c5 f5 c2 d0 13     vcmppd $0x13,%ymm0,%ymm1,%ymm2
+    libdis_test+0xdbb:  c5 e5 c2 23 13     vcmppd $0x13,(%rbx),%ymm3,%ymm4
+    libdis_test+0xdc0:  c5 d5 c2 72 42 13  vcmppd $0x13,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xdc6:  c5 f0 c2 d0 13     vcmpps $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdcb:  c5 e0 c2 20 13     vcmpps $0x13,(%rax),%xmm3,%xmm4
+    libdis_test+0xdd0:  c5 d0 c2 71 42 13  vcmpps $0x13,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xdd6:  c5 f4 c2 d0 13     vcmpps $0x13,%ymm0,%ymm1,%ymm2
+    libdis_test+0xddb:  c5 e4 c2 23 13     vcmpps $0x13,(%rbx),%ymm3,%ymm4
+    libdis_test+0xde0:  c5 d4 c2 72 42 13  vcmpps $0x13,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xde6:  c5 f3 c2 d0 13     vcmpsd $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdeb:  c5 e3 c2 20 13     vcmpsd $0x13,(%rax),%xmm3,%xmm4
+    libdis_test+0xdf0:  c5 d3 c2 71 42 13  vcmpsd $0x13,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xdf6:  c5 f2 c2 d0 13     vcmpss $0x13,%xmm0,%xmm1,%xmm2
+    libdis_test+0xdfb:  c5 e2 c2 20 13     vcmpss $0x13,(%rax),%xmm3,%xmm4
+    libdis_test+0xe00:  c5 d2 c2 71 42 13  vcmpss $0x13,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xe06:  c5 f1 c2 d0 03     vcmppd $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe0b:  c5 e1 c2 20 03     vcmppd $0x3,(%rax),%xmm3,%xmm4
+    libdis_test+0xe10:  c5 d1 c2 71 42 03  vcmppd $0x3,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xe16:  c5 f5 c2 d0 03     vcmppd $0x3,%ymm0,%ymm1,%ymm2
+    libdis_test+0xe1b:  c5 e5 c2 23 03     vcmppd $0x3,(%rbx),%ymm3,%ymm4
+    libdis_test+0xe20:  c5 d5 c2 72 42 03  vcmppd $0x3,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xe26:  c5 f0 c2 d0 03     vcmpps $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe2b:  c5 e0 c2 20 03     vcmpps $0x3,(%rax),%xmm3,%xmm4
+    libdis_test+0xe30:  c5 d0 c2 71 42 03  vcmpps $0x3,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xe36:  c5 f4 c2 d0 03     vcmpps $0x3,%ymm0,%ymm1,%ymm2
+    libdis_test+0xe3b:  c5 e4 c2 23 03     vcmpps $0x3,(%rbx),%ymm3,%ymm4
+    libdis_test+0xe40:  c5 d4 c2 72 42 03  vcmpps $0x3,0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xe46:  c5 f3 c2 d0 03     vcmpsd $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe4b:  c5 e3 c2 20 03     vcmpsd $0x3,(%rax),%xmm3,%xmm4
+    libdis_test+0xe50:  c5 d3 c2 71 42 03  vcmpsd $0x3,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xe56:  c5 f2 c2 d0 03     vcmpss $0x3,%xmm0,%xmm1,%xmm2
+    libdis_test+0xe5b:  c5 e2 c2 20 03     vcmpss $0x3,(%rax),%xmm3,%xmm4
+    libdis_test+0xe60:  c5 d2 c2 71 42 03  vcmpss $0x3,0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xe66:  c5 f9 2f c8        vcomisd %xmm0,%xmm1
+    libdis_test+0xe6a:  c5 f9 2f 1e        vcomisd (%rsi),%xmm3
+    libdis_test+0xe6e:  c5 f9 2f 5f 42     vcomisd 0x42(%rdi),%xmm3
+    libdis_test+0xe73:  c5 f8 2f c8        vcomiss %xmm0,%xmm1
+    libdis_test+0xe77:  c5 f8 2f 1e        vcomiss (%rsi),%xmm3
+    libdis_test+0xe7b:  c5 f8 2f 5f 42     vcomiss 0x42(%rdi),%xmm3
+    libdis_test+0xe80:  c5 fa e6 c8        vcvtdq2pd %xmm0,%xmm1
+    libdis_test+0xe84:  c5 fa e6 1e        vcvtdq2pd (%rsi),%xmm3
+    libdis_test+0xe88:  c5 fa e6 5f 42     vcvtdq2pd 0x42(%rdi),%xmm3
+    libdis_test+0xe8d:  c5 fe e6 f7        vcvtdq2pd %xmm7,%ymm6
+    libdis_test+0xe91:  c5 fe e6 65 00     vcvtdq2pd 0x0(%rbp),%ymm4
+    libdis_test+0xe96:  c5 fe e6 64 24 42  vcvtdq2pd 0x42(%rsp),%ymm4
+    libdis_test+0xe9c:  c5 f8 5b c8        vcvtdq2ps %xmm0,%xmm1
+    libdis_test+0xea0:  c5 f8 5b 1e        vcvtdq2ps (%rsi),%xmm3
+    libdis_test+0xea4:  c5 f8 5b 5f 42     vcvtdq2ps 0x42(%rdi),%xmm3
+    libdis_test+0xea9:  c5 fc 5b f7        vcvtdq2ps %ymm7,%ymm6
+    libdis_test+0xead:  c5 fc 5b 65 00     vcvtdq2ps 0x0(%rbp),%ymm4
+    libdis_test+0xeb2:  c5 fc 5b 64 24 42  vcvtdq2ps 0x42(%rsp),%ymm4
+    libdis_test+0xeb8:  c5 ff e6 de        vcvtpd2dq %ymm6,%xmm3
+    libdis_test+0xebc:  c5 fb e6 c8        vcvtpd2dq %xmm0,%xmm1
+    libdis_test+0xec0:  c5 fb e6 1e        vcvtpd2dq (%rsi),%xmm3
+    libdis_test+0xec4:  c5 fb e6 5f 42     vcvtpd2dq 0x42(%rdi),%xmm3
+    libdis_test+0xec9:  c5 ff e6 f7        vcvtpd2dq %ymm7,%xmm6
+    libdis_test+0xecd:  c5 ff e6 65 00     vcvtpd2dq 0x0(%rbp),%xmm4
+    libdis_test+0xed2:  c5 ff e6 64 24 42  vcvtpd2dq 0x42(%rsp),%xmm4
+    libdis_test+0xed8:  c5 fd 5a de        vcvtpd2ps %ymm6,%xmm3
+    libdis_test+0xedc:  c5 f9 5a c8        vcvtpd2ps %xmm0,%xmm1
+    libdis_test+0xee0:  c5 f9 5a 1e        vcvtpd2ps (%rsi),%xmm3
+    libdis_test+0xee4:  c5 f9 5a 5f 42     vcvtpd2ps 0x42(%rdi),%xmm3
+    libdis_test+0xee9:  c5 fd 5a f7        vcvtpd2ps %ymm7,%xmm6
+    libdis_test+0xeed:  c5 fd 5a 65 00     vcvtpd2ps 0x0(%rbp),%xmm4
+    libdis_test+0xef2:  c5 fd 5a 64 24 42  vcvtpd2ps 0x42(%rsp),%xmm4
+    libdis_test+0xef8:  c5 f9 5b c8        vcvtps2dq %xmm0,%xmm1
+    libdis_test+0xefc:  c5 f9 5b 1e        vcvtps2dq (%rsi),%xmm3
+    libdis_test+0xf00:  c5 f9 5b 5f 42     vcvtps2dq 0x42(%rdi),%xmm3
+    libdis_test+0xf05:  c5 fd 5b f7        vcvtps2dq %ymm7,%ymm6
+    libdis_test+0xf09:  c5 fd 5b 65 00     vcvtps2dq 0x0(%rbp),%ymm4
+    libdis_test+0xf0e:  c5 fd 5b 64 24 42  vcvtps2dq 0x42(%rsp),%ymm4
+    libdis_test+0xf14:  c5 f8 5a c8        vcvtps2pd %xmm0,%xmm1
+    libdis_test+0xf18:  c5 f8 5a 1e        vcvtps2pd (%rsi),%xmm3
+    libdis_test+0xf1c:  c5 f8 5a 5f 42     vcvtps2pd 0x42(%rdi),%xmm3
+    libdis_test+0xf21:  c5 fc 5a f7        vcvtps2pd %xmm7,%ymm6
+    libdis_test+0xf25:  c5 fc 5a 65 00     vcvtps2pd 0x0(%rbp),%ymm4
+    libdis_test+0xf2a:  c5 fc 5a 64 24 42  vcvtps2pd 0x42(%rsp),%ymm4
+    libdis_test+0xf30:  c4 e1 fb 2d c6     vcvtsd2si %xmm6,%rax
+    libdis_test+0xf35:  c4 e1 fb 2d 03     vcvtsd2si (%rbx),%rax
+    libdis_test+0xf3a:  c4 e1 fb 2d 43 24  vcvtsd2si 0x24(%rbx),%rax
+    libdis_test+0xf40:  c5 f3 5a d0        vcvtsd2ss %xmm0,%xmm1,%xmm2
+    libdis_test+0xf44:  c5 e3 5a 20        vcvtsd2ss (%rax),%xmm3,%xmm4
+    libdis_test+0xf48:  c5 d3 5a 71 42     vcvtsd2ss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xf4d:  c5 f2 5a d0        vcvtss2sd %xmm0,%xmm1,%xmm2
+    libdis_test+0xf51:  c5 e2 5a 20        vcvtss2sd (%rax),%xmm3,%xmm4
+    libdis_test+0xf55:  c5 d2 5a 71 42     vcvtss2sd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xf5a:  c4 e1 fa 2d c6     vcvtss2si %xmm6,%rax
+    libdis_test+0xf5f:  c4 e1 fa 2d 03     vcvtss2si (%rbx),%rax
+    libdis_test+0xf64:  c4 e1 fa 2d 43 24  vcvtss2si 0x24(%rbx),%rax
+    libdis_test+0xf6a:  c5 f9 e6 e8        vcvttpd2dq %xmm0,%xmm5
+    libdis_test+0xf6e:  c5 f9 e6 c8        vcvttpd2dq %xmm0,%xmm1
+    libdis_test+0xf72:  c5 f9 e6 1e        vcvttpd2dq (%rsi),%xmm3
+    libdis_test+0xf76:  c5 f9 e6 5f 42     vcvttpd2dq 0x42(%rdi),%xmm3
+    libdis_test+0xf7b:  c5 fd e6 f7        vcvttpd2dq %ymm7,%xmm6
+    libdis_test+0xf7f:  c5 fd e6 65 00     vcvttpd2dq 0x0(%rbp),%xmm4
+    libdis_test+0xf84:  c5 fd e6 64 24 42  vcvttpd2dq 0x42(%rsp),%xmm4
+    libdis_test+0xf8a:  c5 fa 5b c8        vcvttps2dq %xmm0,%xmm1
+    libdis_test+0xf8e:  c5 fa 5b 1e        vcvttps2dq (%rsi),%xmm3
+    libdis_test+0xf92:  c5 fa 5b 5f 42     vcvttps2dq 0x42(%rdi),%xmm3
+    libdis_test+0xf97:  c5 fe 5b f7        vcvttps2dq %ymm7,%ymm6
+    libdis_test+0xf9b:  c5 fe 5b 65 00     vcvttps2dq 0x0(%rbp),%ymm4
+    libdis_test+0xfa0:  c5 fe 5b 64 24 42  vcvttps2dq 0x42(%rsp),%ymm4
+    libdis_test+0xfa6:  c4 e1 fb 2c c6     vcvttsd2si %xmm6,%rax
+    libdis_test+0xfab:  c4 e1 fb 2c 03     vcvttsd2si (%rbx),%rax
+    libdis_test+0xfb0:  c4 e1 fb 2c 43 24  vcvttsd2si 0x24(%rbx),%rax
+    libdis_test+0xfb6:  c4 e1 fa 2c c6     vcvttss2si %xmm6,%rax
+    libdis_test+0xfbb:  c4 e1 fa 2c 03     vcvttss2si (%rbx),%rax
+    libdis_test+0xfc0:  c4 e1 fa 2c 43 24  vcvttss2si 0x24(%rbx),%rax
+    libdis_test+0xfc6:  c5 f1 5e d0        vdivpd %xmm0,%xmm1,%xmm2
+    libdis_test+0xfca:  c5 e1 5e 20        vdivpd (%rax),%xmm3,%xmm4
+    libdis_test+0xfce:  c5 d1 5e 71 42     vdivpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xfd3:  c5 f5 5e d0        vdivpd %ymm0,%ymm1,%ymm2
+    libdis_test+0xfd7:  c5 e5 5e 23        vdivpd (%rbx),%ymm3,%ymm4
+    libdis_test+0xfdb:  c5 d5 5e 72 42     vdivpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xfe0:  c5 f0 5e d0        vdivps %xmm0,%xmm1,%xmm2
+    libdis_test+0xfe4:  c5 e0 5e 20        vdivps (%rax),%xmm3,%xmm4
+    libdis_test+0xfe8:  c5 d0 5e 71 42     vdivps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0xfed:  c5 f4 5e d0        vdivps %ymm0,%ymm1,%ymm2
+    libdis_test+0xff1:  c5 e4 5e 23        vdivps (%rbx),%ymm3,%ymm4
+    libdis_test+0xff5:  c5 d4 5e 72 42     vdivps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0xffa:  c5 f3 5e d0        vdivsd %xmm0,%xmm1,%xmm2
+    libdis_test+0xffe:  c5 e3 5e 20        vdivsd (%rax),%xmm3,%xmm4
+    libdis_test+0x1002: c5 d3 5e 71 42     vdivsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1007: c5 f2 5e d0        vdivss %xmm0,%xmm1,%xmm2
+    libdis_test+0x100b: c5 e2 5e 20        vdivss (%rax),%xmm3,%xmm4
+    libdis_test+0x100f: c5 d2 5e 71 42     vdivss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1014: c4 e3 51 41 fb 48  vdppd  $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x101a: c4 e3 69 41 23 48  vdppd  $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x1020: c4 e3 71 41 73 08  vdppd  $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x1027: c4 e3 51 40 fb 48  vdpps  $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x102d: c4 e3 69 40 23 48  vdpps  $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x1033: c4 e3 71 40 73 08  vdpps  $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x103a: c4 e3 55 40 fb 48  vdpps  $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x1040: c4 e3 6d 40 23 48  vdpps  $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x1046: c4 e3 75 40 73 08  vdpps  $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x104d: c4 e3 7d 19 c1 30  vextractf128 $0x30,%ymm0,%xmm1
+    libdis_test+0x1053: c4 e3 7d 19 01 30  vextractf128 $0x30,%ymm0,(%rcx)
+    libdis_test+0x1059: c4 e3 7d 19 42 24  vextractf128 $0x30,%ymm0,0x24(%rdx)
+                        30 
+    libdis_test+0x1060: c4 e3 79 17 c0 30  vextractps $0x30,%xmm0,%eax
+    libdis_test+0x1066: c4 e3 79 17 01 30  vextractps $0x30,%xmm0,(%rcx)
+    libdis_test+0x106c: c4 e3 79 17 42 24  vextractps $0x30,%xmm0,0x24(%rdx)
+                        30 
+    libdis_test+0x1073: c5 f1 7c d0        vhaddpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1077: c5 e1 7c 20        vhaddpd (%rax),%xmm3,%xmm4
+    libdis_test+0x107b: c5 d1 7c 71 42     vhaddpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1080: c5 f5 7c d0        vhaddpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1084: c5 e5 7c 23        vhaddpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1088: c5 d5 7c 72 42     vhaddpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x108d: c5 f3 7c d0        vhaddps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1091: c5 e3 7c 20        vhaddps (%rax),%xmm3,%xmm4
+    libdis_test+0x1095: c5 d3 7c 71 42     vhaddps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x109a: c5 f7 7c d0        vhaddps %ymm0,%ymm1,%ymm2
+    libdis_test+0x109e: c5 e7 7c 23        vhaddps (%rbx),%ymm3,%ymm4
+    libdis_test+0x10a2: c5 d7 7c 72 42     vhaddps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x10a7: c5 f1 7d d0        vhsubpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x10ab: c5 e1 7d 20        vhsubpd (%rax),%xmm3,%xmm4
+    libdis_test+0x10af: c5 d1 7d 71 42     vhsubpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x10b4: c5 f5 7d d0        vhsubpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x10b8: c5 e5 7d 23        vhsubpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x10bc: c5 d5 7d 72 42     vhsubpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x10c1: c5 f3 7d d0        vhsubps %xmm0,%xmm1,%xmm2
+    libdis_test+0x10c5: c5 e3 7d 20        vhsubps (%rax),%xmm3,%xmm4
+    libdis_test+0x10c9: c5 d3 7d 71 42     vhsubps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x10ce: c5 f7 7d d0        vhsubps %ymm0,%ymm1,%ymm2
+    libdis_test+0x10d2: c5 e7 7d 23        vhsubps (%rbx),%ymm3,%ymm4
+    libdis_test+0x10d6: c5 d7 7d 72 42     vhsubps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x10db: c4 e3 55 18 fb 48  vinsertf128 $0x48,%xmm3,%ymm5,%ymm7
+    libdis_test+0x10e1: c4 e3 6d 18 23 48  vinsertf128 $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x10e7: c4 e3 75 18 73 08  vinsertf128 $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x10ee: c4 e3 51 21 fb 48  vinsertps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x10f4: c4 e3 69 21 23 48  vinsertps $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x10fa: c4 e3 71 21 73 08  vinsertps $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x1101: c5 fb f0 13        vlddqu (%rbx),%xmm2
+    libdis_test+0x1105: c5 fb f0 4b 08     vlddqu 0x8(%rbx),%xmm1
+    libdis_test+0x110a: c5 ff f0 13        vlddqu (%rbx),%ymm2
+    libdis_test+0x110e: c5 ff f0 4b 08     vlddqu 0x8(%rbx),%ymm1
+    libdis_test+0x1113: c5 f8 ae 12        vldmxcsr (%rdx)
+    libdis_test+0x1117: c5 f8 ae 52 08     vldmxcsr 0x8(%rdx)
+    libdis_test+0x111c: c5 f9 f7 e8        vmaskmovdqu %xmm0,%xmm5
+    libdis_test+0x1120: c4 e2 59 2d 13     vmaskmovpd (%rbx),%xmm4,%xmm2
+    libdis_test+0x1125: c4 e2 69 2d 4b 08  vmaskmovpd 0x8(%rbx),%xmm2,%xmm1
+    libdis_test+0x112b: c4 e2 5d 2c 13     vmaskmovps (%rbx),%ymm4,%ymm2
+    libdis_test+0x1130: c4 e2 65 2c 4b 08  vmaskmovps 0x8(%rbx),%ymm3,%ymm1
+    libdis_test+0x1136: c5 f1 5f d0        vmaxpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x113a: c5 e1 5f 20        vmaxpd (%rax),%xmm3,%xmm4
+    libdis_test+0x113e: c5 d1 5f 71 42     vmaxpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1143: c5 f5 5f d0        vmaxpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1147: c5 e5 5f 23        vmaxpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x114b: c5 d5 5f 72 42     vmaxpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1150: c5 f0 5f d0        vmaxps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1154: c5 e0 5f 20        vmaxps (%rax),%xmm3,%xmm4
+    libdis_test+0x1158: c5 d0 5f 71 42     vmaxps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x115d: c5 f4 5f d0        vmaxps %ymm0,%ymm1,%ymm2
+    libdis_test+0x1161: c5 e4 5f 23        vmaxps (%rbx),%ymm3,%ymm4
+    libdis_test+0x1165: c5 d4 5f 72 42     vmaxps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x116a: c5 f3 5f d0        vmaxsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x116e: c5 e3 5f 20        vmaxsd (%rax),%xmm3,%xmm4
+    libdis_test+0x1172: c5 d3 5f 71 42     vmaxsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1177: c5 f2 5f d0        vmaxss %xmm0,%xmm1,%xmm2
+    libdis_test+0x117b: c5 e2 5f 20        vmaxss (%rax),%xmm3,%xmm4
+    libdis_test+0x117f: c5 d2 5f 71 42     vmaxss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1184: c5 f1 5d d0        vminpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1188: c5 e1 5d 20        vminpd (%rax),%xmm3,%xmm4
+    libdis_test+0x118c: c5 d1 5d 71 42     vminpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1191: c5 f5 5d d0        vminpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1195: c5 e5 5d 23        vminpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1199: c5 d5 5d 72 42     vminpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x119e: c5 f0 5d d0        vminps %xmm0,%xmm1,%xmm2
+    libdis_test+0x11a2: c5 e0 5d 20        vminps (%rax),%xmm3,%xmm4
+    libdis_test+0x11a6: c5 d0 5d 71 42     vminps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x11ab: c5 f4 5d d0        vminps %ymm0,%ymm1,%ymm2
+    libdis_test+0x11af: c5 e4 5d 23        vminps (%rbx),%ymm3,%ymm4
+    libdis_test+0x11b3: c5 d4 5d 72 42     vminps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x11b8: c5 f3 5d d0        vminsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x11bc: c5 e3 5d 20        vminsd (%rax),%xmm3,%xmm4
+    libdis_test+0x11c0: c5 d3 5d 71 42     vminsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x11c5: c5 f2 5d d0        vminss %xmm0,%xmm1,%xmm2
+    libdis_test+0x11c9: c5 e2 5d 20        vminss (%rax),%xmm3,%xmm4
+    libdis_test+0x11cd: c5 d2 5d 71 42     vminss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x11d2: c5 f9 28 c8        vmovapd %xmm0,%xmm1
+    libdis_test+0x11d6: c5 f9 28 1e        vmovapd (%rsi),%xmm3
+    libdis_test+0x11da: c5 f9 28 5f 42     vmovapd 0x42(%rdi),%xmm3
+    libdis_test+0x11df: c5 fd 28 f7        vmovapd %ymm7,%ymm6
+    libdis_test+0x11e3: c5 fd 28 65 00     vmovapd 0x0(%rbp),%ymm4
+    libdis_test+0x11e8: c5 fd 28 64 24 42  vmovapd 0x42(%rsp),%ymm4
+    libdis_test+0x11ee: c5 f9 28 c1        vmovapd %xmm1,%xmm0
+    libdis_test+0x11f2: c5 f9 29 1e        vmovapd %xmm3,(%rsi)
+    libdis_test+0x11f6: c5 f9 29 5f 42     vmovapd %xmm3,0x42(%rdi)
+    libdis_test+0x11fb: c5 fd 28 c1        vmovapd %ymm1,%ymm0
+    libdis_test+0x11ff: c5 fd 29 1e        vmovapd %ymm3,(%rsi)
+    libdis_test+0x1203: c5 fd 29 5f 42     vmovapd %ymm3,0x42(%rdi)
+    libdis_test+0x1208: c5 f8 28 c8        vmovaps %xmm0,%xmm1
+    libdis_test+0x120c: c5 f8 28 1e        vmovaps (%rsi),%xmm3
+    libdis_test+0x1210: c5 f8 28 5f 42     vmovaps 0x42(%rdi),%xmm3
+    libdis_test+0x1215: c5 fc 28 f7        vmovaps %ymm7,%ymm6
+    libdis_test+0x1219: c5 fc 28 65 00     vmovaps 0x0(%rbp),%ymm4
+    libdis_test+0x121e: c5 fc 28 64 24 42  vmovaps 0x42(%rsp),%ymm4
+    libdis_test+0x1224: c5 f8 28 c1        vmovaps %xmm1,%xmm0
+    libdis_test+0x1228: c5 f8 29 1e        vmovaps %xmm3,(%rsi)
+    libdis_test+0x122c: c5 f8 29 5f 42     vmovaps %xmm3,0x42(%rdi)
+    libdis_test+0x1231: c5 fc 28 c1        vmovaps %ymm1,%ymm0
+    libdis_test+0x1235: c5 fc 29 1e        vmovaps %ymm3,(%rsi)
+    libdis_test+0x1239: c5 fc 29 5f 42     vmovaps %ymm3,0x42(%rdi)
+    libdis_test+0x123e: c4 e1 f9 6e c0     vmovq  %rax,%xmm0
+    libdis_test+0x1243: c5 f9 6e 08        vmovd  (%rax),%xmm1
+    libdis_test+0x1247: c5 f9 6e 48 14     vmovd  0x14(%rax),%xmm1
+    libdis_test+0x124c: c5 fb 12 c8        vmovddup %xmm0,%xmm1
+    libdis_test+0x1250: c5 fb 12 1e        vmovddup (%rsi),%xmm3
+    libdis_test+0x1254: c5 fb 12 5f 42     vmovddup 0x42(%rdi),%xmm3
+    libdis_test+0x1259: c5 ff 12 f7        vmovddup %ymm7,%ymm6
+    libdis_test+0x125d: c5 ff 12 65 00     vmovddup 0x0(%rbp),%ymm4
+    libdis_test+0x1262: c5 ff 12 64 24 42  vmovddup 0x42(%rsp),%ymm4
+    libdis_test+0x1268: c5 f9 6f c8        vmovdqa %xmm0,%xmm1
+    libdis_test+0x126c: c5 f9 6f 1e        vmovdqa (%rsi),%xmm3
+    libdis_test+0x1270: c5 f9 6f 5f 42     vmovdqa 0x42(%rdi),%xmm3
+    libdis_test+0x1275: c5 fd 6f f7        vmovdqa %ymm7,%ymm6
+    libdis_test+0x1279: c5 fd 6f 65 00     vmovdqa 0x0(%rbp),%ymm4
+    libdis_test+0x127e: c5 fd 6f 64 24 42  vmovdqa 0x42(%rsp),%ymm4
+    libdis_test+0x1284: c5 f9 6f c1        vmovdqa %xmm1,%xmm0
+    libdis_test+0x1288: c5 f9 7f 1e        vmovdqa %xmm3,(%rsi)
+    libdis_test+0x128c: c5 f9 7f 5f 42     vmovdqa %xmm3,0x42(%rdi)
+    libdis_test+0x1291: c5 fd 6f c1        vmovdqa %ymm1,%ymm0
+    libdis_test+0x1295: c5 fd 7f 1e        vmovdqa %ymm3,(%rsi)
+    libdis_test+0x1299: c5 fd 7f 5f 42     vmovdqa %ymm3,0x42(%rdi)
+    libdis_test+0x129e: c5 fa 6f c8        vmovdqu %xmm0,%xmm1
+    libdis_test+0x12a2: c5 fa 6f 1e        vmovdqu (%rsi),%xmm3
+    libdis_test+0x12a6: c5 fa 6f 5f 42     vmovdqu 0x42(%rdi),%xmm3
+    libdis_test+0x12ab: c5 fe 6f f7        vmovdqu %ymm7,%ymm6
+    libdis_test+0x12af: c5 fe 6f 65 00     vmovdqu 0x0(%rbp),%ymm4
+    libdis_test+0x12b4: c5 fe 6f 64 24 42  vmovdqu 0x42(%rsp),%ymm4
+    libdis_test+0x12ba: c5 fa 6f c1        vmovdqu %xmm1,%xmm0
+    libdis_test+0x12be: c5 fa 7f 1e        vmovdqu %xmm3,(%rsi)
+    libdis_test+0x12c2: c5 fa 7f 5f 42     vmovdqu %xmm3,0x42(%rdi)
+    libdis_test+0x12c7: c5 fe 6f c1        vmovdqu %ymm1,%ymm0
+    libdis_test+0x12cb: c5 fe 7f 1e        vmovdqu %ymm3,(%rsi)
+    libdis_test+0x12cf: c5 fe 7f 5f 42     vmovdqu %ymm3,0x42(%rdi)
+    libdis_test+0x12d4: c5 e8 12 e0        vmovhlps %xmm0,%xmm2,%xmm4
+    libdis_test+0x12d8: c5 d9 16 13        vmovhpd (%rbx),%xmm4,%xmm2
+    libdis_test+0x12dc: c5 e1 16 4b 08     vmovhpd 0x8(%rbx),%xmm3,%xmm1
+    libdis_test+0x12e1: c5 f9 17 1e        vmovhpd %xmm3,(%rsi)
+    libdis_test+0x12e5: c5 f9 17 5f 42     vmovhpd %xmm3,0x42(%rdi)
+    libdis_test+0x12ea: c5 d8 16 13        vmovhps (%rbx),%xmm4,%xmm2
+    libdis_test+0x12ee: c5 e0 16 4b 08     vmovhps 0x8(%rbx),%xmm3,%xmm1
+    libdis_test+0x12f3: c5 f8 17 1e        vmovhps %xmm3,(%rsi)
+    libdis_test+0x12f7: c5 f8 17 5f 42     vmovhps %xmm3,0x42(%rdi)
+    libdis_test+0x12fc: c5 e0 16 e9        vmovlhps %xmm1,%xmm3,%xmm5
+    libdis_test+0x1300: c5 d9 12 13        vmovlpd (%rbx),%xmm4,%xmm2
+    libdis_test+0x1304: c5 e1 12 4b 08     vmovlpd 0x8(%rbx),%xmm3,%xmm1
+    libdis_test+0x1309: c5 f9 13 1e        vmovlpd %xmm3,(%rsi)
+    libdis_test+0x130d: c5 f9 13 5f 42     vmovlpd %xmm3,0x42(%rdi)
+    libdis_test+0x1312: c5 d8 12 13        vmovlps (%rbx),%xmm4,%xmm2
+    libdis_test+0x1316: c5 e0 12 4b 08     vmovlps 0x8(%rbx),%xmm3,%xmm1
+    libdis_test+0x131b: c5 f8 13 1e        vmovlps %xmm3,(%rsi)
+    libdis_test+0x131f: c5 f8 13 5f 42     vmovlps %xmm3,0x42(%rdi)
+    libdis_test+0x1324: c5 f9 50 c0        vmovmskpd %xmm0,%eax
+    libdis_test+0x1328: c5 fd 50 d9        vmovmskpd %ymm1,%ebx
+    libdis_test+0x132c: c5 f8 50 ca        vmovmskps %xmm2,%ecx
+    libdis_test+0x1330: c5 fc 50 d3        vmovmskps %ymm3,%edx
+    libdis_test+0x1334: c5 f9 e7 2f        vmovntdq %xmm5,(%rdi)
+    libdis_test+0x1338: c5 f9 e7 6f 24     vmovntdq %xmm5,0x24(%rdi)
+    libdis_test+0x133d: c5 fd e7 36        vmovntdq %ymm6,(%rsi)
+    libdis_test+0x1341: c5 fd e7 76 24     vmovntdq %ymm6,0x24(%rsi)
+    libdis_test+0x1346: c4 e2 79 2a 13     vmovntdqa (%rbx),%xmm2
+    libdis_test+0x134b: c4 e2 79 2a 4b 08  vmovntdqa 0x8(%rbx),%xmm1
+    libdis_test+0x1351: c4 e2 7d 2a 13     vmovntdqa (%rbx),%ymm2
+    libdis_test+0x1356: c4 e2 7d 2a 4b 08  vmovntdqa 0x8(%rbx),%ymm1
+    libdis_test+0x135c: c5 f9 2b 1e        vmovntpd %xmm3,(%rsi)
+    libdis_test+0x1360: c5 f9 2b 5f 42     vmovntpd %xmm3,0x42(%rdi)
+    libdis_test+0x1365: c5 fd 2b 1e        vmovntpd %ymm3,(%rsi)
+    libdis_test+0x1369: c5 fd 2b 5f 42     vmovntpd %ymm3,0x42(%rdi)
+    libdis_test+0x136e: c5 f8 2b 1e        vmovntps %xmm3,(%rsi)
+    libdis_test+0x1372: c5 f8 2b 5f 42     vmovntps %xmm3,0x42(%rdi)
+    libdis_test+0x1377: c5 fc 2b 1e        vmovntps %ymm3,(%rsi)
+    libdis_test+0x137b: c5 fc 2b 5f 42     vmovntps %ymm3,0x42(%rdi)
+    libdis_test+0x1380: c4 e1 f9 7e c0     vmovq  %xmm0,%rax
+    libdis_test+0x1385: c5 f9 d6 00        vmovq  %xmm0,(%rax)
+    libdis_test+0x1389: c5 f9 d6 40 10     vmovq  %xmm0,0x10(%rax)
+    libdis_test+0x138e: c5 fa 7e 4b 10     vmovq  0x10(%rbx),%xmm1
+    libdis_test+0x1393: c5 fa 7e 0b        vmovq  (%rbx),%xmm1
+    libdis_test+0x1397: c4 e1 f9 6e cb     vmovq  %rbx,%xmm1
+    libdis_test+0x139c: c5 eb 10 e0        vmovsd %xmm0,%xmm2,%xmm4
+    libdis_test+0x13a0: c5 fb 10 08        vmovsd (%rax),%xmm1
+    libdis_test+0x13a4: c5 fb 10 50 32     vmovsd 0x32(%rax),%xmm2
+    libdis_test+0x13a9: c5 fa 16 d0        vmovshdup %xmm0,%xmm2
+    libdis_test+0x13ad: c5 fa 16 08        vmovshdup (%rax),%xmm1
+    libdis_test+0x13b1: c5 fa 16 48 10     vmovshdup 0x10(%rax),%xmm1
+    libdis_test+0x13b6: c5 fe 16 d0        vmovshdup %ymm0,%ymm2
+    libdis_test+0x13ba: c5 fe 16 0b        vmovshdup (%rbx),%ymm1
+    libdis_test+0x13be: c5 fe 16 5b 10     vmovshdup 0x10(%rbx),%ymm3
+    libdis_test+0x13c3: c5 fa 12 d0        vmovsldup %xmm0,%xmm2
+    libdis_test+0x13c7: c5 fa 12 08        vmovsldup (%rax),%xmm1
+    libdis_test+0x13cb: c5 fa 12 48 10     vmovsldup 0x10(%rax),%xmm1
+    libdis_test+0x13d0: c5 fe 12 d0        vmovsldup %ymm0,%ymm2
+    libdis_test+0x13d4: c5 fe 12 0b        vmovsldup (%rbx),%ymm1
+    libdis_test+0x13d8: c5 fe 12 5b 10     vmovsldup 0x10(%rbx),%ymm3
+    libdis_test+0x13dd: c5 ea 10 e0        vmovss %xmm0,%xmm2,%xmm4
+    libdis_test+0x13e1: c5 fa 10 08        vmovss (%rax),%xmm1
+    libdis_test+0x13e5: c5 fa 10 50 32     vmovss 0x32(%rax),%xmm2
+    libdis_test+0x13ea: c5 f9 10 c8        vmovupd %xmm0,%xmm1
+    libdis_test+0x13ee: c5 f9 10 1e        vmovupd (%rsi),%xmm3
+    libdis_test+0x13f2: c5 f9 10 5f 42     vmovupd 0x42(%rdi),%xmm3
+    libdis_test+0x13f7: c5 fd 10 f7        vmovupd %ymm7,%ymm6
+    libdis_test+0x13fb: c5 fd 10 65 00     vmovupd 0x0(%rbp),%ymm4
+    libdis_test+0x1400: c5 fd 10 64 24 42  vmovupd 0x42(%rsp),%ymm4
+    libdis_test+0x1406: c5 f9 10 c1        vmovupd %xmm1,%xmm0
+    libdis_test+0x140a: c5 f9 11 1e        vmovupd %xmm3,(%rsi)
+    libdis_test+0x140e: c5 f9 11 5f 42     vmovupd %xmm3,0x42(%rdi)
+    libdis_test+0x1413: c5 fd 10 c1        vmovupd %ymm1,%ymm0
+    libdis_test+0x1417: c5 fd 11 1e        vmovupd %ymm3,(%rsi)
+    libdis_test+0x141b: c5 fd 11 5f 42     vmovupd %ymm3,0x42(%rdi)
+    libdis_test+0x1420: c5 f8 10 c8        vmovups %xmm0,%xmm1
+    libdis_test+0x1424: c5 f8 10 1e        vmovups (%rsi),%xmm3
+    libdis_test+0x1428: c5 f8 10 5f 42     vmovups 0x42(%rdi),%xmm3
+    libdis_test+0x142d: c5 fc 10 f7        vmovups %ymm7,%ymm6
+    libdis_test+0x1431: c5 fc 10 65 00     vmovups 0x0(%rbp),%ymm4
+    libdis_test+0x1436: c5 fc 10 64 24 42  vmovups 0x42(%rsp),%ymm4
+    libdis_test+0x143c: c5 f8 10 c1        vmovups %xmm1,%xmm0
+    libdis_test+0x1440: c5 f8 11 1e        vmovups %xmm3,(%rsi)
+    libdis_test+0x1444: c5 f8 11 5f 42     vmovups %xmm3,0x42(%rdi)
+    libdis_test+0x1449: c5 fc 10 c1        vmovups %ymm1,%ymm0
+    libdis_test+0x144d: c5 fc 11 1e        vmovups %ymm3,(%rsi)
+    libdis_test+0x1451: c5 fc 11 5f 42     vmovups %ymm3,0x42(%rdi)
+    libdis_test+0x1456: c4 e3 51 42 fb 48  vmpsadbw $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x145c: c4 e3 69 42 23 48  vmpsadbw $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x1462: c4 e3 71 42 73 08  vmpsadbw $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x1469: c4 e3 55 42 fb 48  vmpsadbw $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x146f: c4 e3 6d 42 23 48  vmpsadbw $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x1475: c4 e3 75 42 73 08  vmpsadbw $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x147c: c5 f1 59 d0        vmulpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1480: c5 e1 59 20        vmulpd (%rax),%xmm3,%xmm4
+    libdis_test+0x1484: c5 d1 59 71 42     vmulpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1489: c5 f5 59 d0        vmulpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x148d: c5 e5 59 23        vmulpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1491: c5 d5 59 72 42     vmulpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1496: c5 f0 59 d0        vmulps %xmm0,%xmm1,%xmm2
+    libdis_test+0x149a: c5 e0 59 20        vmulps (%rax),%xmm3,%xmm4
+    libdis_test+0x149e: c5 d0 59 71 42     vmulps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x14a3: c5 f4 59 d0        vmulps %ymm0,%ymm1,%ymm2
+    libdis_test+0x14a7: c5 e4 59 23        vmulps (%rbx),%ymm3,%ymm4
+    libdis_test+0x14ab: c5 d4 59 72 42     vmulps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x14b0: c5 f3 59 d0        vmulsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x14b4: c5 e3 59 20        vmulsd (%rax),%xmm3,%xmm4
+    libdis_test+0x14b8: c5 d3 59 71 42     vmulsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x14bd: c5 f2 59 d0        vmulss %xmm0,%xmm1,%xmm2
+    libdis_test+0x14c1: c5 e2 59 20        vmulss (%rax),%xmm3,%xmm4
+    libdis_test+0x14c5: c5 d2 59 71 42     vmulss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x14ca: c5 f1 56 d0        vorpd  %xmm0,%xmm1,%xmm2
+    libdis_test+0x14ce: c5 e1 56 20        vorpd  (%rax),%xmm3,%xmm4
+    libdis_test+0x14d2: c5 d1 56 71 42     vorpd  0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x14d7: c5 f5 56 d0        vorpd  %ymm0,%ymm1,%ymm2
+    libdis_test+0x14db: c5 e5 56 23        vorpd  (%rbx),%ymm3,%ymm4
+    libdis_test+0x14df: c5 d5 56 72 42     vorpd  0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x14e4: c5 f0 56 d0        vorps  %xmm0,%xmm1,%xmm2
+    libdis_test+0x14e8: c5 e0 56 20        vorps  (%rax),%xmm3,%xmm4
+    libdis_test+0x14ec: c5 d0 56 71 42     vorps  0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x14f1: c5 f4 56 d0        vorps  %ymm0,%ymm1,%ymm2
+    libdis_test+0x14f5: c5 e4 56 23        vorps  (%rbx),%ymm3,%ymm4
+    libdis_test+0x14f9: c5 d4 56 72 42     vorps  0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x14fe: c4 e2 79 1c c8     vpabsb %xmm0,%xmm1
+    libdis_test+0x1503: c4 e2 79 1c 1e     vpabsb (%rsi),%xmm3
+    libdis_test+0x1508: c4 e2 79 1c 5f 42  vpabsb 0x42(%rdi),%xmm3
+    libdis_test+0x150e: c4 e2 7d 1c f7     vpabsb %ymm7,%ymm6
+    libdis_test+0x1513: c4 e2 7d 1c 65 00  vpabsb 0x0(%rbp),%ymm4
+    libdis_test+0x1519: c4 e2 7d 1c 64 24  vpabsb 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1520: c4 e2 79 1e c8     vpabsd %xmm0,%xmm1
+    libdis_test+0x1525: c4 e2 79 1e 1e     vpabsd (%rsi),%xmm3
+    libdis_test+0x152a: c4 e2 79 1e 5f 42  vpabsd 0x42(%rdi),%xmm3
+    libdis_test+0x1530: c4 e2 7d 1e f7     vpabsd %ymm7,%ymm6
+    libdis_test+0x1535: c4 e2 7d 1e 65 00  vpabsd 0x0(%rbp),%ymm4
+    libdis_test+0x153b: c4 e2 7d 1e 64 24  vpabsd 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1542: c4 e2 79 1d c8     vpabsw %xmm0,%xmm1
+    libdis_test+0x1547: c4 e2 79 1d 1e     vpabsw (%rsi),%xmm3
+    libdis_test+0x154c: c4 e2 79 1d 5f 42  vpabsw 0x42(%rdi),%xmm3
+    libdis_test+0x1552: c4 e2 7d 1d f7     vpabsw %ymm7,%ymm6
+    libdis_test+0x1557: c4 e2 7d 1d 65 00  vpabsw 0x0(%rbp),%ymm4
+    libdis_test+0x155d: c4 e2 7d 1d 64 24  vpabsw 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1564: c5 f1 6b d0        vpackssdw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1568: c5 e1 6b 20        vpackssdw (%rax),%xmm3,%xmm4
+    libdis_test+0x156c: c5 d1 6b 71 42     vpackssdw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1571: c5 f5 6b d0        vpackssdw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1575: c5 e5 6b 23        vpackssdw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1579: c5 d5 6b 72 42     vpackssdw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x157e: c5 f1 63 d0        vpacksswb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1582: c5 e1 63 20        vpacksswb (%rax),%xmm3,%xmm4
+    libdis_test+0x1586: c5 d1 63 71 42     vpacksswb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x158b: c5 f5 63 d0        vpacksswb %ymm0,%ymm1,%ymm2
+    libdis_test+0x158f: c5 e5 63 23        vpacksswb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1593: c5 d5 63 72 42     vpacksswb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1598: c4 e2 71 2b d0     vpackusdw %xmm0,%xmm1,%xmm2
+    libdis_test+0x159d: c4 e2 61 2b 20     vpackusdw (%rax),%xmm3,%xmm4
+    libdis_test+0x15a2: c4 e2 51 2b 71 42  vpackusdw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x15a8: c4 e2 75 2b d0     vpackusdw %ymm0,%ymm1,%ymm2
+    libdis_test+0x15ad: c4 e2 65 2b 23     vpackusdw (%rbx),%ymm3,%ymm4
+    libdis_test+0x15b2: c4 e2 55 2b 72 42  vpackusdw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x15b8: c5 f1 67 d0        vpackuswb %xmm0,%xmm1,%xmm2
+    libdis_test+0x15bc: c5 e1 67 20        vpackuswb (%rax),%xmm3,%xmm4
+    libdis_test+0x15c0: c5 d1 67 71 42     vpackuswb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x15c5: c5 f5 67 d0        vpackuswb %ymm0,%ymm1,%ymm2
+    libdis_test+0x15c9: c5 e5 67 23        vpackuswb (%rbx),%ymm3,%ymm4
+    libdis_test+0x15cd: c5 d5 67 72 42     vpackuswb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x15d2: c5 f1 fc d0        vpaddb %xmm0,%xmm1,%xmm2
+    libdis_test+0x15d6: c5 e1 fc 20        vpaddb (%rax),%xmm3,%xmm4
+    libdis_test+0x15da: c5 d1 fc 71 42     vpaddb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x15df: c5 f5 fc d0        vpaddb %ymm0,%ymm1,%ymm2
+    libdis_test+0x15e3: c5 e5 fc 23        vpaddb (%rbx),%ymm3,%ymm4
+    libdis_test+0x15e7: c5 d5 fc 72 42     vpaddb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x15ec: c5 f1 fe d0        vpaddd %xmm0,%xmm1,%xmm2
+    libdis_test+0x15f0: c5 e1 fe 20        vpaddd (%rax),%xmm3,%xmm4
+    libdis_test+0x15f4: c5 d1 fe 71 42     vpaddd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x15f9: c5 f5 fe d0        vpaddd %ymm0,%ymm1,%ymm2
+    libdis_test+0x15fd: c5 e5 fe 23        vpaddd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1601: c5 d5 fe 72 42     vpaddd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1606: c5 f1 d4 d0        vpaddq %xmm0,%xmm1,%xmm2
+    libdis_test+0x160a: c5 e1 d4 20        vpaddq (%rax),%xmm3,%xmm4
+    libdis_test+0x160e: c5 d1 d4 71 42     vpaddq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1613: c5 f5 d4 d0        vpaddq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1617: c5 e5 d4 23        vpaddq (%rbx),%ymm3,%ymm4
+    libdis_test+0x161b: c5 d5 d4 72 42     vpaddq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1620: c5 f1 ec d0        vpaddsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1624: c5 e1 ec 20        vpaddsb (%rax),%xmm3,%xmm4
+    libdis_test+0x1628: c5 d1 ec 71 42     vpaddsb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x162d: c5 f5 ec d0        vpaddsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1631: c5 e5 ec 23        vpaddsb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1635: c5 d5 ec 72 42     vpaddsb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x163a: c5 f1 ed d0        vpaddsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x163e: c5 e1 ed 20        vpaddsw (%rax),%xmm3,%xmm4
+    libdis_test+0x1642: c5 d1 ed 71 42     vpaddsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1647: c5 f5 ed d0        vpaddsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x164b: c5 e5 ed 23        vpaddsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x164f: c5 d5 ed 72 42     vpaddsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1654: c5 f1 dc d0        vpaddusb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1658: c5 e1 dc 20        vpaddusb (%rax),%xmm3,%xmm4
+    libdis_test+0x165c: c5 d1 dc 71 42     vpaddusb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1661: c5 f5 dc d0        vpaddusb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1665: c5 e5 dc 23        vpaddusb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1669: c5 d5 dc 72 42     vpaddusb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x166e: c5 f1 dd d0        vpaddusw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1672: c5 e1 dd 20        vpaddusw (%rax),%xmm3,%xmm4
+    libdis_test+0x1676: c5 d1 dd 71 42     vpaddusw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x167b: c5 f5 dd d0        vpaddusw %ymm0,%ymm1,%ymm2
+    libdis_test+0x167f: c5 e5 dd 23        vpaddusw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1683: c5 d5 dd 72 42     vpaddusw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1688: c5 f1 fd d0        vpaddw %xmm0,%xmm1,%xmm2
+    libdis_test+0x168c: c5 e1 fd 20        vpaddw (%rax),%xmm3,%xmm4
+    libdis_test+0x1690: c5 d1 fd 71 42     vpaddw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1695: c5 f5 fd d0        vpaddw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1699: c5 e5 fd 23        vpaddw (%rbx),%ymm3,%ymm4
+    libdis_test+0x169d: c5 d5 fd 72 42     vpaddw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x16a2: c4 e3 51 0f fb 48  vpalignr $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x16a8: c4 e3 69 0f 23 48  vpalignr $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x16ae: c4 e3 71 0f 73 08  vpalignr $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x16b5: c4 e3 55 0f fb 48  vpalignr $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x16bb: c4 e3 6d 0f 23 48  vpalignr $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x16c1: c4 e3 75 0f 73 08  vpalignr $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x16c8: c5 f1 db d0        vpand  %xmm0,%xmm1,%xmm2
+    libdis_test+0x16cc: c5 e1 db 20        vpand  (%rax),%xmm3,%xmm4
+    libdis_test+0x16d0: c5 d1 db 71 42     vpand  0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x16d5: c5 f5 db d0        vpand  %ymm0,%ymm1,%ymm2
+    libdis_test+0x16d9: c5 e5 db 23        vpand  (%rbx),%ymm3,%ymm4
+    libdis_test+0x16dd: c5 d5 db 72 42     vpand  0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x16e2: c5 f1 df d0        vpandn %xmm0,%xmm1,%xmm2
+    libdis_test+0x16e6: c5 e1 df 20        vpandn (%rax),%xmm3,%xmm4
+    libdis_test+0x16ea: c5 d1 df 71 42     vpandn 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x16ef: c5 f5 df d0        vpandn %ymm0,%ymm1,%ymm2
+    libdis_test+0x16f3: c5 e5 df 23        vpandn (%rbx),%ymm3,%ymm4
+    libdis_test+0x16f7: c5 d5 df 72 42     vpandn 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x16fc: c5 f1 e0 d0        vpavgb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1700: c5 e1 e0 20        vpavgb (%rax),%xmm3,%xmm4
+    libdis_test+0x1704: c5 d1 e0 71 42     vpavgb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1709: c5 f5 e0 d0        vpavgb %ymm0,%ymm1,%ymm2
+    libdis_test+0x170d: c5 e5 e0 23        vpavgb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1711: c5 d5 e0 72 42     vpavgb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1716: c5 f1 e3 d0        vpavgw %xmm0,%xmm1,%xmm2
+    libdis_test+0x171a: c5 e1 e3 20        vpavgw (%rax),%xmm3,%xmm4
+    libdis_test+0x171e: c5 d1 e3 71 42     vpavgw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1723: c5 f5 e3 d0        vpavgw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1727: c5 e5 e3 23        vpavgw (%rbx),%ymm3,%ymm4
+    libdis_test+0x172b: c5 d5 e3 72 42     vpavgw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1730: c4 e3 69 4c d9 00  vpblendvb %xmm0,%xmm1,%xmm2,%xmm3
+    libdis_test+0x1736: c4 e3 69 4c 18 00  vpblendvb %xmm0,(%rax),%xmm2,%xmm3
+    libdis_test+0x173c: c4 e3 69 4c 5b 10  vpblendvb %xmm0,0x10(%rbx),%xmm2,%xmm3
+                        00 
+    libdis_test+0x1743: c4 e3 6d 4c d9 00  vpblendvb %ymm0,%ymm1,%ymm2,%ymm3
+    libdis_test+0x1749: c4 e3 6d 4c 18 00  vpblendvb %ymm0,(%rax),%ymm2,%ymm3
+    libdis_test+0x174f: c4 e3 6d 4c 5b 10  vpblendvb %ymm0,0x10(%rbx),%ymm2,%ymm3
+                        00 
+    libdis_test+0x1756: c4 e3 51 0e fb 48  vpblendw $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x175c: c4 e3 69 0e 23 48  vpblendw $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x1762: c4 e3 71 0e 73 08  vpblendw $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x1769: c4 e3 55 0e fb 48  vpblendw $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x176f: c4 e3 6d 0e 23 48  vpblendw $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x1775: c4 e3 75 0e 73 08  vpblendw $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x177c: c4 e3 51 44 fb 48  vpclmulqdq $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x1782: c4 e3 69 44 23 48  vpclmulqdq $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x1788: c4 e3 71 44 73 08  vpclmulqdq $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x178f: c5 f1 74 d0        vpcmpeqb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1793: c5 e1 74 20        vpcmpeqb (%rax),%xmm3,%xmm4
+    libdis_test+0x1797: c5 d1 74 71 42     vpcmpeqb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x179c: c5 f5 74 d0        vpcmpeqb %ymm0,%ymm1,%ymm2
+    libdis_test+0x17a0: c5 e5 74 23        vpcmpeqb (%rbx),%ymm3,%ymm4
+    libdis_test+0x17a4: c5 d5 74 72 42     vpcmpeqb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x17a9: c5 f1 76 d0        vpcmpeqd %xmm0,%xmm1,%xmm2
+    libdis_test+0x17ad: c5 e1 76 20        vpcmpeqd (%rax),%xmm3,%xmm4
+    libdis_test+0x17b1: c5 d1 76 71 42     vpcmpeqd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x17b6: c5 f5 76 d0        vpcmpeqd %ymm0,%ymm1,%ymm2
+    libdis_test+0x17ba: c5 e5 76 23        vpcmpeqd (%rbx),%ymm3,%ymm4
+    libdis_test+0x17be: c5 d5 76 72 42     vpcmpeqd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x17c3: c4 e2 71 29 d0     vpcmpeqq %xmm0,%xmm1,%xmm2
+    libdis_test+0x17c8: c4 e2 61 29 20     vpcmpeqq (%rax),%xmm3,%xmm4
+    libdis_test+0x17cd: c4 e2 51 29 71 42  vpcmpeqq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x17d3: c4 e2 75 29 d0     vpcmpeqq %ymm0,%ymm1,%ymm2
+    libdis_test+0x17d8: c4 e2 65 29 23     vpcmpeqq (%rbx),%ymm3,%ymm4
+    libdis_test+0x17dd: c4 e2 55 29 72 42  vpcmpeqq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x17e3: c5 f1 75 d0        vpcmpeqw %xmm0,%xmm1,%xmm2
+    libdis_test+0x17e7: c5 e1 75 20        vpcmpeqw (%rax),%xmm3,%xmm4
+    libdis_test+0x17eb: c5 d1 75 71 42     vpcmpeqw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x17f0: c5 f5 75 d0        vpcmpeqw %ymm0,%ymm1,%ymm2
+    libdis_test+0x17f4: c5 e5 75 23        vpcmpeqw (%rbx),%ymm3,%ymm4
+    libdis_test+0x17f8: c5 d5 75 72 42     vpcmpeqw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x17fd: c4 e3 79 61 c8 42  vpcmpestri $0x42,%xmm0,%xmm1
+    libdis_test+0x1803: c4 e3 79 61 1e 23  vpcmpestri $0x23,(%rsi),%xmm3
+    libdis_test+0x1809: c4 e3 79 61 5f 42  vpcmpestri $0x42,0x42(%rdi),%xmm3
+                        42 
+    libdis_test+0x1810: c4 e3 79 60 c8 42  vpcmpestrm $0x42,%xmm0,%xmm1
+    libdis_test+0x1816: c4 e3 79 60 1e 23  vpcmpestrm $0x23,(%rsi),%xmm3
+    libdis_test+0x181c: c4 e3 79 60 5f 42  vpcmpestrm $0x42,0x42(%rdi),%xmm3
+                        42 
+    libdis_test+0x1823: c5 f1 64 d0        vpcmpgtb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1827: c5 e1 64 20        vpcmpgtb (%rax),%xmm3,%xmm4
+    libdis_test+0x182b: c5 d1 64 71 42     vpcmpgtb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1830: c5 f5 64 d0        vpcmpgtb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1834: c5 e5 64 23        vpcmpgtb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1838: c5 d5 64 72 42     vpcmpgtb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x183d: c5 f1 66 d0        vpcmpgtd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1841: c5 e1 66 20        vpcmpgtd (%rax),%xmm3,%xmm4
+    libdis_test+0x1845: c5 d1 66 71 42     vpcmpgtd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x184a: c5 f5 66 d0        vpcmpgtd %ymm0,%ymm1,%ymm2
+    libdis_test+0x184e: c5 e5 66 23        vpcmpgtd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1852: c5 d5 66 72 42     vpcmpgtd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1857: c4 e2 71 37 d0     vpcmpgtq %xmm0,%xmm1,%xmm2
+    libdis_test+0x185c: c4 e2 61 37 20     vpcmpgtq (%rax),%xmm3,%xmm4
+    libdis_test+0x1861: c4 e2 51 37 71 42  vpcmpgtq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1867: c4 e2 75 37 d0     vpcmpgtq %ymm0,%ymm1,%ymm2
+    libdis_test+0x186c: c4 e2 65 37 23     vpcmpgtq (%rbx),%ymm3,%ymm4
+    libdis_test+0x1871: c4 e2 55 37 72 42  vpcmpgtq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1877: c5 f1 65 d0        vpcmpgtw %xmm0,%xmm1,%xmm2
+    libdis_test+0x187b: c5 e1 65 20        vpcmpgtw (%rax),%xmm3,%xmm4
+    libdis_test+0x187f: c5 d1 65 71 42     vpcmpgtw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1884: c5 f5 65 d0        vpcmpgtw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1888: c5 e5 65 23        vpcmpgtw (%rbx),%ymm3,%ymm4
+    libdis_test+0x188c: c5 d5 65 72 42     vpcmpgtw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1891: c4 e3 79 63 c8 42  vpcmpistri $0x42,%xmm0,%xmm1
+    libdis_test+0x1897: c4 e3 79 63 1e 23  vpcmpistri $0x23,(%rsi),%xmm3
+    libdis_test+0x189d: c4 e3 79 63 5f 42  vpcmpistri $0x42,0x42(%rdi),%xmm3
+                        42 
+    libdis_test+0x18a4: c4 e3 79 62 c8 42  vpcmpistrm $0x42,%xmm0,%xmm1
+    libdis_test+0x18aa: c4 e3 79 62 1e 23  vpcmpistrm $0x23,(%rsi),%xmm3
+    libdis_test+0x18b0: c4 e3 79 62 5f 42  vpcmpistrm $0x42,0x42(%rdi),%xmm3
+                        42 
+    libdis_test+0x18b7: c4 e3 55 06 fb 48  vperm2f128 $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x18bd: c4 e3 6d 06 23 48  vperm2f128 $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x18c3: c4 e3 75 06 73 08  vperm2f128 $0x48,0x8(%rbx),%ymm1,%ymm6
+                        48 
+    libdis_test+0x18ca: c4 e2 71 0d d0     vpermilpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x18cf: c4 e2 61 0d 20     vpermilpd (%rax),%xmm3,%xmm4
+    libdis_test+0x18d4: c4 e2 51 0d 71 42  vpermilpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x18da: c4 e2 75 0d d0     vpermilpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x18df: c4 e2 65 0d 23     vpermilpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x18e4: c4 e2 55 0d 72 42  vpermilpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x18ea: c4 e3 7d 05 c8 42  vpermilpd $0x42,%ymm0,%ymm1
+    libdis_test+0x18f0: c4 e3 7d 05 1e 23  vpermilpd $0x23,(%rsi),%ymm3
+    libdis_test+0x18f6: c4 e3 7d 05 5f 42  vpermilpd $0x42,0x42(%rdi),%ymm3
+                        42 
+    libdis_test+0x18fd: c4 e2 71 0c d0     vpermilps %xmm0,%xmm1,%xmm2
+    libdis_test+0x1902: c4 e2 61 0c 20     vpermilps (%rax),%xmm3,%xmm4
+    libdis_test+0x1907: c4 e2 51 0c 71 42  vpermilps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x190d: c4 e2 75 0c d0     vpermilps %ymm0,%ymm1,%ymm2
+    libdis_test+0x1912: c4 e2 65 0c 23     vpermilps (%rbx),%ymm3,%ymm4
+    libdis_test+0x1917: c4 e2 55 0c 72 42  vpermilps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x191d: c4 e3 7d 04 c8 42  vpermilps $0x42,%ymm0,%ymm1
+    libdis_test+0x1923: c4 e3 7d 04 1e 23  vpermilps $0x23,(%rsi),%ymm3
+    libdis_test+0x1929: c4 e3 7d 04 5f 42  vpermilps $0x42,0x42(%rdi),%ymm3
+                        42 
+    libdis_test+0x1930: c4 e3 79 14 c0 23  vpextrb $0x23,%xmm0,%eax
+    libdis_test+0x1936: c4 e3 79 14 0b 23  vpextrb $0x23,%xmm1,(%rbx)
+    libdis_test+0x193c: c4 e3 79 14 51 16  vpextrb $0x23,%xmm2,0x16(%rcx)
+                        23 
+    libdis_test+0x1943: c4 e3 79 16 0b 23  vpextrd $0x23,%xmm1,(%rbx)
+    libdis_test+0x1949: c4 e3 79 16 51 16  vpextrd $0x23,%xmm2,0x16(%rcx)
+                        23 
+    libdis_test+0x1950: c4 e3 f9 16 c0 23  vpextrq $0x23,%xmm0,%rax
+    libdis_test+0x1956: c4 e3 f9 16 0b 23  vpextrq $0x23,%xmm1,(%rbx)
+    libdis_test+0x195c: c4 e3 f9 16 51 16  vpextrq $0x23,%xmm2,0x16(%rcx)
+                        23 
+    libdis_test+0x1963: c5 f9 c5 c0 23     vpextrw $0x23,%xmm0,%eax
+    libdis_test+0x1968: c4 e3 79 15 0b 23  vpextrw $0x23,%xmm1,(%rbx)
+    libdis_test+0x196e: c4 e3 79 15 51 16  vpextrw $0x23,%xmm2,0x16(%rcx)
+                        23 
+    libdis_test+0x1975: c4 e2 71 02 d0     vphaddd %xmm0,%xmm1,%xmm2
+    libdis_test+0x197a: c4 e2 61 02 20     vphaddd (%rax),%xmm3,%xmm4
+    libdis_test+0x197f: c4 e2 51 02 71 42  vphaddd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1985: c4 e2 75 02 d0     vphaddd %ymm0,%ymm1,%ymm2
+    libdis_test+0x198a: c4 e2 65 02 23     vphaddd (%rbx),%ymm3,%ymm4
+    libdis_test+0x198f: c4 e2 55 02 72 42  vphaddd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1995: c4 e2 71 03 d0     vphaddsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x199a: c4 e2 61 03 20     vphaddsw (%rax),%xmm3,%xmm4
+    libdis_test+0x199f: c4 e2 51 03 71 42  vphaddsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x19a5: c4 e2 75 03 d0     vphaddsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x19aa: c4 e2 65 03 23     vphaddsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x19af: c4 e2 55 03 72 42  vphaddsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x19b5: c4 e2 71 01 d0     vphaddw %xmm0,%xmm1,%xmm2
+    libdis_test+0x19ba: c4 e2 61 01 20     vphaddw (%rax),%xmm3,%xmm4
+    libdis_test+0x19bf: c4 e2 51 01 71 42  vphaddw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x19c5: c4 e2 75 01 d0     vphaddw %ymm0,%ymm1,%ymm2
+    libdis_test+0x19ca: c4 e2 65 01 23     vphaddw (%rbx),%ymm3,%ymm4
+    libdis_test+0x19cf: c4 e2 55 01 72 42  vphaddw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x19d5: c4 e2 79 41 c8     vphminposuw %xmm0,%xmm1
+    libdis_test+0x19da: c4 e2 79 41 1e     vphminposuw (%rsi),%xmm3
+    libdis_test+0x19df: c4 e2 79 41 5f 42  vphminposuw 0x42(%rdi),%xmm3
+    libdis_test+0x19e5: c4 e2 71 06 d0     vphsubd %xmm0,%xmm1,%xmm2
+    libdis_test+0x19ea: c4 e2 61 06 20     vphsubd (%rax),%xmm3,%xmm4
+    libdis_test+0x19ef: c4 e2 51 06 71 42  vphsubd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x19f5: c4 e2 75 06 d0     vphsubd %ymm0,%ymm1,%ymm2
+    libdis_test+0x19fa: c4 e2 65 06 23     vphsubd (%rbx),%ymm3,%ymm4
+    libdis_test+0x19ff: c4 e2 55 06 72 42  vphsubd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1a05: c4 e2 71 07 d0     vphsubsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1a0a: c4 e2 61 07 20     vphsubsw (%rax),%xmm3,%xmm4
+    libdis_test+0x1a0f: c4 e2 51 07 71 42  vphsubsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1a15: c4 e2 75 07 d0     vphsubsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1a1a: c4 e2 65 07 23     vphsubsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1a1f: c4 e2 55 07 72 42  vphsubsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1a25: c4 e2 71 05 d0     vphsubw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1a2a: c4 e2 61 05 20     vphsubw (%rax),%xmm3,%xmm4
+    libdis_test+0x1a2f: c4 e2 51 05 71 42  vphsubw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1a35: c4 e2 75 05 d0     vphsubw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1a3a: c4 e2 65 05 23     vphsubw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1a3f: c4 e2 55 05 72 42  vphsubw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1a45: c4 e3 79 20 c8 20  vpinsrb $0x20,%eax,%xmm0,%xmm1
+    libdis_test+0x1a4b: c4 e3 69 20 1b 20  vpinsrb $0x20,(%rbx),%xmm2,%xmm3
+    libdis_test+0x1a51: c4 e3 69 20 5b 10  vpinsrb $0x20,0x10(%rbx),%xmm2,%xmm3
+                        20 
+    libdis_test+0x1a58: c4 e3 69 22 1b 20  vpinsrd $0x20,(%rbx),%xmm2,%xmm3
+    libdis_test+0x1a5e: c4 e3 69 22 5b 10  vpinsrd $0x20,0x10(%rbx),%xmm2,%xmm3
+                        20 
+    libdis_test+0x1a65: c4 e3 f9 22 c8 20  vpinsrq $0x20,%rax,%xmm0,%xmm1
+    libdis_test+0x1a6b: c4 e3 e9 22 1b 20  vpinsrq $0x20,(%rbx),%xmm2,%xmm3
+    libdis_test+0x1a71: c4 e3 e9 22 5b 10  vpinsrq $0x20,0x10(%rbx),%xmm2,%xmm3
+                        20 
+    libdis_test+0x1a78: c5 f9 c4 c8 20     vpinsrw $0x20,%eax,%xmm0,%xmm1
+    libdis_test+0x1a7d: c5 e9 c4 1b 20     vpinsrw $0x20,(%rbx),%xmm2,%xmm3
+    libdis_test+0x1a82: c5 e9 c4 5b 10 20  vpinsrw $0x20,0x10(%rbx),%xmm2,%xmm3
+    libdis_test+0x1a88: c4 e2 71 04 d0     vpmaddubsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1a8d: c4 e2 61 04 20     vpmaddubsw (%rax),%xmm3,%xmm4
+    libdis_test+0x1a92: c4 e2 51 04 71 42  vpmaddubsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1a98: c4 e2 75 04 d0     vpmaddubsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1a9d: c4 e2 65 04 23     vpmaddubsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1aa2: c4 e2 55 04 72 42  vpmaddubsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1aa8: c5 f1 f5 d0        vpmaddwd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1aac: c5 e1 f5 20        vpmaddwd (%rax),%xmm3,%xmm4
+    libdis_test+0x1ab0: c5 d1 f5 71 42     vpmaddwd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1ab5: c5 f5 f5 d0        vpmaddwd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ab9: c5 e5 f5 23        vpmaddwd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1abd: c5 d5 f5 72 42     vpmaddwd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1ac2: c4 e2 71 3c d0     vpmaxsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ac7: c4 e2 61 3c 20     vpmaxsb (%rax),%xmm3,%xmm4
+    libdis_test+0x1acc: c4 e2 51 3c 71 42  vpmaxsb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1ad2: c4 e2 75 3c d0     vpmaxsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ad7: c4 e2 65 3c 23     vpmaxsb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1adc: c4 e2 55 3c 72 42  vpmaxsb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1ae2: c4 e2 71 3d d0     vpmaxsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ae7: c4 e2 61 3d 20     vpmaxsd (%rax),%xmm3,%xmm4
+    libdis_test+0x1aec: c4 e2 51 3d 71 42  vpmaxsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1af2: c4 e2 75 3d d0     vpmaxsd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1af7: c4 e2 65 3d 23     vpmaxsd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1afc: c4 e2 55 3d 72 42  vpmaxsd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1b02: c5 f1 ee d0        vpmaxsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b06: c5 e1 ee 20        vpmaxsw (%rax),%xmm3,%xmm4
+    libdis_test+0x1b0a: c5 d1 ee 71 42     vpmaxsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1b0f: c5 f5 ee d0        vpmaxsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b13: c5 e5 ee 23        vpmaxsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1b17: c5 d5 ee 72 42     vpmaxsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1b1c: c5 f1 de d0        vpmaxub %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b20: c5 e1 de 20        vpmaxub (%rax),%xmm3,%xmm4
+    libdis_test+0x1b24: c5 d1 de 71 42     vpmaxub 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1b29: c5 f5 de d0        vpmaxub %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b2d: c5 e5 de 23        vpmaxub (%rbx),%ymm3,%ymm4
+    libdis_test+0x1b31: c5 d5 de 72 42     vpmaxub 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1b36: c4 e2 71 3f d0     vpmaxud %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b3b: c4 e2 61 3f 20     vpmaxud (%rax),%xmm3,%xmm4
+    libdis_test+0x1b40: c4 e2 51 3f 71 42  vpmaxud 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1b46: c4 e2 75 3f d0     vpmaxud %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b4b: c4 e2 65 3f 23     vpmaxud (%rbx),%ymm3,%ymm4
+    libdis_test+0x1b50: c4 e2 55 3f 72 42  vpmaxud 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1b56: c4 e2 71 3e d0     vpmaxuw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b5b: c4 e2 61 3e 20     vpmaxuw (%rax),%xmm3,%xmm4
+    libdis_test+0x1b60: c4 e2 51 3e 71 42  vpmaxuw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1b66: c4 e2 75 3e d0     vpmaxuw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b6b: c4 e2 65 3e 23     vpmaxuw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1b70: c4 e2 55 3e 72 42  vpmaxuw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1b76: c4 e2 71 38 d0     vpminsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b7b: c4 e2 61 38 20     vpminsb (%rax),%xmm3,%xmm4
+    libdis_test+0x1b80: c4 e2 51 38 71 42  vpminsb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1b86: c4 e2 75 38 d0     vpminsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1b8b: c4 e2 65 38 23     vpminsb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1b90: c4 e2 55 38 72 42  vpminsb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1b96: c4 e2 71 39 d0     vpminsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1b9b: c4 e2 61 39 20     vpminsd (%rax),%xmm3,%xmm4
+    libdis_test+0x1ba0: c4 e2 51 39 71 42  vpminsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1ba6: c4 e2 75 39 d0     vpminsd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1bab: c4 e2 65 39 23     vpminsd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1bb0: c4 e2 55 39 72 42  vpminsd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1bb6: c5 f1 ea d0        vpminsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1bba: c5 e1 ea 20        vpminsw (%rax),%xmm3,%xmm4
+    libdis_test+0x1bbe: c5 d1 ea 71 42     vpminsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1bc3: c5 f5 ea d0        vpminsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1bc7: c5 e5 ea 23        vpminsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1bcb: c5 d5 ea 72 42     vpminsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1bd0: c5 f1 da d0        vpminub %xmm0,%xmm1,%xmm2
+    libdis_test+0x1bd4: c5 e1 da 20        vpminub (%rax),%xmm3,%xmm4
+    libdis_test+0x1bd8: c5 d1 da 71 42     vpminub 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1bdd: c5 f5 da d0        vpminub %ymm0,%ymm1,%ymm2
+    libdis_test+0x1be1: c5 e5 da 23        vpminub (%rbx),%ymm3,%ymm4
+    libdis_test+0x1be5: c5 d5 da 72 42     vpminub 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1bea: c4 e2 71 3b d0     vpminud %xmm0,%xmm1,%xmm2
+    libdis_test+0x1bef: c4 e2 61 3b 20     vpminud (%rax),%xmm3,%xmm4
+    libdis_test+0x1bf4: c4 e2 51 3b 71 42  vpminud 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1bfa: c4 e2 75 3b d0     vpminud %ymm0,%ymm1,%ymm2
+    libdis_test+0x1bff: c4 e2 65 3b 23     vpminud (%rbx),%ymm3,%ymm4
+    libdis_test+0x1c04: c4 e2 55 3b 72 42  vpminud 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1c0a: c4 e2 71 3a d0     vpminuw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1c0f: c4 e2 61 3a 20     vpminuw (%rax),%xmm3,%xmm4
+    libdis_test+0x1c14: c4 e2 51 3a 71 42  vpminuw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1c1a: c4 e2 75 3a d0     vpminuw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1c1f: c4 e2 65 3a 23     vpminuw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1c24: c4 e2 55 3a 72 42  vpminuw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1c2a: c5 f9 d7 c0        vpmovmskb %xmm0,%eax
+    libdis_test+0x1c2e: c5 fd d7 d9        vpmovmskb %ymm1,%ebx
+    libdis_test+0x1c32: c4 e2 79 21 c8     vpmovsxbd %xmm0,%xmm1
+    libdis_test+0x1c37: c4 e2 79 21 1e     vpmovsxbd (%rsi),%xmm3
+    libdis_test+0x1c3c: c4 e2 79 21 5f 42  vpmovsxbd 0x42(%rdi),%xmm3
+    libdis_test+0x1c42: c4 e2 7d 21 f7     vpmovsxbd %ymm7,%ymm6
+    libdis_test+0x1c47: c4 e2 7d 21 65 00  vpmovsxbd 0x0(%rbp),%ymm4
+    libdis_test+0x1c4d: c4 e2 7d 21 64 24  vpmovsxbd 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1c54: c4 e2 79 22 c8     vpmovsxbq %xmm0,%xmm1
+    libdis_test+0x1c59: c4 e2 79 22 1e     vpmovsxbq (%rsi),%xmm3
+    libdis_test+0x1c5e: c4 e2 79 22 5f 42  vpmovsxbq 0x42(%rdi),%xmm3
+    libdis_test+0x1c64: c4 e2 7d 22 f7     vpmovsxbq %ymm7,%ymm6
+    libdis_test+0x1c69: c4 e2 7d 22 65 00  vpmovsxbq 0x0(%rbp),%ymm4
+    libdis_test+0x1c6f: c4 e2 7d 22 64 24  vpmovsxbq 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1c76: c4 e2 79 20 c8     vpmovsxbw %xmm0,%xmm1
+    libdis_test+0x1c7b: c4 e2 79 20 1e     vpmovsxbw (%rsi),%xmm3
+    libdis_test+0x1c80: c4 e2 79 20 5f 42  vpmovsxbw 0x42(%rdi),%xmm3
+    libdis_test+0x1c86: c4 e2 7d 20 f7     vpmovsxbw %ymm7,%ymm6
+    libdis_test+0x1c8b: c4 e2 7d 20 65 00  vpmovsxbw 0x0(%rbp),%ymm4
+    libdis_test+0x1c91: c4 e2 7d 20 64 24  vpmovsxbw 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1c98: c4 e2 79 25 c8     vpmovsxdq %xmm0,%xmm1
+    libdis_test+0x1c9d: c4 e2 79 25 1e     vpmovsxdq (%rsi),%xmm3
+    libdis_test+0x1ca2: c4 e2 79 25 5f 42  vpmovsxdq 0x42(%rdi),%xmm3
+    libdis_test+0x1ca8: c4 e2 7d 25 f7     vpmovsxdq %ymm7,%ymm6
+    libdis_test+0x1cad: c4 e2 7d 25 65 00  vpmovsxdq 0x0(%rbp),%ymm4
+    libdis_test+0x1cb3: c4 e2 7d 25 64 24  vpmovsxdq 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1cba: c4 e2 79 23 c8     vpmovsxwd %xmm0,%xmm1
+    libdis_test+0x1cbf: c4 e2 79 23 1e     vpmovsxwd (%rsi),%xmm3
+    libdis_test+0x1cc4: c4 e2 79 23 5f 42  vpmovsxwd 0x42(%rdi),%xmm3
+    libdis_test+0x1cca: c4 e2 7d 23 f7     vpmovsxwd %ymm7,%ymm6
+    libdis_test+0x1ccf: c4 e2 7d 23 65 00  vpmovsxwd 0x0(%rbp),%ymm4
+    libdis_test+0x1cd5: c4 e2 7d 23 64 24  vpmovsxwd 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1cdc: c4 e2 79 24 c8     vpmovsxwq %xmm0,%xmm1
+    libdis_test+0x1ce1: c4 e2 79 24 1e     vpmovsxwq (%rsi),%xmm3
+    libdis_test+0x1ce6: c4 e2 79 24 5f 42  vpmovsxwq 0x42(%rdi),%xmm3
+    libdis_test+0x1cec: c4 e2 7d 24 f7     vpmovsxwq %ymm7,%ymm6
+    libdis_test+0x1cf1: c4 e2 7d 24 65 00  vpmovsxwq 0x0(%rbp),%ymm4
+    libdis_test+0x1cf7: c4 e2 7d 24 64 24  vpmovsxwq 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1cfe: c4 e2 79 31 c8     vpmovzxbd %xmm0,%xmm1
+    libdis_test+0x1d03: c4 e2 79 31 1e     vpmovzxbd (%rsi),%xmm3
+    libdis_test+0x1d08: c4 e2 79 31 5f 42  vpmovzxbd 0x42(%rdi),%xmm3
+    libdis_test+0x1d0e: c4 e2 7d 31 f7     vpmovzxbd %ymm7,%ymm6
+    libdis_test+0x1d13: c4 e2 7d 31 65 00  vpmovzxbd 0x0(%rbp),%ymm4
+    libdis_test+0x1d19: c4 e2 7d 31 64 24  vpmovzxbd 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1d20: c4 e2 79 32 c8     vpmovzxbq %xmm0,%xmm1
+    libdis_test+0x1d25: c4 e2 79 32 1e     vpmovzxbq (%rsi),%xmm3
+    libdis_test+0x1d2a: c4 e2 79 32 5f 42  vpmovzxbq 0x42(%rdi),%xmm3
+    libdis_test+0x1d30: c4 e2 7d 32 f7     vpmovzxbq %ymm7,%ymm6
+    libdis_test+0x1d35: c4 e2 7d 32 65 00  vpmovzxbq 0x0(%rbp),%ymm4
+    libdis_test+0x1d3b: c4 e2 7d 32 64 24  vpmovzxbq 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1d42: c4 e2 79 30 c8     vpmovzxbw %xmm0,%xmm1
+    libdis_test+0x1d47: c4 e2 79 30 1e     vpmovzxbw (%rsi),%xmm3
+    libdis_test+0x1d4c: c4 e2 79 30 5f 42  vpmovzxbw 0x42(%rdi),%xmm3
+    libdis_test+0x1d52: c4 e2 7d 30 f7     vpmovzxbw %ymm7,%ymm6
+    libdis_test+0x1d57: c4 e2 7d 30 65 00  vpmovzxbw 0x0(%rbp),%ymm4
+    libdis_test+0x1d5d: c4 e2 7d 30 64 24  vpmovzxbw 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1d64: c4 e2 79 35 c8     vpmovzxdq %xmm0,%xmm1
+    libdis_test+0x1d69: c4 e2 79 35 1e     vpmovzxdq (%rsi),%xmm3
+    libdis_test+0x1d6e: c4 e2 79 35 5f 42  vpmovzxdq 0x42(%rdi),%xmm3
+    libdis_test+0x1d74: c4 e2 7d 35 f7     vpmovzxdq %ymm7,%ymm6
+    libdis_test+0x1d79: c4 e2 7d 35 65 00  vpmovzxdq 0x0(%rbp),%ymm4
+    libdis_test+0x1d7f: c4 e2 7d 35 64 24  vpmovzxdq 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1d86: c4 e2 79 33 c8     vpmovzxwd %xmm0,%xmm1
+    libdis_test+0x1d8b: c4 e2 79 33 1e     vpmovzxwd (%rsi),%xmm3
+    libdis_test+0x1d90: c4 e2 79 33 5f 42  vpmovzxwd 0x42(%rdi),%xmm3
+    libdis_test+0x1d96: c4 e2 7d 33 f7     vpmovzxwd %ymm7,%ymm6
+    libdis_test+0x1d9b: c4 e2 7d 33 65 00  vpmovzxwd 0x0(%rbp),%ymm4
+    libdis_test+0x1da1: c4 e2 7d 33 64 24  vpmovzxwd 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1da8: c4 e2 79 34 c8     vpmovzxwq %xmm0,%xmm1
+    libdis_test+0x1dad: c4 e2 79 34 1e     vpmovzxwq (%rsi),%xmm3
+    libdis_test+0x1db2: c4 e2 79 34 5f 42  vpmovzxwq 0x42(%rdi),%xmm3
+    libdis_test+0x1db8: c4 e2 7d 34 f7     vpmovzxwq %ymm7,%ymm6
+    libdis_test+0x1dbd: c4 e2 7d 34 65 00  vpmovzxwq 0x0(%rbp),%ymm4
+    libdis_test+0x1dc3: c4 e2 7d 34 64 24  vpmovzxwq 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x1dca: c4 e2 71 28 d0     vpmuldq %xmm0,%xmm1,%xmm2
+    libdis_test+0x1dcf: c4 e2 61 28 20     vpmuldq (%rax),%xmm3,%xmm4
+    libdis_test+0x1dd4: c4 e2 51 28 71 42  vpmuldq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1dda: c4 e2 75 28 d0     vpmuldq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ddf: c4 e2 65 28 23     vpmuldq (%rbx),%ymm3,%ymm4
+    libdis_test+0x1de4: c4 e2 55 28 72 42  vpmuldq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1dea: c4 e2 71 0b d0     vpmulhrsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1def: c4 e2 61 0b 20     vpmulhrsw (%rax),%xmm3,%xmm4
+    libdis_test+0x1df4: c4 e2 51 0b 71 42  vpmulhrsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1dfa: c4 e2 75 0b d0     vpmulhrsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1dff: c4 e2 65 0b 23     vpmulhrsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1e04: c4 e2 55 0b 72 42  vpmulhrsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1e0a: c5 f1 e4 d0        vpmulhuw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e0e: c5 e1 e4 20        vpmulhuw (%rax),%xmm3,%xmm4
+    libdis_test+0x1e12: c5 d1 e4 71 42     vpmulhuw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1e17: c5 f5 e4 d0        vpmulhuw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e1b: c5 e5 e4 23        vpmulhuw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1e1f: c5 d5 e4 72 42     vpmulhuw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1e24: c5 f1 e5 d0        vpmulhw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e28: c5 e1 e5 20        vpmulhw (%rax),%xmm3,%xmm4
+    libdis_test+0x1e2c: c5 d1 e5 71 42     vpmulhw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1e31: c5 f5 e5 d0        vpmulhw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e35: c5 e5 e5 23        vpmulhw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1e39: c5 d5 e5 72 42     vpmulhw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1e3e: c4 e2 71 40 d0     vpmulld %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e43: c4 e2 61 40 20     vpmulld (%rax),%xmm3,%xmm4
+    libdis_test+0x1e48: c4 e2 51 40 71 42  vpmulld 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1e4e: c4 e2 75 40 d0     vpmulld %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e53: c4 e2 65 40 23     vpmulld (%rbx),%ymm3,%ymm4
+    libdis_test+0x1e58: c4 e2 55 40 72 42  vpmulld 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1e5e: c5 f1 d5 d0        vpmullw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e62: c5 e1 d5 20        vpmullw (%rax),%xmm3,%xmm4
+    libdis_test+0x1e66: c5 d1 d5 71 42     vpmullw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1e6b: c5 f5 d5 d0        vpmullw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e6f: c5 e5 d5 23        vpmullw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1e73: c5 d5 d5 72 42     vpmullw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1e78: c5 f1 f4 d0        vpmuludq %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e7c: c5 e1 f4 20        vpmuludq (%rax),%xmm3,%xmm4
+    libdis_test+0x1e80: c5 d1 f4 71 42     vpmuludq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1e85: c5 f5 f4 d0        vpmuludq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1e89: c5 e5 f4 23        vpmuludq (%rbx),%ymm3,%ymm4
+    libdis_test+0x1e8d: c5 d5 f4 72 42     vpmuludq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1e92: c5 f1 eb d0        vpor   %xmm0,%xmm1,%xmm2
+    libdis_test+0x1e96: c5 e1 eb 20        vpor   (%rax),%xmm3,%xmm4
+    libdis_test+0x1e9a: c5 d1 eb 71 42     vpor   0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1e9f: c5 f5 eb d0        vpor   %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ea3: c5 e5 eb 23        vpor   (%rbx),%ymm3,%ymm4
+    libdis_test+0x1ea7: c5 d5 eb 72 42     vpor   0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1eac: c5 f1 f6 d0        vpsadbw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1eb0: c5 e1 f6 20        vpsadbw (%rax),%xmm3,%xmm4
+    libdis_test+0x1eb4: c5 d1 f6 71 42     vpsadbw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1eb9: c5 f5 f6 d0        vpsadbw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1ebd: c5 e5 f6 23        vpsadbw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1ec1: c5 d5 f6 72 42     vpsadbw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1ec6: c4 e2 71 00 d0     vpshufb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ecb: c4 e2 61 00 20     vpshufb (%rax),%xmm3,%xmm4
+    libdis_test+0x1ed0: c4 e2 51 00 71 42  vpshufb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1ed6: c4 e2 75 00 d0     vpshufb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1edb: c4 e2 65 00 23     vpshufb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1ee0: c4 e2 55 00 72 42  vpshufb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1ee6: c5 f9 70 c8 42     vpshufd $0x42,%xmm0,%xmm1
+    libdis_test+0x1eeb: c5 f9 70 1e 23     vpshufd $0x23,(%rsi),%xmm3
+    libdis_test+0x1ef0: c5 f9 70 5f 42 42  vpshufd $0x42,0x42(%rdi),%xmm3
+    libdis_test+0x1ef6: c5 fd 70 c8 42     vpshufd $0x42,%ymm0,%ymm1
+    libdis_test+0x1efb: c5 fd 70 1e 23     vpshufd $0x23,(%rsi),%ymm3
+    libdis_test+0x1f00: c5 fd 70 5f 42 42  vpshufd $0x42,0x42(%rdi),%ymm3
+    libdis_test+0x1f06: c5 fa 70 c8 42     vpshufhw $0x42,%xmm0,%xmm1
+    libdis_test+0x1f0b: c5 fa 70 1e 23     vpshufhw $0x23,(%rsi),%xmm3
+    libdis_test+0x1f10: c5 fa 70 5f 42 42  vpshufhw $0x42,0x42(%rdi),%xmm3
+    libdis_test+0x1f16: c5 fe 70 c8 42     vpshufhw $0x42,%ymm0,%ymm1
+    libdis_test+0x1f1b: c5 fe 70 1e 23     vpshufhw $0x23,(%rsi),%ymm3
+    libdis_test+0x1f20: c5 fe 70 5f 42 42  vpshufhw $0x42,0x42(%rdi),%ymm3
+    libdis_test+0x1f26: c5 fb 70 c8 42     vpshuflw $0x42,%xmm0,%xmm1
+    libdis_test+0x1f2b: c5 fb 70 1e 23     vpshuflw $0x23,(%rsi),%xmm3
+    libdis_test+0x1f30: c5 fb 70 5f 42 42  vpshuflw $0x42,0x42(%rdi),%xmm3
+    libdis_test+0x1f36: c5 ff 70 c8 42     vpshuflw $0x42,%ymm0,%ymm1
+    libdis_test+0x1f3b: c5 ff 70 1e 23     vpshuflw $0x23,(%rsi),%ymm3
+    libdis_test+0x1f40: c5 ff 70 5f 42 42  vpshuflw $0x42,0x42(%rdi),%ymm3
+    libdis_test+0x1f46: c4 e2 71 08 d0     vpsignb %xmm0,%xmm1,%xmm2
+    libdis_test+0x1f4b: c4 e2 61 08 20     vpsignb (%rax),%xmm3,%xmm4
+    libdis_test+0x1f50: c4 e2 51 08 71 42  vpsignb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1f56: c4 e2 75 08 d0     vpsignb %ymm0,%ymm1,%ymm2
+    libdis_test+0x1f5b: c4 e2 65 08 23     vpsignb (%rbx),%ymm3,%ymm4
+    libdis_test+0x1f60: c4 e2 55 08 72 42  vpsignb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1f66: c4 e2 71 0a d0     vpsignd %xmm0,%xmm1,%xmm2
+    libdis_test+0x1f6b: c4 e2 61 0a 20     vpsignd (%rax),%xmm3,%xmm4
+    libdis_test+0x1f70: c4 e2 51 0a 71 42  vpsignd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1f76: c4 e2 75 0a d0     vpsignd %ymm0,%ymm1,%ymm2
+    libdis_test+0x1f7b: c4 e2 65 0a 23     vpsignd (%rbx),%ymm3,%ymm4
+    libdis_test+0x1f80: c4 e2 55 0a 72 42  vpsignd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1f86: c4 e2 71 09 d0     vpsignw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1f8b: c4 e2 61 09 20     vpsignw (%rax),%xmm3,%xmm4
+    libdis_test+0x1f90: c4 e2 51 09 71 42  vpsignw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x1f96: c4 e2 75 09 d0     vpsignw %ymm0,%ymm1,%ymm2
+    libdis_test+0x1f9b: c4 e2 65 09 23     vpsignw (%rbx),%ymm3,%ymm4
+    libdis_test+0x1fa0: c4 e2 55 09 72 42  vpsignw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x1fa6: c5 f1 f2 d0        vpslld %xmm0,%xmm1,%xmm2
+    libdis_test+0x1faa: c5 e1 f2 20        vpslld (%rax),%xmm3,%xmm4
+    libdis_test+0x1fae: c5 d9 f2 6b 10     vpslld 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x1fb3: c5 c1 72 f6 04     vpslld $0x4,%xmm6,%xmm7
+    libdis_test+0x1fb8: c5 f5 f2 d0        vpslld %ymm0,%ymm1,%ymm2
+    libdis_test+0x1fbc: c5 e5 f2 20        vpslld (%rax),%ymm3,%ymm4
+    libdis_test+0x1fc0: c5 dd f2 6b 10     vpslld 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x1fc5: c5 c5 72 f6 04     vpslld $0x4,%ymm6,%ymm7
+    libdis_test+0x1fca: c5 f1 73 f8 07     vpslldq $0x7,%xmm0,%xmm1
+    libdis_test+0x1fcf: c5 f5 73 f8 07     vpslldq $0x7,%ymm0,%ymm1
+    libdis_test+0x1fd4: c5 f1 f3 d0        vpsllq %xmm0,%xmm1,%xmm2
+    libdis_test+0x1fd8: c5 e1 f3 20        vpsllq (%rax),%xmm3,%xmm4
+    libdis_test+0x1fdc: c5 d9 f3 6b 10     vpsllq 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x1fe1: c5 c1 73 f6 04     vpsllq $0x4,%xmm6,%xmm7
+    libdis_test+0x1fe6: c5 f5 f3 d0        vpsllq %ymm0,%ymm1,%ymm2
+    libdis_test+0x1fea: c5 e5 f3 20        vpsllq (%rax),%ymm3,%ymm4
+    libdis_test+0x1fee: c5 dd f3 6b 10     vpsllq 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x1ff3: c5 c5 73 f6 04     vpsllq $0x4,%ymm6,%ymm7
+    libdis_test+0x1ff8: c5 f1 f1 d0        vpsllw %xmm0,%xmm1,%xmm2
+    libdis_test+0x1ffc: c5 e1 f1 20        vpsllw (%rax),%xmm3,%xmm4
+    libdis_test+0x2000: c5 d9 f1 6b 10     vpsllw 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x2005: c5 c1 71 f6 04     vpsllw $0x4,%xmm6,%xmm7
+    libdis_test+0x200a: c5 f5 f1 d0        vpsllw %ymm0,%ymm1,%ymm2
+    libdis_test+0x200e: c5 e5 f1 20        vpsllw (%rax),%ymm3,%ymm4
+    libdis_test+0x2012: c5 dd f1 6b 10     vpsllw 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x2017: c5 c5 71 f6 04     vpsllw $0x4,%ymm6,%ymm7
+    libdis_test+0x201c: c5 f1 e2 d0        vpsrad %xmm0,%xmm1,%xmm2
+    libdis_test+0x2020: c5 e1 e2 20        vpsrad (%rax),%xmm3,%xmm4
+    libdis_test+0x2024: c5 d9 e2 6b 10     vpsrad 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x2029: c5 c1 72 e6 04     vpsrad $0x4,%xmm6,%xmm7
+    libdis_test+0x202e: c5 f5 e2 d0        vpsrad %ymm0,%ymm1,%ymm2
+    libdis_test+0x2032: c5 e5 e2 20        vpsrad (%rax),%ymm3,%ymm4
+    libdis_test+0x2036: c5 dd e2 6b 10     vpsrad 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x203b: c5 c5 72 e6 04     vpsrad $0x4,%ymm6,%ymm7
+    libdis_test+0x2040: c5 f1 e1 d0        vpsraw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2044: c5 e1 e1 20        vpsraw (%rax),%xmm3,%xmm4
+    libdis_test+0x2048: c5 d9 e1 6b 10     vpsraw 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x204d: c5 c1 71 e6 04     vpsraw $0x4,%xmm6,%xmm7
+    libdis_test+0x2052: c5 f5 e1 d0        vpsraw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2056: c5 e5 e1 20        vpsraw (%rax),%ymm3,%ymm4
+    libdis_test+0x205a: c5 dd e1 6b 10     vpsraw 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x205f: c5 c5 71 e6 04     vpsraw $0x4,%ymm6,%ymm7
+    libdis_test+0x2064: c5 f1 d2 d0        vpsrld %xmm0,%xmm1,%xmm2
+    libdis_test+0x2068: c5 e1 d2 20        vpsrld (%rax),%xmm3,%xmm4
+    libdis_test+0x206c: c5 d9 d2 6b 10     vpsrld 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x2071: c5 c1 72 d6 04     vpsrld $0x4,%xmm6,%xmm7
+    libdis_test+0x2076: c5 f5 d2 d0        vpsrld %ymm0,%ymm1,%ymm2
+    libdis_test+0x207a: c5 e5 d2 20        vpsrld (%rax),%ymm3,%ymm4
+    libdis_test+0x207e: c5 dd d2 6b 10     vpsrld 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x2083: c5 c5 72 d6 04     vpsrld $0x4,%ymm6,%ymm7
+    libdis_test+0x2088: c5 f1 73 d8 07     vpsrldq $0x7,%xmm0,%xmm1
+    libdis_test+0x208d: c5 f5 73 d8 07     vpsrldq $0x7,%ymm0,%ymm1
+    libdis_test+0x2092: c5 f1 d3 d0        vpsrlq %xmm0,%xmm1,%xmm2
+    libdis_test+0x2096: c5 e1 d3 20        vpsrlq (%rax),%xmm3,%xmm4
+    libdis_test+0x209a: c5 d9 d3 6b 10     vpsrlq 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x209f: c5 c1 73 d6 04     vpsrlq $0x4,%xmm6,%xmm7
+    libdis_test+0x20a4: c5 f5 d3 d0        vpsrlq %ymm0,%ymm1,%ymm2
+    libdis_test+0x20a8: c5 e5 d3 20        vpsrlq (%rax),%ymm3,%ymm4
+    libdis_test+0x20ac: c5 dd d3 6b 10     vpsrlq 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x20b1: c5 c5 73 d6 04     vpsrlq $0x4,%ymm6,%ymm7
+    libdis_test+0x20b6: c5 f1 d1 d0        vpsrlw %xmm0,%xmm1,%xmm2
+    libdis_test+0x20ba: c5 e1 d1 20        vpsrlw (%rax),%xmm3,%xmm4
+    libdis_test+0x20be: c5 d9 d1 6b 10     vpsrlw 0x10(%rbx),%xmm4,%xmm5
+    libdis_test+0x20c3: c5 c1 71 d6 04     vpsrlw $0x4,%xmm6,%xmm7
+    libdis_test+0x20c8: c5 f5 d1 d0        vpsrlw %ymm0,%ymm1,%ymm2
+    libdis_test+0x20cc: c5 e5 d1 20        vpsrlw (%rax),%ymm3,%ymm4
+    libdis_test+0x20d0: c5 dd d1 6b 10     vpsrlw 0x10(%rbx),%ymm4,%ymm5
+    libdis_test+0x20d5: c5 c5 71 d6 04     vpsrlw $0x4,%ymm6,%ymm7
+    libdis_test+0x20da: c5 f1 f8 d0        vpsubb %xmm0,%xmm1,%xmm2
+    libdis_test+0x20de: c5 e1 f8 20        vpsubb (%rax),%xmm3,%xmm4
+    libdis_test+0x20e2: c5 d1 f8 71 42     vpsubb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x20e7: c5 f5 f8 d0        vpsubb %ymm0,%ymm1,%ymm2
+    libdis_test+0x20eb: c5 e5 f8 23        vpsubb (%rbx),%ymm3,%ymm4
+    libdis_test+0x20ef: c5 d5 f8 72 42     vpsubb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x20f4: c5 f1 fa d0        vpsubd %xmm0,%xmm1,%xmm2
+    libdis_test+0x20f8: c5 e1 fa 20        vpsubd (%rax),%xmm3,%xmm4
+    libdis_test+0x20fc: c5 d1 fa 71 42     vpsubd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2101: c5 f5 fa d0        vpsubd %ymm0,%ymm1,%ymm2
+    libdis_test+0x2105: c5 e5 fa 23        vpsubd (%rbx),%ymm3,%ymm4
+    libdis_test+0x2109: c5 d5 fa 72 42     vpsubd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x210e: c5 f1 fb d0        vpsubq %xmm0,%xmm1,%xmm2
+    libdis_test+0x2112: c5 e1 fb 20        vpsubq (%rax),%xmm3,%xmm4
+    libdis_test+0x2116: c5 d1 fb 71 42     vpsubq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x211b: c5 f5 fb d0        vpsubq %ymm0,%ymm1,%ymm2
+    libdis_test+0x211f: c5 e5 fb 23        vpsubq (%rbx),%ymm3,%ymm4
+    libdis_test+0x2123: c5 d5 fb 72 42     vpsubq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2128: c5 f1 e8 d0        vpsubsb %xmm0,%xmm1,%xmm2
+    libdis_test+0x212c: c5 e1 e8 20        vpsubsb (%rax),%xmm3,%xmm4
+    libdis_test+0x2130: c5 d1 e8 71 42     vpsubsb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2135: c5 f5 e8 d0        vpsubsb %ymm0,%ymm1,%ymm2
+    libdis_test+0x2139: c5 e5 e8 23        vpsubsb (%rbx),%ymm3,%ymm4
+    libdis_test+0x213d: c5 d5 e8 72 42     vpsubsb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2142: c5 f1 e9 d0        vpsubsw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2146: c5 e1 e9 20        vpsubsw (%rax),%xmm3,%xmm4
+    libdis_test+0x214a: c5 d1 e9 71 42     vpsubsw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x214f: c5 f5 e9 d0        vpsubsw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2153: c5 e5 e9 23        vpsubsw (%rbx),%ymm3,%ymm4
+    libdis_test+0x2157: c5 d5 e9 72 42     vpsubsw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x215c: c5 f1 d8 d0        vpsubusb %xmm0,%xmm1,%xmm2
+    libdis_test+0x2160: c5 e1 d8 20        vpsubusb (%rax),%xmm3,%xmm4
+    libdis_test+0x2164: c5 d1 d8 71 42     vpsubusb 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2169: c5 f5 d8 d0        vpsubusb %ymm0,%ymm1,%ymm2
+    libdis_test+0x216d: c5 e5 d8 23        vpsubusb (%rbx),%ymm3,%ymm4
+    libdis_test+0x2171: c5 d5 d8 72 42     vpsubusb 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2176: c5 f1 d9 d0        vpsubusw %xmm0,%xmm1,%xmm2
+    libdis_test+0x217a: c5 e1 d9 20        vpsubusw (%rax),%xmm3,%xmm4
+    libdis_test+0x217e: c5 d1 d9 71 42     vpsubusw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2183: c5 f5 d9 d0        vpsubusw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2187: c5 e5 d9 23        vpsubusw (%rbx),%ymm3,%ymm4
+    libdis_test+0x218b: c5 d5 d9 72 42     vpsubusw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2190: c5 f1 f9 d0        vpsubw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2194: c5 e1 f9 20        vpsubw (%rax),%xmm3,%xmm4
+    libdis_test+0x2198: c5 d1 f9 71 42     vpsubw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x219d: c5 f5 f9 d0        vpsubw %ymm0,%ymm1,%ymm2
+    libdis_test+0x21a1: c5 e5 f9 23        vpsubw (%rbx),%ymm3,%ymm4
+    libdis_test+0x21a5: c5 d5 f9 72 42     vpsubw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x21aa: c4 e2 79 17 c8     vptest %xmm0,%xmm1
+    libdis_test+0x21af: c4 e2 79 17 1e     vptest (%rsi),%xmm3
+    libdis_test+0x21b4: c4 e2 79 17 5f 42  vptest 0x42(%rdi),%xmm3
+    libdis_test+0x21ba: c4 e2 7d 17 f7     vptest %ymm7,%ymm6
+    libdis_test+0x21bf: c4 e2 7d 17 65 00  vptest 0x0(%rbp),%ymm4
+    libdis_test+0x21c5: c4 e2 7d 17 64 24  vptest 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x21cc: c5 f1 68 d0        vpunpckhbw %xmm0,%xmm1,%xmm2
+    libdis_test+0x21d0: c5 e1 68 20        vpunpckhbw (%rax),%xmm3,%xmm4
+    libdis_test+0x21d4: c5 d1 68 71 42     vpunpckhbw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x21d9: c5 f5 68 d0        vpunpckhbw %ymm0,%ymm1,%ymm2
+    libdis_test+0x21dd: c5 e5 68 23        vpunpckhbw (%rbx),%ymm3,%ymm4
+    libdis_test+0x21e1: c5 d5 68 72 42     vpunpckhbw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x21e6: c5 f1 6a d0        vpunpckhdq %xmm0,%xmm1,%xmm2
+    libdis_test+0x21ea: c5 e1 6a 20        vpunpckhdq (%rax),%xmm3,%xmm4
+    libdis_test+0x21ee: c5 d1 6a 71 42     vpunpckhdq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x21f3: c5 f5 6a d0        vpunpckhdq %ymm0,%ymm1,%ymm2
+    libdis_test+0x21f7: c5 e5 6a 23        vpunpckhdq (%rbx),%ymm3,%ymm4
+    libdis_test+0x21fb: c5 d5 6a 72 42     vpunpckhdq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2200: c5 f1 6d d0        vpunpckhqdq %xmm0,%xmm1,%xmm2
+    libdis_test+0x2204: c5 e1 6d 20        vpunpckhqdq (%rax),%xmm3,%xmm4
+    libdis_test+0x2208: c5 d1 6d 71 42     vpunpckhqdq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x220d: c5 f5 6d d0        vpunpckhqdq %ymm0,%ymm1,%ymm2
+    libdis_test+0x2211: c5 e5 6d 23        vpunpckhqdq (%rbx),%ymm3,%ymm4
+    libdis_test+0x2215: c5 d5 6d 72 42     vpunpckhqdq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x221a: c5 f1 69 d0        vpunpckhwd %xmm0,%xmm1,%xmm2
+    libdis_test+0x221e: c5 e1 69 20        vpunpckhwd (%rax),%xmm3,%xmm4
+    libdis_test+0x2222: c5 d1 69 71 42     vpunpckhwd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2227: c5 f5 69 d0        vpunpckhwd %ymm0,%ymm1,%ymm2
+    libdis_test+0x222b: c5 e5 69 23        vpunpckhwd (%rbx),%ymm3,%ymm4
+    libdis_test+0x222f: c5 d5 69 72 42     vpunpckhwd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2234: c5 f1 60 d0        vpunpcklbw %xmm0,%xmm1,%xmm2
+    libdis_test+0x2238: c5 e1 60 20        vpunpcklbw (%rax),%xmm3,%xmm4
+    libdis_test+0x223c: c5 d1 60 71 42     vpunpcklbw 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2241: c5 f5 60 d0        vpunpcklbw %ymm0,%ymm1,%ymm2
+    libdis_test+0x2245: c5 e5 60 23        vpunpcklbw (%rbx),%ymm3,%ymm4
+    libdis_test+0x2249: c5 d5 60 72 42     vpunpcklbw 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x224e: c5 f1 62 d0        vpunpckldq %xmm0,%xmm1,%xmm2
+    libdis_test+0x2252: c5 e1 62 20        vpunpckldq (%rax),%xmm3,%xmm4
+    libdis_test+0x2256: c5 d1 62 71 42     vpunpckldq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x225b: c5 f5 62 d0        vpunpckldq %ymm0,%ymm1,%ymm2
+    libdis_test+0x225f: c5 e5 62 23        vpunpckldq (%rbx),%ymm3,%ymm4
+    libdis_test+0x2263: c5 d5 62 72 42     vpunpckldq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2268: c5 f1 6c d0        vpunpcklqdq %xmm0,%xmm1,%xmm2
+    libdis_test+0x226c: c5 e1 6c 20        vpunpcklqdq (%rax),%xmm3,%xmm4
+    libdis_test+0x2270: c5 d1 6c 71 42     vpunpcklqdq 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2275: c5 f5 6c d0        vpunpcklqdq %ymm0,%ymm1,%ymm2
+    libdis_test+0x2279: c5 e5 6c 23        vpunpcklqdq (%rbx),%ymm3,%ymm4
+    libdis_test+0x227d: c5 d5 6c 72 42     vpunpcklqdq 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2282: c5 f1 61 d0        vpunpcklwd %xmm0,%xmm1,%xmm2
+    libdis_test+0x2286: c5 e1 61 20        vpunpcklwd (%rax),%xmm3,%xmm4
+    libdis_test+0x228a: c5 d1 61 71 42     vpunpcklwd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x228f: c5 f5 61 d0        vpunpcklwd %ymm0,%ymm1,%ymm2
+    libdis_test+0x2293: c5 e5 61 23        vpunpcklwd (%rbx),%ymm3,%ymm4
+    libdis_test+0x2297: c5 d5 61 72 42     vpunpcklwd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x229c: c5 f1 ef d0        vpxor  %xmm0,%xmm1,%xmm2
+    libdis_test+0x22a0: c5 e1 ef 20        vpxor  (%rax),%xmm3,%xmm4
+    libdis_test+0x22a4: c5 d1 ef 71 42     vpxor  0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x22a9: c5 f5 ef d0        vpxor  %ymm0,%ymm1,%ymm2
+    libdis_test+0x22ad: c5 e5 ef 23        vpxor  (%rbx),%ymm3,%ymm4
+    libdis_test+0x22b1: c5 d5 ef 72 42     vpxor  0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x22b6: c5 f8 53 c8        vrcpps %xmm0,%xmm1
+    libdis_test+0x22ba: c5 f8 53 1e        vrcpps (%rsi),%xmm3
+    libdis_test+0x22be: c5 f8 53 5f 42     vrcpps 0x42(%rdi),%xmm3
+    libdis_test+0x22c3: c5 fc 53 f7        vrcpps %ymm7,%ymm6
+    libdis_test+0x22c7: c5 fc 53 65 00     vrcpps 0x0(%rbp),%ymm4
+    libdis_test+0x22cc: c5 fc 53 64 24 42  vrcpps 0x42(%rsp),%ymm4
+    libdis_test+0x22d2: c5 f2 53 d0        vrcpss %xmm0,%xmm1,%xmm2
+    libdis_test+0x22d6: c5 e2 53 20        vrcpss (%rax),%xmm3,%xmm4
+    libdis_test+0x22da: c5 d2 53 71 42     vrcpss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x22df: c4 e3 79 09 c8 42  vroundpd $0x42,%xmm0,%xmm1
+    libdis_test+0x22e5: c4 e3 79 09 1e 23  vroundpd $0x23,(%rsi),%xmm3
+    libdis_test+0x22eb: c4 e3 79 09 5f 42  vroundpd $0x42,0x42(%rdi),%xmm3
+                        42 
+    libdis_test+0x22f2: c4 e3 7d 09 c8 42  vroundpd $0x42,%ymm0,%ymm1
+    libdis_test+0x22f8: c4 e3 7d 09 1e 23  vroundpd $0x23,(%rsi),%ymm3
+    libdis_test+0x22fe: c4 e3 7d 09 5f 42  vroundpd $0x42,0x42(%rdi),%ymm3
+                        42 
+    libdis_test+0x2305: c4 e3 79 08 c8 42  vroundps $0x42,%xmm0,%xmm1
+    libdis_test+0x230b: c4 e3 79 08 1e 23  vroundps $0x23,(%rsi),%xmm3
+    libdis_test+0x2311: c4 e3 79 08 5f 42  vroundps $0x42,0x42(%rdi),%xmm3
+                        42 
+    libdis_test+0x2318: c4 e3 7d 08 c8 42  vroundps $0x42,%ymm0,%ymm1
+    libdis_test+0x231e: c4 e3 7d 08 1e 23  vroundps $0x23,(%rsi),%ymm3
+    libdis_test+0x2324: c4 e3 7d 08 5f 42  vroundps $0x42,0x42(%rdi),%ymm3
+                        42 
+    libdis_test+0x232b: c4 e3 51 0b fb 48  vroundsd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x2331: c4 e3 69 0b 23 48  vroundsd $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x2337: c4 e3 71 0b 73 08  vroundsd $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x233e: c4 e3 51 0a fb 48  vroundss $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x2344: c4 e3 69 0a 23 48  vroundss $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x234a: c4 e3 71 0a 73 08  vroundss $0x48,0x8(%rbx),%xmm1,%xmm6
+                        48 
+    libdis_test+0x2351: c5 f8 52 c8        vrsqrtps %xmm0,%xmm1
+    libdis_test+0x2355: c5 f8 52 1e        vrsqrtps (%rsi),%xmm3
+    libdis_test+0x2359: c5 f8 52 5f 42     vrsqrtps 0x42(%rdi),%xmm3
+    libdis_test+0x235e: c5 fc 52 f7        vrsqrtps %ymm7,%ymm6
+    libdis_test+0x2362: c5 fc 52 65 00     vrsqrtps 0x0(%rbp),%ymm4
+    libdis_test+0x2367: c5 fc 52 64 24 42  vrsqrtps 0x42(%rsp),%ymm4
+    libdis_test+0x236d: c5 f2 52 d0        vrsqrtss %xmm0,%xmm1,%xmm2
+    libdis_test+0x2371: c5 e2 52 20        vrsqrtss (%rax),%xmm3,%xmm4
+    libdis_test+0x2375: c5 d2 52 71 42     vrsqrtss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x237a: c5 d1 c6 fb 48     vshufpd $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x237f: c5 e9 c6 23 48     vshufpd $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x2384: c5 f1 c6 73 08 48  vshufpd $0x48,0x8(%rbx),%xmm1,%xmm6
+    libdis_test+0x238a: c5 d5 c6 fb 48     vshufpd $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x238f: c5 ed c6 23 48     vshufpd $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x2394: c5 f5 c6 73 08 48  vshufpd $0x48,0x8(%rbx),%ymm1,%ymm6
+    libdis_test+0x239a: c5 d0 c6 fb 48     vshufps $0x48,%xmm3,%xmm5,%xmm7
+    libdis_test+0x239f: c5 e8 c6 23 48     vshufps $0x48,(%rbx),%xmm2,%xmm4
+    libdis_test+0x23a4: c5 f0 c6 73 08 48  vshufps $0x48,0x8(%rbx),%xmm1,%xmm6
+    libdis_test+0x23aa: c5 d4 c6 fb 48     vshufps $0x48,%ymm3,%ymm5,%ymm7
+    libdis_test+0x23af: c5 ec c6 23 48     vshufps $0x48,(%rbx),%ymm2,%ymm4
+    libdis_test+0x23b4: c5 f4 c6 73 08 48  vshufps $0x48,0x8(%rbx),%ymm1,%ymm6
+    libdis_test+0x23ba: c5 f9 51 c8        vsqrtpd %xmm0,%xmm1
+    libdis_test+0x23be: c5 f9 51 1e        vsqrtpd (%rsi),%xmm3
+    libdis_test+0x23c2: c5 f9 51 5f 42     vsqrtpd 0x42(%rdi),%xmm3
+    libdis_test+0x23c7: c5 fd 51 f7        vsqrtpd %ymm7,%ymm6
+    libdis_test+0x23cb: c5 fd 51 65 00     vsqrtpd 0x0(%rbp),%ymm4
+    libdis_test+0x23d0: c5 fd 51 64 24 42  vsqrtpd 0x42(%rsp),%ymm4
+    libdis_test+0x23d6: c5 f8 51 c8        vsqrtps %xmm0,%xmm1
+    libdis_test+0x23da: c5 f8 51 1e        vsqrtps (%rsi),%xmm3
+    libdis_test+0x23de: c5 f8 51 5f 42     vsqrtps 0x42(%rdi),%xmm3
+    libdis_test+0x23e3: c5 fc 51 f7        vsqrtps %ymm7,%ymm6
+    libdis_test+0x23e7: c5 fc 51 65 00     vsqrtps 0x0(%rbp),%ymm4
+    libdis_test+0x23ec: c5 fc 51 64 24 42  vsqrtps 0x42(%rsp),%ymm4
+    libdis_test+0x23f2: c5 f3 51 d0        vsqrtsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x23f6: c5 e3 51 20        vsqrtsd (%rax),%xmm3,%xmm4
+    libdis_test+0x23fa: c5 d3 51 71 42     vsqrtsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x23ff: c5 f2 51 d0        vsqrtss %xmm0,%xmm1,%xmm2
+    libdis_test+0x2403: c5 e2 51 20        vsqrtss (%rax),%xmm3,%xmm4
+    libdis_test+0x2407: c5 d2 51 71 42     vsqrtss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x240c: c5 f8 ae 1a        vstmxcsr (%rdx)
+    libdis_test+0x2410: c5 f8 ae 5a 08     vstmxcsr 0x8(%rdx)
+    libdis_test+0x2415: c5 f1 5c d0        vsubpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x2419: c5 e1 5c 20        vsubpd (%rax),%xmm3,%xmm4
+    libdis_test+0x241d: c5 d1 5c 71 42     vsubpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2422: c5 f5 5c d0        vsubpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x2426: c5 e5 5c 23        vsubpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x242a: c5 d5 5c 72 42     vsubpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x242f: c5 f0 5c d0        vsubps %xmm0,%xmm1,%xmm2
+    libdis_test+0x2433: c5 e0 5c 20        vsubps (%rax),%xmm3,%xmm4
+    libdis_test+0x2437: c5 d0 5c 71 42     vsubps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x243c: c5 f4 5c d0        vsubps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2440: c5 e4 5c 23        vsubps (%rbx),%ymm3,%ymm4
+    libdis_test+0x2444: c5 d4 5c 72 42     vsubps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2449: c5 f3 5c d0        vsubsd %xmm0,%xmm1,%xmm2
+    libdis_test+0x244d: c5 e3 5c 20        vsubsd (%rax),%xmm3,%xmm4
+    libdis_test+0x2451: c5 d3 5c 71 42     vsubsd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2456: c5 f2 5c d0        vsubss %xmm0,%xmm1,%xmm2
+    libdis_test+0x245a: c5 e2 5c 20        vsubss (%rax),%xmm3,%xmm4
+    libdis_test+0x245e: c5 d2 5c 71 42     vsubss 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2463: c4 e2 79 0f c8     vtestpd %xmm0,%xmm1
+    libdis_test+0x2468: c4 e2 79 0f 1e     vtestpd (%rsi),%xmm3
+    libdis_test+0x246d: c4 e2 79 0f 5f 42  vtestpd 0x42(%rdi),%xmm3
+    libdis_test+0x2473: c4 e2 7d 0f f7     vtestpd %ymm7,%ymm6
+    libdis_test+0x2478: c4 e2 7d 0f 65 00  vtestpd 0x0(%rbp),%ymm4
+    libdis_test+0x247e: c4 e2 7d 0f 64 24  vtestpd 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x2485: c4 e2 79 0e c8     vtestps %xmm0,%xmm1
+    libdis_test+0x248a: c4 e2 79 0e 1e     vtestps (%rsi),%xmm3
+    libdis_test+0x248f: c4 e2 79 0e 5f 42  vtestps 0x42(%rdi),%xmm3
+    libdis_test+0x2495: c4 e2 7d 0e f7     vtestps %ymm7,%ymm6
+    libdis_test+0x249a: c4 e2 7d 0e 65 00  vtestps 0x0(%rbp),%ymm4
+    libdis_test+0x24a0: c4 e2 7d 0e 64 24  vtestps 0x42(%rsp),%ymm4
+                        42 
+    libdis_test+0x24a7: c5 f9 2e c8        vucomisd %xmm0,%xmm1
+    libdis_test+0x24ab: c5 f9 2e 1e        vucomisd (%rsi),%xmm3
+    libdis_test+0x24af: c5 f9 2e 5f 42     vucomisd 0x42(%rdi),%xmm3
+    libdis_test+0x24b4: c5 f8 2e c8        vucomiss %xmm0,%xmm1
+    libdis_test+0x24b8: c5 f8 2e 1e        vucomiss (%rsi),%xmm3
+    libdis_test+0x24bc: c5 f8 2e 5f 42     vucomiss 0x42(%rdi),%xmm3
+    libdis_test+0x24c1: c5 f1 15 d0        vunpckhpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x24c5: c5 e1 15 20        vunpckhpd (%rax),%xmm3,%xmm4
+    libdis_test+0x24c9: c5 d1 15 71 42     vunpckhpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x24ce: c5 f5 15 d0        vunpckhpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x24d2: c5 e5 15 23        vunpckhpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x24d6: c5 d5 15 72 42     vunpckhpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x24db: c5 f0 15 d0        vunpckhps %xmm0,%xmm1,%xmm2
+    libdis_test+0x24df: c5 e0 15 20        vunpckhps (%rax),%xmm3,%xmm4
+    libdis_test+0x24e3: c5 d0 15 71 42     vunpckhps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x24e8: c5 f4 15 d0        vunpckhps %ymm0,%ymm1,%ymm2
+    libdis_test+0x24ec: c5 e4 15 23        vunpckhps (%rbx),%ymm3,%ymm4
+    libdis_test+0x24f0: c5 d4 15 72 42     vunpckhps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x24f5: c5 f1 14 d0        vunpcklpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x24f9: c5 e1 14 20        vunpcklpd (%rax),%xmm3,%xmm4
+    libdis_test+0x24fd: c5 d1 14 71 42     vunpcklpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2502: c5 f5 14 d0        vunpcklpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x2506: c5 e5 14 23        vunpcklpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x250a: c5 d5 14 72 42     vunpcklpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x250f: c5 f0 14 d0        vunpcklps %xmm0,%xmm1,%xmm2
+    libdis_test+0x2513: c5 e0 14 20        vunpcklps (%rax),%xmm3,%xmm4
+    libdis_test+0x2517: c5 d0 14 71 42     vunpcklps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x251c: c5 f4 14 d0        vunpcklps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2520: c5 e4 14 23        vunpcklps (%rbx),%ymm3,%ymm4
+    libdis_test+0x2524: c5 d4 14 72 42     vunpcklps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2529: c5 f1 57 d0        vxorpd %xmm0,%xmm1,%xmm2
+    libdis_test+0x252d: c5 e1 57 20        vxorpd (%rax),%xmm3,%xmm4
+    libdis_test+0x2531: c5 d1 57 71 42     vxorpd 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2536: c5 f5 57 d0        vxorpd %ymm0,%ymm1,%ymm2
+    libdis_test+0x253a: c5 e5 57 23        vxorpd (%rbx),%ymm3,%ymm4
+    libdis_test+0x253e: c5 d5 57 72 42     vxorpd 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x2543: c5 f0 57 d0        vxorps %xmm0,%xmm1,%xmm2
+    libdis_test+0x2547: c5 e0 57 20        vxorps (%rax),%xmm3,%xmm4
+    libdis_test+0x254b: c5 d0 57 71 42     vxorps 0x42(%rcx),%xmm5,%xmm6
+    libdis_test+0x2550: c5 f4 57 d0        vxorps %ymm0,%ymm1,%ymm2
+    libdis_test+0x2554: c5 e4 57 23        vxorps (%rbx),%ymm3,%ymm4
+    libdis_test+0x2558: c5 d4 57 72 42     vxorps 0x42(%rdx),%ymm5,%ymm6
+    libdis_test+0x255d: c5 fc 77           vzeroall 
+    libdis_test+0x2560: c5 f8 77           vzeroupper 
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.avx.s b/usr/src/test/util-tests/tests/dis/i386/64.avx.s
new file mode 100644
index 0000000000..15e0b9a4ce
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.avx.s
@@ -0,0 +1,2324 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test AVX related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vaddpd	%xmm0, %xmm1, %xmm2
+	vaddpd	(%rax), %xmm3, %xmm4
+	vaddpd	0x42(%rcx), %xmm5, %xmm6
+	vaddpd	%ymm0, %ymm1, %ymm2
+	vaddpd	(%rbx), %ymm3, %ymm4
+	vaddpd	0x42(%rdx), %ymm5, %ymm6
+
+	vaddps	%xmm0, %xmm1, %xmm2
+	vaddps	(%rax), %xmm3, %xmm4
+	vaddps	0x42(%rcx), %xmm5, %xmm6
+	vaddps	%ymm0, %ymm1, %ymm2
+	vaddps	(%rbx), %ymm3, %ymm4
+	vaddps	0x42(%rdx), %ymm5, %ymm6
+
+	vaddsd	%xmm0, %xmm1, %xmm2
+	vaddsd	(%rax), %xmm3, %xmm4
+	vaddsd	0x42(%rcx), %xmm5, %xmm6
+
+	vaddss	%xmm0, %xmm1, %xmm2
+	vaddss	(%rax), %xmm3, %xmm4
+	vaddss	0x42(%rcx), %xmm5, %xmm6
+
+	vaddsubpd	%xmm0, %xmm1, %xmm2
+	vaddsubpd	(%rax), %xmm3, %xmm4
+	vaddsubpd	0x42(%rcx), %xmm5, %xmm6
+	vaddsubpd	%ymm0, %ymm1, %ymm2
+	vaddsubpd	(%rbx), %ymm3, %ymm4
+	vaddsubpd	0x42(%rdx), %ymm5, %ymm6
+
+	vaddsubps	%xmm0, %xmm1, %xmm2
+	vaddsubps	(%rax), %xmm3, %xmm4
+	vaddsubps	0x42(%rcx), %xmm5, %xmm6
+	vaddsubps	%ymm0, %ymm1, %ymm2
+	vaddsubps	(%rbx), %ymm3, %ymm4
+	vaddsubps	0x42(%rdx), %ymm5, %ymm6
+
+	vaesdec	%xmm0, %xmm1, %xmm2
+	vaesdec	(%rax), %xmm3, %xmm4
+	vaesdec	0x42(%rcx), %xmm5, %xmm6
+
+	vaesdeclast	%xmm0, %xmm1, %xmm2
+	vaesdeclast	(%rax), %xmm3, %xmm4
+	vaesdeclast	0x42(%rcx), %xmm5, %xmm6
+
+	vaesenc	%xmm0, %xmm1, %xmm2
+	vaesenc	(%rax), %xmm3, %xmm4
+	vaesenc	0x42(%rcx), %xmm5, %xmm6
+
+	vaesenclast	%xmm0, %xmm1, %xmm2
+	vaesenclast	(%rax), %xmm3, %xmm4
+	vaesenclast	0x42(%rcx), %xmm5, %xmm6
+
+	vaesimc	%xmm0, %xmm1
+	vaesimc	(%rsi), %xmm3
+	vaesimc	0x42(%rdi), %xmm3
+
+	vaeskeygenassist	$0x42, %xmm0, %xmm1
+	vaeskeygenassist	$0x23, 	(%rsi), %xmm3
+	vaeskeygenassist	$0x42, 0x42(%rdi), %xmm3
+
+	vandnpd	%xmm0, %xmm1, %xmm2
+	vandnpd	(%rax), %xmm3, %xmm4
+	vandnpd	0x42(%rcx), %xmm5, %xmm6
+	vandnpd	%ymm0, %ymm1, %ymm2
+	vandnpd	(%rbx), %ymm3, %ymm4
+	vandnpd	0x42(%rdx), %ymm5, %ymm6
+
+	vandnps	%xmm0, %xmm1, %xmm2
+	vandnps	(%rax), %xmm3, %xmm4
+	vandnps	0x42(%rcx), %xmm5, %xmm6
+	vandnps	%ymm0, %ymm1, %ymm2
+	vandnps	(%rbx), %ymm3, %ymm4
+	vandnps	0x42(%rdx), %ymm5, %ymm6
+
+	vandpd	%xmm0, %xmm1, %xmm2
+	vandpd	(%rax), %xmm3, %xmm4
+	vandpd	0x42(%rcx), %xmm5, %xmm6
+	vandpd	%ymm0, %ymm1, %ymm2
+	vandpd	(%rbx), %ymm3, %ymm4
+	vandpd	0x42(%rdx), %ymm5, %ymm6
+
+	vandps	%xmm0, %xmm1, %xmm2
+	vandps	(%rax), %xmm3, %xmm4
+	vandps	0x42(%rcx), %xmm5, %xmm6
+	vandps	%ymm0, %ymm1, %ymm2
+	vandps	(%rbx), %ymm3, %ymm4
+	vandps	0x42(%rdx), %ymm5, %ymm6
+
+	vblendpd	$0x48, %xmm3, %xmm5, %xmm7
+	vblendpd	$0x48, (%rbx), %xmm2, %xmm4
+	vblendpd	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vblendpd	$0x48, %ymm3, %ymm5, %ymm7
+	vblendpd	$0x48, (%rbx), %ymm2, %ymm4
+	vblendpd	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vblendps	$0x48, %xmm3, %xmm5, %xmm7
+	vblendps	$0x48, (%rbx), %xmm2, %xmm4
+	vblendps	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vblendps	$0x48, %ymm3, %ymm5, %ymm7
+	vblendps	$0x48, (%rbx), %ymm2, %ymm4
+	vblendps	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vblendvpd	%xmm0, %xmm1, %xmm2, %xmm3
+	vblendvpd	%xmm0, (%rax), %xmm2, %xmm3
+	vblendvpd	%xmm0, 0x10(%rbx), %xmm2, %xmm3
+	vblendvpd	%ymm0, %ymm1, %ymm2, %ymm3
+	vblendvpd	%ymm0, (%rax), %ymm2, %ymm3
+	vblendvpd	%ymm0, 0x10(%rbx), %ymm2, %ymm3
+
+	vblendvps	%xmm0, %xmm1, %xmm2, %xmm3
+	vblendvps	%xmm0, (%rax), %xmm2, %xmm3
+	vblendvps	%xmm0, 0x10(%rbx), %xmm2, %xmm3
+	vblendvps	%ymm0, %ymm1, %ymm2, %ymm3
+	vblendvps	%ymm0, (%rax), %ymm2, %ymm3
+	vblendvps	%ymm0, 0x10(%rbx), %ymm2, %ymm3
+
+	vbroadcastf128	(%rax), %ymm0
+	vbroadcastf128	0x42(%rax), %ymm0
+
+	vbroadcastsd	(%rax), %ymm0
+	vbroadcastsd	0x42(%rax), %ymm0
+
+	vbroadcastss	(%rax), %ymm0
+	vbroadcastss	0x42(%rax), %ymm0
+
+	vcmpeq_ospd	%xmm0, %xmm1, %xmm2
+	vcmpeq_ospd	(%rax), %xmm3, %xmm4
+	vcmpeq_ospd	0x42(%rcx), %xmm5, %xmm6
+	vcmpeq_ospd	%ymm0, %ymm1, %ymm2
+	vcmpeq_ospd	(%rbx), %ymm3, %ymm4
+	vcmpeq_ospd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeq_osps	%xmm0, %xmm1, %xmm2
+	vcmpeq_osps	(%rax), %xmm3, %xmm4
+	vcmpeq_osps	0x42(%rcx), %xmm5, %xmm6
+	vcmpeq_osps	%ymm0, %ymm1, %ymm2
+	vcmpeq_osps	(%rbx), %ymm3, %ymm4
+	vcmpeq_osps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeq_ossd	%xmm0, %xmm1, %xmm2
+	vcmpeq_ossd	(%rax), %xmm3, %xmm4
+	vcmpeq_ossd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpeq_osss	%xmm0, %xmm1, %xmm2
+	vcmpeq_osss	(%rax), %xmm3, %xmm4
+	vcmpeq_osss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpeq_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqpd	(%rax), %xmm3, %xmm4
+	vcmpeq_uqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpeq_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpeq_uqpd	(%rbx), %ymm3, %ymm4
+	vcmpeq_uqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeq_uqps	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqps	(%rax), %xmm3, %xmm4
+	vcmpeq_uqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpeq_uqps	%ymm0, %ymm1, %ymm2
+	vcmpeq_uqps	(%rbx), %ymm3, %ymm4
+	vcmpeq_uqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeq_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqsd	(%rax), %xmm3, %xmm4
+	vcmpeq_uqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpeq_uqss	%xmm0, %xmm1, %xmm2
+	vcmpeq_uqss	(%rax), %xmm3, %xmm4
+	vcmpeq_uqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpeq_uspd	%xmm0, %xmm1, %xmm2
+	vcmpeq_uspd	(%rax), %xmm3, %xmm4
+	vcmpeq_uspd	0x42(%rcx), %xmm5, %xmm6
+	vcmpeq_uspd	%ymm0, %ymm1, %ymm2
+	vcmpeq_uspd	(%rbx), %ymm3, %ymm4
+	vcmpeq_uspd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeq_usps	%xmm0, %xmm1, %xmm2
+	vcmpeq_usps	(%rax), %xmm3, %xmm4
+	vcmpeq_usps	0x42(%rcx), %xmm5, %xmm6
+	vcmpeq_usps	%ymm0, %ymm1, %ymm2
+	vcmpeq_usps	(%rbx), %ymm3, %ymm4
+	vcmpeq_usps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeq_ussd	%xmm0, %xmm1, %xmm2
+	vcmpeq_ussd	(%rax), %xmm3, %xmm4
+	vcmpeq_ussd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpeq_usss	%xmm0, %xmm1, %xmm2
+	vcmpeq_usss	(%rax), %xmm3, %xmm4
+	vcmpeq_usss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpeqpd	%xmm0, %xmm1, %xmm2
+	vcmpeqpd	(%rax), %xmm3, %xmm4
+	vcmpeqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpeqpd	%ymm0, %ymm1, %ymm2
+	vcmpeqpd	(%rbx), %ymm3, %ymm4
+	vcmpeqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeqps	%xmm0, %xmm1, %xmm2
+	vcmpeqps	(%rax), %xmm3, %xmm4
+	vcmpeqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpeqps	%ymm0, %ymm1, %ymm2
+	vcmpeqps	(%rbx), %ymm3, %ymm4
+	vcmpeqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpeqsd	%xmm0, %xmm1, %xmm2
+	vcmpeqsd	(%rax), %xmm3, %xmm4
+	vcmpeqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpeqss	%xmm0, %xmm1, %xmm2
+	vcmpeqss	(%rax), %xmm3, %xmm4
+	vcmpeqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpfalse_ospd	%xmm0, %xmm1, %xmm2
+	vcmpfalse_ospd	(%rax), %xmm3, %xmm4
+	vcmpfalse_ospd	0x42(%rcx), %xmm5, %xmm6
+	vcmpfalse_ospd	%ymm0, %ymm1, %ymm2
+	vcmpfalse_ospd	(%rbx), %ymm3, %ymm4
+	vcmpfalse_ospd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpfalse_osps	%xmm0, %xmm1, %xmm2
+	vcmpfalse_osps	(%rax), %xmm3, %xmm4
+	vcmpfalse_osps	0x42(%rcx), %xmm5, %xmm6
+	vcmpfalse_osps	%ymm0, %ymm1, %ymm2
+	vcmpfalse_osps	(%rbx), %ymm3, %ymm4
+	vcmpfalse_osps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpfalse_ossd	%xmm0, %xmm1, %xmm2
+	vcmpfalse_ossd	(%rax), %xmm3, %xmm4
+	vcmpfalse_ossd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpfalse_osss	%xmm0, %xmm1, %xmm2
+	vcmpfalse_osss	(%rax), %xmm3, %xmm4
+	vcmpfalse_osss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpfalsepd	%xmm0, %xmm1, %xmm2
+	vcmpfalsepd	(%rax), %xmm3, %xmm4
+	vcmpfalsepd	0x42(%rcx), %xmm5, %xmm6
+	vcmpfalsepd	%ymm0, %ymm1, %ymm2
+	vcmpfalsepd	(%rbx), %ymm3, %ymm4
+	vcmpfalsepd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpfalseps	%xmm0, %xmm1, %xmm2
+	vcmpfalseps	(%rax), %xmm3, %xmm4
+	vcmpfalseps	0x42(%rcx), %xmm5, %xmm6
+	vcmpfalseps	%ymm0, %ymm1, %ymm2
+	vcmpfalseps	(%rbx), %ymm3, %ymm4
+	vcmpfalseps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpfalsesd	%xmm0, %xmm1, %xmm2
+	vcmpfalsesd	(%rax), %xmm3, %xmm4
+	vcmpfalsesd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpfalsess	%xmm0, %xmm1, %xmm2
+	vcmpfalsess	(%rax), %xmm3, %xmm4
+	vcmpfalsess	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpge_oqpd	%xmm0, %xmm1, %xmm2
+	vcmpge_oqpd	(%rax), %xmm3, %xmm4
+	vcmpge_oqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpge_oqpd	%ymm0, %ymm1, %ymm2
+	vcmpge_oqpd	(%rbx), %ymm3, %ymm4
+	vcmpge_oqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpge_oqps	%xmm0, %xmm1, %xmm2
+	vcmpge_oqps	(%rax), %xmm3, %xmm4
+	vcmpge_oqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpge_oqps	%ymm0, %ymm1, %ymm2
+	vcmpge_oqps	(%rbx), %ymm3, %ymm4
+	vcmpge_oqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpge_oqsd	%xmm0, %xmm1, %xmm2
+	vcmpge_oqsd	(%rax), %xmm3, %xmm4
+	vcmpge_oqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpge_oqss	%xmm0, %xmm1, %xmm2
+	vcmpge_oqss	(%rax), %xmm3, %xmm4
+	vcmpge_oqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpgepd	%xmm0, %xmm1, %xmm2
+	vcmpgepd	(%rax), %xmm3, %xmm4
+	vcmpgepd	0x42(%rcx), %xmm5, %xmm6
+	vcmpgepd	%ymm0, %ymm1, %ymm2
+	vcmpgepd	(%rbx), %ymm3, %ymm4
+	vcmpgepd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpgeps	%xmm0, %xmm1, %xmm2
+	vcmpgeps	(%rax), %xmm3, %xmm4
+	vcmpgeps	0x42(%rcx), %xmm5, %xmm6
+	vcmpgeps	%ymm0, %ymm1, %ymm2
+	vcmpgeps	(%rbx), %ymm3, %ymm4
+	vcmpgeps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpgesd	%xmm0, %xmm1, %xmm2
+	vcmpgesd	(%rax), %xmm3, %xmm4
+	vcmpgesd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpgess	%xmm0, %xmm1, %xmm2
+	vcmpgess	(%rax), %xmm3, %xmm4
+	vcmpgess	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpgt_oqpd	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqpd	(%rax), %xmm3, %xmm4
+	vcmpgt_oqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpgt_oqpd	%ymm0, %ymm1, %ymm2
+	vcmpgt_oqpd	(%rbx), %ymm3, %ymm4
+	vcmpgt_oqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpgt_oqps	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqps	(%rax), %xmm3, %xmm4
+	vcmpgt_oqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpgt_oqps	%ymm0, %ymm1, %ymm2
+	vcmpgt_oqps	(%rbx), %ymm3, %ymm4
+	vcmpgt_oqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpgt_oqsd	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqsd	(%rax), %xmm3, %xmm4
+	vcmpgt_oqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpgt_oqss	%xmm0, %xmm1, %xmm2
+	vcmpgt_oqss	(%rax), %xmm3, %xmm4
+	vcmpgt_oqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpgtpd	%xmm0, %xmm1, %xmm2
+	vcmpgtpd	(%rax), %xmm3, %xmm4
+	vcmpgtpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpgtpd	%ymm0, %ymm1, %ymm2
+	vcmpgtpd	(%rbx), %ymm3, %ymm4
+	vcmpgtpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpgtps	%xmm0, %xmm1, %xmm2
+	vcmpgtps	(%rax), %xmm3, %xmm4
+	vcmpgtps	0x42(%rcx), %xmm5, %xmm6
+	vcmpgtps	%ymm0, %ymm1, %ymm2
+	vcmpgtps	(%rbx), %ymm3, %ymm4
+	vcmpgtps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpgtsd	%xmm0, %xmm1, %xmm2
+	vcmpgtsd	(%rax), %xmm3, %xmm4
+	vcmpgtsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpgtss	%xmm0, %xmm1, %xmm2
+	vcmpgtss	(%rax), %xmm3, %xmm4
+	vcmpgtss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmple_oqpd	%xmm0, %xmm1, %xmm2
+	vcmple_oqpd	(%rax), %xmm3, %xmm4
+	vcmple_oqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmple_oqpd	%ymm0, %ymm1, %ymm2
+	vcmple_oqpd	(%rbx), %ymm3, %ymm4
+	vcmple_oqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmple_oqps	%xmm0, %xmm1, %xmm2
+	vcmple_oqps	(%rax), %xmm3, %xmm4
+	vcmple_oqps	0x42(%rcx), %xmm5, %xmm6
+	vcmple_oqps	%ymm0, %ymm1, %ymm2
+	vcmple_oqps	(%rbx), %ymm3, %ymm4
+	vcmple_oqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmple_oqsd	%xmm0, %xmm1, %xmm2
+	vcmple_oqsd	(%rax), %xmm3, %xmm4
+	vcmple_oqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmple_oqss	%xmm0, %xmm1, %xmm2
+	vcmple_oqss	(%rax), %xmm3, %xmm4
+	vcmple_oqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmplepd	%xmm0, %xmm1, %xmm2
+	vcmplepd	(%rax), %xmm3, %xmm4
+	vcmplepd	0x42(%rcx), %xmm5, %xmm6
+	vcmplepd	%ymm0, %ymm1, %ymm2
+	vcmplepd	(%rbx), %ymm3, %ymm4
+	vcmplepd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpleps	%xmm0, %xmm1, %xmm2
+	vcmpleps	(%rax), %xmm3, %xmm4
+	vcmpleps	0x42(%rcx), %xmm5, %xmm6
+	vcmpleps	%ymm0, %ymm1, %ymm2
+	vcmpleps	(%rbx), %ymm3, %ymm4
+	vcmpleps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmplesd	%xmm0, %xmm1, %xmm2
+	vcmplesd	(%rax), %xmm3, %xmm4
+	vcmplesd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpless	%xmm0, %xmm1, %xmm2
+	vcmpless	(%rax), %xmm3, %xmm4
+	vcmpless	0x42(%rcx), %xmm5, %xmm6
+
+	vcmplt_oqpd	%xmm0, %xmm1, %xmm2
+	vcmplt_oqpd	(%rax), %xmm3, %xmm4
+	vcmplt_oqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmplt_oqpd	%ymm0, %ymm1, %ymm2
+	vcmplt_oqpd	(%rbx), %ymm3, %ymm4
+	vcmplt_oqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmplt_oqps	%xmm0, %xmm1, %xmm2
+	vcmplt_oqps	(%rax), %xmm3, %xmm4
+	vcmplt_oqps	0x42(%rcx), %xmm5, %xmm6
+	vcmplt_oqps	%ymm0, %ymm1, %ymm2
+	vcmplt_oqps	(%rbx), %ymm3, %ymm4
+	vcmplt_oqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmplt_oqsd	%xmm0, %xmm1, %xmm2
+	vcmplt_oqsd	(%rax), %xmm3, %xmm4
+	vcmplt_oqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmplt_oqss	%xmm0, %xmm1, %xmm2
+	vcmplt_oqss	(%rax), %xmm3, %xmm4
+	vcmplt_oqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpltpd	%xmm0, %xmm1, %xmm2
+	vcmpltpd	(%rax), %xmm3, %xmm4
+	vcmpltpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpltpd	%ymm0, %ymm1, %ymm2
+	vcmpltpd	(%rbx), %ymm3, %ymm4
+	vcmpltpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpltps	%xmm0, %xmm1, %xmm2
+	vcmpltps	(%rax), %xmm3, %xmm4
+	vcmpltps	0x42(%rcx), %xmm5, %xmm6
+	vcmpltps	%ymm0, %ymm1, %ymm2
+	vcmpltps	(%rbx), %ymm3, %ymm4
+	vcmpltps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpltsd	%xmm0, %xmm1, %xmm2
+	vcmpltsd	(%rax), %xmm3, %xmm4
+	vcmpltsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpltss	%xmm0, %xmm1, %xmm2
+	vcmpltss	(%rax), %xmm3, %xmm4
+	vcmpltss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneq_oqpd	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqpd	(%rax), %xmm3, %xmm4
+	vcmpneq_oqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpneq_oqpd	%ymm0, %ymm1, %ymm2
+	vcmpneq_oqpd	(%rbx), %ymm3, %ymm4
+	vcmpneq_oqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneq_oqps	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqps	(%rax), %xmm3, %xmm4
+	vcmpneq_oqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpneq_oqps	%ymm0, %ymm1, %ymm2
+	vcmpneq_oqps	(%rbx), %ymm3, %ymm4
+	vcmpneq_oqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneq_oqsd	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqsd	(%rax), %xmm3, %xmm4
+	vcmpneq_oqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneq_oqss	%xmm0, %xmm1, %xmm2
+	vcmpneq_oqss	(%rax), %xmm3, %xmm4
+	vcmpneq_oqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneq_ospd	%xmm0, %xmm1, %xmm2
+	vcmpneq_ospd	(%rax), %xmm3, %xmm4
+	vcmpneq_ospd	0x42(%rcx), %xmm5, %xmm6
+	vcmpneq_ospd	%ymm0, %ymm1, %ymm2
+	vcmpneq_ospd	(%rbx), %ymm3, %ymm4
+	vcmpneq_ospd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneq_osps	%xmm0, %xmm1, %xmm2
+	vcmpneq_osps	(%rax), %xmm3, %xmm4
+	vcmpneq_osps	0x42(%rcx), %xmm5, %xmm6
+	vcmpneq_osps	%ymm0, %ymm1, %ymm2
+	vcmpneq_osps	(%rbx), %ymm3, %ymm4
+	vcmpneq_osps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneq_ossd	%xmm0, %xmm1, %xmm2
+	vcmpneq_ossd	(%rax), %xmm3, %xmm4
+	vcmpneq_ossd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneq_osss	%xmm0, %xmm1, %xmm2
+	vcmpneq_osss	(%rax), %xmm3, %xmm4
+	vcmpneq_osss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneq_uspd	%xmm0, %xmm1, %xmm2
+	vcmpneq_uspd	(%rax), %xmm3, %xmm4
+	vcmpneq_uspd	0x42(%rcx), %xmm5, %xmm6
+	vcmpneq_uspd	%ymm0, %ymm1, %ymm2
+	vcmpneq_uspd	(%rbx), %ymm3, %ymm4
+	vcmpneq_uspd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneq_usps	%xmm0, %xmm1, %xmm2
+	vcmpneq_usps	(%rax), %xmm3, %xmm4
+	vcmpneq_usps	0x42(%rcx), %xmm5, %xmm6
+	vcmpneq_usps	%ymm0, %ymm1, %ymm2
+	vcmpneq_usps	(%rbx), %ymm3, %ymm4
+	vcmpneq_usps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneq_ussd	%xmm0, %xmm1, %xmm2
+	vcmpneq_ussd	(%rax), %xmm3, %xmm4
+	vcmpneq_ussd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneq_usss	%xmm0, %xmm1, %xmm2
+	vcmpneq_usss	(%rax), %xmm3, %xmm4
+	vcmpneq_usss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneqpd	%xmm0, %xmm1, %xmm2
+	vcmpneqpd	(%rax), %xmm3, %xmm4
+	vcmpneqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpneqpd	%ymm0, %ymm1, %ymm2
+	vcmpneqpd	(%rbx), %ymm3, %ymm4
+	vcmpneqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneqps	%xmm0, %xmm1, %xmm2
+	vcmpneqps	(%rax), %xmm3, %xmm4
+	vcmpneqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpneqps	%ymm0, %ymm1, %ymm2
+	vcmpneqps	(%rbx), %ymm3, %ymm4
+	vcmpneqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpneqsd	%xmm0, %xmm1, %xmm2
+	vcmpneqsd	(%rax), %xmm3, %xmm4
+	vcmpneqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpneqss	%xmm0, %xmm1, %xmm2
+	vcmpneqss	(%rax), %xmm3, %xmm4
+	vcmpneqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnge_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqpd	(%rax), %xmm3, %xmm4
+	vcmpnge_uqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpnge_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpnge_uqpd	(%rbx), %ymm3, %ymm4
+	vcmpnge_uqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnge_uqps	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqps	(%rax), %xmm3, %xmm4
+	vcmpnge_uqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpnge_uqps	%ymm0, %ymm1, %ymm2
+	vcmpnge_uqps	(%rbx), %ymm3, %ymm4
+	vcmpnge_uqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnge_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqsd	(%rax), %xmm3, %xmm4
+	vcmpnge_uqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnge_uqss	%xmm0, %xmm1, %xmm2
+	vcmpnge_uqss	(%rax), %xmm3, %xmm4
+	vcmpnge_uqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpngepd	%xmm0, %xmm1, %xmm2
+	vcmpngepd	(%rax), %xmm3, %xmm4
+	vcmpngepd	0x42(%rcx), %xmm5, %xmm6
+	vcmpngepd	%ymm0, %ymm1, %ymm2
+	vcmpngepd	(%rbx), %ymm3, %ymm4
+	vcmpngepd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpngeps	%xmm0, %xmm1, %xmm2
+	vcmpngeps	(%rax), %xmm3, %xmm4
+	vcmpngeps	0x42(%rcx), %xmm5, %xmm6
+	vcmpngeps	%ymm0, %ymm1, %ymm2
+	vcmpngeps	(%rbx), %ymm3, %ymm4
+	vcmpngeps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpngesd	%xmm0, %xmm1, %xmm2
+	vcmpngesd	(%rax), %xmm3, %xmm4
+	vcmpngesd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpngess	%xmm0, %xmm1, %xmm2
+	vcmpngess	(%rax), %xmm3, %xmm4
+	vcmpngess	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpngt_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqpd	(%rax), %xmm3, %xmm4
+	vcmpngt_uqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpngt_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpngt_uqpd	(%rbx), %ymm3, %ymm4
+	vcmpngt_uqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpngt_uqps	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqps	(%rax), %xmm3, %xmm4
+	vcmpngt_uqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpngt_uqps	%ymm0, %ymm1, %ymm2
+	vcmpngt_uqps	(%rbx), %ymm3, %ymm4
+	vcmpngt_uqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpngt_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqsd	(%rax), %xmm3, %xmm4
+	vcmpngt_uqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpngt_uqss	%xmm0, %xmm1, %xmm2
+	vcmpngt_uqss	(%rax), %xmm3, %xmm4
+	vcmpngt_uqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpngtpd	%xmm0, %xmm1, %xmm2
+	vcmpngtpd	(%rax), %xmm3, %xmm4
+	vcmpngtpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpngtpd	%ymm0, %ymm1, %ymm2
+	vcmpngtpd	(%rbx), %ymm3, %ymm4
+	vcmpngtpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpngtps	%xmm0, %xmm1, %xmm2
+	vcmpngtps	(%rax), %xmm3, %xmm4
+	vcmpngtps	0x42(%rcx), %xmm5, %xmm6
+	vcmpngtps	%ymm0, %ymm1, %ymm2
+	vcmpngtps	(%rbx), %ymm3, %ymm4
+	vcmpngtps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpngtsd	%xmm0, %xmm1, %xmm2
+	vcmpngtsd	(%rax), %xmm3, %xmm4
+	vcmpngtsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpngtss	%xmm0, %xmm1, %xmm2
+	vcmpngtss	(%rax), %xmm3, %xmm4
+	vcmpngtss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnle_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqpd	(%rax), %xmm3, %xmm4
+	vcmpnle_uqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpnle_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpnle_uqpd	(%rbx), %ymm3, %ymm4
+	vcmpnle_uqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnle_uqps	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqps	(%rax), %xmm3, %xmm4
+	vcmpnle_uqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpnle_uqps	%ymm0, %ymm1, %ymm2
+	vcmpnle_uqps	(%rbx), %ymm3, %ymm4
+	vcmpnle_uqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnle_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqsd	(%rax), %xmm3, %xmm4
+	vcmpnle_uqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnle_uqss	%xmm0, %xmm1, %xmm2
+	vcmpnle_uqss	(%rax), %xmm3, %xmm4
+	vcmpnle_uqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnlepd	%xmm0, %xmm1, %xmm2
+	vcmpnlepd	(%rax), %xmm3, %xmm4
+	vcmpnlepd	0x42(%rcx), %xmm5, %xmm6
+	vcmpnlepd	%ymm0, %ymm1, %ymm2
+	vcmpnlepd	(%rbx), %ymm3, %ymm4
+	vcmpnlepd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnleps	%xmm0, %xmm1, %xmm2
+	vcmpnleps	(%rax), %xmm3, %xmm4
+	vcmpnleps	0x42(%rcx), %xmm5, %xmm6
+	vcmpnleps	%ymm0, %ymm1, %ymm2
+	vcmpnleps	(%rbx), %ymm3, %ymm4
+	vcmpnleps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnlesd	%xmm0, %xmm1, %xmm2
+	vcmpnlesd	(%rax), %xmm3, %xmm4
+	vcmpnlesd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnless	%xmm0, %xmm1, %xmm2
+	vcmpnless	(%rax), %xmm3, %xmm4
+	vcmpnless	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnlt_uqpd	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqpd	(%rax), %xmm3, %xmm4
+	vcmpnlt_uqpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpnlt_uqpd	%ymm0, %ymm1, %ymm2
+	vcmpnlt_uqpd	(%rbx), %ymm3, %ymm4
+	vcmpnlt_uqpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnlt_uqps	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqps	(%rax), %xmm3, %xmm4
+	vcmpnlt_uqps	0x42(%rcx), %xmm5, %xmm6
+	vcmpnlt_uqps	%ymm0, %ymm1, %ymm2
+	vcmpnlt_uqps	(%rbx), %ymm3, %ymm4
+	vcmpnlt_uqps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnlt_uqsd	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqsd	(%rax), %xmm3, %xmm4
+	vcmpnlt_uqsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnlt_uqss	%xmm0, %xmm1, %xmm2
+	vcmpnlt_uqss	(%rax), %xmm3, %xmm4
+	vcmpnlt_uqss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnltpd	%xmm0, %xmm1, %xmm2
+	vcmpnltpd	(%rax), %xmm3, %xmm4
+	vcmpnltpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpnltpd	%ymm0, %ymm1, %ymm2
+	vcmpnltpd	(%rbx), %ymm3, %ymm4
+	vcmpnltpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnltps	%xmm0, %xmm1, %xmm2
+	vcmpnltps	(%rax), %xmm3, %xmm4
+	vcmpnltps	0x42(%rcx), %xmm5, %xmm6
+	vcmpnltps	%ymm0, %ymm1, %ymm2
+	vcmpnltps	(%rbx), %ymm3, %ymm4
+	vcmpnltps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpnltsd	%xmm0, %xmm1, %xmm2
+	vcmpnltsd	(%rax), %xmm3, %xmm4
+	vcmpnltsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpnltss	%xmm0, %xmm1, %xmm2
+	vcmpnltss	(%rax), %xmm3, %xmm4
+	vcmpnltss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpord_spd	%xmm0, %xmm1, %xmm2
+	vcmpord_spd	(%rax), %xmm3, %xmm4
+	vcmpord_spd	0x42(%rcx), %xmm5, %xmm6
+	vcmpord_spd	%ymm0, %ymm1, %ymm2
+	vcmpord_spd	(%rbx), %ymm3, %ymm4
+	vcmpord_spd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpord_sps	%xmm0, %xmm1, %xmm2
+	vcmpord_sps	(%rax), %xmm3, %xmm4
+	vcmpord_sps	0x42(%rcx), %xmm5, %xmm6
+	vcmpord_sps	%ymm0, %ymm1, %ymm2
+	vcmpord_sps	(%rbx), %ymm3, %ymm4
+	vcmpord_sps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpord_ssd	%xmm0, %xmm1, %xmm2
+	vcmpord_ssd	(%rax), %xmm3, %xmm4
+	vcmpord_ssd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpord_sss	%xmm0, %xmm1, %xmm2
+	vcmpord_sss	(%rax), %xmm3, %xmm4
+	vcmpord_sss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpordpd	%xmm0, %xmm1, %xmm2
+	vcmpordpd	(%rax), %xmm3, %xmm4
+	vcmpordpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpordpd	%ymm0, %ymm1, %ymm2
+	vcmpordpd	(%rbx), %ymm3, %ymm4
+	vcmpordpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpordps	%xmm0, %xmm1, %xmm2
+	vcmpordps	(%rax), %xmm3, %xmm4
+	vcmpordps	0x42(%rcx), %xmm5, %xmm6
+	vcmpordps	%ymm0, %ymm1, %ymm2
+	vcmpordps	(%rbx), %ymm3, %ymm4
+	vcmpordps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpordsd	%xmm0, %xmm1, %xmm2
+	vcmpordsd	(%rax), %xmm3, %xmm4
+	vcmpordsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpordss	%xmm0, %xmm1, %xmm2
+	vcmpordss	(%rax), %xmm3, %xmm4
+	vcmpordss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmppd	$0x48, %xmm3, %xmm5, %xmm7
+	vcmppd	$0x48, (%rbx), %xmm2, %xmm4
+	vcmppd	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vcmppd	$0x48, %ymm3, %ymm5, %ymm7
+	vcmppd	$0x48, (%rbx), %ymm2, %ymm4
+	vcmppd	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vcmpps	$0x48, %xmm3, %xmm5, %xmm7
+	vcmpps	$0x48, (%rbx), %xmm2, %xmm4
+	vcmpps	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vcmpps	$0x48, %ymm3, %ymm5, %ymm7
+	vcmpps	$0x48, (%rbx), %ymm2, %ymm4
+	vcmpps	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vcmpsd	$0x48, %xmm3, %xmm5, %xmm7
+	vcmpsd	$0x48, (%rbx), %xmm2, %xmm4
+	vcmpsd	$0x48, 0x8(%rbx), %xmm1, %xmm6
+
+	vcmpss	$0x48, %xmm3, %xmm5, %xmm7
+	vcmpss	$0x48, (%rbx), %xmm2, %xmm4
+	vcmpss	$0x48, 0x8(%rbx), %xmm1, %xmm6
+
+	vcmptrue_uspd	%xmm0, %xmm1, %xmm2
+	vcmptrue_uspd	(%rax), %xmm3, %xmm4
+	vcmptrue_uspd	0x42(%rcx), %xmm5, %xmm6
+	vcmptrue_uspd	%ymm0, %ymm1, %ymm2
+	vcmptrue_uspd	(%rbx), %ymm3, %ymm4
+	vcmptrue_uspd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmptrue_usps	%xmm0, %xmm1, %xmm2
+	vcmptrue_usps	(%rax), %xmm3, %xmm4
+	vcmptrue_usps	0x42(%rcx), %xmm5, %xmm6
+	vcmptrue_usps	%ymm0, %ymm1, %ymm2
+	vcmptrue_usps	(%rbx), %ymm3, %ymm4
+	vcmptrue_usps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmptrue_ussd	%xmm0, %xmm1, %xmm2
+	vcmptrue_ussd	(%rax), %xmm3, %xmm4
+	vcmptrue_ussd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmptrue_usss	%xmm0, %xmm1, %xmm2
+	vcmptrue_usss	(%rax), %xmm3, %xmm4
+	vcmptrue_usss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmptruepd	%xmm0, %xmm1, %xmm2
+	vcmptruepd	(%rax), %xmm3, %xmm4
+	vcmptruepd	0x42(%rcx), %xmm5, %xmm6
+	vcmptruepd	%ymm0, %ymm1, %ymm2
+	vcmptruepd	(%rbx), %ymm3, %ymm4
+	vcmptruepd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmptrueps	%xmm0, %xmm1, %xmm2
+	vcmptrueps	(%rax), %xmm3, %xmm4
+	vcmptrueps	0x42(%rcx), %xmm5, %xmm6
+	vcmptrueps	%ymm0, %ymm1, %ymm2
+	vcmptrueps	(%rbx), %ymm3, %ymm4
+	vcmptrueps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmptruesd	%xmm0, %xmm1, %xmm2
+	vcmptruesd	(%rax), %xmm3, %xmm4
+	vcmptruesd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmptruess	%xmm0, %xmm1, %xmm2
+	vcmptruess	(%rax), %xmm3, %xmm4
+	vcmptruess	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpunord_spd	%xmm0, %xmm1, %xmm2
+	vcmpunord_spd	(%rax), %xmm3, %xmm4
+	vcmpunord_spd	0x42(%rcx), %xmm5, %xmm6
+	vcmpunord_spd	%ymm0, %ymm1, %ymm2
+	vcmpunord_spd	(%rbx), %ymm3, %ymm4
+	vcmpunord_spd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpunord_sps	%xmm0, %xmm1, %xmm2
+	vcmpunord_sps	(%rax), %xmm3, %xmm4
+	vcmpunord_sps	0x42(%rcx), %xmm5, %xmm6
+	vcmpunord_sps	%ymm0, %ymm1, %ymm2
+	vcmpunord_sps	(%rbx), %ymm3, %ymm4
+	vcmpunord_sps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpunord_ssd	%xmm0, %xmm1, %xmm2
+	vcmpunord_ssd	(%rax), %xmm3, %xmm4
+	vcmpunord_ssd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpunord_sss	%xmm0, %xmm1, %xmm2
+	vcmpunord_sss	(%rax), %xmm3, %xmm4
+	vcmpunord_sss	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpunordpd	%xmm0, %xmm1, %xmm2
+	vcmpunordpd	(%rax), %xmm3, %xmm4
+	vcmpunordpd	0x42(%rcx), %xmm5, %xmm6
+	vcmpunordpd	%ymm0, %ymm1, %ymm2
+	vcmpunordpd	(%rbx), %ymm3, %ymm4
+	vcmpunordpd	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpunordps	%xmm0, %xmm1, %xmm2
+	vcmpunordps	(%rax), %xmm3, %xmm4
+	vcmpunordps	0x42(%rcx), %xmm5, %xmm6
+	vcmpunordps	%ymm0, %ymm1, %ymm2
+	vcmpunordps	(%rbx), %ymm3, %ymm4
+	vcmpunordps	0x42(%rdx), %ymm5, %ymm6
+
+	vcmpunordsd	%xmm0, %xmm1, %xmm2
+	vcmpunordsd	(%rax), %xmm3, %xmm4
+	vcmpunordsd	0x42(%rcx), %xmm5, %xmm6
+
+	vcmpunordss	%xmm0, %xmm1, %xmm2
+	vcmpunordss	(%rax), %xmm3, %xmm4
+	vcmpunordss	0x42(%rcx), %xmm5, %xmm6
+
+	vcomisd	%xmm0, %xmm1
+	vcomisd	(%rsi), %xmm3
+	vcomisd	0x42(%rdi), %xmm3
+
+	vcomiss	%xmm0, %xmm1
+	vcomiss	(%rsi), %xmm3
+	vcomiss	0x42(%rdi), %xmm3
+
+	vcvtdq2pd	%xmm0, %xmm1
+	vcvtdq2pd	(%rsi), %xmm3
+	vcvtdq2pd	0x42(%rdi), %xmm3
+	vcvtdq2pd	%xmm7, %ymm6
+	vcvtdq2pd	(%rbp), %ymm4
+	vcvtdq2pd	0x42(%rsp), %ymm4
+
+	vcvtdq2ps	%xmm0, %xmm1
+	vcvtdq2ps	(%rsi), %xmm3
+	vcvtdq2ps	0x42(%rdi), %xmm3
+	vcvtdq2ps	%ymm7, %ymm6
+	vcvtdq2ps	(%rbp), %ymm4
+	vcvtdq2ps	0x42(%rsp), %ymm4
+
+	vcvtpd2dq	%ymm6, %xmm3
+
+	vcvtpd2dqx	%xmm0, %xmm1
+	vcvtpd2dqx	(%rsi), %xmm3
+	vcvtpd2dqx	0x42(%rdi), %xmm3
+
+	vcvtpd2dqy	%ymm7, %xmm6
+	vcvtpd2dqy	(%rbp), %xmm4
+	vcvtpd2dqy	0x42(%rsp), %xmm4
+
+	vcvtpd2ps	%ymm6, %xmm3
+
+	vcvtpd2psx	%xmm0, %xmm1
+	vcvtpd2psx	(%rsi), %xmm3
+	vcvtpd2psx	0x42(%rdi), %xmm3
+
+	vcvtpd2psy	%ymm7, %xmm6
+	vcvtpd2psy	(%rbp), %xmm4
+	vcvtpd2psy	0x42(%rsp), %xmm4
+
+	vcvtps2dq	%xmm0, %xmm1
+	vcvtps2dq	(%rsi), %xmm3
+	vcvtps2dq	0x42(%rdi), %xmm3
+	vcvtps2dq	%ymm7, %ymm6
+	vcvtps2dq	(%rbp), %ymm4
+	vcvtps2dq	0x42(%rsp), %ymm4
+
+	vcvtps2pd	%xmm0, %xmm1
+	vcvtps2pd	(%rsi), %xmm3
+	vcvtps2pd	0x42(%rdi), %xmm3
+	vcvtps2pd	%xmm7, %ymm6
+	vcvtps2pd	(%rbp), %ymm4
+	vcvtps2pd	0x42(%rsp), %ymm4
+
+	vcvtsd2si	%xmm6, %rax
+	vcvtsd2si	(%rbx), %rax
+	vcvtsd2si	0x24(%rbx), %rax
+
+	vcvtsd2ss	%xmm0, %xmm1, %xmm2
+	vcvtsd2ss	(%rax), %xmm3, %xmm4
+	vcvtsd2ss	0x42(%rcx), %xmm5, %xmm6
+
+	vcvtss2sd	%xmm0, %xmm1, %xmm2
+	vcvtss2sd	(%rax), %xmm3, %xmm4
+	vcvtss2sd	0x42(%rcx), %xmm5, %xmm6
+
+	vcvtss2si	%xmm6, %rax
+	vcvtss2si	(%rbx), %rax
+	vcvtss2si	0x24(%rbx), %rax
+
+	vcvttpd2dq	%xmm0, %xmm5
+
+	vcvttpd2dqx	%xmm0, %xmm1
+	vcvttpd2dqx	(%rsi), %xmm3
+	vcvttpd2dqx	0x42(%rdi), %xmm3
+
+	vcvttpd2dqy	%ymm7, %xmm6
+	vcvttpd2dqy	(%rbp), %xmm4
+	vcvttpd2dqy	0x42(%rsp), %xmm4
+
+	vcvttps2dq	%xmm0, %xmm1
+	vcvttps2dq	(%rsi), %xmm3
+	vcvttps2dq	0x42(%rdi), %xmm3
+	vcvttps2dq	%ymm7, %ymm6
+	vcvttps2dq	(%rbp), %ymm4
+	vcvttps2dq	0x42(%rsp), %ymm4
+
+	vcvttsd2si	%xmm6, %rax
+	vcvttsd2si	(%rbx), %rax
+	vcvttsd2si	0x24(%rbx), %rax
+
+	vcvttss2si	%xmm6, %rax
+	vcvttss2si	(%rbx), %rax
+	vcvttss2si	0x24(%rbx), %rax
+
+	vdivpd	%xmm0, %xmm1, %xmm2
+	vdivpd	(%rax), %xmm3, %xmm4
+	vdivpd	0x42(%rcx), %xmm5, %xmm6
+	vdivpd	%ymm0, %ymm1, %ymm2
+	vdivpd	(%rbx), %ymm3, %ymm4
+	vdivpd	0x42(%rdx), %ymm5, %ymm6
+
+	vdivps	%xmm0, %xmm1, %xmm2
+	vdivps	(%rax), %xmm3, %xmm4
+	vdivps	0x42(%rcx), %xmm5, %xmm6
+	vdivps	%ymm0, %ymm1, %ymm2
+	vdivps	(%rbx), %ymm3, %ymm4
+	vdivps	0x42(%rdx), %ymm5, %ymm6
+
+	vdivsd	%xmm0, %xmm1, %xmm2
+	vdivsd	(%rax), %xmm3, %xmm4
+	vdivsd	0x42(%rcx), %xmm5, %xmm6
+
+	vdivss	%xmm0, %xmm1, %xmm2
+	vdivss	(%rax), %xmm3, %xmm4
+	vdivss	0x42(%rcx), %xmm5, %xmm6
+
+	vdppd	$0x48, %xmm3, %xmm5, %xmm7
+	vdppd	$0x48, (%rbx), %xmm2, %xmm4
+	vdppd	$0x48, 0x8(%rbx), %xmm1, %xmm6
+
+	vdpps	$0x48, %xmm3, %xmm5, %xmm7
+	vdpps	$0x48, (%rbx), %xmm2, %xmm4
+	vdpps	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vdpps	$0x48, %ymm3, %ymm5, %ymm7
+	vdpps	$0x48, (%rbx), %ymm2, %ymm4
+	vdpps	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vextractf128	$0x30, %ymm0, %xmm1
+	vextractf128	$0x30, %ymm0, (%rcx)
+	vextractf128	$0x30, %ymm0, 0x24(%rdx)
+
+	vextractps	$0x30, %xmm0, %rax
+	vextractps	$0x30, %xmm0, (%rcx)
+	vextractps	$0x30, %xmm0, 0x24(%rdx)
+
+	vhaddpd	%xmm0, %xmm1, %xmm2
+	vhaddpd	(%rax), %xmm3, %xmm4
+	vhaddpd	0x42(%rcx), %xmm5, %xmm6
+	vhaddpd	%ymm0, %ymm1, %ymm2
+	vhaddpd	(%rbx), %ymm3, %ymm4
+	vhaddpd	0x42(%rdx), %ymm5, %ymm6
+
+	vhaddps	%xmm0, %xmm1, %xmm2
+	vhaddps	(%rax), %xmm3, %xmm4
+	vhaddps	0x42(%rcx), %xmm5, %xmm6
+	vhaddps	%ymm0, %ymm1, %ymm2
+	vhaddps	(%rbx), %ymm3, %ymm4
+	vhaddps	0x42(%rdx), %ymm5, %ymm6
+
+	vhsubpd	%xmm0, %xmm1, %xmm2
+	vhsubpd	(%rax), %xmm3, %xmm4
+	vhsubpd	0x42(%rcx), %xmm5, %xmm6
+	vhsubpd	%ymm0, %ymm1, %ymm2
+	vhsubpd	(%rbx), %ymm3, %ymm4
+	vhsubpd	0x42(%rdx), %ymm5, %ymm6
+
+	vhsubps	%xmm0, %xmm1, %xmm2
+	vhsubps	(%rax), %xmm3, %xmm4
+	vhsubps	0x42(%rcx), %xmm5, %xmm6
+	vhsubps	%ymm0, %ymm1, %ymm2
+	vhsubps	(%rbx), %ymm3, %ymm4
+	vhsubps	0x42(%rdx), %ymm5, %ymm6
+
+	vinsertf128	$0x48, %xmm3, %ymm5, %ymm7
+	vinsertf128	$0x48, (%rbx), %ymm2, %ymm4
+	vinsertf128	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vinsertps	$0x48, %xmm3, %xmm5, %xmm7
+	vinsertps	$0x48, (%rbx), %xmm2, %xmm4
+	vinsertps	$0x48, 0x8(%rbx), %xmm1, %xmm6
+
+	vlddqu	(%rbx), %xmm2
+	vlddqu	0x8(%rbx), %xmm1
+	vlddqu	(%rbx), %ymm2
+	vlddqu	0x8(%rbx), %ymm1
+
+	vldmxcsr	(%rdx)
+	vldmxcsr	0x8(%rdx)
+
+	vmaskmovdqu	%xmm0, %xmm5
+
+	vmaskmovpd	(%rbx), %xmm4, %xmm2
+	vmaskmovpd	0x8(%rbx), %xmm2, %xmm1
+
+	vmaskmovps	(%rbx), %ymm4, %ymm2
+	vmaskmovps	0x8(%rbx), %ymm3, %ymm1
+
+	vmaxpd	%xmm0, %xmm1, %xmm2
+	vmaxpd	(%rax), %xmm3, %xmm4
+	vmaxpd	0x42(%rcx), %xmm5, %xmm6
+	vmaxpd	%ymm0, %ymm1, %ymm2
+	vmaxpd	(%rbx), %ymm3, %ymm4
+	vmaxpd	0x42(%rdx), %ymm5, %ymm6
+
+	vmaxps	%xmm0, %xmm1, %xmm2
+	vmaxps	(%rax), %xmm3, %xmm4
+	vmaxps	0x42(%rcx), %xmm5, %xmm6
+	vmaxps	%ymm0, %ymm1, %ymm2
+	vmaxps	(%rbx), %ymm3, %ymm4
+	vmaxps	0x42(%rdx), %ymm5, %ymm6
+
+	vmaxsd	%xmm0, %xmm1, %xmm2
+	vmaxsd	(%rax), %xmm3, %xmm4
+	vmaxsd	0x42(%rcx), %xmm5, %xmm6
+
+	vmaxss	%xmm0, %xmm1, %xmm2
+	vmaxss	(%rax), %xmm3, %xmm4
+	vmaxss	0x42(%rcx), %xmm5, %xmm6
+
+	vminpd	%xmm0, %xmm1, %xmm2
+	vminpd	(%rax), %xmm3, %xmm4
+	vminpd	0x42(%rcx), %xmm5, %xmm6
+	vminpd	%ymm0, %ymm1, %ymm2
+	vminpd	(%rbx), %ymm3, %ymm4
+	vminpd	0x42(%rdx), %ymm5, %ymm6
+
+	vminps	%xmm0, %xmm1, %xmm2
+	vminps	(%rax), %xmm3, %xmm4
+	vminps	0x42(%rcx), %xmm5, %xmm6
+	vminps	%ymm0, %ymm1, %ymm2
+	vminps	(%rbx), %ymm3, %ymm4
+	vminps	0x42(%rdx), %ymm5, %ymm6
+
+	vminsd	%xmm0, %xmm1, %xmm2
+	vminsd	(%rax), %xmm3, %xmm4
+	vminsd	0x42(%rcx), %xmm5, %xmm6
+
+	vminss	%xmm0, %xmm1, %xmm2
+	vminss	(%rax), %xmm3, %xmm4
+	vminss	0x42(%rcx), %xmm5, %xmm6
+
+	vmovapd	%xmm0, %xmm1
+	vmovapd	(%rsi), %xmm3
+	vmovapd	0x42(%rdi), %xmm3
+	vmovapd	%ymm7, %ymm6
+	vmovapd	(%rbp), %ymm4
+	vmovapd	0x42(%rsp), %ymm4
+	vmovapd	%xmm1, %xmm0
+	vmovapd	%xmm3, (%rsi)
+	vmovapd	%xmm3, 0x42(%rdi)
+	vmovapd	%ymm1, %ymm0
+	vmovapd	%ymm3, (%rsi)
+	vmovapd	%ymm3, 0x42(%rdi)
+
+	vmovaps	%xmm0, %xmm1
+	vmovaps	(%rsi), %xmm3
+	vmovaps	0x42(%rdi), %xmm3
+	vmovaps	%ymm7, %ymm6
+	vmovaps	(%rbp), %ymm4
+	vmovaps	0x42(%rsp), %ymm4
+	vmovaps	%xmm1, %xmm0
+	vmovaps	%xmm3, (%rsi)
+	vmovaps	%xmm3, 0x42(%rdi)
+	vmovaps	%ymm1, %ymm0
+	vmovaps	%ymm3, (%rsi)
+	vmovaps	%ymm3, 0x42(%rdi)
+
+	vmovd	%rax, %xmm0
+	vmovd	(%rax), %xmm1
+	vmovd	0x14(%rax), %xmm1
+
+	vmovddup	%xmm0, %xmm1
+	vmovddup	(%rsi), %xmm3
+	vmovddup	0x42(%rdi), %xmm3
+	vmovddup	%ymm7, %ymm6
+	vmovddup	(%rbp), %ymm4
+	vmovddup	0x42(%rsp), %ymm4
+
+	vmovdqa	%xmm0, %xmm1
+	vmovdqa	(%rsi), %xmm3
+	vmovdqa	0x42(%rdi), %xmm3
+	vmovdqa	%ymm7, %ymm6
+	vmovdqa	(%rbp), %ymm4
+	vmovdqa	0x42(%rsp), %ymm4
+	vmovdqa	%xmm1, %xmm0
+	vmovdqa	%xmm3, (%rsi)
+	vmovdqa	%xmm3, 0x42(%rdi)
+	vmovdqa	%ymm1, %ymm0
+	vmovdqa	%ymm3, (%rsi)
+	vmovdqa	%ymm3, 0x42(%rdi)
+
+	vmovdqu	%xmm0, %xmm1
+	vmovdqu	(%rsi), %xmm3
+	vmovdqu	0x42(%rdi), %xmm3
+	vmovdqu	%ymm7, %ymm6
+	vmovdqu	(%rbp), %ymm4
+	vmovdqu	0x42(%rsp), %ymm4
+	vmovdqu	%xmm1, %xmm0
+	vmovdqu	%xmm3, (%rsi)
+	vmovdqu	%xmm3, 0x42(%rdi)
+	vmovdqu	%ymm1, %ymm0
+	vmovdqu	%ymm3, (%rsi)
+	vmovdqu	%ymm3, 0x42(%rdi)
+
+	vmovhlps	%xmm0, %xmm2, %xmm4
+
+	vmovhpd	(%rbx), %xmm4, %xmm2
+	vmovhpd	0x8(%rbx), %xmm3, %xmm1
+	vmovhpd	%xmm3, (%rsi)
+	vmovhpd	%xmm3, 0x42(%rdi)
+
+	vmovhps	(%rbx), %xmm4, %xmm2
+	vmovhps	0x8(%rbx), %xmm3, %xmm1
+	vmovhps	%xmm3, (%rsi)
+	vmovhps	%xmm3, 0x42(%rdi)
+
+	vmovlhps	%xmm1, %xmm3, %xmm5
+
+	vmovlpd	(%rbx), %xmm4, %xmm2
+	vmovlpd	0x8(%rbx), %xmm3, %xmm1
+	vmovlpd	%xmm3, (%rsi)
+	vmovlpd	%xmm3, 0x42(%rdi)
+
+	vmovlps	(%rbx), %xmm4, %xmm2
+	vmovlps	0x8(%rbx), %xmm3, %xmm1
+	vmovlps	%xmm3, (%rsi)
+	vmovlps	%xmm3, 0x42(%rdi)
+
+	vmovmskpd	%xmm0, %rax
+	vmovmskpd	%ymm1, %rbx
+
+	vmovmskps	%xmm2, %rcx
+	vmovmskps	%ymm3, %rdx
+
+	vmovntdq	%xmm5, (%rdi)
+	vmovntdq	%xmm5, 0x24(%rdi)
+	vmovntdq	%ymm6, (%rsi)
+	vmovntdq	%ymm6, 0x24(%rsi)
+
+	vmovntdqa	(%rbx), %xmm2
+	vmovntdqa	0x8(%rbx), %xmm1
+	vmovntdqa	(%rbx), %ymm2
+	vmovntdqa	0x8(%rbx), %ymm1
+
+	vmovntpd	%xmm3, (%rsi)
+	vmovntpd	%xmm3, 0x42(%rdi)
+	vmovntpd	%ymm3, (%rsi)
+	vmovntpd	%ymm3, 0x42(%rdi)
+
+	vmovntps	%xmm3, (%rsi)
+	vmovntps	%xmm3, 0x42(%rdi)
+	vmovntps	%ymm3, (%rsi)
+	vmovntps	%ymm3, 0x42(%rdi)
+
+	vmovq	%xmm0, %rax
+	vmovq	%xmm0, (%rax)
+	vmovq	%xmm0, 0x10(%rax)
+	vmovq	0x10(%rbx), %xmm1
+	vmovq	(%rbx), %xmm1
+	vmovq	%rbx, %xmm1
+
+	vmovsd	%xmm0, %xmm2, %xmm4
+	vmovsd	(%rax), %xmm1
+	vmovsd	0x32(%rax), %xmm2
+
+	vmovshdup	%xmm0, %xmm2
+	vmovshdup	(%rax), %xmm1
+	vmovshdup	0x10(%rax), %xmm1
+	vmovshdup	%ymm0, %ymm2
+	vmovshdup	(%rbx), %ymm1
+	vmovshdup	0x10(%rbx), %ymm3
+
+	vmovsldup	%xmm0, %xmm2
+	vmovsldup	(%rax), %xmm1
+	vmovsldup	0x10(%rax), %xmm1
+	vmovsldup	%ymm0, %ymm2
+	vmovsldup	(%rbx), %ymm1
+	vmovsldup	0x10(%rbx), %ymm3
+
+	vmovss	%xmm0, %xmm2, %xmm4
+	vmovss	(%rax), %xmm1
+	vmovss	0x32(%rax), %xmm2
+
+	vmovupd	%xmm0, %xmm1
+	vmovupd	(%rsi), %xmm3
+	vmovupd	0x42(%rdi), %xmm3
+	vmovupd	%ymm7, %ymm6
+	vmovupd	(%rbp), %ymm4
+	vmovupd	0x42(%rsp), %ymm4
+	vmovupd	%xmm1, %xmm0
+	vmovupd	%xmm3, (%rsi)
+	vmovupd	%xmm3, 0x42(%rdi)
+	vmovupd	%ymm1, %ymm0
+	vmovupd	%ymm3, (%rsi)
+	vmovupd	%ymm3, 0x42(%rdi)
+
+	vmovups	%xmm0, %xmm1
+	vmovups	(%rsi), %xmm3
+	vmovups	0x42(%rdi), %xmm3
+	vmovups	%ymm7, %ymm6
+	vmovups	(%rbp), %ymm4
+	vmovups	0x42(%rsp), %ymm4
+	vmovups	%xmm1, %xmm0
+	vmovups	%xmm3, (%rsi)
+	vmovups	%xmm3, 0x42(%rdi)
+	vmovups	%ymm1, %ymm0
+	vmovups	%ymm3, (%rsi)
+	vmovups	%ymm3, 0x42(%rdi)
+
+	vmpsadbw	$0x48, %xmm3, %xmm5, %xmm7
+	vmpsadbw	$0x48, (%rbx), %xmm2, %xmm4
+	vmpsadbw	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vmpsadbw	$0x48, %ymm3, %ymm5, %ymm7
+	vmpsadbw	$0x48, (%rbx), %ymm2, %ymm4
+	vmpsadbw	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vmulpd	%xmm0, %xmm1, %xmm2
+	vmulpd	(%rax), %xmm3, %xmm4
+	vmulpd	0x42(%rcx), %xmm5, %xmm6
+	vmulpd	%ymm0, %ymm1, %ymm2
+	vmulpd	(%rbx), %ymm3, %ymm4
+	vmulpd	0x42(%rdx), %ymm5, %ymm6
+
+	vmulps	%xmm0, %xmm1, %xmm2
+	vmulps	(%rax), %xmm3, %xmm4
+	vmulps	0x42(%rcx), %xmm5, %xmm6
+	vmulps	%ymm0, %ymm1, %ymm2
+	vmulps	(%rbx), %ymm3, %ymm4
+	vmulps	0x42(%rdx), %ymm5, %ymm6
+
+	vmulsd	%xmm0, %xmm1, %xmm2
+	vmulsd	(%rax), %xmm3, %xmm4
+	vmulsd	0x42(%rcx), %xmm5, %xmm6
+
+	vmulss	%xmm0, %xmm1, %xmm2
+	vmulss	(%rax), %xmm3, %xmm4
+	vmulss	0x42(%rcx), %xmm5, %xmm6
+
+	vorpd	%xmm0, %xmm1, %xmm2
+	vorpd	(%rax), %xmm3, %xmm4
+	vorpd	0x42(%rcx), %xmm5, %xmm6
+	vorpd	%ymm0, %ymm1, %ymm2
+	vorpd	(%rbx), %ymm3, %ymm4
+	vorpd	0x42(%rdx), %ymm5, %ymm6
+
+	vorps	%xmm0, %xmm1, %xmm2
+	vorps	(%rax), %xmm3, %xmm4
+	vorps	0x42(%rcx), %xmm5, %xmm6
+	vorps	%ymm0, %ymm1, %ymm2
+	vorps	(%rbx), %ymm3, %ymm4
+	vorps	0x42(%rdx), %ymm5, %ymm6
+
+	vpabsb	%xmm0, %xmm1
+	vpabsb	(%rsi), %xmm3
+	vpabsb	0x42(%rdi), %xmm3
+	vpabsb	%ymm7, %ymm6
+	vpabsb	(%rbp), %ymm4
+	vpabsb	0x42(%rsp), %ymm4
+
+	vpabsd	%xmm0, %xmm1
+	vpabsd	(%rsi), %xmm3
+	vpabsd	0x42(%rdi), %xmm3
+	vpabsd	%ymm7, %ymm6
+	vpabsd	(%rbp), %ymm4
+	vpabsd	0x42(%rsp), %ymm4
+
+	vpabsw	%xmm0, %xmm1
+	vpabsw	(%rsi), %xmm3
+	vpabsw	0x42(%rdi), %xmm3
+	vpabsw	%ymm7, %ymm6
+	vpabsw	(%rbp), %ymm4
+	vpabsw	0x42(%rsp), %ymm4
+
+	vpackssdw	%xmm0, %xmm1, %xmm2
+	vpackssdw	(%rax), %xmm3, %xmm4
+	vpackssdw	0x42(%rcx), %xmm5, %xmm6
+	vpackssdw	%ymm0, %ymm1, %ymm2
+	vpackssdw	(%rbx), %ymm3, %ymm4
+	vpackssdw	0x42(%rdx), %ymm5, %ymm6
+
+	vpacksswb	%xmm0, %xmm1, %xmm2
+	vpacksswb	(%rax), %xmm3, %xmm4
+	vpacksswb	0x42(%rcx), %xmm5, %xmm6
+	vpacksswb	%ymm0, %ymm1, %ymm2
+	vpacksswb	(%rbx), %ymm3, %ymm4
+	vpacksswb	0x42(%rdx), %ymm5, %ymm6
+
+	vpackusdw	%xmm0, %xmm1, %xmm2
+	vpackusdw	(%rax), %xmm3, %xmm4
+	vpackusdw	0x42(%rcx), %xmm5, %xmm6
+	vpackusdw	%ymm0, %ymm1, %ymm2
+	vpackusdw	(%rbx), %ymm3, %ymm4
+	vpackusdw	0x42(%rdx), %ymm5, %ymm6
+
+	vpackuswb	%xmm0, %xmm1, %xmm2
+	vpackuswb	(%rax), %xmm3, %xmm4
+	vpackuswb	0x42(%rcx), %xmm5, %xmm6
+	vpackuswb	%ymm0, %ymm1, %ymm2
+	vpackuswb	(%rbx), %ymm3, %ymm4
+	vpackuswb	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddb	%xmm0, %xmm1, %xmm2
+	vpaddb	(%rax), %xmm3, %xmm4
+	vpaddb	0x42(%rcx), %xmm5, %xmm6
+	vpaddb	%ymm0, %ymm1, %ymm2
+	vpaddb	(%rbx), %ymm3, %ymm4
+	vpaddb	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddd	%xmm0, %xmm1, %xmm2
+	vpaddd	(%rax), %xmm3, %xmm4
+	vpaddd	0x42(%rcx), %xmm5, %xmm6
+	vpaddd	%ymm0, %ymm1, %ymm2
+	vpaddd	(%rbx), %ymm3, %ymm4
+	vpaddd	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddq	%xmm0, %xmm1, %xmm2
+	vpaddq	(%rax), %xmm3, %xmm4
+	vpaddq	0x42(%rcx), %xmm5, %xmm6
+	vpaddq	%ymm0, %ymm1, %ymm2
+	vpaddq	(%rbx), %ymm3, %ymm4
+	vpaddq	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddsb	%xmm0, %xmm1, %xmm2
+	vpaddsb	(%rax), %xmm3, %xmm4
+	vpaddsb	0x42(%rcx), %xmm5, %xmm6
+	vpaddsb	%ymm0, %ymm1, %ymm2
+	vpaddsb	(%rbx), %ymm3, %ymm4
+	vpaddsb	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddsw	%xmm0, %xmm1, %xmm2
+	vpaddsw	(%rax), %xmm3, %xmm4
+	vpaddsw	0x42(%rcx), %xmm5, %xmm6
+	vpaddsw	%ymm0, %ymm1, %ymm2
+	vpaddsw	(%rbx), %ymm3, %ymm4
+	vpaddsw	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddusb	%xmm0, %xmm1, %xmm2
+	vpaddusb	(%rax), %xmm3, %xmm4
+	vpaddusb	0x42(%rcx), %xmm5, %xmm6
+	vpaddusb	%ymm0, %ymm1, %ymm2
+	vpaddusb	(%rbx), %ymm3, %ymm4
+	vpaddusb	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddusw	%xmm0, %xmm1, %xmm2
+	vpaddusw	(%rax), %xmm3, %xmm4
+	vpaddusw	0x42(%rcx), %xmm5, %xmm6
+	vpaddusw	%ymm0, %ymm1, %ymm2
+	vpaddusw	(%rbx), %ymm3, %ymm4
+	vpaddusw	0x42(%rdx), %ymm5, %ymm6
+
+	vpaddw	%xmm0, %xmm1, %xmm2
+	vpaddw	(%rax), %xmm3, %xmm4
+	vpaddw	0x42(%rcx), %xmm5, %xmm6
+	vpaddw	%ymm0, %ymm1, %ymm2
+	vpaddw	(%rbx), %ymm3, %ymm4
+	vpaddw	0x42(%rdx), %ymm5, %ymm6
+
+	vpalignr	$0x48, %xmm3, %xmm5, %xmm7
+	vpalignr	$0x48, (%rbx), %xmm2, %xmm4
+	vpalignr	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vpalignr	$0x48, %ymm3, %ymm5, %ymm7
+	vpalignr	$0x48, (%rbx), %ymm2, %ymm4
+	vpalignr	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vpand	%xmm0, %xmm1, %xmm2
+	vpand	(%rax), %xmm3, %xmm4
+	vpand	0x42(%rcx), %xmm5, %xmm6
+	vpand	%ymm0, %ymm1, %ymm2
+	vpand	(%rbx), %ymm3, %ymm4
+	vpand	0x42(%rdx), %ymm5, %ymm6
+
+	vpandn	%xmm0, %xmm1, %xmm2
+	vpandn	(%rax), %xmm3, %xmm4
+	vpandn	0x42(%rcx), %xmm5, %xmm6
+	vpandn	%ymm0, %ymm1, %ymm2
+	vpandn	(%rbx), %ymm3, %ymm4
+	vpandn	0x42(%rdx), %ymm5, %ymm6
+
+	vpavgb	%xmm0, %xmm1, %xmm2
+	vpavgb	(%rax), %xmm3, %xmm4
+	vpavgb	0x42(%rcx), %xmm5, %xmm6
+	vpavgb	%ymm0, %ymm1, %ymm2
+	vpavgb	(%rbx), %ymm3, %ymm4
+	vpavgb	0x42(%rdx), %ymm5, %ymm6
+
+	vpavgw	%xmm0, %xmm1, %xmm2
+	vpavgw	(%rax), %xmm3, %xmm4
+	vpavgw	0x42(%rcx), %xmm5, %xmm6
+	vpavgw	%ymm0, %ymm1, %ymm2
+	vpavgw	(%rbx), %ymm3, %ymm4
+	vpavgw	0x42(%rdx), %ymm5, %ymm6
+
+	vpblendvb	%xmm0, %xmm1, %xmm2, %xmm3
+	vpblendvb	%xmm0, (%rax), %xmm2, %xmm3
+	vpblendvb	%xmm0, 0x10(%rbx), %xmm2, %xmm3
+	vpblendvb	%ymm0, %ymm1, %ymm2, %ymm3
+	vpblendvb	%ymm0, (%rax), %ymm2, %ymm3
+	vpblendvb	%ymm0, 0x10(%rbx), %ymm2, %ymm3
+
+	vpblendw	$0x48, %xmm3, %xmm5, %xmm7
+	vpblendw	$0x48, (%rbx), %xmm2, %xmm4
+	vpblendw	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vpblendw	$0x48, %ymm3, %ymm5, %ymm7
+	vpblendw	$0x48, (%rbx), %ymm2, %ymm4
+	vpblendw	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vpclmulqdq	$0x48, %xmm3, %xmm5, %xmm7
+	vpclmulqdq	$0x48, (%rbx), %xmm2, %xmm4
+	vpclmulqdq	$0x48, 0x8(%rbx), %xmm1, %xmm6
+
+	vpcmpeqb	%xmm0, %xmm1, %xmm2
+	vpcmpeqb	(%rax), %xmm3, %xmm4
+	vpcmpeqb	0x42(%rcx), %xmm5, %xmm6
+	vpcmpeqb	%ymm0, %ymm1, %ymm2
+	vpcmpeqb	(%rbx), %ymm3, %ymm4
+	vpcmpeqb	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpeqd	%xmm0, %xmm1, %xmm2
+	vpcmpeqd	(%rax), %xmm3, %xmm4
+	vpcmpeqd	0x42(%rcx), %xmm5, %xmm6
+	vpcmpeqd	%ymm0, %ymm1, %ymm2
+	vpcmpeqd	(%rbx), %ymm3, %ymm4
+	vpcmpeqd	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpeqq	%xmm0, %xmm1, %xmm2
+	vpcmpeqq	(%rax), %xmm3, %xmm4
+	vpcmpeqq	0x42(%rcx), %xmm5, %xmm6
+	vpcmpeqq	%ymm0, %ymm1, %ymm2
+	vpcmpeqq	(%rbx), %ymm3, %ymm4
+	vpcmpeqq	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpeqw	%xmm0, %xmm1, %xmm2
+	vpcmpeqw	(%rax), %xmm3, %xmm4
+	vpcmpeqw	0x42(%rcx), %xmm5, %xmm6
+	vpcmpeqw	%ymm0, %ymm1, %ymm2
+	vpcmpeqw	(%rbx), %ymm3, %ymm4
+	vpcmpeqw	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpestri	$0x42, %xmm0, %xmm1
+	vpcmpestri	$0x23, 	(%rsi), %xmm3
+	vpcmpestri	$0x42, 0x42(%rdi), %xmm3
+
+	vpcmpestrm	$0x42, %xmm0, %xmm1
+	vpcmpestrm	$0x23, 	(%rsi), %xmm3
+	vpcmpestrm	$0x42, 0x42(%rdi), %xmm3
+
+	vpcmpgtb	%xmm0, %xmm1, %xmm2
+	vpcmpgtb	(%rax), %xmm3, %xmm4
+	vpcmpgtb	0x42(%rcx), %xmm5, %xmm6
+	vpcmpgtb	%ymm0, %ymm1, %ymm2
+	vpcmpgtb	(%rbx), %ymm3, %ymm4
+	vpcmpgtb	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpgtd	%xmm0, %xmm1, %xmm2
+	vpcmpgtd	(%rax), %xmm3, %xmm4
+	vpcmpgtd	0x42(%rcx), %xmm5, %xmm6
+	vpcmpgtd	%ymm0, %ymm1, %ymm2
+	vpcmpgtd	(%rbx), %ymm3, %ymm4
+	vpcmpgtd	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpgtq	%xmm0, %xmm1, %xmm2
+	vpcmpgtq	(%rax), %xmm3, %xmm4
+	vpcmpgtq	0x42(%rcx), %xmm5, %xmm6
+	vpcmpgtq	%ymm0, %ymm1, %ymm2
+	vpcmpgtq	(%rbx), %ymm3, %ymm4
+	vpcmpgtq	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpgtw	%xmm0, %xmm1, %xmm2
+	vpcmpgtw	(%rax), %xmm3, %xmm4
+	vpcmpgtw	0x42(%rcx), %xmm5, %xmm6
+	vpcmpgtw	%ymm0, %ymm1, %ymm2
+	vpcmpgtw	(%rbx), %ymm3, %ymm4
+	vpcmpgtw	0x42(%rdx), %ymm5, %ymm6
+
+	vpcmpistri	$0x42, %xmm0, %xmm1
+	vpcmpistri	$0x23, 	(%rsi), %xmm3
+	vpcmpistri	$0x42, 0x42(%rdi), %xmm3
+
+	vpcmpistrm	$0x42, %xmm0, %xmm1
+	vpcmpistrm	$0x23, 	(%rsi), %xmm3
+	vpcmpistrm	$0x42, 0x42(%rdi), %xmm3
+
+	vperm2f128	$0x48, %ymm3, %ymm5, %ymm7
+	vperm2f128	$0x48, (%rbx), %ymm2, %ymm4
+	vperm2f128	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vpermilpd	%xmm0, %xmm1, %xmm2
+	vpermilpd	(%rax), %xmm3, %xmm4
+	vpermilpd	0x42(%rcx), %xmm5, %xmm6
+	vpermilpd	%ymm0, %ymm1, %ymm2
+	vpermilpd	(%rbx), %ymm3, %ymm4
+	vpermilpd	0x42(%rdx), %ymm5, %ymm6
+	vpermilpd	$0x42, %ymm0, %ymm1
+	vpermilpd	$0x23, 	(%rsi), %ymm3
+	vpermilpd	$0x42, 0x42(%rdi), %ymm3
+
+	vpermilps	%xmm0, %xmm1, %xmm2
+	vpermilps	(%rax), %xmm3, %xmm4
+	vpermilps	0x42(%rcx), %xmm5, %xmm6
+	vpermilps	%ymm0, %ymm1, %ymm2
+	vpermilps	(%rbx), %ymm3, %ymm4
+	vpermilps	0x42(%rdx), %ymm5, %ymm6
+	vpermilps	$0x42, %ymm0, %ymm1
+	vpermilps	$0x23, 	(%rsi), %ymm3
+	vpermilps	$0x42, 0x42(%rdi), %ymm3
+
+	vpextrb	$0x23, %xmm0, %rax
+	vpextrb	$0x23, %xmm1, (%rbx)
+	vpextrb	$0x23, %xmm2, 0x16(%rcx)
+
+	vpextrd	$0x23, %xmm1, (%rbx)
+	vpextrd	$0x23, %xmm2, 0x16(%rcx)
+
+	vpextrq	$0x23, %xmm0, %rax
+	vpextrq	$0x23, %xmm1, (%rbx)
+	vpextrq	$0x23, %xmm2, 0x16(%rcx)
+
+	vpextrw	$0x23, %xmm0, %rax
+	vpextrw	$0x23, %xmm1, (%rbx)
+	vpextrw	$0x23, %xmm2, 0x16(%rcx)
+
+	vphaddd	%xmm0, %xmm1, %xmm2
+	vphaddd	(%rax), %xmm3, %xmm4
+	vphaddd	0x42(%rcx), %xmm5, %xmm6
+	vphaddd	%ymm0, %ymm1, %ymm2
+	vphaddd	(%rbx), %ymm3, %ymm4
+	vphaddd	0x42(%rdx), %ymm5, %ymm6
+
+	vphaddsw	%xmm0, %xmm1, %xmm2
+	vphaddsw	(%rax), %xmm3, %xmm4
+	vphaddsw	0x42(%rcx), %xmm5, %xmm6
+	vphaddsw	%ymm0, %ymm1, %ymm2
+	vphaddsw	(%rbx), %ymm3, %ymm4
+	vphaddsw	0x42(%rdx), %ymm5, %ymm6
+
+	vphaddw	%xmm0, %xmm1, %xmm2
+	vphaddw	(%rax), %xmm3, %xmm4
+	vphaddw	0x42(%rcx), %xmm5, %xmm6
+	vphaddw	%ymm0, %ymm1, %ymm2
+	vphaddw	(%rbx), %ymm3, %ymm4
+	vphaddw	0x42(%rdx), %ymm5, %ymm6
+
+	vphminposuw	%xmm0, %xmm1
+	vphminposuw	(%rsi), %xmm3
+	vphminposuw	0x42(%rdi), %xmm3
+
+	vphsubd	%xmm0, %xmm1, %xmm2
+	vphsubd	(%rax), %xmm3, %xmm4
+	vphsubd	0x42(%rcx), %xmm5, %xmm6
+	vphsubd	%ymm0, %ymm1, %ymm2
+	vphsubd	(%rbx), %ymm3, %ymm4
+	vphsubd	0x42(%rdx), %ymm5, %ymm6
+
+	vphsubsw	%xmm0, %xmm1, %xmm2
+	vphsubsw	(%rax), %xmm3, %xmm4
+	vphsubsw	0x42(%rcx), %xmm5, %xmm6
+	vphsubsw	%ymm0, %ymm1, %ymm2
+	vphsubsw	(%rbx), %ymm3, %ymm4
+	vphsubsw	0x42(%rdx), %ymm5, %ymm6
+
+	vphsubw	%xmm0, %xmm1, %xmm2
+	vphsubw	(%rax), %xmm3, %xmm4
+	vphsubw	0x42(%rcx), %xmm5, %xmm6
+	vphsubw	%ymm0, %ymm1, %ymm2
+	vphsubw	(%rbx), %ymm3, %ymm4
+	vphsubw	0x42(%rdx), %ymm5, %ymm6
+
+	vpinsrb	$0x20, %rax, %xmm0, %xmm1
+	vpinsrb	$0x20, (%rbx), %xmm2, %xmm3
+	vpinsrb	$0x20, 0x10(%rbx), %xmm2, %xmm3
+
+	vpinsrd	$0x20, (%rbx), %xmm2, %xmm3
+	vpinsrd	$0x20, 0x10(%rbx), %xmm2, %xmm3
+
+	vpinsrq	$0x20, %rax, %xmm0, %xmm1
+	vpinsrq	$0x20, (%rbx), %xmm2, %xmm3
+	vpinsrq	$0x20, 0x10(%rbx), %xmm2, %xmm3
+
+	vpinsrw	$0x20, %rax, %xmm0, %xmm1
+	vpinsrw	$0x20, (%rbx), %xmm2, %xmm3
+	vpinsrw	$0x20, 0x10(%rbx), %xmm2, %xmm3
+
+	vpmaddubsw	%xmm0, %xmm1, %xmm2
+	vpmaddubsw	(%rax), %xmm3, %xmm4
+	vpmaddubsw	0x42(%rcx), %xmm5, %xmm6
+	vpmaddubsw	%ymm0, %ymm1, %ymm2
+	vpmaddubsw	(%rbx), %ymm3, %ymm4
+	vpmaddubsw	0x42(%rdx), %ymm5, %ymm6
+
+	vpmaddwd	%xmm0, %xmm1, %xmm2
+	vpmaddwd	(%rax), %xmm3, %xmm4
+	vpmaddwd	0x42(%rcx), %xmm5, %xmm6
+	vpmaddwd	%ymm0, %ymm1, %ymm2
+	vpmaddwd	(%rbx), %ymm3, %ymm4
+	vpmaddwd	0x42(%rdx), %ymm5, %ymm6
+
+	vpmaxsb	%xmm0, %xmm1, %xmm2
+	vpmaxsb	(%rax), %xmm3, %xmm4
+	vpmaxsb	0x42(%rcx), %xmm5, %xmm6
+	vpmaxsb	%ymm0, %ymm1, %ymm2
+	vpmaxsb	(%rbx), %ymm3, %ymm4
+	vpmaxsb	0x42(%rdx), %ymm5, %ymm6
+
+	vpmaxsd	%xmm0, %xmm1, %xmm2
+	vpmaxsd	(%rax), %xmm3, %xmm4
+	vpmaxsd	0x42(%rcx), %xmm5, %xmm6
+	vpmaxsd	%ymm0, %ymm1, %ymm2
+	vpmaxsd	(%rbx), %ymm3, %ymm4
+	vpmaxsd	0x42(%rdx), %ymm5, %ymm6
+
+	vpmaxsw	%xmm0, %xmm1, %xmm2
+	vpmaxsw	(%rax), %xmm3, %xmm4
+	vpmaxsw	0x42(%rcx), %xmm5, %xmm6
+	vpmaxsw	%ymm0, %ymm1, %ymm2
+	vpmaxsw	(%rbx), %ymm3, %ymm4
+	vpmaxsw	0x42(%rdx), %ymm5, %ymm6
+
+	vpmaxub	%xmm0, %xmm1, %xmm2
+	vpmaxub	(%rax), %xmm3, %xmm4
+	vpmaxub	0x42(%rcx), %xmm5, %xmm6
+	vpmaxub	%ymm0, %ymm1, %ymm2
+	vpmaxub	(%rbx), %ymm3, %ymm4
+	vpmaxub	0x42(%rdx), %ymm5, %ymm6
+
+	vpmaxud	%xmm0, %xmm1, %xmm2
+	vpmaxud	(%rax), %xmm3, %xmm4
+	vpmaxud	0x42(%rcx), %xmm5, %xmm6
+	vpmaxud	%ymm0, %ymm1, %ymm2
+	vpmaxud	(%rbx), %ymm3, %ymm4
+	vpmaxud	0x42(%rdx), %ymm5, %ymm6
+
+	vpmaxuw	%xmm0, %xmm1, %xmm2
+	vpmaxuw	(%rax), %xmm3, %xmm4
+	vpmaxuw	0x42(%rcx), %xmm5, %xmm6
+	vpmaxuw	%ymm0, %ymm1, %ymm2
+	vpmaxuw	(%rbx), %ymm3, %ymm4
+	vpmaxuw	0x42(%rdx), %ymm5, %ymm6
+
+	vpminsb	%xmm0, %xmm1, %xmm2
+	vpminsb	(%rax), %xmm3, %xmm4
+	vpminsb	0x42(%rcx), %xmm5, %xmm6
+	vpminsb	%ymm0, %ymm1, %ymm2
+	vpminsb	(%rbx), %ymm3, %ymm4
+	vpminsb	0x42(%rdx), %ymm5, %ymm6
+
+	vpminsd	%xmm0, %xmm1, %xmm2
+	vpminsd	(%rax), %xmm3, %xmm4
+	vpminsd	0x42(%rcx), %xmm5, %xmm6
+	vpminsd	%ymm0, %ymm1, %ymm2
+	vpminsd	(%rbx), %ymm3, %ymm4
+	vpminsd	0x42(%rdx), %ymm5, %ymm6
+
+	vpminsw	%xmm0, %xmm1, %xmm2
+	vpminsw	(%rax), %xmm3, %xmm4
+	vpminsw	0x42(%rcx), %xmm5, %xmm6
+	vpminsw	%ymm0, %ymm1, %ymm2
+	vpminsw	(%rbx), %ymm3, %ymm4
+	vpminsw	0x42(%rdx), %ymm5, %ymm6
+
+	vpminub	%xmm0, %xmm1, %xmm2
+	vpminub	(%rax), %xmm3, %xmm4
+	vpminub	0x42(%rcx), %xmm5, %xmm6
+	vpminub	%ymm0, %ymm1, %ymm2
+	vpminub	(%rbx), %ymm3, %ymm4
+	vpminub	0x42(%rdx), %ymm5, %ymm6
+
+	vpminud	%xmm0, %xmm1, %xmm2
+	vpminud	(%rax), %xmm3, %xmm4
+	vpminud	0x42(%rcx), %xmm5, %xmm6
+	vpminud	%ymm0, %ymm1, %ymm2
+	vpminud	(%rbx), %ymm3, %ymm4
+	vpminud	0x42(%rdx), %ymm5, %ymm6
+
+	vpminuw	%xmm0, %xmm1, %xmm2
+	vpminuw	(%rax), %xmm3, %xmm4
+	vpminuw	0x42(%rcx), %xmm5, %xmm6
+	vpminuw	%ymm0, %ymm1, %ymm2
+	vpminuw	(%rbx), %ymm3, %ymm4
+	vpminuw	0x42(%rdx), %ymm5, %ymm6
+
+	vpmovmskb	%xmm0, %rax
+	vpmovmskb	%ymm1, %rbx
+
+	vpmovsxbd	%xmm0, %xmm1
+	vpmovsxbd	(%rsi), %xmm3
+	vpmovsxbd	0x42(%rdi), %xmm3
+	vpmovsxbd	%xmm7, %ymm6
+	vpmovsxbd	(%rbp), %ymm4
+	vpmovsxbd	0x42(%rsp), %ymm4
+
+	vpmovsxbq	%xmm0, %xmm1
+	vpmovsxbq	(%rsi), %xmm3
+	vpmovsxbq	0x42(%rdi), %xmm3
+	vpmovsxbq	%xmm7, %ymm6
+	vpmovsxbq	(%rbp), %ymm4
+	vpmovsxbq	0x42(%rsp), %ymm4
+
+	vpmovsxbw	%xmm0, %xmm1
+	vpmovsxbw	(%rsi), %xmm3
+	vpmovsxbw	0x42(%rdi), %xmm3
+	vpmovsxbw	%xmm7, %ymm6
+	vpmovsxbw	(%rbp), %ymm4
+	vpmovsxbw	0x42(%rsp), %ymm4
+
+	vpmovsxdq	%xmm0, %xmm1
+	vpmovsxdq	(%rsi), %xmm3
+	vpmovsxdq	0x42(%rdi), %xmm3
+	vpmovsxdq	%xmm7, %ymm6
+	vpmovsxdq	(%rbp), %ymm4
+	vpmovsxdq	0x42(%rsp), %ymm4
+
+	vpmovsxwd	%xmm0, %xmm1
+	vpmovsxwd	(%rsi), %xmm3
+	vpmovsxwd	0x42(%rdi), %xmm3
+	vpmovsxwd	%xmm7, %ymm6
+	vpmovsxwd	(%rbp), %ymm4
+	vpmovsxwd	0x42(%rsp), %ymm4
+
+	vpmovsxwq	%xmm0, %xmm1
+	vpmovsxwq	(%rsi), %xmm3
+	vpmovsxwq	0x42(%rdi), %xmm3
+	vpmovsxwq	%xmm7, %ymm6
+	vpmovsxwq	(%rbp), %ymm4
+	vpmovsxwq	0x42(%rsp), %ymm4
+
+	vpmovzxbd	%xmm0, %xmm1
+	vpmovzxbd	(%rsi), %xmm3
+	vpmovzxbd	0x42(%rdi), %xmm3
+	vpmovzxbd	%xmm7, %ymm6
+	vpmovzxbd	(%rbp), %ymm4
+	vpmovzxbd	0x42(%rsp), %ymm4
+
+	vpmovzxbq	%xmm0, %xmm1
+	vpmovzxbq	(%rsi), %xmm3
+	vpmovzxbq	0x42(%rdi), %xmm3
+	vpmovzxbq	%xmm7, %ymm6
+	vpmovzxbq	(%rbp), %ymm4
+	vpmovzxbq	0x42(%rsp), %ymm4
+
+	vpmovzxbw	%xmm0, %xmm1
+	vpmovzxbw	(%rsi), %xmm3
+	vpmovzxbw	0x42(%rdi), %xmm3
+	vpmovzxbw	%xmm7, %ymm6
+	vpmovzxbw	(%rbp), %ymm4
+	vpmovzxbw	0x42(%rsp), %ymm4
+
+	vpmovzxdq	%xmm0, %xmm1
+	vpmovzxdq	(%rsi), %xmm3
+	vpmovzxdq	0x42(%rdi), %xmm3
+	vpmovzxdq	%xmm7, %ymm6
+	vpmovzxdq	(%rbp), %ymm4
+	vpmovzxdq	0x42(%rsp), %ymm4
+
+	vpmovzxwd	%xmm0, %xmm1
+	vpmovzxwd	(%rsi), %xmm3
+	vpmovzxwd	0x42(%rdi), %xmm3
+	vpmovzxwd	%xmm7, %ymm6
+	vpmovzxwd	(%rbp), %ymm4
+	vpmovzxwd	0x42(%rsp), %ymm4
+
+	vpmovzxwq	%xmm0, %xmm1
+	vpmovzxwq	(%rsi), %xmm3
+	vpmovzxwq	0x42(%rdi), %xmm3
+	vpmovzxwq	%xmm7, %ymm6
+	vpmovzxwq	(%rbp), %ymm4
+	vpmovzxwq	0x42(%rsp), %ymm4
+
+	vpmuldq	%xmm0, %xmm1, %xmm2
+	vpmuldq	(%rax), %xmm3, %xmm4
+	vpmuldq	0x42(%rcx), %xmm5, %xmm6
+	vpmuldq	%ymm0, %ymm1, %ymm2
+	vpmuldq	(%rbx), %ymm3, %ymm4
+	vpmuldq	0x42(%rdx), %ymm5, %ymm6
+
+	vpmulhrsw	%xmm0, %xmm1, %xmm2
+	vpmulhrsw	(%rax), %xmm3, %xmm4
+	vpmulhrsw	0x42(%rcx), %xmm5, %xmm6
+	vpmulhrsw	%ymm0, %ymm1, %ymm2
+	vpmulhrsw	(%rbx), %ymm3, %ymm4
+	vpmulhrsw	0x42(%rdx), %ymm5, %ymm6
+
+	vpmulhuw	%xmm0, %xmm1, %xmm2
+	vpmulhuw	(%rax), %xmm3, %xmm4
+	vpmulhuw	0x42(%rcx), %xmm5, %xmm6
+	vpmulhuw	%ymm0, %ymm1, %ymm2
+	vpmulhuw	(%rbx), %ymm3, %ymm4
+	vpmulhuw	0x42(%rdx), %ymm5, %ymm6
+
+	vpmulhw	%xmm0, %xmm1, %xmm2
+	vpmulhw	(%rax), %xmm3, %xmm4
+	vpmulhw	0x42(%rcx), %xmm5, %xmm6
+	vpmulhw	%ymm0, %ymm1, %ymm2
+	vpmulhw	(%rbx), %ymm3, %ymm4
+	vpmulhw	0x42(%rdx), %ymm5, %ymm6
+
+	vpmulld	%xmm0, %xmm1, %xmm2
+	vpmulld	(%rax), %xmm3, %xmm4
+	vpmulld	0x42(%rcx), %xmm5, %xmm6
+	vpmulld	%ymm0, %ymm1, %ymm2
+	vpmulld	(%rbx), %ymm3, %ymm4
+	vpmulld	0x42(%rdx), %ymm5, %ymm6
+
+	vpmullw	%xmm0, %xmm1, %xmm2
+	vpmullw	(%rax), %xmm3, %xmm4
+	vpmullw	0x42(%rcx), %xmm5, %xmm6
+	vpmullw	%ymm0, %ymm1, %ymm2
+	vpmullw	(%rbx), %ymm3, %ymm4
+	vpmullw	0x42(%rdx), %ymm5, %ymm6
+
+	vpmuludq	%xmm0, %xmm1, %xmm2
+	vpmuludq	(%rax), %xmm3, %xmm4
+	vpmuludq	0x42(%rcx), %xmm5, %xmm6
+	vpmuludq	%ymm0, %ymm1, %ymm2
+	vpmuludq	(%rbx), %ymm3, %ymm4
+	vpmuludq	0x42(%rdx), %ymm5, %ymm6
+
+	vpor	%xmm0, %xmm1, %xmm2
+	vpor	(%rax), %xmm3, %xmm4
+	vpor	0x42(%rcx), %xmm5, %xmm6
+	vpor	%ymm0, %ymm1, %ymm2
+	vpor	(%rbx), %ymm3, %ymm4
+	vpor	0x42(%rdx), %ymm5, %ymm6
+
+	vpsadbw	%xmm0, %xmm1, %xmm2
+	vpsadbw	(%rax), %xmm3, %xmm4
+	vpsadbw	0x42(%rcx), %xmm5, %xmm6
+	vpsadbw	%ymm0, %ymm1, %ymm2
+	vpsadbw	(%rbx), %ymm3, %ymm4
+	vpsadbw	0x42(%rdx), %ymm5, %ymm6
+
+	vpshufb	%xmm0, %xmm1, %xmm2
+	vpshufb	(%rax), %xmm3, %xmm4
+	vpshufb	0x42(%rcx), %xmm5, %xmm6
+	vpshufb	%ymm0, %ymm1, %ymm2
+	vpshufb	(%rbx), %ymm3, %ymm4
+	vpshufb	0x42(%rdx), %ymm5, %ymm6
+
+	vpshufd	$0x42, %xmm0, %xmm1
+	vpshufd	$0x23, 	(%rsi), %xmm3
+	vpshufd	$0x42, 0x42(%rdi), %xmm3
+	vpshufd	$0x42, %ymm0, %ymm1
+	vpshufd	$0x23, 	(%rsi), %ymm3
+	vpshufd	$0x42, 0x42(%rdi), %ymm3
+
+	vpshufhw	$0x42, %xmm0, %xmm1
+	vpshufhw	$0x23, 	(%rsi), %xmm3
+	vpshufhw	$0x42, 0x42(%rdi), %xmm3
+	vpshufhw	$0x42, %ymm0, %ymm1
+	vpshufhw	$0x23, 	(%rsi), %ymm3
+	vpshufhw	$0x42, 0x42(%rdi), %ymm3
+
+	vpshuflw	$0x42, %xmm0, %xmm1
+	vpshuflw	$0x23, 	(%rsi), %xmm3
+	vpshuflw	$0x42, 0x42(%rdi), %xmm3
+	vpshuflw	$0x42, %ymm0, %ymm1
+	vpshuflw	$0x23, 	(%rsi), %ymm3
+	vpshuflw	$0x42, 0x42(%rdi), %ymm3
+
+	vpsignb	%xmm0, %xmm1, %xmm2
+	vpsignb	(%rax), %xmm3, %xmm4
+	vpsignb	0x42(%rcx), %xmm5, %xmm6
+	vpsignb	%ymm0, %ymm1, %ymm2
+	vpsignb	(%rbx), %ymm3, %ymm4
+	vpsignb	0x42(%rdx), %ymm5, %ymm6
+
+	vpsignd	%xmm0, %xmm1, %xmm2
+	vpsignd	(%rax), %xmm3, %xmm4
+	vpsignd	0x42(%rcx), %xmm5, %xmm6
+	vpsignd	%ymm0, %ymm1, %ymm2
+	vpsignd	(%rbx), %ymm3, %ymm4
+	vpsignd	0x42(%rdx), %ymm5, %ymm6
+
+	vpsignw	%xmm0, %xmm1, %xmm2
+	vpsignw	(%rax), %xmm3, %xmm4
+	vpsignw	0x42(%rcx), %xmm5, %xmm6
+	vpsignw	%ymm0, %ymm1, %ymm2
+	vpsignw	(%rbx), %ymm3, %ymm4
+	vpsignw	0x42(%rdx), %ymm5, %ymm6
+
+	vpslld	%xmm0, %xmm1, %xmm2
+	vpslld	(%rax), %xmm3, %xmm4
+	vpslld	0x10(%rbx), %xmm4, %xmm5
+	vpslld	$0x4, %xmm6, %xmm7
+	vpslld	%xmm0, %ymm1, %ymm2
+	vpslld	(%rax), %ymm3, %ymm4
+	vpslld	0x10(%rbx), %ymm4, %ymm5
+	vpslld	$0x4, %ymm6, %ymm7
+
+	vpslldq	$0x7, %xmm0, %xmm1
+	vpslldq	$0x7, %ymm0, %ymm1
+
+	vpsllq	%xmm0, %xmm1, %xmm2
+	vpsllq	(%rax), %xmm3, %xmm4
+	vpsllq	0x10(%rbx), %xmm4, %xmm5
+	vpsllq	$0x4, %xmm6, %xmm7
+	vpsllq	%xmm0, %ymm1, %ymm2
+	vpsllq	(%rax), %ymm3, %ymm4
+	vpsllq	0x10(%rbx), %ymm4, %ymm5
+	vpsllq	$0x4, %ymm6, %ymm7
+
+	vpsllw	%xmm0, %xmm1, %xmm2
+	vpsllw	(%rax), %xmm3, %xmm4
+	vpsllw	0x10(%rbx), %xmm4, %xmm5
+	vpsllw	$0x4, %xmm6, %xmm7
+	vpsllw	%xmm0, %ymm1, %ymm2
+	vpsllw	(%rax), %ymm3, %ymm4
+	vpsllw	0x10(%rbx), %ymm4, %ymm5
+	vpsllw	$0x4, %ymm6, %ymm7
+
+	vpsrad	%xmm0, %xmm1, %xmm2
+	vpsrad	(%rax), %xmm3, %xmm4
+	vpsrad	0x10(%rbx), %xmm4, %xmm5
+	vpsrad	$0x4, %xmm6, %xmm7
+	vpsrad	%xmm0, %ymm1, %ymm2
+	vpsrad	(%rax), %ymm3, %ymm4
+	vpsrad	0x10(%rbx), %ymm4, %ymm5
+	vpsrad	$0x4, %ymm6, %ymm7
+
+	vpsraw	%xmm0, %xmm1, %xmm2
+	vpsraw	(%rax), %xmm3, %xmm4
+	vpsraw	0x10(%rbx), %xmm4, %xmm5
+	vpsraw	$0x4, %xmm6, %xmm7
+	vpsraw	%xmm0, %ymm1, %ymm2
+	vpsraw	(%rax), %ymm3, %ymm4
+	vpsraw	0x10(%rbx), %ymm4, %ymm5
+	vpsraw	$0x4, %ymm6, %ymm7
+
+	vpsrld	%xmm0, %xmm1, %xmm2
+	vpsrld	(%rax), %xmm3, %xmm4
+	vpsrld	0x10(%rbx), %xmm4, %xmm5
+	vpsrld	$0x4, %xmm6, %xmm7
+	vpsrld	%xmm0, %ymm1, %ymm2
+	vpsrld	(%rax), %ymm3, %ymm4
+	vpsrld	0x10(%rbx), %ymm4, %ymm5
+	vpsrld	$0x4, %ymm6, %ymm7
+
+	vpsrldq	$0x7, %xmm0, %xmm1
+	vpsrldq	$0x7, %ymm0, %ymm1
+
+	vpsrlq	%xmm0, %xmm1, %xmm2
+	vpsrlq	(%rax), %xmm3, %xmm4
+	vpsrlq	0x10(%rbx), %xmm4, %xmm5
+	vpsrlq	$0x4, %xmm6, %xmm7
+	vpsrlq	%xmm0, %ymm1, %ymm2
+	vpsrlq	(%rax), %ymm3, %ymm4
+	vpsrlq	0x10(%rbx), %ymm4, %ymm5
+	vpsrlq	$0x4, %ymm6, %ymm7
+
+	vpsrlw	%xmm0, %xmm1, %xmm2
+	vpsrlw	(%rax), %xmm3, %xmm4
+	vpsrlw	0x10(%rbx), %xmm4, %xmm5
+	vpsrlw	$0x4, %xmm6, %xmm7
+	vpsrlw	%xmm0, %ymm1, %ymm2
+	vpsrlw	(%rax), %ymm3, %ymm4
+	vpsrlw	0x10(%rbx), %ymm4, %ymm5
+	vpsrlw	$0x4, %ymm6, %ymm7
+
+	vpsubb	%xmm0, %xmm1, %xmm2
+	vpsubb	(%rax), %xmm3, %xmm4
+	vpsubb	0x42(%rcx), %xmm5, %xmm6
+	vpsubb	%ymm0, %ymm1, %ymm2
+	vpsubb	(%rbx), %ymm3, %ymm4
+	vpsubb	0x42(%rdx), %ymm5, %ymm6
+
+	vpsubd	%xmm0, %xmm1, %xmm2
+	vpsubd	(%rax), %xmm3, %xmm4
+	vpsubd	0x42(%rcx), %xmm5, %xmm6
+	vpsubd	%ymm0, %ymm1, %ymm2
+	vpsubd	(%rbx), %ymm3, %ymm4
+	vpsubd	0x42(%rdx), %ymm5, %ymm6
+
+	vpsubq	%xmm0, %xmm1, %xmm2
+	vpsubq	(%rax), %xmm3, %xmm4
+	vpsubq	0x42(%rcx), %xmm5, %xmm6
+	vpsubq	%ymm0, %ymm1, %ymm2
+	vpsubq	(%rbx), %ymm3, %ymm4
+	vpsubq	0x42(%rdx), %ymm5, %ymm6
+
+	vpsubsb	%xmm0, %xmm1, %xmm2
+	vpsubsb	(%rax), %xmm3, %xmm4
+	vpsubsb	0x42(%rcx), %xmm5, %xmm6
+	vpsubsb	%ymm0, %ymm1, %ymm2
+	vpsubsb	(%rbx), %ymm3, %ymm4
+	vpsubsb	0x42(%rdx), %ymm5, %ymm6
+
+	vpsubsw	%xmm0, %xmm1, %xmm2
+	vpsubsw	(%rax), %xmm3, %xmm4
+	vpsubsw	0x42(%rcx), %xmm5, %xmm6
+	vpsubsw	%ymm0, %ymm1, %ymm2
+	vpsubsw	(%rbx), %ymm3, %ymm4
+	vpsubsw	0x42(%rdx), %ymm5, %ymm6
+
+	vpsubusb	%xmm0, %xmm1, %xmm2
+	vpsubusb	(%rax), %xmm3, %xmm4
+	vpsubusb	0x42(%rcx), %xmm5, %xmm6
+	vpsubusb	%ymm0, %ymm1, %ymm2
+	vpsubusb	(%rbx), %ymm3, %ymm4
+	vpsubusb	0x42(%rdx), %ymm5, %ymm6
+
+	vpsubusw	%xmm0, %xmm1, %xmm2
+	vpsubusw	(%rax), %xmm3, %xmm4
+	vpsubusw	0x42(%rcx), %xmm5, %xmm6
+	vpsubusw	%ymm0, %ymm1, %ymm2
+	vpsubusw	(%rbx), %ymm3, %ymm4
+	vpsubusw	0x42(%rdx), %ymm5, %ymm6
+
+	vpsubw	%xmm0, %xmm1, %xmm2
+	vpsubw	(%rax), %xmm3, %xmm4
+	vpsubw	0x42(%rcx), %xmm5, %xmm6
+	vpsubw	%ymm0, %ymm1, %ymm2
+	vpsubw	(%rbx), %ymm3, %ymm4
+	vpsubw	0x42(%rdx), %ymm5, %ymm6
+
+	vptest	%xmm0, %xmm1
+	vptest	(%rsi), %xmm3
+	vptest	0x42(%rdi), %xmm3
+	vptest	%ymm7, %ymm6
+	vptest	(%rbp), %ymm4
+	vptest	0x42(%rsp), %ymm4
+
+	vpunpckhbw	%xmm0, %xmm1, %xmm2
+	vpunpckhbw	(%rax), %xmm3, %xmm4
+	vpunpckhbw	0x42(%rcx), %xmm5, %xmm6
+	vpunpckhbw	%ymm0, %ymm1, %ymm2
+	vpunpckhbw	(%rbx), %ymm3, %ymm4
+	vpunpckhbw	0x42(%rdx), %ymm5, %ymm6
+
+	vpunpckhdq	%xmm0, %xmm1, %xmm2
+	vpunpckhdq	(%rax), %xmm3, %xmm4
+	vpunpckhdq	0x42(%rcx), %xmm5, %xmm6
+	vpunpckhdq	%ymm0, %ymm1, %ymm2
+	vpunpckhdq	(%rbx), %ymm3, %ymm4
+	vpunpckhdq	0x42(%rdx), %ymm5, %ymm6
+
+	vpunpckhqdq	%xmm0, %xmm1, %xmm2
+	vpunpckhqdq	(%rax), %xmm3, %xmm4
+	vpunpckhqdq	0x42(%rcx), %xmm5, %xmm6
+	vpunpckhqdq	%ymm0, %ymm1, %ymm2
+	vpunpckhqdq	(%rbx), %ymm3, %ymm4
+	vpunpckhqdq	0x42(%rdx), %ymm5, %ymm6
+
+	vpunpckhwd	%xmm0, %xmm1, %xmm2
+	vpunpckhwd	(%rax), %xmm3, %xmm4
+	vpunpckhwd	0x42(%rcx), %xmm5, %xmm6
+	vpunpckhwd	%ymm0, %ymm1, %ymm2
+	vpunpckhwd	(%rbx), %ymm3, %ymm4
+	vpunpckhwd	0x42(%rdx), %ymm5, %ymm6
+
+	vpunpcklbw	%xmm0, %xmm1, %xmm2
+	vpunpcklbw	(%rax), %xmm3, %xmm4
+	vpunpcklbw	0x42(%rcx), %xmm5, %xmm6
+	vpunpcklbw	%ymm0, %ymm1, %ymm2
+	vpunpcklbw	(%rbx), %ymm3, %ymm4
+	vpunpcklbw	0x42(%rdx), %ymm5, %ymm6
+
+	vpunpckldq	%xmm0, %xmm1, %xmm2
+	vpunpckldq	(%rax), %xmm3, %xmm4
+	vpunpckldq	0x42(%rcx), %xmm5, %xmm6
+	vpunpckldq	%ymm0, %ymm1, %ymm2
+	vpunpckldq	(%rbx), %ymm3, %ymm4
+	vpunpckldq	0x42(%rdx), %ymm5, %ymm6
+
+	vpunpcklqdq	%xmm0, %xmm1, %xmm2
+	vpunpcklqdq	(%rax), %xmm3, %xmm4
+	vpunpcklqdq	0x42(%rcx), %xmm5, %xmm6
+	vpunpcklqdq	%ymm0, %ymm1, %ymm2
+	vpunpcklqdq	(%rbx), %ymm3, %ymm4
+	vpunpcklqdq	0x42(%rdx), %ymm5, %ymm6
+
+	vpunpcklwd	%xmm0, %xmm1, %xmm2
+	vpunpcklwd	(%rax), %xmm3, %xmm4
+	vpunpcklwd	0x42(%rcx), %xmm5, %xmm6
+	vpunpcklwd	%ymm0, %ymm1, %ymm2
+	vpunpcklwd	(%rbx), %ymm3, %ymm4
+	vpunpcklwd	0x42(%rdx), %ymm5, %ymm6
+
+	vpxor	%xmm0, %xmm1, %xmm2
+	vpxor	(%rax), %xmm3, %xmm4
+	vpxor	0x42(%rcx), %xmm5, %xmm6
+	vpxor	%ymm0, %ymm1, %ymm2
+	vpxor	(%rbx), %ymm3, %ymm4
+	vpxor	0x42(%rdx), %ymm5, %ymm6
+
+	vrcpps	%xmm0, %xmm1
+	vrcpps	(%rsi), %xmm3
+	vrcpps	0x42(%rdi), %xmm3
+	vrcpps	%ymm7, %ymm6
+	vrcpps	(%rbp), %ymm4
+	vrcpps	0x42(%rsp), %ymm4
+
+	vrcpss	%xmm0, %xmm1, %xmm2
+	vrcpss	(%rax), %xmm3, %xmm4
+	vrcpss	0x42(%rcx), %xmm5, %xmm6
+
+	vroundpd	$0x42, %xmm0, %xmm1
+	vroundpd	$0x23, 	(%rsi), %xmm3
+	vroundpd	$0x42, 0x42(%rdi), %xmm3
+	vroundpd	$0x42, %ymm0, %ymm1
+	vroundpd	$0x23, 	(%rsi), %ymm3
+	vroundpd	$0x42, 0x42(%rdi), %ymm3
+
+	vroundps	$0x42, %xmm0, %xmm1
+	vroundps	$0x23, 	(%rsi), %xmm3
+	vroundps	$0x42, 0x42(%rdi), %xmm3
+	vroundps	$0x42, %ymm0, %ymm1
+	vroundps	$0x23, 	(%rsi), %ymm3
+	vroundps	$0x42, 0x42(%rdi), %ymm3
+
+	vroundsd	$0x48, %xmm3, %xmm5, %xmm7
+	vroundsd	$0x48, (%rbx), %xmm2, %xmm4
+	vroundsd	$0x48, 0x8(%rbx), %xmm1, %xmm6
+
+	vroundss	$0x48, %xmm3, %xmm5, %xmm7
+	vroundss	$0x48, (%rbx), %xmm2, %xmm4
+	vroundss	$0x48, 0x8(%rbx), %xmm1, %xmm6
+
+	vrsqrtps	%xmm0, %xmm1
+	vrsqrtps	(%rsi), %xmm3
+	vrsqrtps	0x42(%rdi), %xmm3
+	vrsqrtps	%ymm7, %ymm6
+	vrsqrtps	(%rbp), %ymm4
+	vrsqrtps	0x42(%rsp), %ymm4
+
+	vrsqrtss	%xmm0, %xmm1, %xmm2
+	vrsqrtss	(%rax), %xmm3, %xmm4
+	vrsqrtss	0x42(%rcx), %xmm5, %xmm6
+
+	vshufpd	$0x48, %xmm3, %xmm5, %xmm7
+	vshufpd	$0x48, (%rbx), %xmm2, %xmm4
+	vshufpd	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vshufpd	$0x48, %ymm3, %ymm5, %ymm7
+	vshufpd	$0x48, (%rbx), %ymm2, %ymm4
+	vshufpd	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vshufps	$0x48, %xmm3, %xmm5, %xmm7
+	vshufps	$0x48, (%rbx), %xmm2, %xmm4
+	vshufps	$0x48, 0x8(%rbx), %xmm1, %xmm6
+	vshufps	$0x48, %ymm3, %ymm5, %ymm7
+	vshufps	$0x48, (%rbx), %ymm2, %ymm4
+	vshufps	$0x48, 0x8(%rbx), %ymm1, %ymm6
+
+	vsqrtpd	%xmm0, %xmm1
+	vsqrtpd	(%rsi), %xmm3
+	vsqrtpd	0x42(%rdi), %xmm3
+	vsqrtpd	%ymm7, %ymm6
+	vsqrtpd	(%rbp), %ymm4
+	vsqrtpd	0x42(%rsp), %ymm4
+
+	vsqrtps	%xmm0, %xmm1
+	vsqrtps	(%rsi), %xmm3
+	vsqrtps	0x42(%rdi), %xmm3
+	vsqrtps	%ymm7, %ymm6
+	vsqrtps	(%rbp), %ymm4
+	vsqrtps	0x42(%rsp), %ymm4
+
+	vsqrtsd	%xmm0, %xmm1, %xmm2
+	vsqrtsd	(%rax), %xmm3, %xmm4
+	vsqrtsd	0x42(%rcx), %xmm5, %xmm6
+
+	vsqrtss	%xmm0, %xmm1, %xmm2
+	vsqrtss	(%rax), %xmm3, %xmm4
+	vsqrtss	0x42(%rcx), %xmm5, %xmm6
+
+	vstmxcsr	(%rdx)
+	vstmxcsr	0x8(%rdx)
+
+	vsubpd	%xmm0, %xmm1, %xmm2
+	vsubpd	(%rax), %xmm3, %xmm4
+	vsubpd	0x42(%rcx), %xmm5, %xmm6
+	vsubpd	%ymm0, %ymm1, %ymm2
+	vsubpd	(%rbx), %ymm3, %ymm4
+	vsubpd	0x42(%rdx), %ymm5, %ymm6
+
+	vsubps	%xmm0, %xmm1, %xmm2
+	vsubps	(%rax), %xmm3, %xmm4
+	vsubps	0x42(%rcx), %xmm5, %xmm6
+	vsubps	%ymm0, %ymm1, %ymm2
+	vsubps	(%rbx), %ymm3, %ymm4
+	vsubps	0x42(%rdx), %ymm5, %ymm6
+
+	vsubsd	%xmm0, %xmm1, %xmm2
+	vsubsd	(%rax), %xmm3, %xmm4
+	vsubsd	0x42(%rcx), %xmm5, %xmm6
+
+	vsubss	%xmm0, %xmm1, %xmm2
+	vsubss	(%rax), %xmm3, %xmm4
+	vsubss	0x42(%rcx), %xmm5, %xmm6
+
+	vtestpd	%xmm0, %xmm1
+	vtestpd	(%rsi), %xmm3
+	vtestpd	0x42(%rdi), %xmm3
+	vtestpd	%ymm7, %ymm6
+	vtestpd	(%rbp), %ymm4
+	vtestpd	0x42(%rsp), %ymm4
+
+	vtestps	%xmm0, %xmm1
+	vtestps	(%rsi), %xmm3
+	vtestps	0x42(%rdi), %xmm3
+	vtestps	%ymm7, %ymm6
+	vtestps	(%rbp), %ymm4
+	vtestps	0x42(%rsp), %ymm4
+
+	vucomisd	%xmm0, %xmm1
+	vucomisd	(%rsi), %xmm3
+	vucomisd	0x42(%rdi), %xmm3
+
+	vucomiss	%xmm0, %xmm1
+	vucomiss	(%rsi), %xmm3
+	vucomiss	0x42(%rdi), %xmm3
+
+	vunpckhpd	%xmm0, %xmm1, %xmm2
+	vunpckhpd	(%rax), %xmm3, %xmm4
+	vunpckhpd	0x42(%rcx), %xmm5, %xmm6
+	vunpckhpd	%ymm0, %ymm1, %ymm2
+	vunpckhpd	(%rbx), %ymm3, %ymm4
+	vunpckhpd	0x42(%rdx), %ymm5, %ymm6
+
+	vunpckhps	%xmm0, %xmm1, %xmm2
+	vunpckhps	(%rax), %xmm3, %xmm4
+	vunpckhps	0x42(%rcx), %xmm5, %xmm6
+	vunpckhps	%ymm0, %ymm1, %ymm2
+	vunpckhps	(%rbx), %ymm3, %ymm4
+	vunpckhps	0x42(%rdx), %ymm5, %ymm6
+
+	vunpcklpd	%xmm0, %xmm1, %xmm2
+	vunpcklpd	(%rax), %xmm3, %xmm4
+	vunpcklpd	0x42(%rcx), %xmm5, %xmm6
+	vunpcklpd	%ymm0, %ymm1, %ymm2
+	vunpcklpd	(%rbx), %ymm3, %ymm4
+	vunpcklpd	0x42(%rdx), %ymm5, %ymm6
+
+	vunpcklps	%xmm0, %xmm1, %xmm2
+	vunpcklps	(%rax), %xmm3, %xmm4
+	vunpcklps	0x42(%rcx), %xmm5, %xmm6
+	vunpcklps	%ymm0, %ymm1, %ymm2
+	vunpcklps	(%rbx), %ymm3, %ymm4
+	vunpcklps	0x42(%rdx), %ymm5, %ymm6
+
+	vxorpd	%xmm0, %xmm1, %xmm2
+	vxorpd	(%rax), %xmm3, %xmm4
+	vxorpd	0x42(%rcx), %xmm5, %xmm6
+	vxorpd	%ymm0, %ymm1, %ymm2
+	vxorpd	(%rbx), %ymm3, %ymm4
+	vxorpd	0x42(%rdx), %ymm5, %ymm6
+
+	vxorps	%xmm0, %xmm1, %xmm2
+	vxorps	(%rax), %xmm3, %xmm4
+	vxorps	0x42(%rcx), %xmm5, %xmm6
+	vxorps	%ymm0, %ymm1, %ymm2
+	vxorps	(%rbx), %ymm3, %ymm4
+	vxorps	0x42(%rdx), %ymm5, %ymm6
+
+	vzeroall
+
+	vzeroupper
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.avx2-gather.out b/usr/src/test/util-tests/tests/dis/i386/64.avx2-gather.out
new file mode 100644
index 0000000000..170132e474
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.avx2-gather.out
@@ -0,0 +1,64 @@
+    libdis_test:       67 c4 e2 f9 92 14  vgatherdpd %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0x7:   c4 e2 f9 92 14 8d  vgatherdpd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x11:  67 c4 e2 fd 92 14  vgatherdpd %ymm0,(%rax,%xmm1,4),%ymm2
+                       88 
+    libdis_test+0x18:  c4 e2 fd 92 14 8d  vgatherdpd %ymm0,0x42(,%xmm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0x22:  67 c4 e2 79 92 14  vgatherdps %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0x29:  c4 e2 79 92 14 8d  vgatherdps %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x33:  67 c4 e2 7d 92 14  vgatherdps %ymm0,(%rax,%ymm1,4),%ymm2
+                       88 
+    libdis_test+0x3a:  c4 e2 7d 92 14 8d  vgatherdps %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0x44:  67 c4 e2 f9 93 14  vgatherqpd %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0x4b:  c4 e2 f9 93 14 8d  vgatherqpd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x55:  67 c4 e2 fd 93 14  vgatherqpd %ymm0,(%rax,%ymm1,4),%ymm2
+                       88 
+    libdis_test+0x5c:  c4 e2 fd 93 14 8d  vgatherqpd %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0x66:  67 c4 e2 79 93 14  vgatherqps %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0x6d:  c4 e2 79 93 14 8d  vgatherqps %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x77:  67 c4 e2 7d 93 14  vgatherqps %xmm0,(%rax,%ymm1,4),%xmm2
+                       88 
+    libdis_test+0x7e:  c4 e2 7d 93 14 8d  vgatherqps %xmm0,0x42(,%ymm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x88:  67 c4 e2 79 90 14  vpgatherdd %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0x8f:  c4 e2 79 90 14 8d  vpgatherdd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0x99:  67 c4 e2 7d 90 14  vpgatherdd %ymm0,(%rax,%ymm1,4),%ymm2
+                       88 
+    libdis_test+0xa0:  c4 e2 7d 90 14 8d  vpgatherdd %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0xaa:  67 c4 e2 f9 90 14  vpgatherdq %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0xb1:  c4 e2 f9 90 14 8d  vpgatherdq %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xbb:  67 c4 e2 fd 90 14  vpgatherdq %ymm0,(%rax,%xmm1,4),%ymm2
+                       88 
+    libdis_test+0xc2:  c4 e2 fd 90 14 8d  vpgatherdq %ymm0,0x42(,%xmm1,4),%ymm2
+                       42 00 00 00 
+    libdis_test+0xcc:  67 c4 e2 79 91 14  vpgatherqd %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0xd3:  c4 e2 79 91 14 8d  vpgatherqd %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xdd:  67 c4 e2 7d 91 14  vpgatherqd %xmm0,(%rax,%ymm1,4),%xmm2
+                       88 
+    libdis_test+0xe4:  c4 e2 7d 91 14 8d  vpgatherqd %xmm0,0x42(,%ymm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xee:  67 c4 e2 f9 91 14  vpgatherqq %xmm0,(%rax,%xmm1,4),%xmm2
+                       88 
+    libdis_test+0xf5:  c4 e2 f9 91 14 8d  vpgatherqq %xmm0,0x42(,%xmm1,4),%xmm2
+                       42 00 00 00 
+    libdis_test+0xff:  67 c4 e2 fd 91 14  vpgatherqq %ymm0,(%rax,%ymm1,4),%ymm2
+                       88 
+    libdis_test+0x106: c4 e2 fd 91 14 8d  vpgatherqq %ymm0,0x42(,%ymm1,4),%ymm2
+                       42 00 00 00 
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.avx2-gather.s b/usr/src/test/util-tests/tests/dis/i386/64.avx2-gather.s
new file mode 100644
index 0000000000..149b2ac8fc
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.avx2-gather.s
@@ -0,0 +1,57 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test AVX2 Gather related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vgatherdpd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherdpd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherdpd	%ymm0, (%eax, %xmm1, 4), %ymm2
+	vgatherdpd	%ymm0, 0x42(, %xmm1, 4), %ymm2
+	vgatherdps	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherdps	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherdps	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vgatherdps	%ymm0, 0x42(, %ymm1, 4), %ymm2
+	vgatherqpd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherqpd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherqpd	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vgatherqpd	%ymm0, 0x42(, %ymm1, 4), %ymm2
+	vgatherqps	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vgatherqps	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vgatherqps	%xmm0, (%eax, %ymm1, 4), %xmm2
+	vgatherqps	%xmm0, 0x42(, %ymm1, 4), %xmm2
+	vpgatherdd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherdd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherdd	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vpgatherdd	%ymm0, 0x42(, %ymm1, 4), %ymm2
+	vpgatherdq	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherdq	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherdq	%ymm0, (%eax, %xmm1, 4), %ymm2
+	vpgatherdq	%ymm0, 0x42(, %xmm1, 4), %ymm2
+	vpgatherqd	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherqd	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherqd	%xmm0, (%eax, %ymm1, 4), %xmm2
+	vpgatherqd	%xmm0, 0x42(, %ymm1, 4), %xmm2
+	vpgatherqq	%xmm0, (%eax, %xmm1, 4), %xmm2
+	vpgatherqq	%xmm0, 0x42(, %xmm1, 4), %xmm2
+	vpgatherqq	%ymm0, (%eax, %ymm1, 4), %ymm2
+	vpgatherqq	%ymm0, 0x42(, %ymm1, 4), %ymm2
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.avx2.out b/usr/src/test/util-tests/tests/dis/i386/64.avx2.out
new file mode 100644
index 0000000000..fe0dacbae1
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.avx2.out
@@ -0,0 +1,59 @@
+    libdis_test:       c4 e2 7d 5a 00     vbroadcasti128 (%rax),%ymm0
+    libdis_test+0x5:   c4 e3 7d 39 dc 23  vextracti128 $0x23,%ymm3,%xmm4
+    libdis_test+0xb:   c4 e3 7d 39 1b 23  vextracti128 $0x23,%ymm3,(%rbx)
+    libdis_test+0x11:  c4 e3 65 38 e2 42  vinserti128 $0x42,%ymm2,%ymm3,%ymm4
+    libdis_test+0x17:  c4 e3 65 38 20 42  vinserti128 $0x42,(%rax),%ymm3,%ymm4
+    libdis_test+0x1d:  c4 e2 7d 2a 00     vmovntdqa (%rax),%ymm0
+    libdis_test+0x22:  c4 e3 61 02 e2 42  vpblendd $0x42,%xmm2,%xmm3,%xmm4
+    libdis_test+0x28:  c4 e3 61 02 20 42  vpblendd $0x42,(%rax),%xmm3,%xmm4
+    libdis_test+0x2e:  c4 e3 65 02 e2 42  vpblendd $0x42,%ymm2,%ymm3,%ymm4
+    libdis_test+0x34:  c4 e3 65 02 20 42  vpblendd $0x42,(%rax),%ymm3,%ymm4
+    libdis_test+0x3a:  c4 e2 79 78 c8     vpbroadcastb %xmm0,%xmm1
+    libdis_test+0x3f:  c4 e2 79 78 10     vpbroadcastb (%rax),%xmm2
+    libdis_test+0x44:  c4 e2 7d 78 c8     vpbroadcastb %xmm0,%ymm1
+    libdis_test+0x49:  c4 e2 7d 78 10     vpbroadcastb (%rax),%ymm2
+    libdis_test+0x4e:  c4 e2 79 58 c8     vpbroadcastd %xmm0,%xmm1
+    libdis_test+0x53:  c4 e2 79 58 10     vpbroadcastd (%rax),%xmm2
+    libdis_test+0x58:  c4 e2 7d 58 c8     vpbroadcastd %xmm0,%ymm1
+    libdis_test+0x5d:  c4 e2 7d 58 10     vpbroadcastd (%rax),%ymm2
+    libdis_test+0x62:  c4 e2 79 59 c8     vpbroadcastq %xmm0,%xmm1
+    libdis_test+0x67:  c4 e2 79 59 10     vpbroadcastq (%rax),%xmm2
+    libdis_test+0x6c:  c4 e2 7d 59 c8     vpbroadcastq %xmm0,%ymm1
+    libdis_test+0x71:  c4 e2 7d 59 10     vpbroadcastq (%rax),%ymm2
+    libdis_test+0x76:  c4 e2 79 79 c8     vpbroadcastw %xmm0,%xmm1
+    libdis_test+0x7b:  c4 e2 79 79 10     vpbroadcastw (%rax),%xmm2
+    libdis_test+0x80:  c4 e2 7d 79 c8     vpbroadcastw %xmm0,%ymm1
+    libdis_test+0x85:  c4 e2 7d 79 10     vpbroadcastw (%rax),%ymm2
+    libdis_test+0x8a:  c4 e3 65 46 e2 42  vperm2i128 $0x42,%ymm2,%ymm3,%ymm4
+    libdis_test+0x90:  c4 e3 65 46 20 42  vperm2i128 $0x42,(%rax),%ymm3,%ymm4
+    libdis_test+0x96:  c4 e2 65 36 e2     vpermd %ymm2,%ymm3,%ymm4
+    libdis_test+0x9b:  c4 e2 65 36 20     vpermd (%rax),%ymm3,%ymm4
+    libdis_test+0xa0:  c4 e3 fd 01 da 42  vpermpd $0x42,%ymm2,%ymm3
+    libdis_test+0xa6:  c4 e3 fd 01 18 42  vpermpd $0x42,(%rax),%ymm3
+    libdis_test+0xac:  c4 e2 6d 16 d9     vpermps %ymm1,%ymm2,%ymm3
+    libdis_test+0xb1:  c4 e2 6d 16 18     vpermps (%rax),%ymm2,%ymm3
+    libdis_test+0xb6:  c4 e3 fd 00 da 42  vpermq $0x42,%ymm2,%ymm3
+    libdis_test+0xbc:  c4 e3 fd 00 18 42  vpermq $0x42,(%rax),%ymm3
+    libdis_test+0xc2:  c4 e2 6d 8c 18     vpmaskmovd (%rax),%ymm2,%ymm3
+    libdis_test+0xc7:  c4 e2 e9 8c 18     vpmaskmovq (%rax),%xmm2,%xmm3
+    libdis_test+0xcc:  c4 e2 ed 8c 18     vpmaskmovq (%rax),%ymm2,%ymm3
+    libdis_test+0xd1:  c4 e2 69 47 d9     vpsllvd %xmm1,%xmm2,%xmm3
+    libdis_test+0xd6:  c4 e2 69 47 18     vpsllvd (%rax),%xmm2,%xmm3
+    libdis_test+0xdb:  c4 e2 6d 47 d9     vpsllvd %ymm1,%ymm2,%ymm3
+    libdis_test+0xe0:  c4 e2 6d 47 18     vpsllvd (%rax),%ymm2,%ymm3
+    libdis_test+0xe5:  c4 e2 e9 47 d9     vpsllvq %xmm1,%xmm2,%xmm3
+    libdis_test+0xea:  c4 e2 e9 47 18     vpsllvq (%rax),%xmm2,%xmm3
+    libdis_test+0xef:  c4 e2 ed 47 d9     vpsllvq %ymm1,%ymm2,%ymm3
+    libdis_test+0xf4:  c4 e2 ed 47 18     vpsllvq (%rax),%ymm2,%ymm3
+    libdis_test+0xf9:  c4 e2 69 46 d9     vpsravd %xmm1,%xmm2,%xmm3
+    libdis_test+0xfe:  c4 e2 69 46 18     vpsravd (%rax),%xmm2,%xmm3
+    libdis_test+0x103: c4 e2 6d 46 d9     vpsravd %ymm1,%ymm2,%ymm3
+    libdis_test+0x108: c4 e2 6d 46 18     vpsravd (%rax),%ymm2,%ymm3
+    libdis_test+0x10d: c4 e2 69 45 d9     vpsrlvd %xmm1,%xmm2,%xmm3
+    libdis_test+0x112: c4 e2 69 45 18     vpsrlvd (%rax),%xmm2,%xmm3
+    libdis_test+0x117: c4 e2 6d 45 d9     vpsrlvd %ymm1,%ymm2,%ymm3
+    libdis_test+0x11c: c4 e2 6d 45 18     vpsrlvd (%rax),%ymm2,%ymm3
+    libdis_test+0x121: c4 e2 e9 45 d9     vpsrlvq %xmm1,%xmm2,%xmm3
+    libdis_test+0x126: c4 e2 e9 45 18     vpsrlvq (%rax),%xmm2,%xmm3
+    libdis_test+0x12b: c4 e2 ed 45 d9     vpsrlvq %ymm1,%ymm2,%ymm3
+    libdis_test+0x130: c4 e2 ed 45 18     vpsrlvq (%rax),%ymm2,%ymm3
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.avx2.s b/usr/src/test/util-tests/tests/dis/i386/64.avx2.s
new file mode 100644
index 0000000000..3f43c49ff4
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.avx2.s
@@ -0,0 +1,84 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test AVX2 related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vbroadcasti128	(%rax), %ymm0
+	vextracti128	$0x23, %ymm3, %xmm4
+	vextracti128	$0x23, %ymm3, (%rbx)
+	vinserti128	$0x42, %xmm2, %ymm3, %ymm4
+	vinserti128	$0x42, (%rax), %ymm3, %ymm4
+	vmovntdqa	(%rax), %ymm0
+	vpblendd	$0x42, %xmm2, %xmm3, %xmm4
+	vpblendd	$0x42, (%rax), %xmm3, %xmm4
+	vpblendd	$0x42, %ymm2, %ymm3, %ymm4
+	vpblendd	$0x42, (%rax), %ymm3, %ymm4
+	vpbroadcastb	%xmm0, %xmm1
+	vpbroadcastb	(%rax), %xmm2
+	vpbroadcastb	%xmm0, %ymm1
+	vpbroadcastb	(%rax), %ymm2
+	vpbroadcastd	%xmm0, %xmm1
+	vpbroadcastd	(%rax), %xmm2
+	vpbroadcastd	%xmm0, %ymm1
+	vpbroadcastd	(%rax), %ymm2
+	vpbroadcastq	%xmm0, %xmm1
+	vpbroadcastq	(%rax), %xmm2
+	vpbroadcastq	%xmm0, %ymm1
+	vpbroadcastq	(%rax), %ymm2
+	vpbroadcastw	%xmm0, %xmm1
+	vpbroadcastw	(%rax), %xmm2
+	vpbroadcastw	%xmm0, %ymm1
+	vpbroadcastw	(%rax), %ymm2
+	vperm2i128	$0x42, %ymm2, %ymm3, %ymm4
+	vperm2i128	$0x42, (%rax), %ymm3, %ymm4
+	vpermd		%ymm2, %ymm3, %ymm4
+	vpermd		(%rax), %ymm3, %ymm4
+	vpermpd		$0x42, %ymm2, %ymm3
+	vpermpd		$0x42, (%rax), %ymm3
+	vpermps		%ymm1, %ymm2, %ymm3
+	vpermps		(%rax), %ymm2, %ymm3
+	vpermq		$0x42, %ymm2, %ymm3
+	vpermq		$0x42, (%rax), %ymm3
+	vpmaskmovd	(%rax), %ymm2, %ymm3
+	vpmaskmovq	(%rax), %xmm2, %xmm3
+	vpmaskmovq	(%rax), %ymm2, %ymm3
+	vpsllvd		%xmm1, %xmm2, %xmm3
+	vpsllvd		(%rax), %xmm2, %xmm3
+	vpsllvd		%ymm1, %ymm2, %ymm3
+	vpsllvd		(%rax), %ymm2, %ymm3
+	vpsllvq		%xmm1, %xmm2, %xmm3
+	vpsllvq		(%rax), %xmm2, %xmm3
+	vpsllvq		%ymm1, %ymm2, %ymm3
+	vpsllvq		(%rax), %ymm2, %ymm3
+	vpsravd		%xmm1, %xmm2, %xmm3
+	vpsravd		(%rax), %xmm2, %xmm3
+	vpsravd		%ymm1, %ymm2, %ymm3
+	vpsravd		(%rax), %ymm2, %ymm3
+	vpsrlvd		%xmm1, %xmm2, %xmm3
+	vpsrlvd		(%rax), %xmm2, %xmm3
+	vpsrlvd		%ymm1, %ymm2, %ymm3
+	vpsrlvd		(%rax), %ymm2, %ymm3
+	vpsrlvq		%xmm1, %xmm2, %xmm3
+	vpsrlvq		(%rax), %xmm2, %xmm3
+	vpsrlvq		%ymm1, %ymm2, %ymm3
+	vpsrlvq		(%rax), %ymm2, %ymm3
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.f16c.out b/usr/src/test/util-tests/tests/dis/i386/64.f16c.out
new file mode 100644
index 0000000000..06492d86e5
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.f16c.out
@@ -0,0 +1,14 @@
+    libdis_test:      c4 e2 79 13 c8     vcvtph2ps %xmm0,%xmm1
+    libdis_test+0x5:  c4 e2 79 13 08     vcvtph2ps (%rax),%xmm1
+    libdis_test+0xa:  c4 e2 79 13 48 24  vcvtph2ps 0x24(%rax),%xmm1
+    libdis_test+0x10: c4 e2 7d 13 c8     vcvtph2ps %xmm0,%ymm1
+    libdis_test+0x15: c4 e2 7d 13 08     vcvtph2ps (%rax),%ymm1
+    libdis_test+0x1a: c4 e2 7d 13 48 24  vcvtph2ps 0x24(%rax),%ymm1
+    libdis_test+0x20: c4 e3 79 1d c1 10  vcvtps2ph $0x10,%xmm0,%xmm1
+    libdis_test+0x26: c4 e3 79 1d 1b 10  vcvtps2ph $0x10,%xmm3,(%rbx)
+    libdis_test+0x2c: c4 e3 79 1d 61 10  vcvtps2ph $0x10,%xmm4,0x10(%rcx)
+                      10 
+    libdis_test+0x33: c4 e3 7d 1d c1 10  vcvtps2ph $0x10,%ymm0,%xmm1
+    libdis_test+0x39: c4 e3 7d 1d 1b 10  vcvtps2ph $0x10,%ymm3,(%rbx)
+    libdis_test+0x3f: c4 e3 7d 1d 61 10  vcvtps2ph $0x10,%ymm4,0x10(%rcx)
+                      10 
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.f16c.s b/usr/src/test/util-tests/tests/dis/i386/64.f16c.s
new file mode 100644
index 0000000000..e1163e8411
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.f16c.s
@@ -0,0 +1,38 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test F16C related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	vcvtph2ps	%xmm0, %xmm1
+	vcvtph2ps	(%rax), %xmm1
+	vcvtph2ps	0x24(%rax), %xmm1
+	vcvtph2ps	%xmm0, %ymm1
+	vcvtph2ps	(%rax), %ymm1
+	vcvtph2ps	0x24(%rax), %ymm1
+
+	vcvtps2ph	$0x10, %xmm0, %xmm1
+	vcvtps2ph	$0x10, %xmm3, (%rbx)
+	vcvtps2ph	$0x10, %xmm4, 0x10(%rcx)
+	vcvtps2ph	$0x10, %ymm0, %xmm1
+	vcvtps2ph	$0x10, %ymm3, (%rbx)
+	vcvtps2ph	$0x10, %ymm4, 0x10(%rcx)
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.movbe.out b/usr/src/test/util-tests/tests/dis/i386/64.movbe.out
new file mode 100644
index 0000000000..7933b1468e
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.movbe.out
@@ -0,0 +1,6 @@
+    libdis_test:      66 0f 38 f1 03     movbew %ax,(%rbx)
+    libdis_test+0x5:  0f 38 f1 03        movbel %eax,(%rbx)
+    libdis_test+0x9:  48 0f 38 f1 03     movbeq %rax,(%rbx)
+    libdis_test+0xe:  66 0f 38 f0 18     movbew (%rax),%bx
+    libdis_test+0x13: 0f 38 f0 18        movbel (%rax),%ebx
+    libdis_test+0x17: 48 0f 38 f0 18     movbeq (%rax),%rbx
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.movbe.s b/usr/src/test/util-tests/tests/dis/i386/64.movbe.s
new file mode 100644
index 0000000000..717534c5e5
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.movbe.s
@@ -0,0 +1,31 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test MOVBE related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	movbew	%ax, (%rbx)
+	movbel	%eax, (%rbx)
+	movbeq	%rax, (%rbx)
+	movbew	(%rax), %bx
+	movbel	(%rax), %ebx
+	movbeq	(%rax), %rbx
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.pclmulqdq.out b/usr/src/test/util-tests/tests/dis/i386/64.pclmulqdq.out
new file mode 100644
index 0000000000..6d4d164f8f
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.pclmulqdq.out
@@ -0,0 +1,20 @@
+    libdis_test:      66 0f 3a 44 c8 02  pclmulqdq $0x2,%xmm0,%xmm1
+    libdis_test+0x6:  66 0f 3a 44 10 02  pclmulqdq $0x2,(%rax),%xmm2
+    libdis_test+0xc:  66 0f 3a 44 5b 10  pclmulqdq $0x2,0x10(%rbx),%xmm3
+                      02 
+    libdis_test+0x13: 66 0f 3a 44 c8 00  pclmullqlqdq %xmm0,%xmm1
+    libdis_test+0x19: 66 0f 3a 44 10 00  pclmullqlqdq (%rax),%xmm2
+    libdis_test+0x1f: 66 0f 3a 44 53 04  pclmullqlqdq 0x4(%rbx),%xmm2
+                      00 
+    libdis_test+0x26: 66 0f 3a 44 c8 01  pclmulhqlqdq %xmm0,%xmm1
+    libdis_test+0x2c: 66 0f 3a 44 10 01  pclmulhqlqdq (%rax),%xmm2
+    libdis_test+0x32: 66 0f 3a 44 53 04  pclmulhqlqdq 0x4(%rbx),%xmm2
+                      01 
+    libdis_test+0x39: 66 0f 3a 44 c8 10  pclmullqhqdq %xmm0,%xmm1
+    libdis_test+0x3f: 66 0f 3a 44 10 10  pclmullqhqdq (%rax),%xmm2
+    libdis_test+0x45: 66 0f 3a 44 53 04  pclmullqhqdq 0x4(%rbx),%xmm2
+                      10 
+    libdis_test+0x4c: 66 0f 3a 44 c8 11  pclmulhqhqdq %xmm0,%xmm1
+    libdis_test+0x52: 66 0f 3a 44 10 11  pclmulhqhqdq (%rax),%xmm2
+    libdis_test+0x58: 66 0f 3a 44 53 04  pclmulhqhqdq 0x4(%rbx),%xmm2
+                      11 
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.pclmulqdq.s b/usr/src/test/util-tests/tests/dis/i386/64.pclmulqdq.s
new file mode 100644
index 0000000000..65bf1c4476
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.pclmulqdq.s
@@ -0,0 +1,44 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test PCLMULQDQ related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	pclmulqdq	$0x2, %xmm0, %xmm1
+	pclmulqdq	$0x2, (%rax), %xmm2
+	pclmulqdq	$0x2, 0x10(%rbx), %xmm3
+
+	pclmullqlqdq	%xmm0, %xmm1
+	pclmullqlqdq	(%rax), %xmm2
+	pclmullqlqdq	0x4(%rbx), %xmm2
+
+	pclmulhqlqdq	%xmm0, %xmm1
+	pclmulhqlqdq	(%rax), %xmm2
+	pclmulhqlqdq	0x4(%rbx), %xmm2
+
+	pclmullqhqdq	%xmm0, %xmm1
+	pclmullqhqdq	(%rax), %xmm2
+	pclmullqhqdq	0x4(%rbx), %xmm2
+
+	pclmulhqhqdq	%xmm0, %xmm1
+	pclmulhqhqdq	(%rax), %xmm2
+	pclmulhqhqdq	0x4(%rbx), %xmm2
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.sha.out b/usr/src/test/util-tests/tests/dis/i386/64.sha.out
new file mode 100644
index 0000000000..7dd05bcb72
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.sha.out
@@ -0,0 +1,28 @@
+    libdis_test:      0f 3a cc c8 01     sha1rnds4 $0x1,%xmm0,%xmm1
+    libdis_test+0x5:  0f 3a cc 0b 02     sha1rnds4 $0x2,(%rbx),%xmm1
+    libdis_test+0xa:  0f 3a cc 4b 23 03  sha1rnds4 $0x3,0x23(%rbx),%xmm1
+    libdis_test+0x10: 0f 3a cc 0c 8b 02  sha1rnds4 $0x2,(%rbx,%rcx,4),%xmm1
+    libdis_test+0x16: 0f 38 c8 c8        sha1nexte %xmm0,%xmm1
+    libdis_test+0x1a: 0f 38 c8 0b        sha1nexte (%rbx),%xmm1
+    libdis_test+0x1e: 0f 38 c8 4b 23     sha1nexte 0x23(%rbx),%xmm1
+    libdis_test+0x23: 0f 38 c8 0c 8b     sha1nexte (%rbx,%rcx,4),%xmm1
+    libdis_test+0x28: 0f 38 c9 c8        sha1msg1 %xmm0,%xmm1
+    libdis_test+0x2c: 0f 38 c9 0b        sha1msg1 (%rbx),%xmm1
+    libdis_test+0x30: 0f 38 c9 4b 23     sha1msg1 0x23(%rbx),%xmm1
+    libdis_test+0x35: 0f 38 c9 0c 8b     sha1msg1 (%rbx,%rcx,4),%xmm1
+    libdis_test+0x3a: 0f 38 ca c8        sha1msg2 %xmm0,%xmm1
+    libdis_test+0x3e: 0f 38 ca 0b        sha1msg2 (%rbx),%xmm1
+    libdis_test+0x42: 0f 38 ca 4b 23     sha1msg2 0x23(%rbx),%xmm1
+    libdis_test+0x47: 0f 38 ca 0c 8b     sha1msg2 (%rbx,%rcx,4),%xmm1
+    libdis_test+0x4c: 0f 38 cb ec        sha256rnds2 %xmm4,%xmm5
+    libdis_test+0x50: 0f 38 cb 2b        sha256rnds2 (%rbx),%xmm5
+    libdis_test+0x54: 0f 38 cb 6b 23     sha256rnds2 0x23(%rbx),%xmm5
+    libdis_test+0x59: 0f 38 cb 2c 8b     sha256rnds2 (%rbx,%rcx,4),%xmm5
+    libdis_test+0x5e: 0f 38 cc c8        sha256msg1 %xmm0,%xmm1
+    libdis_test+0x62: 0f 38 cc 0b        sha256msg1 (%rbx),%xmm1
+    libdis_test+0x66: 0f 38 cc 4b 23     sha256msg1 0x23(%rbx),%xmm1
+    libdis_test+0x6b: 0f 38 cc 0c 8b     sha256msg1 (%rbx,%rcx,4),%xmm1
+    libdis_test+0x70: 0f 38 cd c8        sha256msg2 %xmm0,%xmm1
+    libdis_test+0x74: 0f 38 cd 0b        sha256msg2 (%rbx),%xmm1
+    libdis_test+0x78: 0f 38 cd 4b 23     sha256msg2 0x23(%rbx),%xmm1
+    libdis_test+0x7d: 0f 38 cd 0c 8b     sha256msg2 (%rbx,%rcx,4),%xmm1
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.sha.s b/usr/src/test/util-tests/tests/dis/i386/64.sha.s
new file mode 100644
index 0000000000..92c9879185
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.sha.s
@@ -0,0 +1,53 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test SHA related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	sha1rnds4	$0x1, %xmm0, %xmm1
+	sha1rnds4	$0x2, (%rbx), %xmm1
+	sha1rnds4	$0x3, 0x23(%rbx), %xmm1
+	sha1rnds4	$0x2, (%rbx, %rcx, 4), %xmm1
+	sha1nexte	%xmm0, %xmm1
+	sha1nexte	(%rbx), %xmm1
+	sha1nexte	0x23(%rbx), %xmm1
+	sha1nexte	(%rbx, %rcx, 4), %xmm1
+	sha1msg1	%xmm0, %xmm1
+	sha1msg1	(%rbx), %xmm1
+	sha1msg1	0x23(%rbx), %xmm1
+	sha1msg1	(%rbx, %rcx, 4), %xmm1
+	sha1msg2	%xmm0, %xmm1
+	sha1msg2	(%rbx), %xmm1
+	sha1msg2	0x23(%rbx), %xmm1
+	sha1msg2	(%rbx, %rcx, 4), %xmm1
+	sha256rnds2	%xmm4, %xmm5
+	sha256rnds2	(%rbx), %xmm5
+	sha256rnds2	0x23(%rbx), %xmm5
+	sha256rnds2	(%rbx, %rcx, 4), %xmm5
+	sha256msg1	%xmm0, %xmm1
+	sha256msg1	(%rbx), %xmm1
+	sha256msg1	0x23(%rbx), %xmm1
+	sha256msg1	(%rbx, %rcx, 4), %xmm1
+	sha256msg2	%xmm0, %xmm1
+	sha256msg2	(%rbx), %xmm1
+	sha256msg2	0x23(%rbx), %xmm1
+	sha256msg2	(%rbx, %rcx, 4), %xmm1
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.sse-3.out b/usr/src/test/util-tests/tests/dis/i386/64.sse-3.out
new file mode 100644
index 0000000000..21c82e0a65
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.sse-3.out
@@ -0,0 +1,31 @@
+    libdis_test:      66 0f d0 c8        addsubpd %xmm0,%xmm1
+    libdis_test+0x4:  66 0f d0 12        addsubpd (%rdx),%xmm2
+    libdis_test+0x8:  66 0f d0 54 24 23  addsubpd 0x23(%rsp),%xmm2
+    libdis_test+0xe:  f2 0f d0 c8        addsubps %xmm0,%xmm1
+    libdis_test+0x12: f2 0f d0 12        addsubps (%rdx),%xmm2
+    libdis_test+0x16: f2 0f d0 54 24 23  addsubps 0x23(%rsp),%xmm2
+    libdis_test+0x1c: 66 0f 7c c8        haddpd %xmm0,%xmm1
+    libdis_test+0x20: 66 0f 7c 12        haddpd (%rdx),%xmm2
+    libdis_test+0x24: 66 0f 7c 54 24 23  haddpd 0x23(%rsp),%xmm2
+    libdis_test+0x2a: f2 0f 7c c8        haddps %xmm0,%xmm1
+    libdis_test+0x2e: f2 0f 7c 12        haddps (%rdx),%xmm2
+    libdis_test+0x32: f2 0f 7c 54 24 23  haddps 0x23(%rsp),%xmm2
+    libdis_test+0x38: 66 0f 7d c8        hsubpd %xmm0,%xmm1
+    libdis_test+0x3c: 66 0f 7d 12        hsubpd (%rdx),%xmm2
+    libdis_test+0x40: 66 0f 7d 54 24 23  hsubpd 0x23(%rsp),%xmm2
+    libdis_test+0x46: f2 0f 7d c8        hsubps %xmm0,%xmm1
+    libdis_test+0x4a: f2 0f 7d 12        hsubps (%rdx),%xmm2
+    libdis_test+0x4e: f2 0f 7d 54 24 23  hsubps 0x23(%rsp),%xmm2
+    libdis_test+0x54: f2 0f f0 18        lddqu  (%rax),%xmm3
+    libdis_test+0x58: f2 0f 12 ec        movddup %xmm4,%xmm5
+    libdis_test+0x5c: f2 0f 12 30        movddup (%rax),%xmm6
+    libdis_test+0x60: f2 0f 12 7b 42     movddup 0x42(%rbx),%xmm7
+    libdis_test+0x65: f3 0f 16 ec        movshdup %xmm4,%xmm5
+    libdis_test+0x69: f3 0f 16 30        movshdup (%rax),%xmm6
+    libdis_test+0x6d: f3 0f 16 7b 42     movshdup 0x42(%rbx),%xmm7
+    libdis_test+0x72: f3 0f 12 ec        movsldup %xmm4,%xmm5
+    libdis_test+0x76: f3 0f 12 30        movsldup (%rax),%xmm6
+    libdis_test+0x7a: f3 0f 12 7b 42     movsldup 0x42(%rbx),%xmm7
+    libdis_test+0x7f: df 88 34 12 00 00  fisttp 0x1234(%rax)
+    libdis_test+0x85: db 88 34 12 00 00  tisttpl 0x1234(%rax)
+    libdis_test+0x8b: dd 88 34 12 00 00  fisttpll 0x1234(%rax)
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.sse-3.s b/usr/src/test/util-tests/tests/dis/i386/64.sse-3.s
new file mode 100644
index 0000000000..c238b1c355
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.sse-3.s
@@ -0,0 +1,56 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test SSE 3 related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	addsubpd	%xmm0, %xmm1
+	addsubpd	(%rdx), %xmm2
+	addsubpd	0x23(%rsp), %xmm2
+	addsubps	%xmm0, %xmm1
+	addsubps	(%rdx), %xmm2
+	addsubps	0x23(%rsp), %xmm2
+	haddpd		%xmm0, %xmm1
+	haddpd		(%rdx), %xmm2
+	haddpd		0x23(%rsp), %xmm2
+	haddps		%xmm0, %xmm1
+	haddps		(%rdx), %xmm2
+	haddps		0x23(%rsp), %xmm2
+	hsubpd		%xmm0, %xmm1
+	hsubpd		(%rdx), %xmm2
+	hsubpd		0x23(%rsp), %xmm2
+	hsubps		%xmm0, %xmm1
+	hsubps		(%rdx), %xmm2
+	hsubps		0x23(%rsp), %xmm2
+	lddqu		(%rax), %xmm3
+	movddup		%xmm4, %xmm5
+	movddup		(%rax), %xmm6
+	movddup		0x42(%rbx), %xmm7
+	movshdup	%xmm4, %xmm5
+	movshdup	(%rax), %xmm6
+	movshdup	0x42(%rbx), %xmm7
+	movsldup	%xmm4, %xmm5
+	movsldup	(%rax), %xmm6
+	movsldup	0x42(%rbx), %xmm7
+	fisttp		0x1234(%rax)
+	fisttpl		0x1234(%rax)
+	fisttpll	0x1234(%rax)
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.sse-4.1.out b/usr/src/test/util-tests/tests/dis/i386/64.sse-4.1.out
new file mode 100644
index 0000000000..40189ebf84
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.sse-4.1.out
@@ -0,0 +1,150 @@
+    libdis_test:       66 0f 3a 0d c8 42  blendpd $0x42,%xmm0,%xmm1
+    libdis_test+0x6:   66 0f 3a 0d 0b 42  blendpd $0x42,(%rbx),%xmm1
+    libdis_test+0xc:   66 0f 3a 0c c8 42  blendps $0x42,%xmm0,%xmm1
+    libdis_test+0x12:  66 0f 3a 0c 0b 42  blendps $0x42,(%rbx),%xmm1
+    libdis_test+0x18:  66 0f 38 15 d1     blendvpd %xmm1,%xmm2
+    libdis_test+0x1d:  66 0f 38 15 13     blendvpd (%rbx),%xmm2
+    libdis_test+0x22:  66 0f 38 15 53 42  blendvpd 0x42(%rbx),%xmm2
+    libdis_test+0x28:  66 0f 38 14 d1     blendvps %xmm1,%xmm2
+    libdis_test+0x2d:  66 0f 38 14 13     blendvps (%rbx),%xmm2
+    libdis_test+0x32:  66 0f 38 14 53 42  blendvps 0x42(%rbx),%xmm2
+    libdis_test+0x38:  66 0f 3a 41 c8 42  dppd   $0x42,%xmm0,%xmm1
+    libdis_test+0x3e:  66 0f 3a 41 0b 42  dppd   $0x42,(%rbx),%xmm1
+    libdis_test+0x44:  66 0f 3a 40 c8 42  dpps   $0x42,%xmm0,%xmm1
+    libdis_test+0x4a:  66 0f 3a 40 0b 42  dpps   $0x42,(%rbx),%xmm1
+    libdis_test+0x50:  66 0f 3a 17 f3 23  extractps $0x23,%xmm6,%ebx
+    libdis_test+0x56:  66 0f 3a 17 33 23  extractps $0x23,%xmm6,(%rbx)
+    libdis_test+0x5c:  66 0f 3a 21 d1 23  insertps $0x23,%xmm1,%xmm2
+    libdis_test+0x62:  66 0f 3a 21 13 23  insertps $0x23,(%rbx),%xmm2
+    libdis_test+0x68:  66 0f 3a 21 53 42  insertps $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0x6f:  66 0f 38 2a 03     movntdqa (%rbx),%xmm0
+    libdis_test+0x74:  66 0f 3a 42 d1 23  mpsadbw $0x23,%xmm1,%xmm2
+    libdis_test+0x7a:  66 0f 3a 42 13 23  mpsadbw $0x23,(%rbx),%xmm2
+    libdis_test+0x80:  66 0f 3a 42 53 42  mpsadbw $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0x87:  66 0f 38 2b d1     packusdw %xmm1,%xmm2
+    libdis_test+0x8c:  66 0f 38 2b 13     packusdw (%rbx),%xmm2
+    libdis_test+0x91:  66 0f 38 2b 53 42  packusdw 0x42(%rbx),%xmm2
+    libdis_test+0x97:  66 0f 38 10 d1     pblendvb %xmm1,%xmm2
+    libdis_test+0x9c:  66 0f 38 10 13     pblendvb (%rbx),%xmm2
+    libdis_test+0xa1:  66 0f 38 10 53 42  pblendvb 0x42(%rbx),%xmm2
+    libdis_test+0xa7:  66 0f 3a 0e d1 23  pblendw $0x23,%xmm1,%xmm2
+    libdis_test+0xad:  66 0f 3a 0e 13 23  pblendw $0x23,(%rbx),%xmm2
+    libdis_test+0xb3:  66 0f 3a 0e 53 42  pblendw $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0xba:  66 0f 38 29 d1     pcmpeqq %xmm1,%xmm2
+    libdis_test+0xbf:  66 0f 38 29 13     pcmpeqq (%rbx),%xmm2
+    libdis_test+0xc4:  66 0f 38 29 53 42  pcmpeqq 0x42(%rbx),%xmm2
+    libdis_test+0xca:  66 0f 3a 14 e2 23  pextrb $0x23,%xmm4,%edx
+    libdis_test+0xd0:  66 0f 3a 14 22 23  pextrb $0x23,%xmm4,(%rdx)
+    libdis_test+0xd6:  66 0f 3a 16 e2 23  pextrd $0x23,%xmm4,%edx
+    libdis_test+0xdc:  66 0f 3a 16 22 23  pextrd $0x23,%xmm4,(%rdx)
+    libdis_test+0xe2:  66 48 0f 3a 16 e2  pextrq $0x23,%xmm4,%rdx
+                       23 
+    libdis_test+0xe9:  66 48 0f 3a 16 22  pextrq $0x23,%xmm4,(%rdx)
+                       23 
+    libdis_test+0xf0:  66 0f c5 d4 23     pextrw $0x23,%xmm4,%edx
+    libdis_test+0xf5:  66 0f 3a 15 22 23  pextrw $0x23,%xmm4,(%rdx)
+    libdis_test+0xfb:  66 0f 38 41 d1     phminposuw %xmm1,%xmm2
+    libdis_test+0x100: 66 0f 38 41 13     phminposuw (%rbx),%xmm2
+    libdis_test+0x105: 66 0f 38 41 53 42  phminposuw 0x42(%rbx),%xmm2
+    libdis_test+0x10b: 66 0f 3a 20 d3 23  pinsrb $0x23,%ebx,%xmm2
+    libdis_test+0x111: 66 0f 3a 20 13 23  pinsrb $0x23,(%rbx),%xmm2
+    libdis_test+0x117: 66 0f 3a 20 53 42  pinsrb $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0x11e: 66 0f 3a 22 d3 23  pinsrd $0x23,%ebx,%xmm2
+    libdis_test+0x124: 66 0f 3a 22 13 23  pinsrd $0x23,(%rbx),%xmm2
+    libdis_test+0x12a: 66 0f 3a 22 53 42  pinsrd $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0x131: 66 48 0f 3a 22 d3  pinsrq $0x23,%rbx,%xmm2
+                       23 
+    libdis_test+0x138: 66 48 0f 3a 22 13  pinsrq $0x23,(%rbx),%xmm2
+                       23 
+    libdis_test+0x13f: 66 48 0f 3a 22 53  pinsrq $0x23,0x42(%rbx),%xmm2
+                       42 23 
+    libdis_test+0x147: 66 0f 38 3c d1     pmaxsb %xmm1,%xmm2
+    libdis_test+0x14c: 66 0f 38 3c 13     pmaxsb (%rbx),%xmm2
+    libdis_test+0x151: 66 0f 38 3c 53 42  pmaxsb 0x42(%rbx),%xmm2
+    libdis_test+0x157: 66 0f 38 3d d1     pmaxsd %xmm1,%xmm2
+    libdis_test+0x15c: 66 0f 38 3d 13     pmaxsd (%rbx),%xmm2
+    libdis_test+0x161: 66 0f 38 3d 53 42  pmaxsd 0x42(%rbx),%xmm2
+    libdis_test+0x167: 66 0f 38 3f d1     pmaxud %xmm1,%xmm2
+    libdis_test+0x16c: 66 0f 38 3f 13     pmaxud (%rbx),%xmm2
+    libdis_test+0x171: 66 0f 38 3f 53 42  pmaxud 0x42(%rbx),%xmm2
+    libdis_test+0x177: 66 0f 38 3e d1     pmaxuw %xmm1,%xmm2
+    libdis_test+0x17c: 66 0f 38 3e 13     pmaxuw (%rbx),%xmm2
+    libdis_test+0x181: 66 0f 38 3e 53 42  pmaxuw 0x42(%rbx),%xmm2
+    libdis_test+0x187: 66 0f 38 38 d1     pminsb %xmm1,%xmm2
+    libdis_test+0x18c: 66 0f 38 38 13     pminsb (%rbx),%xmm2
+    libdis_test+0x191: 66 0f 38 38 53 42  pminsb 0x42(%rbx),%xmm2
+    libdis_test+0x197: 66 0f 38 39 d1     pminsd %xmm1,%xmm2
+    libdis_test+0x19c: 66 0f 38 39 13     pminsd (%rbx),%xmm2
+    libdis_test+0x1a1: 66 0f 38 39 53 42  pminsd 0x42(%rbx),%xmm2
+    libdis_test+0x1a7: 66 0f 38 3b d1     pminud %xmm1,%xmm2
+    libdis_test+0x1ac: 66 0f 38 3b 13     pminud (%rbx),%xmm2
+    libdis_test+0x1b1: 66 0f 38 3b 53 42  pminud 0x42(%rbx),%xmm2
+    libdis_test+0x1b7: 66 0f 38 3a d1     pminuw %xmm1,%xmm2
+    libdis_test+0x1bc: 66 0f 38 3a 13     pminuw (%rbx),%xmm2
+    libdis_test+0x1c1: 66 0f 38 3a 53 42  pminuw 0x42(%rbx),%xmm2
+    libdis_test+0x1c7: 66 0f 38 21 d1     pmovsxbd %xmm1,%xmm2
+    libdis_test+0x1cc: 66 0f 38 21 13     pmovsxbd (%rbx),%xmm2
+    libdis_test+0x1d1: 66 0f 38 21 53 42  pmovsxbd 0x42(%rbx),%xmm2
+    libdis_test+0x1d7: 66 0f 38 22 d1     pmovsxbq %xmm1,%xmm2
+    libdis_test+0x1dc: 66 0f 38 22 13     pmovsxbq (%rbx),%xmm2
+    libdis_test+0x1e1: 66 0f 38 22 53 42  pmovsxbq 0x42(%rbx),%xmm2
+    libdis_test+0x1e7: 66 0f 38 20 d1     pmovsxbw %xmm1,%xmm2
+    libdis_test+0x1ec: 66 0f 38 20 13     pmovsxbw (%rbx),%xmm2
+    libdis_test+0x1f1: 66 0f 38 20 53 42  pmovsxbw 0x42(%rbx),%xmm2
+    libdis_test+0x1f7: 66 0f 38 25 d1     pmovsxdq %xmm1,%xmm2
+    libdis_test+0x1fc: 66 0f 38 25 13     pmovsxdq (%rbx),%xmm2
+    libdis_test+0x201: 66 0f 38 25 53 42  pmovsxdq 0x42(%rbx),%xmm2
+    libdis_test+0x207: 66 0f 38 23 d1     pmovsxwd %xmm1,%xmm2
+    libdis_test+0x20c: 66 0f 38 23 13     pmovsxwd (%rbx),%xmm2
+    libdis_test+0x211: 66 0f 38 23 53 42  pmovsxwd 0x42(%rbx),%xmm2
+    libdis_test+0x217: 66 0f 38 24 d1     pmovsxwq %xmm1,%xmm2
+    libdis_test+0x21c: 66 0f 38 24 13     pmovsxwq (%rbx),%xmm2
+    libdis_test+0x221: 66 0f 38 24 53 42  pmovsxwq 0x42(%rbx),%xmm2
+    libdis_test+0x227: 66 0f 38 31 d1     pmovzxbd %xmm1,%xmm2
+    libdis_test+0x22c: 66 0f 38 31 13     pmovzxbd (%rbx),%xmm2
+    libdis_test+0x231: 66 0f 38 31 53 42  pmovzxbd 0x42(%rbx),%xmm2
+    libdis_test+0x237: 66 0f 38 32 d1     pmovzxbq %xmm1,%xmm2
+    libdis_test+0x23c: 66 0f 38 32 13     pmovzxbq (%rbx),%xmm2
+    libdis_test+0x241: 66 0f 38 32 53 42  pmovzxbq 0x42(%rbx),%xmm2
+    libdis_test+0x247: 66 0f 38 30 d1     pmovzxbw %xmm1,%xmm2
+    libdis_test+0x24c: 66 0f 38 30 13     pmovzxbw (%rbx),%xmm2
+    libdis_test+0x251: 66 0f 38 30 53 42  pmovzxbw 0x42(%rbx),%xmm2
+    libdis_test+0x257: 66 0f 38 35 d1     pmovzxdq %xmm1,%xmm2
+    libdis_test+0x25c: 66 0f 38 35 13     pmovzxdq (%rbx),%xmm2
+    libdis_test+0x261: 66 0f 38 35 53 42  pmovzxdq 0x42(%rbx),%xmm2
+    libdis_test+0x267: 66 0f 38 33 d1     pmovzxwd %xmm1,%xmm2
+    libdis_test+0x26c: 66 0f 38 33 13     pmovzxwd (%rbx),%xmm2
+    libdis_test+0x271: 66 0f 38 33 53 42  pmovzxwd 0x42(%rbx),%xmm2
+    libdis_test+0x277: 66 0f 38 34 d1     pmovzxwq %xmm1,%xmm2
+    libdis_test+0x27c: 66 0f 38 34 13     pmovzxwq (%rbx),%xmm2
+    libdis_test+0x281: 66 0f 38 34 53 42  pmovzxwq 0x42(%rbx),%xmm2
+    libdis_test+0x287: 66 0f 38 28 d1     pmuldq %xmm1,%xmm2
+    libdis_test+0x28c: 66 0f 38 28 13     pmuldq (%rbx),%xmm2
+    libdis_test+0x291: 66 0f 38 28 53 42  pmuldq 0x42(%rbx),%xmm2
+    libdis_test+0x297: 66 0f 38 40 d1     pmulld %xmm1,%xmm2
+    libdis_test+0x29c: 66 0f 38 40 13     pmulld (%rbx),%xmm2
+    libdis_test+0x2a1: 66 0f 38 40 53 42  pmulld 0x42(%rbx),%xmm2
+    libdis_test+0x2a7: 66 0f 38 17 d1     ptest  %xmm1,%xmm2
+    libdis_test+0x2ac: 66 0f 38 17 13     ptest  (%rbx),%xmm2
+    libdis_test+0x2b1: 66 0f 38 17 53 42  ptest  0x42(%rbx),%xmm2
+    libdis_test+0x2b7: 66 0f 3a 09 d1 23  roundpd $0x23,%xmm1,%xmm2
+    libdis_test+0x2bd: 66 0f 3a 09 13 23  roundpd $0x23,(%rbx),%xmm2
+    libdis_test+0x2c3: 66 0f 3a 09 53 42  roundpd $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0x2ca: 66 0f 3a 08 d1 23  roundps $0x23,%xmm1,%xmm2
+    libdis_test+0x2d0: 66 0f 3a 08 13 23  roundps $0x23,(%rbx),%xmm2
+    libdis_test+0x2d6: 66 0f 3a 08 53 42  roundps $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0x2dd: 66 0f 3a 0b d1 23  roundsd $0x23,%xmm1,%xmm2
+    libdis_test+0x2e3: 66 0f 3a 0b 13 23  roundsd $0x23,(%rbx),%xmm2
+    libdis_test+0x2e9: 66 0f 3a 0b 53 42  roundsd $0x23,0x42(%rbx),%xmm2
+                       23 
+    libdis_test+0x2f0: 66 0f 3a 0a d1 23  roundss $0x23,%xmm1,%xmm2
+    libdis_test+0x2f6: 66 0f 3a 0a 13 23  roundss $0x23,(%rbx),%xmm2
+    libdis_test+0x2fc: 66 0f 3a 0a 53 42  roundss $0x23,0x42(%rbx),%xmm2
+                       23 
diff --git a/usr/src/test/util-tests/tests/dis/i386/64.sse-4.1.s b/usr/src/test/util-tests/tests/dis/i386/64.sse-4.1.s
new file mode 100644
index 0000000000..80d17b8c54
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/64.sse-4.1.s
@@ -0,0 +1,161 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test SSE 4.2 related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	blendpd		$0x42, %xmm0, %xmm1
+	blendpd		$0x42, (%rbx), %xmm1
+	blendps		$0x42, %xmm0, %xmm1
+	blendps		$0x42, (%rbx), %xmm1
+	blendvpd	%xmm1, %xmm2
+	blendvpd	(%rbx), %xmm2
+	blendvpd	0x42(%rbx), %xmm2
+	blendvps	%xmm1, %xmm2
+	blendvps	(%rbx), %xmm2
+	blendvps	0x42(%rbx), %xmm2
+	dppd		$0x42, %xmm0, %xmm1
+	dppd		$0x42, (%rbx), %xmm1
+	dpps		$0x42, %xmm0, %xmm1
+	dpps		$0x42, (%rbx), %xmm1
+	extractps	$0x23, %xmm6, %rbx
+	extractps	$0x23, %xmm6, (%rbx)
+	insertps	$0x23, %xmm1, %xmm2
+	insertps	$0x23, (%rbx), %xmm2
+	insertps	$0x23, 0x42(%rbx), %xmm2
+	movntdqa	(%rbx), %xmm0
+	mpsadbw		$0x23, %xmm1, %xmm2
+	mpsadbw		$0x23, (%rbx), %xmm2
+	mpsadbw		$0x23, 0x42(%rbx), %xmm2
+	packusdw	%xmm1, %xmm2
+	packusdw	(%rbx), %xmm2
+	packusdw	0x42(%rbx), %xmm2
+	pblendvb	%xmm1, %xmm2
+	pblendvb	(%rbx), %xmm2
+	pblendvb	0x42(%rbx), %xmm2
+	pblendw		$0x23, %xmm1, %xmm2
+	pblendw		$0x23, (%rbx), %xmm2
+	pblendw		$0x23, 0x42(%rbx), %xmm2
+	pcmpeqq		%xmm1, %xmm2
+	pcmpeqq		(%rbx), %xmm2
+	pcmpeqq		0x42(%rbx), %xmm2
+	pextrb		$0x23, %xmm4, %rdx
+	pextrb		$0x23, %xmm4, (%rdx)
+	pextrd		$0x23, %xmm4, %edx
+	pextrd		$0x23, %xmm4, (%rdx)
+	pextrq		$0x23, %xmm4, %rdx
+	pextrq		$0x23, %xmm4, (%rdx)
+	pextrw		$0x23, %xmm4, %rdx
+	pextrw		$0x23, %xmm4, (%rdx)
+	phminposuw	%xmm1, %xmm2
+	phminposuw	(%rbx), %xmm2
+	phminposuw	0x42(%rbx), %xmm2
+	pinsrb		$0x23, %rbx, %xmm2
+	pinsrb		$0x23, (%rbx), %xmm2
+	pinsrb		$0x23, 0x42(%rbx), %xmm2
+	pinsrd		$0x23, %ebx, %xmm2
+	pinsrd		$0x23, (%rbx), %xmm2
+	pinsrd		$0x23, 0x42(%rbx), %xmm2
+	pinsrq		$0x23, %rbx, %xmm2
+	pinsrq		$0x23, (%rbx), %xmm2
+	pinsrq		$0x23, 0x42(%rbx), %xmm2
+	pmaxsb		%xmm1, %xmm2
+	pmaxsb		(%rbx), %xmm2
+	pmaxsb		0x42(%rbx), %xmm2
+	pmaxsd		%xmm1, %xmm2
+	pmaxsd		(%rbx), %xmm2
+	pmaxsd		0x42(%rbx), %xmm2
+	pmaxud		%xmm1, %xmm2
+	pmaxud		(%rbx), %xmm2
+	pmaxud		0x42(%rbx), %xmm2
+	pmaxuw		%xmm1, %xmm2
+	pmaxuw		(%rbx), %xmm2
+	pmaxuw		0x42(%rbx), %xmm2
+	pminsb		%xmm1, %xmm2
+	pminsb		(%rbx), %xmm2
+	pminsb		0x42(%rbx), %xmm2
+	pminsd		%xmm1, %xmm2
+	pminsd		(%rbx), %xmm2
+	pminsd		0x42(%rbx), %xmm2
+	pminud		%xmm1, %xmm2
+	pminud		(%rbx), %xmm2
+	pminud		0x42(%rbx), %xmm2
+	pminuw		%xmm1, %xmm2
+	pminuw		(%rbx), %xmm2
+	pminuw		0x42(%rbx), %xmm2
+	pmovsxbd	%xmm1, %xmm2
+	pmovsxbd	(%rbx), %xmm2
+	pmovsxbd	0x42(%rbx), %xmm2
+	pmovsxbq	%xmm1, %xmm2
+	pmovsxbq	(%rbx), %xmm2
+	pmovsxbq	0x42(%rbx), %xmm2
+	pmovsxbw	%xmm1, %xmm2
+	pmovsxbw	(%rbx), %xmm2
+	pmovsxbw	0x42(%rbx), %xmm2
+	pmovsxdq	%xmm1, %xmm2
+	pmovsxdq	(%rbx), %xmm2
+	pmovsxdq	0x42(%rbx), %xmm2
+	pmovsxwd	%xmm1, %xmm2
+	pmovsxwd	(%rbx), %xmm2
+	pmovsxwd	0x42(%rbx), %xmm2
+	pmovsxwq	%xmm1, %xmm2
+	pmovsxwq	(%rbx), %xmm2
+	pmovsxwq	0x42(%rbx), %xmm2
+	pmovzxbd	%xmm1, %xmm2
+	pmovzxbd	(%rbx), %xmm2
+	pmovzxbd	0x42(%rbx), %xmm2
+	pmovzxbq	%xmm1, %xmm2
+	pmovzxbq	(%rbx), %xmm2
+	pmovzxbq	0x42(%rbx), %xmm2
+	pmovzxbw	%xmm1, %xmm2
+	pmovzxbw	(%rbx), %xmm2
+	pmovzxbw	0x42(%rbx), %xmm2
+	pmovzxdq	%xmm1, %xmm2
+	pmovzxdq	(%rbx), %xmm2
+	pmovzxdq	0x42(%rbx), %xmm2
+	pmovzxwd	%xmm1, %xmm2
+	pmovzxwd	(%rbx), %xmm2
+	pmovzxwd	0x42(%rbx), %xmm2
+	pmovzxwq	%xmm1, %xmm2
+	pmovzxwq	(%rbx), %xmm2
+	pmovzxwq	0x42(%rbx), %xmm2
+	pmuldq		%xmm1, %xmm2
+	pmuldq		(%rbx), %xmm2
+	pmuldq		0x42(%rbx), %xmm2
+	pmulld		%xmm1, %xmm2
+	pmulld		(%rbx), %xmm2
+	pmulld		0x42(%rbx), %xmm2
+	ptest		%xmm1, %xmm2
+	ptest		(%rbx), %xmm2
+	ptest		0x42(%rbx), %xmm2
+	roundpd		$0x23, %xmm1, %xmm2
+	roundpd		$0x23, (%rbx), %xmm2
+	roundpd		$0x23, 0x42(%rbx), %xmm2
+	roundps		$0x23, %xmm1, %xmm2
+	roundps		$0x23, (%rbx), %xmm2
+	roundps		$0x23, 0x42(%rbx), %xmm2
+	roundsd		$0x23, %xmm1, %xmm2
+	roundsd		$0x23, (%rbx), %xmm2
+	roundsd		$0x23, 0x42(%rbx), %xmm2
+	roundss		$0x23, %xmm1, %xmm2
+	roundss		$0x23, (%rbx), %xmm2
+	roundss		$0x23, 0x42(%rbx), %xmm2
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.cpuid.out b/usr/src/test/util-tests/tests/dis/i386/tst.cpuid.out
new file mode 100644
index 0000000000..f708700583
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.cpuid.out
@@ -0,0 +1 @@
+    libdis_test:     0f a2              cpuid  
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.cpuid.s b/usr/src/test/util-tests/tests/dis/i386/tst.cpuid.s
new file mode 100644
index 0000000000..c0af97204a
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.cpuid.s
@@ -0,0 +1,26 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test cpuid related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	cpuid
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.fence.out b/usr/src/test/util-tests/tests/dis/i386/tst.fence.out
new file mode 100644
index 0000000000..7d73f98cb4
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.fence.out
@@ -0,0 +1,3 @@
+    libdis_test:     0f ae f0           mfence 
+    libdis_test+0x3: 0f ae e8           lfence 
+    libdis_test+0x6: 0f ae f8           sfence 
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.fence.s b/usr/src/test/util-tests/tests/dis/i386/tst.fence.s
new file mode 100644
index 0000000000..298f65d6de
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.fence.s
@@ -0,0 +1,29 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test fence related instructions (these nominally are part of SSE2, but broken
+ * out).
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	mfence
+	lfence
+	sfence
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.msr.out b/usr/src/test/util-tests/tests/dis/i386/tst.msr.out
new file mode 100644
index 0000000000..d8498208dd
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.msr.out
@@ -0,0 +1,2 @@
+    libdis_test:     0f 32              rdmsr  
+    libdis_test+0x2: 0f 30              wrmsr  
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.msr.s b/usr/src/test/util-tests/tests/dis/i386/tst.msr.s
new file mode 100644
index 0000000000..267f8e651b
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.msr.s
@@ -0,0 +1,27 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test MSR related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	rdmsr
+	wrmsr
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.sep.out b/usr/src/test/util-tests/tests/dis/i386/tst.sep.out
new file mode 100644
index 0000000000..e9b52a08ce
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.sep.out
@@ -0,0 +1,4 @@
+    libdis_test:     0f 34              sysenter 
+    libdis_test+0x2: 0f 35              sysexit 
+    libdis_test+0x4: 0f 05              syscall 
+    libdis_test+0x6: 0f 07              sysret 
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.sep.s b/usr/src/test/util-tests/tests/dis/i386/tst.sep.s
new file mode 100644
index 0000000000..0dc60966f7
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.sep.s
@@ -0,0 +1,29 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test SEP related instructions and the other syscall instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	sysenter
+	sysexit
+	syscall
+	sysret
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.tsc.out b/usr/src/test/util-tests/tests/dis/i386/tst.tsc.out
new file mode 100644
index 0000000000..7e1d11f916
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.tsc.out
@@ -0,0 +1,2 @@
+    libdis_test:     0f 31              rdtsc  
+    libdis_test+0x2: 0f 01 f9           rdtscp 
diff --git a/usr/src/test/util-tests/tests/dis/i386/tst.tsc.s b/usr/src/test/util-tests/tests/dis/i386/tst.tsc.s
new file mode 100644
index 0000000000..da55a18bb5
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dis/i386/tst.tsc.s
@@ -0,0 +1,27 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2016 Joyent, Inc.
+ */
+
+/*
+ * Test TSC related instructions
+ */
+
+.text
+.align 16
+.globl libdis_test
+.type libdis_test, @function
+libdis_test:
+	rdtsc
+	rdtscp
+.size libdis_test, [.-libdis_test]
diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
index 6d2168647a..5bbf4f02d1 100644
--- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
+++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
@@ -17,9 +17,11 @@
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
+export PATH="/usr/bin"
 export NOINUSE_CHECK=1
 export STF_SUITE="/opt/zfs-tests"
 export STF_TOOLS="/opt/test-runner/stf"
+export PATHDIR=""
 runner="/opt/test-runner/bin/run"
 auto_detect=false
 
@@ -35,9 +37,9 @@ function fail
 
 function find_disks
 {
-	typeset all_disks=$(echo '' | sudo -k /usr/sbin/format | awk \
+	typeset all_disks=$(echo '' | sudo -k format | awk \
 	    '/c[0-9]/ {print $2}')
-	typeset used_disks=$(/sbin/zpool status | awk \
+	typeset used_disks=$(zpool status | awk \
 	    '/c[0-9]*t[0-9a-f]*d[0-9]/ {print $1}' | sed 's/s[0-9]//g')
 
 	typeset disk used avail_disks
@@ -54,7 +56,7 @@ function find_disks
 
 function find_rpool
 {
-	typeset ds=$(/usr/sbin/mount | awk '/^\/ / {print $3}')
+	typeset ds=$(mount | awk '/^\/ / {print $3}')
 	echo ${ds%%/*}
 }
 
@@ -84,14 +86,46 @@ function verify_disks
 {
 	typeset disk
 	for disk in $DISKS; do
-		sudo -k /usr/sbin/prtvtoc /dev/rdsk/${disk}s0 >/dev/null 2>&1
+		sudo -k prtvtoc /dev/rdsk/${disk}s0 >/dev/null 2>&1
 		[[ $? -eq 0 ]] || return 1
 	done
 	return 0
 }
 
-verify_id
+function create_links
+{
+	typeset dir=$1
+	typeset file_list=$2
+
+	[[ -n $PATHDIR ]] || fail "PATHDIR wasn't correctly set"
+
+	for i in $file_list; do
+		[[ ! -e $PATHDIR/$i ]] || fail "$i already exists"
+		ln -s $dir/$i $PATHDIR/$i || fail "Couldn't link $i"
+	done
+
+}
+
+function constrain_path
+{
+	. $STF_SUITE/include/commands.cfg
+
+	PATHDIR=$(/usr/bin/mktemp -d /var/tmp/constrained_path.XXXX)
+	chmod 755 $PATHDIR || fail "Couldn't chmod $PATHDIR"
+
+	create_links "/usr/bin" "$USR_BIN_FILES"
+	create_links "/usr/sbin" "$USR_SBIN_FILES"
+	create_links "/sbin" "$SBIN_FILES"
+	create_links "/opt/zfs-tests/bin" "$ZFSTEST_FILES"
+
+	# Special case links
+	ln -s /usr/gnu/bin/dd $PATHDIR/gnu_dd
+}
+
+constrain_path
+export PATH=$PATHDIR
 
+verify_id
 while getopts ac:q c; do
 	case $c in
 	'a')
@@ -137,6 +171,9 @@ num_disks=$(echo $DISKS | awk '{print NF}')
 [[ $num_disks -lt 3 ]] && fail "Not enough disks to run ZFS Test Suite"
 
 # Ensure user has only basic privileges.
-/usr/bin/ppriv -s EIP=basic -e $runner $quiet -c $runfile
+ppriv -s EIP=basic -e $runner $quiet -c $runfile
+ret=$?
+
+rm -rf $PATHDIR || fail "Couldn't remove $PATHDIR"
 
-exit $?
+exit $ret
diff --git a/usr/src/test/zfs-tests/include/commands.cfg b/usr/src/test/zfs-tests/include/commands.cfg
index 33a6fe21dd..bf60cd9565 100644
--- a/usr/src/test/zfs-tests/include/commands.cfg
+++ b/usr/src/test/zfs-tests/include/commands.cfg
@@ -10,161 +10,176 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2016 by Delphix. All rights reserved.
 #
 
-export ARP="/usr/sbin/arp"
-export AWK="/usr/bin/awk"
-export BASENAME="/usr/bin/basename"
-export BC="/usr/bin/bc"
-export BUNZIP2="/usr/bin/bunzip2"
-export BZCAT="/usr/bin/bzcat"
-# bzip2, bunzip2 and bzcat prepend the contents of $BZIP2 or $BZIP to any
-# arguments. Setting BZIP2 here will lead to hard-to-diagnose unhappiness.
-export CAT="/usr/bin/cat"
-export CD="/usr/bin/cd"
-export CHGRP="/usr/bin/chgrp"
-export CHMOD="/usr/bin/chmod"
-export CHOWN="/usr/bin/chown"
-export CKSUM="/usr/bin/cksum"
-export CLRI="/usr/sbin/clri"
-export CMP="/usr/bin/cmp"
-export COMPRESS="/usr/bin/compress"
-export COREADM="/usr/bin/coreadm"
-export CP="/usr/bin/cp"
-export CPIO="/usr/bin/cpio"
-export CUT="/usr/bin/cut"
-export DATE="/usr/bin/date"
-export DD="/usr/bin/dd"
-export DEVFSADM="/usr/sbin/devfsadm"
-export DF="/usr/bin/df"
-export DIFF="/usr/bin/diff"
-export DIRCMP="/usr/bin/dircmp"
-export DIRNAME="/usr/bin/dirname"
-export DTRACE="/usr/sbin/dtrace"
-export DU="/usr/bin/du"
-export DUMPADM="/usr/sbin/dumpadm"
-export ECHO="/usr/bin/echo"
-export EGREP="/usr/bin/egrep"
-# Don't use $ENV here, because in ksh scripts it evaluates to
-# $HOME/.kshrc - likely not what you wanted.
-export FALSE="/usr/bin/false"
-export FDISK="/usr/sbin/fdisk"
-export FF="/usr/sbin/ff"
-export FGREP="/usr/bin/fgrep"
-export FILE="/usr/bin/file"
-export FIND="/usr/bin/find"
-export FIO="/usr/bin/fio"
-export FMADM="/usr/sbin/fmadm"
-export FMDUMP="/usr/sbin/fmdump"
-export FORMAT="/usr/sbin/format"
-export FSCK="/usr/sbin/fsck"
-export FSDB="/usr/sbin/fsdb"
-export FSIRAND="/usr/sbin/fsirand"
-export FSTYP="/usr/sbin/fstyp"
-export GETENT="/usr/bin/getent"
-export GETMAJOR="/usr/sbin/getmajor"
-export GNUDD="/usr/gnu/bin/dd"
-export GREP="/usr/bin/grep"
-export GROUPADD="/usr/sbin/groupadd"
-export GROUPDEL="/usr/sbin/groupdel"
-export GROUPMOD="/usr/sbin/groupmod"
-export GROUPS="/usr/bin/groups"
-export HEAD="/usr/bin/head"
-export HOSTNAME="/usr/bin/hostname"
-export ID="/usr/bin/id"
-export IOSTAT="/usr/bin/iostat"
-export ISAINFO="/usr/bin/isainfo"
-export KILL="/usr/bin/kill"
-export KSH="/usr/bin/ksh"
-export KSTAT="/usr/bin/kstat"
-export LABELIT="/usr/sbin/labelit"
-export LOCKFS="/usr/sbin/lockfs"
-export LOFIADM="/usr/sbin/lofiadm"
-export LOGNAME="/usr/bin/logname"
-export LS="/usr/bin/ls"
-export MD5SUM="/usr/bin/md5sum"
-export MDB="/usr/bin/mdb"
-export MKDIR="/usr/bin/mkdir"
-export MKFILE="/usr/sbin/mkfile"
-export MKTEMP="/usr/bin/mktemp"
-export MKNOD="/usr/sbin/mknod"
-export MODINFO="/usr/sbin/modinfo"
-export MODUNLOAD="/usr/sbin/modunload"
-export MOUNT="/usr/sbin/mount"
-export MPSTAT="/usr/bin/mpstat"
-export MV="/usr/bin/mv"
-export NAWK="/usr/bin/nawk"
-export NCHECK="/usr/sbin/ncheck"
-export NEWFS="/usr/sbin/newfs"
-export PACK="/usr/bin/pack"
-export PAGESIZE="/usr/bin/pagesize"
-export PAX="/usr/bin/pax"
-export PFEXEC="/usr/bin/pfexec"
-export PGREP="/usr/bin/pgrep"
-export PING="/usr/sbin/ping"
-export PKGINFO="/usr/bin/pkginfo"
-export PKILL="/usr/bin/pkill"
-export PPRIV="/usr/bin/ppriv"
-export PRINTF="/usr/bin/printf"
-export PRTVTOC="/usr/sbin/prtvtoc"
-export PS="/usr/bin/ps"
-export PSRINFO="/usr/sbin/psrinfo"
-export PWD="/usr/bin/pwd"
-export PYTHON="/usr/bin/python"
-export QUOTAON="/usr/sbin/quotaon"
-export READLINK="/usr/bin/readlink"
-export RCP="/usr/bin/rcp"
-export REBOOT="/usr/sbin/reboot"
-export RM="/usr/bin/rm"
-export RMDIR="/usr/bin/rmdir"
-export RSH="/usr/bin/rsh"
-export RUNAT="/usr/bin/runat"
-export SED="/usr/bin/sed"
-export SHARE="/usr/sbin/share"
-export SHUF="/usr/bin/shuf"
-export SLEEP="/usr/bin/sleep"
-export SORT="/usr/bin/sort"
-export STAT="/usr/bin/stat"
-export STRINGS="/usr/bin/strings"
-export SU="/usr/bin/su"
-export SUM="/usr/bin/sum"
-export SVCADM="/usr/sbin/svcadm"
-export SVCS="/usr/bin/svcs"
-export SWAP="/usr/sbin/swap"
-export SWAPADD="/sbin/swapadd"
-export SYNC="/usr/bin/sync"
-export TAIL="/usr/bin/tail"
-export TAR="/usr/sbin/tar"
-export TIMEOUT="/usr/bin/timeout"
-export TOUCH="/usr/bin/touch"
-export TR="/usr/bin/tr"
-export TRUNCATE="/usr/bin/truncate"
-export TRUE="/usr/bin/true"
-export TUNEFS="/usr/sbin/tunefs"
-export UFSDUMP="/usr/sbin/ufsdump"
-export UFSRESTORE="/usr/sbin/ufsrestore"
-export UMASK="/usr/bin/umask"
-export UMOUNT="/usr/sbin/umount"
-export UMOUNTALL="/usr/sbin/umountall"
-export UNAME="/usr/bin/uname"
-export UNCOMPRESS="/usr/bin/uncompress"
-export UNIQ="/usr/bin/uniq"
-export UNPACK="/usr/bin/unpack"
-export UNSHARE="/usr/sbin/unshare"
-export USERADD="/usr/sbin/useradd"
-export USERDEL="/usr/sbin/userdel"
-export USERMOD="/usr/sbin/usermod"
-export VMSTAT="/usr/bin/vmstat"
-export WAIT="/usr/bin/wait"
-export WC="/usr/bin/wc"
-export ZDB="/usr/sbin/zdb"
-export ZFS="/usr/sbin/zfs"
-export ZHACK="/usr/sbin/zhack"
-export ZINJECT="/usr/sbin/zinject"
-export ZLOGIN="/usr/sbin/zlogin"
-export ZLOOK="/usr/bin/zlook"
-export ZONEADM="/usr/sbin/zoneadm"
-export ZONECFG="/usr/sbin/zonecfg"
-export ZONENAME="/usr/bin/zonename"
-export ZPOOL="/usr/sbin/zpool"
+#
+# These variables are used by zfstest.ksh to constrain which utilities
+# may be used by the suite. The suite will create a directory which is
+# the only element of $PATH and create symlinks from that dir to the
+# binaries listed below.
+# Please keep the contents of each variable sorted for ease of reading
+# and maintenance.
+#
+export USR_BIN_FILES='awk
+    basename
+    bc
+    bunzip2
+    bzcat
+    cat
+    cd
+    chgrp
+    chmod
+    chown
+    cksum
+    cmp
+    compress
+    coreadm
+    cp
+    cpio
+    cut
+    date
+    dd
+    df
+    diff
+    dircmp
+    dirname
+    du
+    echo
+    egrep
+    expr
+    false
+    file
+    find
+    fio
+    getent
+    grep
+    head
+    hostname
+    id
+    iostat
+    isainfo
+    kill
+    ksh
+    logname
+    ls
+    md5sum
+    mdb
+    mkdir
+    mktemp
+    mpstat
+    mv
+    nawk
+    pack
+    pagesize
+    pax
+    pfexec
+    pgrep
+    pkginfo
+    pkill
+    ppriv
+    print
+    printf
+    ps
+    pwd
+    python
+    readlink
+    rm
+    rmdir
+    rsh
+    runat
+    sed
+    seq
+    shuf
+    sleep
+    sort
+    stat
+    strings
+    su
+    sudo
+    sum
+    svcs
+    sync
+    tail
+    timeout
+    touch
+    tr
+    true
+    truncate
+    umask
+    uname
+    uncompress
+    unpack
+    vmstat
+    wait
+    wc
+    xargs
+    zlook
+    zonename'
+
+export USR_SBIN_FILES='arp
+    clri
+    dtrace
+    dumpadm
+    ff
+    format
+    fsdb
+    fsirand
+    fstyp
+    getmajor
+    groupadd
+    groupdel
+    groupmod
+    labelit
+    lockfs
+    lofiadm
+    mkfile
+    mknod
+    ncheck
+    newfs
+    ping
+    prtvtoc
+    psrinfo
+    quotaon
+    share
+    svcadm
+    swap
+    tar
+    tunefs
+    ufsdump
+    ufsrestore
+    unshare
+    useradd
+    userdel
+    usermod
+    zdb
+    zhack
+    zinject
+    zoneadm
+    zonecfg'
+
+export SBIN_FILES='fdisk
+    mount
+    swapadd
+    umount
+    umountall
+    zfs
+    zpool'
+
+export ZFSTEST_FILES='chg_usr_exec
+    devname2devid
+    dir_rd_update
+    file_check
+    file_trunc
+    file_write
+    getholes
+    largest_file
+    mkbusy
+    mkfiles
+    mkholes
+    mktree
+    mmapwrite
+    randfree_file
+    readmmap
+    rename_dir
+    rm_lnkcnt_zero_file'
diff --git a/usr/src/test/zfs-tests/include/default.cfg b/usr/src/test/zfs-tests/include/default.cfg
index 3b0fda68df..d36b0f3b84 100644
--- a/usr/src/test/zfs-tests/include/default.cfg
+++ b/usr/src/test/zfs-tests/include/default.cfg
@@ -28,7 +28,6 @@
 # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
-. $STF_SUITE/include/commands.cfg
 . $STF_SUITE/include/libtest.shlib
 
 # Define run length constants
@@ -40,25 +39,6 @@ export RT_SHORT="1"
 export ZONE_POOL="zonepool"
 export ZONE_CTR="zonectr"
 
-# Test Suite Specific Commands
-export CHG_USR_EXEC="$STF_SUITE/bin/chg_usr_exec"
-export DEVNAME2DEVID="$STF_SUITE/bin/devname2devid"
-export DIR_RD_UPDATE="$STF_SUITE/bin/dir_rd_update"
-export FILE_CHECK="$STF_SUITE/bin/file_check"
-export FILE_TRUNC="$STF_SUITE/bin/file_trunc"
-export FILE_WRITE="$STF_SUITE/bin/file_write"
-export GETHOLES="$STF_SUITE/bin/getholes"
-export LARGEST_FILE="$STF_SUITE/bin/largest_file"
-export MKBUSY="$STF_SUITE/bin/mkbusy"
-export MKFILES="$STF_SUITE/bin/mkfiles"
-export MKHOLES="$STF_SUITE/bin/mkholes"
-export MKTREE="$STF_SUITE/bin/mktree"
-export MMAPWRITE="$STF_SUITE/bin/mmapwrite"
-export RANDFREE_FILE="$STF_SUITE/bin/randfree_file"
-export READMMAP="$STF_SUITE/bin/readmmap"
-export RENAME_DIR="$STF_SUITE/bin/rename_dir"
-export RM_LNKCNT_ZERO_FILE="$STF_SUITE/bin/rm_lnkcnt_zero_file"
-
 # ensure we're running in the C locale, since
 # localised messages may result in test failures
 export LC_ALL="C"
@@ -85,42 +65,48 @@ export FIO_SCRIPTS=$STF_SUITE/tests/perf/fio
 export PERF_SCRIPTS=$STF_SUITE/tests/perf/scripts
 
 # some test pool names
-export TESTPOOL=testpool.$$
-export TESTPOOL1=testpool1.$$
-export TESTPOOL2=testpool2.$$
-export TESTPOOL3=testpool3.$$
+export TESTPOOL=testpool
+export TESTPOOL1=testpool1
+export TESTPOOL2=testpool2
+export TESTPOOL3=testpool3
 export PERFPOOL=perfpool
 
 # some test file system names
-export TESTFS=testfs.$$
-export TESTFS1=testfs1.$$
-export TESTFS2=testfs2.$$
-export TESTFS3=testfs3.$$
+export TESTFS=testfs
+export TESTFS1=testfs1
+export TESTFS2=testfs2
+export TESTFS3=testfs3
 
 # some test directory names
-export TESTDIR=${TEST_BASE_DIR%%/}/testdir$$
-export TESTDIR0=${TEST_BASE_DIR%%/}/testdir0$$
-export TESTDIR1=${TEST_BASE_DIR%%/}/testdir1$$
-export TESTDIR2=${TEST_BASE_DIR%%/}/testdir2$$
+export TESTDIR=${TEST_BASE_DIR%%/}/testdir
+export TESTDIR0=${TEST_BASE_DIR%%/}/testdir0
+export TESTDIR1=${TEST_BASE_DIR%%/}/testdir1
+export TESTDIR2=${TEST_BASE_DIR%%/}/testdir2
+
+# some test sub file system names
+export TESTSUBFS=subfs
+export TESTSUBFS1=subfs1
+export TESTSUBFS2=subfs2
 
 export ZFSROOT=
 
-export TESTSNAP=testsnap$$
-export TESTSNAP1=testsnap1$$
-export TESTSNAP2=testsnap2$$
-export TESTCLONE=testclone$$
-export TESTCLONE1=testclone1$$
-export TESTCLONE2=testclone2$$
-export TESTCLCT=testclct$$
-export TESTCTR=testctr$$
-export TESTCTR1=testctr1$$
-export TESTCTR2=testctr2$$
-export TESTVOL=testvol$$
-export TESTVOL1=testvol1$$
-export TESTVOL2=testvol2$$
-export TESTFILE0=testfile0.$$
-export TESTFILE1=testfile1.$$
-export TESTFILE2=testfile2.$$
+export TESTSNAP=testsnap
+export TESTSNAP1=testsnap1
+export TESTSNAP2=testsnap2
+export TESTCLONE=testclone
+export TESTCLONE1=testclone1
+export TESTCLONE2=testclone2
+export TESTCLCT=testclct
+export TESTCTR=testctr
+export TESTCTR1=testctr1
+export TESTCTR2=testctr2
+export TESTVOL=testvol
+export TESTVOL1=testvol1
+export TESTVOL2=testvol2
+export TESTFILE0=testfile0
+export TESTFILE1=testfile1
+export TESTFILE2=testfile2
+export TESTBKMARK=testbkmark
 
 export LONGPNAME="poolname50charslong_012345678901234567890123456789"
 export LONGFSNAME="fsysname50charslong_012345678901234567890123456789"
@@ -139,7 +125,7 @@ export MINVDEVSIZE=$((256 * 1024 * 1024))
 # Minimum vdev size possible as defined in the OS
 export SPA_MINDEVSIZE=$((64 * 1024 * 1024))
 
-export AUTO_SNAP=$($SVCS -a | $GREP auto-snapshot | $GREP online | $AWK \
+export AUTO_SNAP=$(svcs -a | grep auto-snapshot | grep online | awk \
     '{print $3}')
 
 # finally, if we're running in a local zone
diff --git a/usr/src/test/zfs-tests/include/libtest.shlib b/usr/src/test/zfs-tests/include/libtest.shlib
index 1d3202768b..2957cf0808 100644
--- a/usr/src/test/zfs-tests/include/libtest.shlib
+++ b/usr/src/test/zfs-tests/include/libtest.shlib
@@ -22,7 +22,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -47,17 +47,17 @@ function ismounted
 	case $fstype in
 		zfs)
 			if [[ "$1" == "/"* ]] ; then
-				for out in $($ZFS mount | $AWK '{print $2}'); do
+				for out in $(zfs mount | awk '{print $2}'); do
 					[[ $1 == $out ]] && return 0
 				done
 			else
-				for out in $($ZFS mount | $AWK '{print $1}'); do
+				for out in $(zfs mount | awk '{print $1}'); do
 					[[ $1 == $out ]] && return 0
 				done
 			fi
 		;;
 		ufs|nfs)
-			out=$($DF -F $fstype $1 2>/dev/null)
+			out=$(df -F $fstype $1 2>/dev/null)
 			ret=$?
 			(($ret != 0)) && return $ret
 
@@ -104,7 +104,7 @@ function unmounted
 
 function splitline
 {
-	$ECHO $1 | $SED "s/,/ /g"
+	echo $1 | sed "s/,/ /g"
 }
 
 function default_setup
@@ -127,36 +127,36 @@ function default_setup_noexit
 		if poolexists $TESTPOOL ; then
 			destroy_pool $TESTPOOL
 		fi
-		[[ -d /$TESTPOOL ]] && $RM -rf /$TESTPOOL
-		log_must $ZPOOL create -f $TESTPOOL $disklist
+		[[ -d /$TESTPOOL ]] && rm -rf /$TESTPOOL
+		log_must zpool create -f $TESTPOOL $disklist
 	else
 		reexport_pool
 	fi
 
-	$RM -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
-	$MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR
+	rm -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
+	mkdir -p $TESTDIR || log_unresolved Could not create $TESTDIR
 
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
 	if [[ -n $container ]]; then
-		$RM -rf $TESTDIR1  || \
+		rm -rf $TESTDIR1  || \
 			log_unresolved Could not remove $TESTDIR1
-		$MKDIR -p $TESTDIR1 || \
+		mkdir -p $TESTDIR1 || \
 			log_unresolved Could not create $TESTDIR1
 
-		log_must $ZFS create $TESTPOOL/$TESTCTR
-		log_must $ZFS set canmount=off $TESTPOOL/$TESTCTR
-		log_must $ZFS create $TESTPOOL/$TESTCTR/$TESTFS1
-		log_must $ZFS set mountpoint=$TESTDIR1 \
+		log_must zfs create $TESTPOOL/$TESTCTR
+		log_must zfs set canmount=off $TESTPOOL/$TESTCTR
+		log_must zfs create $TESTPOOL/$TESTCTR/$TESTFS1
+		log_must zfs set mountpoint=$TESTDIR1 \
 		    $TESTPOOL/$TESTCTR/$TESTFS1
 	fi
 
 	if [[ -n $volume ]]; then
 		if is_global_zone ; then
-			log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
+			log_must zfs create -V $VOLSIZE $TESTPOOL/$TESTVOL
 		else
-			log_must $ZFS create $TESTPOOL/$TESTVOL
+			log_must zfs create $TESTPOOL/$TESTVOL
 		fi
 	fi
 }
@@ -215,7 +215,7 @@ function create_snapshot
 	datasetexists $fs_vol || \
 		log_fail "$fs_vol must exist."
 
-	log_must $ZFS snapshot $fs_vol@$snap
+	log_must zfs snapshot $fs_vol@$snap
 }
 
 #
@@ -234,7 +234,36 @@ function create_clone   # snapshot clone
 	[[ -z $clone ]] && \
 		log_fail "Clone name is undefined."
 
-	log_must $ZFS clone $snap $clone
+	log_must zfs clone $snap $clone
+}
+
+#
+# Create a bookmark of the given snapshot.  Defaultly create a bookmark on
+# filesystem.
+#
+# $1 Existing filesystem or volume name. Default, $TESTFS
+# $2 Existing snapshot name. Default, $TESTSNAP
+# $3 bookmark name. Default, $TESTBKMARK
+#
+function create_bookmark
+{
+	typeset fs_vol=${1:-$TESTFS}
+	typeset snap=${2:-$TESTSNAP}
+	typeset bkmark=${3:-$TESTBKMARK}
+
+	[[ -z $fs_vol ]] && log_fail "Filesystem or volume's name is undefined."
+	[[ -z $snap ]] && log_fail "Snapshot's name is undefined."
+	[[ -z $bkmark ]] && log_fail "Bookmark's name is undefined."
+
+	if bkmarkexists $fs_vol#$bkmark; then
+		log_fail "$fs_vol#$bkmark already exists."
+	fi
+	datasetexists $fs_vol || \
+		log_fail "$fs_vol must exist."
+	snapexists $fs_vol@$snap || \
+		log_fail "$fs_vol@$snap must exist."
+
+	log_must $ZFS bookmark $fs_vol@$snap $fs_vol#$bkmark
 }
 
 function default_mirror_setup
@@ -259,10 +288,10 @@ function default_mirror_setup_noexit
 		log_fail "$func: No parameters passed"
 	[[ -z $secondary ]] && \
 		log_fail "$func: No secondary partition passed"
-	[[ -d /$TESTPOOL ]] && $RM -rf /$TESTPOOL
-	log_must $ZPOOL create -f $TESTPOOL mirror $@
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	[[ -d /$TESTPOOL ]] && rm -rf /$TESTPOOL
+	log_must zpool create -f $TESTPOOL mirror $@
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 #
@@ -279,8 +308,8 @@ function setup_mirrors
 	shift
 	while ((nmirrors > 0)); do
 		log_must test -n "$1" -a -n "$2"
-		[[ -d /$TESTPOOL$nmirrors ]] && $RM -rf /$TESTPOOL$nmirrors
-		log_must $ZPOOL create -f $TESTPOOL$nmirrors mirror $1 $2
+		[[ -d /$TESTPOOL$nmirrors ]] && rm -rf /$TESTPOOL$nmirrors
+		log_must zpool create -f $TESTPOOL$nmirrors mirror $1 $2
 		shift 2
 		((nmirrors = nmirrors - 1))
 	done
@@ -300,8 +329,8 @@ function setup_raidzs
 	shift
 	while ((nraidzs > 0)); do
 		log_must test -n "$1" -a -n "$2"
-		[[ -d /$TESTPOOL$nraidzs ]] && $RM -rf /$TESTPOOL$nraidzs
-		log_must $ZPOOL create -f $TESTPOOL$nraidzs raidz $1 $2
+		[[ -d /$TESTPOOL$nraidzs ]] && rm -rf /$TESTPOOL$nraidzs
+		log_must zpool create -f $TESTPOOL$nraidzs raidz $1 $2
 		shift 2
 		((nraidzs = nraidzs - 1))
 	done
@@ -331,10 +360,10 @@ function default_raidz_setup
 		log_fail "A raid-z requires a minimum of two disks."
 	fi
 
-	[[ -d /$TESTPOOL ]] && $RM -rf /$TESTPOOL
-	log_must $ZPOOL create -f $TESTPOOL raidz $1 $2 $3
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	[[ -d /$TESTPOOL ]] && rm -rf /$TESTPOOL
+	log_must zpool create -f $TESTPOOL raidz $1 $2 $3
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
 	log_pass
 }
@@ -363,10 +392,10 @@ function default_cleanup_noexit
 	# filesystems it contains.
 	#
 	if is_global_zone; then
-		$ZFS unmount -a > /dev/null 2>&1
-		exclude=`eval $ECHO \"'(${KEEP})'\"`
-		ALL_POOLS=$($ZPOOL list -H -o name \
-		    | $GREP -v "$NO_POOLS" | $EGREP -v "$exclude")
+		zfs unmount -a > /dev/null 2>&1
+		exclude=`eval echo \"'(${KEEP})'\"`
+		ALL_POOLS=$(zpool list -H -o name \
+		    | grep -v "$NO_POOLS" | egrep -v "$exclude")
 		# Here, we loop through the pools we're allowed to
 		# destroy, only destroying them if it's safe to do
 		# so.
@@ -378,57 +407,57 @@ function default_cleanup_noexit
 				then
 					destroy_pool $pool
 				fi
-				ALL_POOLS=$($ZPOOL list -H -o name \
-				    | $GREP -v "$NO_POOLS" \
-				    | $EGREP -v "$exclude")
+				ALL_POOLS=$(zpool list -H -o name \
+				    | grep -v "$NO_POOLS" \
+				    | egrep -v "$exclude")
 			done
 		done
 
-		$ZFS mount -a
+		zfs mount -a
 	else
 		typeset fs=""
-		for fs in $($ZFS list -H -o name \
-		    | $GREP "^$ZONE_POOL/$ZONE_CTR[01234]/"); do
+		for fs in $(zfs list -H -o name \
+		    | grep "^$ZONE_POOL/$ZONE_CTR[01234]/"); do
 			datasetexists $fs && \
-				log_must $ZFS destroy -Rf $fs
+				log_must zfs destroy -Rf $fs
 		done
 
 		# Need cleanup here to avoid garbage dir left.
-		for fs in $($ZFS list -H -o name); do
+		for fs in $(zfs list -H -o name); do
 			[[ $fs == /$ZONE_POOL ]] && continue
-			[[ -d $fs ]] && log_must $RM -rf $fs/*
+			[[ -d $fs ]] && log_must rm -rf $fs/*
 		done
 
 		#
 		# Reset the $ZONE_POOL/$ZONE_CTR[01234] file systems property to
 		# the default value
 		#
-		for fs in $($ZFS list -H -o name); do
+		for fs in $(zfs list -H -o name); do
 			if [[ $fs == $ZONE_POOL/$ZONE_CTR[01234] ]]; then
-				log_must $ZFS set reservation=none $fs
-				log_must $ZFS set recordsize=128K $fs
-				log_must $ZFS set mountpoint=/$fs $fs
+				log_must zfs set reservation=none $fs
+				log_must zfs set recordsize=128K $fs
+				log_must zfs set mountpoint=/$fs $fs
 				typeset enc=""
 				enc=$(get_prop encryption $fs)
 				if [[ $? -ne 0 ]] || [[ -z "$enc" ]] || \
 					[[ "$enc" == "off" ]]; then
-					log_must $ZFS set checksum=on $fs
+					log_must zfs set checksum=on $fs
 				fi
-				log_must $ZFS set compression=off $fs
-				log_must $ZFS set atime=on $fs
-				log_must $ZFS set devices=off $fs
-				log_must $ZFS set exec=on $fs
-				log_must $ZFS set setuid=on $fs
-				log_must $ZFS set readonly=off $fs
-				log_must $ZFS set snapdir=hidden $fs
-				log_must $ZFS set aclmode=groupmask $fs
-				log_must $ZFS set aclinherit=secure $fs
+				log_must zfs set compression=off $fs
+				log_must zfs set atime=on $fs
+				log_must zfs set devices=off $fs
+				log_must zfs set exec=on $fs
+				log_must zfs set setuid=on $fs
+				log_must zfs set readonly=off $fs
+				log_must zfs set snapdir=hidden $fs
+				log_must zfs set aclmode=groupmask $fs
+				log_must zfs set aclinherit=secure $fs
 			fi
 		done
 	fi
 
 	[[ -d $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR
+		log_must rm -rf $TESTDIR
 }
 
 
@@ -444,16 +473,16 @@ function default_container_cleanup
 
 	ismounted $TESTPOOL/$TESTCTR/$TESTFS1
 	[[ $? -eq 0 ]] && \
-	    log_must $ZFS unmount $TESTPOOL/$TESTCTR/$TESTFS1
+	    log_must zfs unmount $TESTPOOL/$TESTCTR/$TESTFS1
 
 	datasetexists $TESTPOOL/$TESTCTR/$TESTFS1 && \
-	    log_must $ZFS destroy -R $TESTPOOL/$TESTCTR/$TESTFS1
+	    log_must zfs destroy -R $TESTPOOL/$TESTCTR/$TESTFS1
 
 	datasetexists $TESTPOOL/$TESTCTR && \
-	    log_must $ZFS destroy -Rf $TESTPOOL/$TESTCTR
+	    log_must zfs destroy -Rf $TESTPOOL/$TESTCTR
 
 	[[ -e $TESTDIR1 ]] && \
-	    log_must $RM -rf $TESTDIR1 > /dev/null 2>&1
+	    log_must rm -rf $TESTDIR1 > /dev/null 2>&1
 
 	default_cleanup
 }
@@ -484,9 +513,9 @@ function destroy_snapshot
 			log_fail "get_prop mountpoint $snap failed."
 	fi
 
-	log_must $ZFS destroy $snap
+	log_must zfs destroy $snap
 	[[ $mtpt != "" && -d $mtpt ]] && \
-		log_must $RM -rf $mtpt
+		log_must rm -rf $mtpt
 }
 
 #
@@ -510,9 +539,26 @@ function destroy_clone
 			log_fail "get_prop mountpoint $clone failed."
 	fi
 
-	log_must $ZFS destroy $clone
+	log_must zfs destroy $clone
 	[[ $mtpt != "" && -d $mtpt ]] && \
-		log_must $RM -rf $mtpt
+		log_must rm -rf $mtpt
+}
+
+#
+# Common function used to cleanup bookmark of file system or volume.  Default
+# to delete the file system's bookmark.
+#
+# $1 bookmark name
+#
+function destroy_bookmark
+{
+	typeset bkmark=${1:-$TESTPOOL/$TESTFS#$TESTBKMARK}
+
+	if ! bkmarkexists $bkmark; then
+		log_fail "'$bkmarkp' does not existed."
+	fi
+
+	log_must $ZFS destroy $bkmark
 }
 
 # Return 0 if a snapshot exists; $? otherwise
@@ -521,7 +567,18 @@ function destroy_clone
 
 function snapexists
 {
-	$ZFS list -H -t snapshot "$1" > /dev/null 2>&1
+	zfs list -H -t snapshot "$1" > /dev/null 2>&1
+	return $?
+}
+
+#
+# Return 0 if a bookmark exists; $? otherwise
+#
+# $1 - bookmark name
+#
+function bkmarkexists
+{
+	$ZFS list -H -t bookmark "$1" > /dev/null 2>&1
 	return $?
 }
 
@@ -546,7 +603,7 @@ function dataset_setprop
 		return 1
 	fi
 	typeset output=
-	output=$($ZFS set $2=$3 $1 2>&1)
+	output=$(zfs set $2=$3 $1 2>&1)
 	typeset rv=$?
 	if ((rv != 0)); then
 		log_note "Setting property on $1 failed."
@@ -578,7 +635,7 @@ function dataset_set_defaultproperties
 
 	typeset confset=
 	typeset -i found=0
-	for confset in $($ZFS list); do
+	for confset in $(zfs list); do
 		if [[ $dataset = $confset ]]; then
 			found=1
 			break
@@ -641,20 +698,20 @@ function set_partition #<slice_num> <slice_start> <size_plus_units>  <whole_disk
 	    log_fail "The slice, size or disk name is unspecified."
 	typeset format_file=/var/tmp/format_in.$$
 
-	$ECHO "partition" >$format_file
-	$ECHO "$slicenum" >> $format_file
-	$ECHO "" >> $format_file
-	$ECHO "" >> $format_file
-	$ECHO "$start" >> $format_file
-	$ECHO "$size" >> $format_file
-	$ECHO "label" >> $format_file
-	$ECHO "" >> $format_file
-	$ECHO "q" >> $format_file
-	$ECHO "q" >> $format_file
-
-	$FORMAT -e -s -d $disk -f $format_file
+	echo "partition" >$format_file
+	echo "$slicenum" >> $format_file
+	echo "" >> $format_file
+	echo "" >> $format_file
+	echo "$start" >> $format_file
+	echo "$size" >> $format_file
+	echo "label" >> $format_file
+	echo "" >> $format_file
+	echo "q" >> $format_file
+	echo "q" >> $format_file
+
+	format -e -s -d $disk -f $format_file
 	typeset ret_val=$?
-	$RM -f $format_file
+	rm -f $format_file
 	[[ $ret_val -ne 0 ]] && \
 	    log_fail "Unable to format $disk slice $slicenum to $size"
 	return 0
@@ -676,16 +733,16 @@ function get_endslice #<disk> <slice>
 	disk=${disk%s*}
 
 	typeset -i ratio=0
-	ratio=$($PRTVTOC /dev/rdsk/${disk}s2 | \
-		$GREP "sectors\/cylinder" | \
-		$AWK '{print $2}')
+	ratio=$(prtvtoc /dev/rdsk/${disk}s2 | \
+		grep "sectors\/cylinder" | \
+		awk '{print $2}')
 
 	if ((ratio == 0)); then
 		return
 	fi
 
-	typeset -i endcyl=$($PRTVTOC -h /dev/rdsk/${disk}s2 |
-		$NAWK -v token="$slice" '{if ($1==token) print $6}')
+	typeset -i endcyl=$(prtvtoc -h /dev/rdsk/${disk}s2 |
+		nawk -v token="$slice" '{if ($1==token) print $6}')
 
 	((endcyl = (endcyl + 1) / ratio))
 	echo $endcyl
@@ -719,7 +776,7 @@ function partition_disk	#<slice_size> <whole_disk_name>	<total_slices>
 
 #
 # This function continues to write to a filenum number of files into dirnum
-# number of directories until either $FILE_WRITE returns an error or the
+# number of directories until either file_write returns an error or the
 # maximum number of files per directory have been written.
 #
 # Usage:
@@ -755,13 +812,13 @@ function fill_fs # destdir dirnum filenum bytes num_writes data
 	typeset -i fn=0
 	typeset -i retval=0
 
-	log_must $MKDIR -p $destdir/$idirnum
+	log_must mkdir -p $destdir/$idirnum
 	while (($odirnum > 0)); do
 		if ((dirnum >= 0 && idirnum >= dirnum)); then
 			odirnum=0
 			break
 		fi
-		$FILE_WRITE -o create -f $destdir/$idirnum/$TESTFILE.$fn \
+		file_write -o create -f $destdir/$idirnum/$TESTFILE.$fn \
 		    -b $bytes -c $num_writes -d $data
 		retval=$?
 		if (($retval != 0)); then
@@ -771,7 +828,7 @@ function fill_fs # destdir dirnum filenum bytes num_writes data
 		if (($fn >= $filenum)); then
 			fn=0
 			((idirnum = idirnum + 1))
-			log_must $MKDIR -p $destdir/$idirnum
+			log_must mkdir -p $destdir/$idirnum
 		else
 			((fn = fn + 1))
 		fi
@@ -791,14 +848,14 @@ function get_prop # property dataset
 	typeset prop=$1
 	typeset dataset=$2
 
-	prop_val=$($ZFS get -pH -o value $prop $dataset 2>/dev/null)
+	prop_val=$(zfs get -pH -o value $prop $dataset 2>/dev/null)
 	if [[ $? -ne 0 ]]; then
 		log_note "Unable to get $prop property for dataset " \
 		"$dataset"
 		return 1
 	fi
 
-	$ECHO $prop_val
+	echo $prop_val
 	return 0
 }
 
@@ -813,8 +870,8 @@ function get_pool_prop # property pool
 	typeset pool=$2
 
 	if poolexists $pool ; then
-		prop_val=$($ZPOOL get $prop $pool 2>/dev/null | $TAIL -1 | \
-			$AWK '{print $3}')
+		prop_val=$(zpool get $prop $pool 2>/dev/null | tail -1 | \
+			awk '{print $3}')
 		if [[ $? -ne 0 ]]; then
 			log_note "Unable to get $prop property for pool " \
 			"$pool"
@@ -825,7 +882,7 @@ function get_pool_prop # property pool
 		return 1
 	fi
 
-	$ECHO $prop_val
+	echo $prop_val
 	return 0
 }
 
@@ -842,7 +899,7 @@ function poolexists
 		return 1
 	fi
 
-	$ZPOOL get name "$pool" > /dev/null 2>&1
+	zpool get name "$pool" > /dev/null 2>&1
 	return $?
 }
 
@@ -857,7 +914,7 @@ function datasetexists
 	fi
 
 	while (($# > 0)); do
-		$ZFS get name $1 > /dev/null 2>&1 || \
+		zfs get name $1 > /dev/null 2>&1 || \
 			return $?
 		shift
 	done
@@ -876,7 +933,7 @@ function datasetnonexists
 	fi
 
 	while (($# > 0)); do
-		$ZFS list -H -t filesystem,snapshot,volume $1 > /dev/null 2>&1 \
+		zfs list -H -t filesystem,snapshot,volume $1 > /dev/null 2>&1 \
 		    && return 1
 		shift
 	done
@@ -908,13 +965,13 @@ function is_shared
 		fi
 	fi
 
-	for mtpt in `$SHARE | $AWK '{print $2}'` ; do
+	for mtpt in `share | awk '{print $2}'` ; do
 		if [[ $mtpt == $fs ]] ; then
 			return 0
 		fi
 	done
 
-	typeset stat=$($SVCS -H -o STA nfs/server:default)
+	typeset stat=$(svcs -H -o STA nfs/server:default)
 	if [[ $stat != "ON" ]]; then
 		log_note "Current nfs/server status: $stat"
 	fi
@@ -948,7 +1005,7 @@ function unshare_fs #fs
 
 	is_shared $fs
 	if (($? == 0)); then
-		log_must $ZFS unshare $fs
+		log_must zfs unshare $fs
 	fi
 
 	return 0
@@ -967,7 +1024,7 @@ function setup_nfs_server
 	fi
 
 	typeset nfs_fmri="svc:/network/nfs/server:default"
-	if [[ $($SVCS -Ho STA $nfs_fmri) != "ON" ]]; then
+	if [[ $(svcs -Ho STA $nfs_fmri) != "ON" ]]; then
 		#
 		# Only really sharing operation can enable NFS server
 		# to online permanently.
@@ -975,11 +1032,11 @@ function setup_nfs_server
 		typeset dummy=/tmp/dummy
 
 		if [[ -d $dummy ]]; then
-			log_must $RM -rf $dummy
+			log_must rm -rf $dummy
 		fi
 
-		log_must $MKDIR $dummy
-		log_must $SHARE $dummy
+		log_must mkdir $dummy
+		log_must share $dummy
 
 		#
 		# Waiting for fmri's status to be the final status.
@@ -988,20 +1045,20 @@ function setup_nfs_server
 		#
 		# Waiting for 1's at least.
 		#
-		log_must $SLEEP 1
+		log_must sleep 1
 		timeout=10
-		while [[ timeout -ne 0 && $($SVCS -Ho STA $nfs_fmri) == *'*' ]]
+		while [[ timeout -ne 0 && $(svcs -Ho STA $nfs_fmri) == *'*' ]]
 		do
-			log_must $SLEEP 1
+			log_must sleep 1
 
 			((timeout -= 1))
 		done
 
-		log_must $UNSHARE $dummy
-		log_must $RM -rf $dummy
+		log_must unshare $dummy
+		log_must rm -rf $dummy
 	fi
 
-	log_note "Current NFS status: '$($SVCS -Ho STA,FMRI $nfs_fmri)'"
+	log_note "Current NFS status: '$(svcs -Ho STA,FMRI $nfs_fmri)'"
 }
 
 #
@@ -1011,7 +1068,7 @@ function setup_nfs_server
 #
 function is_global_zone
 {
-	typeset cur_zone=$($ZONENAME 2>/dev/null)
+	typeset cur_zone=$(zonename 2>/dev/null)
 	if [[ $cur_zone != "global" ]]; then
 		return 1
 	fi
@@ -1083,8 +1140,8 @@ function create_pool #pool devs_list
 	fi
 
 	if is_global_zone ; then
-		[[ -d /$pool ]] && $RM -rf /$pool
-		log_must $ZPOOL create -f $pool $@
+		[[ -d /$pool ]] && rm -rf /$pool
+		log_must zpool create -f $pool $@
 	fi
 
 	return 0
@@ -1117,16 +1174,16 @@ function destroy_pool #pool
 			typeset -i wait_time=10 ret=1 count=0
 			must=""
 			while [[ $ret -ne 0 ]]; do
-				$must $ZPOOL destroy -f $pool
+				$must zpool destroy -f $pool
 				ret=$?
 				[[ $ret -eq 0 ]] && break
 				log_note "zpool destroy failed with $ret"
 				[[ count++ -ge 7 ]] && must=log_must
-				$SLEEP $wait_time
+				sleep $wait_time
 			done
 
 			[[ -d $mtpt ]] && \
-				log_must $RM -rf $mtpt
+				log_must rm -rf $mtpt
 		else
 			log_note "Pool does not exist. ($pool)"
 			return 1
@@ -1157,96 +1214,96 @@ function zfs_zones_setup #zone_name zone_root zone_ip
 
 	# Create pool and 5 container within it
 	#
-	[[ -d /$pool_name ]] && $RM -rf /$pool_name
-	log_must $ZPOOL create -f $pool_name $DISKS
+	[[ -d /$pool_name ]] && rm -rf /$pool_name
+	log_must zpool create -f $pool_name $DISKS
 	while ((i < cntctr)); do
-		log_must $ZFS create $pool_name/$prefix_ctr$i
+		log_must zfs create $pool_name/$prefix_ctr$i
 		((i += 1))
 	done
 
 	# create a zvol
-	log_must $ZFS create -V 1g $pool_name/zone_zvol
+	log_must zfs create -V 1g $pool_name/zone_zvol
 
 	#
 	# If current system support slog, add slog device for pool
 	#
 	if verify_slog_support ; then
 		typeset sdevs="/var/tmp/sdev1 /var/tmp/sdev2"
-		log_must $MKFILE $MINVDEVSIZE $sdevs
-		log_must $ZPOOL add $pool_name log mirror $sdevs
+		log_must mkfile $MINVDEVSIZE $sdevs
+		log_must zpool add $pool_name log mirror $sdevs
 	fi
 
 	# this isn't supported just yet.
 	# Create a filesystem. In order to add this to
 	# the zone, it must have it's mountpoint set to 'legacy'
-	# log_must $ZFS create $pool_name/zfs_filesystem
-	# log_must $ZFS set mountpoint=legacy $pool_name/zfs_filesystem
+	# log_must zfs create $pool_name/zfs_filesystem
+	# log_must zfs set mountpoint=legacy $pool_name/zfs_filesystem
 
 	[[ -d $zone_root ]] && \
-		log_must $RM -rf $zone_root/$zone_name
+		log_must rm -rf $zone_root/$zone_name
 	[[ ! -d $zone_root ]] && \
-		log_must $MKDIR -p -m 0700 $zone_root/$zone_name
+		log_must mkdir -p -m 0700 $zone_root/$zone_name
 
 	# Create zone configure file and configure the zone
 	#
 	typeset zone_conf=/tmp/zone_conf.$$
-	$ECHO "create" > $zone_conf
-	$ECHO "set zonepath=$zone_root/$zone_name" >> $zone_conf
-	$ECHO "set autoboot=true" >> $zone_conf
+	echo "create" > $zone_conf
+	echo "set zonepath=$zone_root/$zone_name" >> $zone_conf
+	echo "set autoboot=true" >> $zone_conf
 	i=0
 	while ((i < cntctr)); do
-		$ECHO "add dataset" >> $zone_conf
-		$ECHO "set name=$pool_name/$prefix_ctr$i" >> \
+		echo "add dataset" >> $zone_conf
+		echo "set name=$pool_name/$prefix_ctr$i" >> \
 			$zone_conf
-		$ECHO "end" >> $zone_conf
+		echo "end" >> $zone_conf
 		((i += 1))
 	done
 
 	# add our zvol to the zone
-	$ECHO "add device" >> $zone_conf
-	$ECHO "set match=/dev/zvol/dsk/$pool_name/zone_zvol" >> $zone_conf
-	$ECHO "end" >> $zone_conf
+	echo "add device" >> $zone_conf
+	echo "set match=/dev/zvol/dsk/$pool_name/zone_zvol" >> $zone_conf
+	echo "end" >> $zone_conf
 
 	# add a corresponding zvol rdsk to the zone
-	$ECHO "add device" >> $zone_conf
-	$ECHO "set match=/dev/zvol/rdsk/$pool_name/zone_zvol" >> $zone_conf
-	$ECHO "end" >> $zone_conf
+	echo "add device" >> $zone_conf
+	echo "set match=/dev/zvol/rdsk/$pool_name/zone_zvol" >> $zone_conf
+	echo "end" >> $zone_conf
 
 	# once it's supported, we'll add our filesystem to the zone
-	# $ECHO "add fs" >> $zone_conf
-	# $ECHO "set type=zfs" >> $zone_conf
-	# $ECHO "set special=$pool_name/zfs_filesystem" >> $zone_conf
-	# $ECHO "set dir=/export/zfs_filesystem" >> $zone_conf
-	# $ECHO "end" >> $zone_conf
+	# echo "add fs" >> $zone_conf
+	# echo "set type=zfs" >> $zone_conf
+	# echo "set special=$pool_name/zfs_filesystem" >> $zone_conf
+	# echo "set dir=/export/zfs_filesystem" >> $zone_conf
+	# echo "end" >> $zone_conf
 
-	$ECHO "verify" >> $zone_conf
-	$ECHO "commit" >> $zone_conf
-	log_must $ZONECFG -z $zone_name -f $zone_conf
-	log_must $RM -f $zone_conf
+	echo "verify" >> $zone_conf
+	echo "commit" >> $zone_conf
+	log_must zonecfg -z $zone_name -f $zone_conf
+	log_must rm -f $zone_conf
 
 	# Install the zone
-	$ZONEADM -z $zone_name install
+	zoneadm -z $zone_name install
 	if (($? == 0)); then
-		log_note "SUCCESS: $ZONEADM -z $zone_name install"
+		log_note "SUCCESS: zoneadm -z $zone_name install"
 	else
-		log_fail "FAIL: $ZONEADM -z $zone_name install"
+		log_fail "FAIL: zoneadm -z $zone_name install"
 	fi
 
 	# Install sysidcfg file
 	#
 	typeset sysidcfg=$zone_root/$zone_name/root/etc/sysidcfg
-	$ECHO "system_locale=C" > $sysidcfg
-	$ECHO  "terminal=dtterm" >> $sysidcfg
-	$ECHO  "network_interface=primary {" >> $sysidcfg
-	$ECHO  "hostname=$zone_name" >> $sysidcfg
-	$ECHO  "}" >> $sysidcfg
-	$ECHO  "name_service=NONE" >> $sysidcfg
-	$ECHO  "root_password=mo791xfZ/SFiw" >> $sysidcfg
-	$ECHO  "security_policy=NONE" >> $sysidcfg
-	$ECHO  "timezone=US/Eastern" >> $sysidcfg
+	echo "system_locale=C" > $sysidcfg
+	echo  "terminal=dtterm" >> $sysidcfg
+	echo  "network_interface=primary {" >> $sysidcfg
+	echo  "hostname=$zone_name" >> $sysidcfg
+	echo  "}" >> $sysidcfg
+	echo  "name_service=NONE" >> $sysidcfg
+	echo  "root_password=mo791xfZ/SFiw" >> $sysidcfg
+	echo  "security_policy=NONE" >> $sysidcfg
+	echo  "timezone=US/Eastern" >> $sysidcfg
 
 	# Boot this zone
-	log_must $ZONEADM -z $zone_name boot
+	log_must zoneadm -z $zone_name boot
 }
 
 #
@@ -1261,12 +1318,12 @@ function reexport_pool
 		if ((i == 0)); then
 			TESTPOOL=$ZONE_POOL/$ZONE_CTR$i
 			if ! ismounted $TESTPOOL; then
-				log_must $ZFS mount $TESTPOOL
+				log_must zfs mount $TESTPOOL
 			fi
 		else
 			eval TESTPOOL$i=$ZONE_POOL/$ZONE_CTR$i
 			if eval ! ismounted \$TESTPOOL$i; then
-				log_must eval $ZFS mount \$TESTPOOL$i
+				log_must eval zfs mount \$TESTPOOL$i
 			fi
 		fi
 		((i += 1))
@@ -1284,7 +1341,7 @@ function check_state # pool disk state{online,offline}
 	typeset disk=${2#/dev/dsk/}
 	typeset state=$3
 
-	$ZPOOL status -v $pool | grep "$disk"  \
+	zpool status -v $pool | grep "$disk"  \
 	    | grep -i "$state" > /dev/null 2>&1
 
 	return $?
@@ -1310,7 +1367,7 @@ function snapshot_mountpoint
 		log_fail "Error name of snapshot '$dataset'."
 	fi
 
-	$ECHO $(get_prop mountpoint $fs)/.zfs/snapshot/$snap
+	echo $(get_prop mountpoint $fs)/.zfs/snapshot/$snap
 }
 
 #
@@ -1329,9 +1386,9 @@ function verify_filesys # pool filesystem dir
 	typeset dirs=$@
 	typeset search_path=""
 
-	log_note "Calling $ZDB to verify filesystem '$filesys'"
-	$ZFS unmount -a > /dev/null 2>&1
-	log_must $ZPOOL export $pool
+	log_note "Calling zdb to verify filesystem '$filesys'"
+	zfs unmount -a > /dev/null 2>&1
+	log_must zpool export $pool
 
 	if [[ -n $dirs ]] ; then
 		for dir in $dirs ; do
@@ -1339,17 +1396,17 @@ function verify_filesys # pool filesystem dir
 		done
 	fi
 
-	log_must $ZPOOL import $search_path $pool
+	log_must zpool import $search_path $pool
 
-	$ZDB -cudi $filesys > $zdbout 2>&1
+	zdb -cudi $filesys > $zdbout 2>&1
 	if [[ $? != 0 ]]; then
-		log_note "Output: $ZDB -cudi $filesys"
-		$CAT $zdbout
-		log_fail "$ZDB detected errors with: '$filesys'"
+		log_note "Output: zdb -cudi $filesys"
+		cat $zdbout
+		log_fail "zdb detected errors with: '$filesys'"
 	fi
 
-	log_must $ZFS mount -a
-	log_must $RM -rf $zdbout
+	log_must zfs mount -a
+	log_must rm -rf $zdbout
 }
 
 #
@@ -1359,11 +1416,11 @@ function get_disklist # pool
 {
 	typeset disklist=""
 
-	disklist=$($ZPOOL iostat -v $1 | $NAWK '(NR >4) {print $1}' | \
-	    $GREP -v "\-\-\-\-\-" | \
-	    $EGREP -v -e "^(mirror|raidz1|raidz2|spare|log|cache)$")
+	disklist=$(zpool iostat -v $1 | nawk '(NR >4) {print $1}' | \
+	    grep -v "\-\-\-\-\-" | \
+	    egrep -v -e "^(mirror|raidz1|raidz2|spare|log|cache)$")
 
-	$ECHO $disklist
+	echo $disklist
 }
 
 # /**
@@ -1384,14 +1441,14 @@ function stress_timeout
 
 	log_note "Waiting for child processes($cpids). " \
 		"It could last dozens of minutes, please be patient ..."
-	log_must $SLEEP $TIMEOUT
+	log_must sleep $TIMEOUT
 
 	log_note "Killing child processes after ${TIMEOUT} stress timeout."
 	typeset pid
 	for pid in $cpids; do
-		$PS -p $pid > /dev/null 2>&1
+		ps -p $pid > /dev/null 2>&1
 		if (($? == 0)); then
-			log_must $KILL -USR1 $pid
+			log_must kill -USR1 $pid
 		fi
 	done
 }
@@ -1465,9 +1522,9 @@ function check_pool_status # pool token keyword
 	typeset token=$2
 	typeset keyword=$3
 
-	$ZPOOL status -v "$pool" 2>/dev/null | $NAWK -v token="$token:" '
+	zpool status -v "$pool" 2>/dev/null | nawk -v token="$token:" '
 		($1==token) {print $0}' \
-	| $GREP -i "$keyword" > /dev/null 2>&1
+	| grep -i "$keyword" > /dev/null 2>&1
 
 	return $?
 }
@@ -1539,17 +1596,17 @@ function verify_rsh_connect #rhost, username
 {
 	typeset rhost=$1
 	typeset username=$2
-	typeset rsh_cmd="$RSH -n"
+	typeset rsh_cmd="rsh -n"
 	typeset cur_user=
 
-	$GETENT hosts $rhost >/dev/null 2>&1
+	getent hosts $rhost >/dev/null 2>&1
 	if (($? != 0)); then
 		log_note "$rhost cannot be found from" \
 			"administrative database."
 		return 1
 	fi
 
-	$PING $rhost 3 >/dev/null 2>&1
+	ping $rhost 3 >/dev/null 2>&1
 	if (($? != 0)); then
 		log_note "$rhost is not reachable."
 		return 1
@@ -1559,11 +1616,11 @@ function verify_rsh_connect #rhost, username
 		rsh_cmd="$rsh_cmd -l $username"
 		cur_user="given user \"$username\""
 	else
-		cur_user="current user \"`$LOGNAME`\""
+		cur_user="current user \"`logname`\""
 	fi
 
-	 if ! $rsh_cmd $rhost $TRUE; then
-		log_note "$RSH to $rhost is not accessible" \
+	 if ! $rsh_cmd $rhost true; then
+		log_note "rsh to $rhost is not accessible" \
 			"with $cur_user."
 		return 1
 	fi
@@ -1620,9 +1677,9 @@ function rsh_status
 
 	err_file=/tmp/${rhost}.$$.err
 	if ((${#ruser} == 0)); then
-		rsh_str="$RSH -n"
+		rsh_str="rsh -n"
 	else
-		rsh_str="$RSH -n -l $ruser"
+		rsh_str="rsh -n -l $ruser"
 	fi
 
 	$rsh_str $rhost /usr/bin/ksh -c "'$cmd_str; \
@@ -1630,16 +1687,16 @@ function rsh_status
 		>/dev/null 2>$err_file
 	ret=$?
 	if (($ret != 0)); then
-		$CAT $err_file
-		$RM -f $std_file $err_file
-		log_fail  "$RSH itself failed with exit code $ret..."
+		cat $err_file
+		rm -f $std_file $err_file
+		log_fail  "rsh itself failed with exit code $ret..."
 	fi
 
-	 ret=$($GREP -v 'print -u 2' $err_file | $GREP 'status=' | \
-		$CUT -d= -f2)
-	(($ret != 0)) && $CAT $err_file >&2
+	 ret=$(grep -v 'print -u 2' $err_file | grep 'status=' | \
+		cut -d= -f2)
+	(($ret != 0)) && cat $err_file >&2
 
-	$RM -f $err_file >/dev/null 2>&1
+	rm -f $err_file >/dev/null 2>&1
 	return $ret
 }
 
@@ -1652,10 +1709,10 @@ function get_remote_pkgpath
 	typeset rhost=$1
 	typeset pkgpath=""
 
-	pkgpath=$($RSH -n $rhost "$PKGINFO -l SUNWstc-fs-zfs | $GREP BASEDIR: |\
-			$CUT -d: -f2")
+	pkgpath=$(rsh -n $rhost "pkginfo -l SUNWstc-fs-zfs | grep BASEDIR: |\
+			cut -d: -f2")
 
-	$ECHO $pkgpath
+	echo $pkgpath
 }
 
 #/**
@@ -1674,15 +1731,15 @@ function find_disks
 	dmpi=/tmp/dumpdev.$$
 	max_finddisksnum=${MAX_FINDDISKSNUM:-6}
 
-	$SWAP -l > $sfi
-	$DUMPADM > $dmpi 2>/dev/null
+	swap -l > $sfi
+	dumpadm > $dmpi 2>/dev/null
 
 # write an awk script that can process the output of format
 # to produce a list of disks we know about. Note that we have
 # to escape "$2" so that the shell doesn't interpret it while
 # we're creating the awk script.
 # -------------------
-	$CAT > /tmp/find_disks.awk <<EOF
+	cat > /tmp/find_disks.awk <<EOF
 #!/bin/nawk -f
 	BEGIN { FS="."; }
 
@@ -1703,29 +1760,29 @@ function find_disks
 EOF
 #---------------------
 
-	$CHMOD 755 /tmp/find_disks.awk
-	disks=${@:-$($ECHO "" | $FORMAT -e 2>/dev/null | /tmp/find_disks.awk)}
-	$RM /tmp/find_disks.awk
+	chmod 755 /tmp/find_disks.awk
+	disks=${@:-$(echo "" | format -e 2>/dev/null | /tmp/find_disks.awk)}
+	rm /tmp/find_disks.awk
 
 	unused=""
 	for disk in $disks; do
 	# Check for mounted
-		$GREP "${disk}[sp]" /etc/mnttab >/dev/null
+		grep "${disk}[sp]" /etc/mnttab >/dev/null
 		(($? == 0)) && continue
 	# Check for swap
-		$GREP "${disk}[sp]" $sfi >/dev/null
+		grep "${disk}[sp]" $sfi >/dev/null
 		(($? == 0)) && continue
 	# check for dump device
-		$GREP "${disk}[sp]" $dmpi >/dev/null
+		grep "${disk}[sp]" $dmpi >/dev/null
 		(($? == 0)) && continue
 	# check to see if this disk hasn't been explicitly excluded
 	# by a user-set environment variable
-		$ECHO "${ZFS_HOST_DEVICES_IGNORE}" | $GREP "${disk}" > /dev/null
+		echo "${ZFS_HOST_DEVICES_IGNORE}" | grep "${disk}" > /dev/null
 		(($? == 0)) && continue
 		unused_candidates="$unused_candidates $disk"
 	done
-	$RM $sfi
-	$RM $dmpi
+	rm $sfi
+	rm $dmpi
 
 # now just check to see if those disks do actually exist
 # by looking for a device pointing to the first slice in
@@ -1742,7 +1799,7 @@ EOF
 	done
 
 # finally, return our disk list
-	$ECHO $unused
+	echo $unused
 }
 
 #
@@ -1762,7 +1819,7 @@ function add_user #<group_name> <user_name> <basedir>
 		log_fail "group name or user name are not defined."
 	fi
 
-	log_must $USERADD -g $gname -d $basedir/$uname -m $uname
+	log_must useradd -g $gname -d $basedir/$uname -m $uname
 
 	return 0
 }
@@ -1782,11 +1839,11 @@ function del_user #<logname> <basedir>
 		log_fail "login name is necessary."
 	fi
 
-	if $ID $user > /dev/null 2>&1; then
-		log_must $USERDEL $user
+	if id $user > /dev/null 2>&1; then
+		log_must userdel $user
 	fi
 
-	[[ -d $basedir/$user ]] && $RM -fr $basedir/$user
+	[[ -d $basedir/$user ]] && rm -fr $basedir/$user
 
 	return 0
 }
@@ -1807,7 +1864,7 @@ function add_group #<group_name>
 	# Assign 100 as the base gid
 	typeset -i gid=100
 	while true; do
-		$GROUPADD -g $gid $group > /dev/null 2>&1
+		groupadd -g $gid $group > /dev/null 2>&1
 		typeset -i ret=$?
 		case $ret in
 			0) return 0 ;;
@@ -1830,13 +1887,13 @@ function del_group #<group_name>
 		log_fail "group name is necessary."
 	fi
 
-	$GROUPMOD -n $grp $grp > /dev/null 2>&1
+	groupmod -n $grp $grp > /dev/null 2>&1
 	typeset -i ret=$?
 	case $ret in
 		# Group does not exist.
 		6) return 0 ;;
 		# Name already exists as a group name
-		9) log_must $GROUPDEL $grp ;;
+		9) log_must groupdel $grp ;;
 		*) return 1 ;;
 	esac
 
@@ -1858,29 +1915,29 @@ function safe_to_destroy_pool { # $1 the pool name
 	# by looking at all other pools, ensuring that they
 	# aren't built from files or zvols contained in this pool.
 
-	for pool in $($ZPOOL list -H -o name)
+	for pool in $(zpool list -H -o name)
 	do
 		ALTMOUNTPOOL=""
 
 		# this is a list of the top-level directories in each of the
 		# files that make up the path to the files the pool is based on
-		FILEPOOL=$($ZPOOL status -v $pool | $GREP /$1/ | \
-			$AWK '{print $1}')
+		FILEPOOL=$(zpool status -v $pool | grep /$1/ | \
+			awk '{print $1}')
 
 		# this is a list of the zvols that make up the pool
-		ZVOLPOOL=$($ZPOOL status -v $pool | $GREP "/dev/zvol/dsk/$1$" \
-		    | $AWK '{print $1}')
+		ZVOLPOOL=$(zpool status -v $pool | grep "/dev/zvol/dsk/$1$" \
+		    | awk '{print $1}')
 
 		# also want to determine if it's a file-based pool using an
 		# alternate mountpoint...
-		POOL_FILE_DIRS=$($ZPOOL status -v $pool | \
-					$GREP / | $AWK '{print $1}' | \
-					$AWK -F/ '{print $2}' | $GREP -v "dev")
+		POOL_FILE_DIRS=$(zpool status -v $pool | \
+					grep / | awk '{print $1}' | \
+					awk -F/ '{print $2}' | grep -v "dev")
 
 		for pooldir in $POOL_FILE_DIRS
 		do
-			OUTPUT=$($ZFS list -H -r -o mountpoint $1 | \
-					$GREP "${pooldir}$" | $AWK '{print $1}')
+			OUTPUT=$(zfs list -H -r -o mountpoint $1 | \
+					grep "${pooldir}$" | awk '{print $1}')
 
 			ALTMOUNTPOOL="${ALTMOUNTPOOL}${OUTPUT}"
 		done
@@ -1930,11 +1987,11 @@ function get_compress_opts
 		COMPRESS_OPTS="on off lzjb"
 	fi
 	typeset valid_opts="$COMPRESS_OPTS"
-	$ZFS get 2>&1 | $GREP gzip >/dev/null 2>&1
+	zfs get 2>&1 | grep gzip >/dev/null 2>&1
 	if [[ $? -eq 0 ]]; then
 		valid_opts="$valid_opts $GZIP_OPTS"
 	fi
-	$ECHO "$valid_opts"
+	echo "$valid_opts"
 }
 
 #
@@ -1987,22 +2044,22 @@ function verify_opt_p_ops
 
 	# make sure the upper level filesystem does not exist
 	if datasetexists ${newdataset%/*} ; then
-		log_must $ZFS destroy -rRf ${newdataset%/*}
+		log_must zfs destroy -rRf ${newdataset%/*}
 	fi
 
 	# without -p option, operation will fail
-	log_mustnot $ZFS $ops $dataset $newdataset
+	log_mustnot zfs $ops $dataset $newdataset
 	log_mustnot datasetexists $newdataset ${newdataset%/*}
 
 	# with -p option, operation should succeed
-	log_must $ZFS $ops -p $dataset $newdataset
+	log_must zfs $ops -p $dataset $newdataset
 	if ! datasetexists $newdataset ; then
 		log_fail "-p option does not work for $ops"
 	fi
 
 	# when $ops is create or clone, redo the operation still return zero
 	if [[ $ops != "rename" ]]; then
-		log_must $ZFS $ops -p $dataset $newdataset
+		log_must zfs $ops -p $dataset $newdataset
 	fi
 
 	return 0
@@ -2022,12 +2079,12 @@ function get_config
 	if ! poolexists "$pool" ; then
 		return 1
 	fi
-	alt_root=$($ZPOOL list -H $pool | $AWK '{print $NF}')
+	alt_root=$(zpool list -H $pool | awk '{print $NF}')
 	if [[ $alt_root == "-" ]]; then
-		value=$($ZDB -C $pool | $GREP "$config:" | $AWK -F: \
+		value=$(zdb -C $pool | grep "$config:" | awk -F: \
 		    '{print $2}')
 	else
-		value=$($ZDB -e $pool | $GREP "$config:" | $AWK -F: \
+		value=$(zdb -e $pool | grep "$config:" | awk -F: \
 		    '{print $2}')
 	fi
 	if [[ -n $value ]] ; then
@@ -2054,8 +2111,8 @@ function _random_get
 	typeset -i ind
 	((ind = RANDOM % cnt + 1))
 
-	typeset ret=$($ECHO "$str" | $CUT -f $ind -d ' ')
-	$ECHO $ret
+	typeset ret=$(echo "$str" | cut -f $ind -d ' ')
+	echo $ret
 }
 
 #
@@ -2087,14 +2144,14 @@ function verify_slog_support
 	typeset vdev=$dir/a
 	typeset sdev=$dir/b
 
-	$MKDIR -p $dir
-	$MKFILE $MINVDEVSIZE $vdev $sdev
+	mkdir -p $dir
+	mkfile $MINVDEVSIZE $vdev $sdev
 
 	typeset -i ret=0
-	if ! $ZPOOL create -n $pool $vdev log $sdev > /dev/null 2>&1; then
+	if ! zpool create -n $pool $vdev log $sdev > /dev/null 2>&1; then
 		ret=1
 	fi
-	$RM -r $dir
+	rm -r $dir
 
 	return $ret
 }
@@ -2123,7 +2180,7 @@ function gen_dataset_name
 		((iter -= 1))
 	done
 
-	$ECHO $l_name
+	echo $l_name
 }
 
 #
@@ -2138,10 +2195,10 @@ function gen_dataset_name
 function datasetcksum
 {
 	typeset cksum
-	$SYNC
-	cksum=$($ZDB -vvv $1 | $GREP "^Dataset $1 \[" | $GREP "cksum" \
-		| $AWK -F= '{print $7}')
-	$ECHO $cksum
+	sync
+	cksum=$(zdb -vvv $1 | grep "^Dataset $1 \[" | grep "cksum" \
+		| awk -F= '{print $7}')
+	echo $cksum
 }
 
 #
@@ -2151,8 +2208,8 @@ function datasetcksum
 function checksum
 {
 	typeset cksum
-	cksum=$($CKSUM $1 | $AWK '{print $1}')
-	$ECHO $cksum
+	cksum=$(cksum $1 | awk '{print $1}')
+	echo $cksum
 }
 
 #
@@ -2164,8 +2221,8 @@ function get_device_state #pool disk field("", "spares","logs")
 	typeset disk=${2#/dev/dsk/}
 	typeset field=${3:-$pool}
 
-	state=$($ZPOOL status -v "$pool" 2>/dev/null | \
-		$NAWK -v device=$disk -v pool=$pool -v field=$field \
+	state=$(zpool status -v "$pool" 2>/dev/null | \
+		nawk -v device=$disk -v pool=$pool -v field=$field \
 		'BEGIN {startconfig=0; startfield=0; }
 		/config:/ {startconfig=1}
 		(startconfig==1) && ($1==field) {startfield=1; next;}
@@ -2193,7 +2250,7 @@ function get_fstype
 	#  $ df -n /
 	#  /		  : ufs
 	#
-	$DF -n $dir | $AWK '{print $3}'
+	df -n $dir | awk '{print $3}'
 }
 
 #
@@ -2207,36 +2264,36 @@ function labelvtoc
 		log_fail "The disk name is unspecified."
 	fi
 	typeset label_file=/var/tmp/labelvtoc.$$
-	typeset arch=$($UNAME -p)
+	typeset arch=$(uname -p)
 
 	if [[ $arch == "i386" ]]; then
-		$ECHO "label" > $label_file
-		$ECHO "0" >> $label_file
-		$ECHO "" >> $label_file
-		$ECHO "q" >> $label_file
-		$ECHO "q" >> $label_file
+		echo "label" > $label_file
+		echo "0" >> $label_file
+		echo "" >> $label_file
+		echo "q" >> $label_file
+		echo "q" >> $label_file
 
-		$FDISK -B $disk >/dev/null 2>&1
+		fdisk -B $disk >/dev/null 2>&1
 		# wait a while for fdisk finishes
-		$SLEEP 60
+		sleep 60
 	elif [[ $arch == "sparc" ]]; then
-		$ECHO "label" > $label_file
-		$ECHO "0" >> $label_file
-		$ECHO "" >> $label_file
-		$ECHO "" >> $label_file
-		$ECHO "" >> $label_file
-		$ECHO "q" >> $label_file
+		echo "label" > $label_file
+		echo "0" >> $label_file
+		echo "" >> $label_file
+		echo "" >> $label_file
+		echo "" >> $label_file
+		echo "q" >> $label_file
 	else
 		log_fail "unknown arch type"
 	fi
 
-	$FORMAT -e -s -d $disk -f $label_file
+	format -e -s -d $disk -f $label_file
 	typeset -i ret_val=$?
-	$RM -f $label_file
+	rm -f $label_file
 	#
 	# wait the format to finish
 	#
-	$SLEEP 60
+	sleep 60
 	if ((ret_val != 0)); then
 		log_fail "unable to label $disk as VTOC."
 	fi
@@ -2250,7 +2307,7 @@ function labelvtoc
 #
 function is_zfsroot
 {
-	$DF -n / | $GREP zfs > /dev/null 2>&1
+	df -n / | grep zfs > /dev/null 2>&1
 	return $?
 }
 
@@ -2261,14 +2318,14 @@ function is_zfsroot
 function get_rootfs
 {
 	typeset rootfs=""
-	rootfs=$($AWK '{if ($2 == "/" && $3 == "zfs") print $1}' \
+	rootfs=$(awk '{if ($2 == "/" && $3 == "zfs") print $1}' \
 		/etc/mnttab)
 	if [[ -z "$rootfs" ]]; then
 		log_fail "Can not get rootfs"
 	fi
-	$ZFS list $rootfs > /dev/null 2>&1
+	zfs list $rootfs > /dev/null 2>&1
 	if (($? == 0)); then
-		$ECHO $rootfs
+		echo $rootfs
 	else
 		log_fail "This is not a zfsroot system."
 	fi
@@ -2283,15 +2340,15 @@ function get_rootpool
 {
 	typeset rootfs=""
 	typeset rootpool=""
-	rootfs=$($AWK '{if ($2 == "/" && $3 =="zfs") print $1}' \
+	rootfs=$(awk '{if ($2 == "/" && $3 =="zfs") print $1}' \
 		 /etc/mnttab)
 	if [[ -z "$rootfs" ]]; then
 		log_fail "Can not get rootpool"
 	fi
-	$ZFS list $rootfs > /dev/null 2>&1
+	zfs list $rootfs > /dev/null 2>&1
 	if (($? == 0)); then
-		rootpool=`$ECHO $rootfs | awk -F\/ '{print $1}'`
-		$ECHO $rootpool
+		rootpool=`echo $rootfs | awk -F\/ '{print $1}'`
+		echo $rootpool
 	else
 		log_fail "This is not a zfsroot system."
 	fi
@@ -2305,7 +2362,7 @@ function is_physical_device #device
 	typeset device=${1#/dev/dsk/}
 	device=${device#/dev/rdsk/}
 
-	$ECHO $device | $EGREP "^c[0-F]+([td][0-F]+)+$" > /dev/null 2>&1
+	echo $device | egrep "^c[0-F]+([td][0-F]+)+$" > /dev/null 2>&1
 	return $?
 }
 
@@ -2320,9 +2377,9 @@ function get_device_dir #device
 		if [[ $device != "/" ]]; then
 			device=${device%/*}
 		fi
-		$ECHO $device
+		echo $device
 	else
-		$ECHO "/dev/dsk"
+		echo "/dev/dsk"
 	fi
 }
 
@@ -2341,7 +2398,7 @@ function get_package_name
 #
 function get_word_count
 {
-	$ECHO $1 | $WC -w
+	echo $1 | wc -w
 }
 
 #
@@ -2385,7 +2442,7 @@ function ds_is_snapshot
 #
 function is_te_enabled
 {
-	$SVCS -H -o state labeld 2>/dev/null | $GREP "enabled"
+	svcs -H -o state labeld 2>/dev/null | grep "enabled"
 	if (($? != 0)); then
 		return 1
 	else
@@ -2396,12 +2453,12 @@ function is_te_enabled
 # Utility function to determine if a system has multiple cpus.
 function is_mp
 {
-	(($($PSRINFO | $WC -l) > 1))
+	(($(psrinfo | wc -l) > 1))
 }
 
 function get_cpu_freq
 {
-	$PSRINFO -v 0 | $AWK '/processor operates at/ {print $6}'
+	psrinfo -v 0 | awk '/processor operates at/ {print $6}'
 }
 
 # Run the given command as the user provided.
@@ -2410,7 +2467,7 @@ function user_run
 	typeset user=$1
 	shift
 
-	eval \$SU \$user -c \"$@\" > /tmp/out 2>/tmp/err
+	eval su \$user -c \"$@\" > /tmp/out 2>/tmp/err
 	return $?
 }
 
@@ -2435,14 +2492,14 @@ function vdevs_in_pool
 
 	shift
 
-	typeset tmpfile=$($MKTEMP)
-	$ZPOOL list -Hv "$pool" >$tmpfile
+	typeset tmpfile=$(mktemp)
+	zpool list -Hv "$pool" >$tmpfile
 	for vdev in $@; do
-		$GREP -w ${vdev##*/} $tmpfile >/dev/null 2>&1
+		grep -w ${vdev##*/} $tmpfile >/dev/null 2>&1
 		[[ $? -ne 0 ]] && return 1
 	done
 
-	$RM -f $tmpfile
+	rm -f $tmpfile
 
 	return 0;
 }
diff --git a/usr/src/test/zfs-tests/include/math.shlib b/usr/src/test/zfs-tests/include/math.shlib
index 38479d3521..ca1cbcb4e4 100644
--- a/usr/src/test/zfs-tests/include/math.shlib
+++ b/usr/src/test/zfs-tests/include/math.shlib
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -30,14 +30,14 @@ function within_percent
 	typeset percent=$3
 
 	# Set $a or $b to $2 such that a >= b
-	[[ '1' = $($ECHO "if ($2 > $a) 1" | $BC) ]] && a=$2 || b=$2
+	[[ '1' = $(echo "if ($2 > $a) 1" | bc) ]] && a=$2 || b=$2
 
 	# Prevent division by 0
 	[[ $a =~ [1-9] ]] || return 1
 
-	typeset p=$($ECHO "scale=2; $b * 100 / $a" | $BC)
+	typeset p=$(echo "scale=2; $b * 100 / $a" | bc)
 	log_note "Comparing $a and $b given $percent% (calculated: $p%)"
-	[[ '1' = $($ECHO "scale=2; if ($p >= $percent) 1" | $BC) ]] && return 0
+	[[ '1' = $(echo "scale=2; if ($p >= $percent) 1" | bc) ]] && return 0
 
 	return 1
 }
diff --git a/usr/src/test/zfs-tests/include/properties.shlib b/usr/src/test/zfs-tests/include/properties.shlib
index bb0b4ff586..2897e90c25 100644
--- a/usr/src/test/zfs-tests/include/properties.shlib
+++ b/usr/src/test/zfs-tests/include/properties.shlib
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 typeset -a compress_props=('on' 'off' 'lzjb' 'gzip' 'gzip-1' 'gzip-2' 'gzip-3'
@@ -36,7 +36,7 @@ function get_rand_prop
 
 	typeset prop_max=$((${#prop_array[@]} - 1))
 	typeset -i i
-	for i in $($SHUF -i $start-$prop_max -n $num_props); do
+	for i in $(shuf -i $start-$prop_max -n $num_props); do
 		retstr="${prop_array[$i]} $retstr"
 	done
 	echo $retstr
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib b/usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib
index 1ebc1cd968..2d8d02b28e 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl.cfg
 . $STF_SUITE/include/libtest.shlib
 
@@ -39,7 +43,7 @@ function get_mode #<obj>
 		return 1
 	fi
 
-	$LS -ld $obj | $AWK '{print $1}'
+	ls -ld $obj | awk '{print $1}'
 }
 
 #
@@ -54,7 +58,7 @@ function get_acl #<obj>
 		return 1
 	fi
 
-	$LS -vd $obj | $NAWK '(NR != 1) {print $0}'
+	ls -vd $obj | nawk '(NR != 1) {print $0}'
 }
 
 #
@@ -69,7 +73,7 @@ function get_compact_acl #<obj>
 		return 1
 	fi
 
-	$LS -Vd $obj | $NAWK '(NR != 1) {print $0}'
+	ls -Vd $obj | nawk '(NR != 1) {print $0}'
 }
 
 #
@@ -94,9 +98,9 @@ function compare_acls #<src> <tgt>
 	get_acl $src > $tmpsrc
 	get_acl $tgt > $tmptgt
 	typeset -i ret=0
-	$DIFF $tmpsrc $tmptgt > /dev/null 2>&1
+	diff $tmpsrc $tmptgt > /dev/null 2>&1
 	ret=$?
-	$RM -f $tmpsrc $tmptgt
+	rm -f $tmpsrc $tmptgt
 
 	if (( ret != 0 )); then
 		return $ret
@@ -104,9 +108,9 @@ function compare_acls #<src> <tgt>
 
 	get_compact_acl $src > $tmpsrc
 	get_compact_acl $tgt > $tmptgt
-	$DIFF $tmpsrc $tmptgt > /dev/null 2>&1
+	diff $tmpsrc $tmptgt > /dev/null 2>&1
 	ret=$?
-	$RM -f $tmpsrc $tmptgt
+	rm -f $tmpsrc $tmptgt
 
 	return $ret
 }
@@ -162,9 +166,9 @@ function compare_xattrs #<src> <tgt>
 	get_xattr $src > $tmpsrc
 	get_xattr $tgt > $tmptgt
 	typeset -i ret=0
-	$DIFF $tmpsrc $tmptgt > /dev/null 2>&1
+	diff $tmpsrc $tmptgt > /dev/null 2>&1
 	ret=$?
-	$RM -f $tmpsrc $tmptgt
+	rm -f $tmpsrc $tmptgt
 
         return $ret
 }
@@ -181,7 +185,7 @@ function plus_sign_check_l #<obj>
 		return 1
 	fi
 
-	$LS -ld $obj | $AWK '{print $1}' | $GREP "+\>" > /dev/null
+	ls -ld $obj | awk '{print $1}' | grep "+\>" > /dev/null
 
         return $?
 }
@@ -198,7 +202,7 @@ function plus_sign_check_v #<obj>
 		return 1
 	fi
 
-	$LS -vd $obj | $NAWK '(NR == 1) {print $1}' | $GREP "+\>" > /dev/null
+	ls -vd $obj | nawk '(NR == 1) {print $1}' | grep "+\>" > /dev/null
 
         return $?
 }
@@ -211,7 +215,7 @@ function plus_sign_check_v #<obj>
 #
 function chgusr_exec #<login_name> <commands> [...]
 {
-	$CHG_USR_EXEC $@
+	chg_usr_exec $@
 	return $?
 }
 
@@ -232,7 +236,7 @@ function set_cur_usr #<login_name>
 #
 function usr_exec #<commands> [...]
 {
-	$CHG_USR_EXEC "$ZFS_ACL_CUR_USER" $@
+	chg_usr_exec "$ZFS_ACL_CUR_USER" $@
 	return $?
 }
 
@@ -248,7 +252,7 @@ function count_ACE #<file or dir name>
 		return 1
 	fi
 
-	$LS -vd $1 | $NAWK 'BEGIN {count=0}
+	ls -vd $1 | nawk 'BEGIN {count=0}
 			(NR != 1)&&(/[0-9]:/) {count++}
 			END {print count}'
 
@@ -286,8 +290,8 @@ function get_ACE #<file or dir name> <specified number> <verbose|compact>
 			;;
 	esac
 
-	$LS $args $file > $tmpfile
-	(( $? != 0 )) && log_fail "FAIL: $LS $args $file > $tmpfile"
+	ls $args $file > $tmpfile
+	(( $? != 0 )) && log_fail "FAIL: ls $args $file > $tmpfile"
 	while read line; do
 		[[ -z $line ]] && continue
 		if [[ $args == -vd ]]; then
@@ -308,8 +312,8 @@ function get_ACE #<file or dir name> <specified number> <verbose|compact>
 		fi
 	done < $tmpfile
 
-	$RM -f $tmpfile
-	(( $? != 0 )) && log_fail "FAIL: $RM -f $tmpfile"
+	rm -f $tmpfile
+	(( $? != 0 )) && log_fail "FAIL: rm -f $tmpfile"
 }
 
 #
@@ -337,7 +341,7 @@ function cleanup
 {
 	if [[ -d $TESTDIR ]]; then
 		cd $TESTDIR
-		$RM -rf $TESTDIR/*
+		rm -rf $TESTDIR/*
 	fi
 }
 
@@ -363,26 +367,26 @@ function rwx_node #user node acl_spec|access
 	if [[ -d $node ]]; then
 		case $acl_spec in
 		*:read_data:*|read_data)
-			chgusr_exec $user $LS -l $node > /dev/null 2>&1
+			chgusr_exec $user ls -l $node > /dev/null 2>&1
 			return $? ;;
 		*:write_data:*|write_data)
 			if [[ -f ${node}/tmpfile ]]; then
-				log_must $RM -f ${node}/tmpfile
+				log_must rm -f ${node}/tmpfile
 			fi
-			chgusr_exec $user $TOUCH ${node}/tmpfile > \
+			chgusr_exec $user touch ${node}/tmpfile > \
 				/dev/null 2>&1
 			return $? ;;
 		*"execute:"*|execute)
-			chgusr_exec $user $FIND $node > /dev/null 2>&1
+			chgusr_exec $user find $node > /dev/null 2>&1
 			return $? ;;
 		esac
 	else
 		case $acl_spec in
 		*:read_data:*|read_data)
-			chgusr_exec $user $CAT $node > /dev/null 2>&1
+			chgusr_exec $user cat $node > /dev/null 2>&1
 			return $? ;;
 		*:write_data:*|write_data)
-			chgusr_exec $user $DD if=/usr/bin/ls of=$node > \
+			chgusr_exec $user dd if=/usr/bin/ls of=$node > \
 				/dev/null 2>&1
 			return $? ;;
 		*"execute:"*|execute)
@@ -405,9 +409,9 @@ function get_xattr #<obj>
 		return 1
 	fi
 
-	for xattr in `$RUNAT $obj $LS | \
+	for xattr in `runat $obj ls | \
 		/usr/xpg4/bin/egrep -v -e SUNWattr_ro -e SUNWattr_rw` ; do
-		$RUNAT $obj $SUM $xattr
+		runat $obj sum $xattr
 	done
 }
 
@@ -424,12 +428,12 @@ function get_owner #node
 	fi
 
 	if [[ -d $node ]]; then
-		value=$($LS -dl $node | $AWK '{print $3}')
+		value=$(ls -dl $node | awk '{print $3}')
 	elif [[ -e $node ]]; then
-		value=$($LS -l $node | $AWK '{print $3}')
+		value=$(ls -l $node | awk '{print $3}')
 	fi
 
-	$ECHO $value
+	echo $value
 }
 
 #
@@ -445,12 +449,12 @@ function get_group #node
 	fi
 
 	if [[ -d $node ]]; then
-		value=$($LS -dl $node | $AWK '{print $4}')
+		value=$(ls -dl $node | awk '{print $4}')
 	elif [[ -e $node ]]; then
-		value=$($LS -l $node | $AWK '{print $4}')
+		value=$(ls -l $node | awk '{print $4}')
 	fi
 
-	$ECHO $value
+	echo $value
 }
 
 
@@ -471,7 +475,7 @@ function get_user_group #uid
 	if [[ $? -eq 0 ]]; then
 		value=${value##*\(}
 		value=${value%%\)*}
-		$ECHO $value
+		echo $value
 	else
 		log_fail "Invalid UID (uid)."
 	fi
@@ -509,17 +513,17 @@ function cksum_files #<dir> <file_array_name> <attribute_array_name>
 	[[ ! -d $dir ]] && return
 	typeset oldpwd=$PWD
 	cd $dir
-	typeset files=$($LS file*)
+	typeset files=$(ls file*)
 
 	typeset -i i=0
 	typeset -i n=0
 	while (( i < NUM_FILE )); do
 		typeset f=$(getitem $i $files)
-		eval $farr_name[$i]=\$\(\$CKSUM $f\)
+		eval $farr_name[$i]=\$\(\cksum $f\)
 
 		typeset -i j=0
 		while (( j < NUM_ATTR )); do
-			eval $aarr_name[$n]=\$\(\$RUNAT \$f \$CKSUM \
+			eval $aarr_name[$n]=\$\(\runat \$f \cksum \
 				attribute.$j\)
 
 			(( j += 1 ))
@@ -571,12 +575,12 @@ function record_cksum #<outfile>
 	typeset dir=$1
 	typeset outfile=$2
 
-	[[ ! -d ${outfile%/*} ]] && usr_exec $MKDIR -p ${outfile%/*}
+	[[ ! -d ${outfile%/*} ]] && usr_exec mkdir -p ${outfile%/*}
 
-	usr_exec cd $dir ; $FIND . -depth -type f -exec cksum {} \\\; | \
-	    $SORT > $outfile
-	usr_exec cd $dir ; $FIND . -depth -type f -xattr -exec runat {} \
-		cksum attribute* \\\; | $SORT >> $outfile
+	usr_exec cd $dir ; find . -depth -type f -exec cksum {} \\\; | \
+	    sort > $outfile
+	usr_exec cd $dir ; find . -depth -type f -xattr -exec runat {} \
+		cksum attribute* \\\; | sort >> $outfile
 }
 
 #
@@ -589,20 +593,20 @@ function create_files #<directory>
 {
 	typeset basedir=$1
 
-	[[ ! -d $basedir ]] && usr_exec $MKDIR -m 777 $basedir
-	[[ ! -d $RES_DIR  ]] && usr_exec $MKDIR -m 777 $RES_DIR
-	[[ ! -d $INI_DIR ]] && usr_exec $MKDIR -m 777 $INI_DIR
-	[[ ! -d $TST_DIR ]] && usr_exec $MKDIR -m 777 $TST_DIR
-	[[ ! -d $TMP_DIR  ]] && usr_exec $MKDIR -m 777 $TMP_DIR
+	[[ ! -d $basedir ]] && usr_exec mkdir -m 777 $basedir
+	[[ ! -d $RES_DIR  ]] && usr_exec mkdir -m 777 $RES_DIR
+	[[ ! -d $INI_DIR ]] && usr_exec mkdir -m 777 $INI_DIR
+	[[ ! -d $TST_DIR ]] && usr_exec mkdir -m 777 $TST_DIR
+	[[ ! -d $TMP_DIR  ]] && usr_exec mkdir -m 777 $TMP_DIR
 
 	#
 	# Create the original file and its attribute files.
 	#
 	[[ ! -a $RES_DIR/file ]] && \
-		usr_exec $FILE_WRITE -o create -f $RES_DIR/file \
+		usr_exec file_write -o create -f $RES_DIR/file \
 			-b 1024 -d 0 -c 1
 	[[ ! -a $RES_DIR/attribute ]] && \
-		usr_exec $CP $RES_DIR/file $RES_DIR/attribute
+		usr_exec cp $RES_DIR/file $RES_DIR/attribute
 
 	typeset oldpwd=$PWD
 	cd $INI_DIR
@@ -610,12 +614,12 @@ function create_files #<directory>
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
 		typeset dstfile=$INI_DIR/file.$$.$i
-		usr_exec $CP $RES_DIR/file $dstfile
+		usr_exec cp $RES_DIR/file $dstfile
 
 		typeset -i j=0
 		while (( j < NUM_ATTR )); do
-			usr_exec $RUNAT $dstfile \
-				$CP $RES_DIR/attribute ./attribute.$j
+			usr_exec runat $dstfile \
+				cp $RES_DIR/attribute ./attribute.$j
 			(( j += 1 ))
 		done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs.kshlib b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs.kshlib
index 83808d48e9..2dc7ca81c8 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,15 +47,15 @@ function create_object
 
 	case $type in
 	dir)
-		$MKDIR -p $object
+		mkdir -p $object
 		;;
 	file)
-		$ECHO "ZFS test suites" > $object
+		echo "ZFS test suites" > $object
 		;;
 	esac
 
 	if [[ -n $owner ]]; then
-		$CHOWN $owner $object
+		chown $owner $object
 	fi
 	return 0
 }
@@ -69,7 +73,7 @@ function destroy_object
 			# clear_attribute is a common function name,
 			# but each case should have their own implement.
 			log_must clear_attribute $object
-			log_must $RM -rf $object
+			log_must rm -rf $object
 		fi
 	done
 	return 0
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_001_pos.ksh
index 4f46665a9d..cc37752768 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -52,7 +52,7 @@ function cleanup
 {
 	for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do
 		mtpt=$(get_prop mountpoint $fs)
-		log_must $RM -rf $mtpt/file.* $mtpt/dir.*
+		log_must rm -rf $mtpt/file.* $mtpt/dir.*
 	done
 }
 
@@ -75,10 +75,10 @@ function set_attribute
 	fi
 
 	if [[ -n $user ]]; then
-		$SU $user -c "$CHMOD S+c${attr} $object"
+		su $user -c "chmod S+c${attr} $object"
 		ret=$?
 	else
-		$CHMOD S+c${attr} $object
+		chmod S+c${attr} $object
 		ret=$?
 	fi
 
@@ -104,10 +104,10 @@ function clear_attribute
 	fi
 
 	if [[ -n $user ]]; then
-		$SU $user -c "$CHMOD S-c${attr} $object"
+		su $user -c "chmod S-c${attr} $object"
 		ret=$?
 	else
-		$CHMOD S-c${attr} $object
+		chmod S-c${attr} $object
 		ret=$?
 	fi
 
@@ -134,16 +134,16 @@ function grant_attr
 	# Only grant the user explicitly while it's not root neither owner.
 
 	if [[ $user == "root" ]]; then
-		log_must $CHMOD A+user:root:write_attributes:deny $object
+		log_must chmod A+user:root:write_attributes:deny $object
 	elif [[ $user == $(get_owner $object) ]]; then
 		if (((RANDOM % 2) == 0)); then
-			log_must $CHMOD A+owner@:write_attributes:deny $object
+			log_must chmod A+owner@:write_attributes:deny $object
 		else
-			log_must $CHMOD A+user:$user:write_attributes:deny \
+			log_must chmod A+user:$user:write_attributes:deny \
 			    $object
 		fi
 	else
-		log_must $CHMOD A+user:$user:write_attributes:allow $object
+		log_must chmod A+user:$user:write_attributes:allow $object
 	fi
 	attr_mod="write_attributes"
 }
@@ -163,7 +163,7 @@ function revoke_attr
 		log_fail "User($user), Object($object) not defined."
 	fi
 
-	log_must $CHMOD A0- $object
+	log_must chmod A0- $object
 	attr_mod=
 }
 
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_002_pos.ksh
index 16eb6892c0..549decc29b 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -50,10 +50,10 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf $mntpt/file $mntpt/dir >/dev/null 2>&1
+	rm -rf $mntpt/file $mntpt/dir >/dev/null 2>&1
 
-	log_must $CP $orig_user_attr /etc/user_attr
-	log_must $RM -f $orig_user_attr
+	log_must cp $orig_user_attr /etc/user_attr
+	log_must rm -f $orig_user_attr
 }
 
 function try
@@ -64,7 +64,7 @@ function try
 	typeset priv=$4		# What privilege to run with if non-root
 	typeset op=$5		# Whether to set or clear the attribute
 
-	typeset cmd="$CHMOD $op$attr $obj"
+	typeset cmd="chmod $op$attr $obj"
 
 	#
 	# No one can add 'q' (av_quarantine) to a directory. root can do
@@ -80,21 +80,21 @@ function try
 		fi
 	else
 		if [[ $attr =~ 'q' && -d $obj && $op == $add ]]; then
-			log_mustnot $SU $user -c "$cmd"
+			log_mustnot su $user -c "$cmd"
 		else
 			if [[ $op == $add ]]; then
 				if [[ -n $priv ]]; then
-					log_must $SU $user -c "$cmd"
+					log_must su $user -c "$cmd"
 				else
-					log_mustnot $SU $user -c "$cmd"
+					log_mustnot su $user -c "$cmd"
 				fi
 			else
 				if [[ $attr = 'q' && -d $obj ]]; then
-					log_must $SU $user -c "$cmd"
+					log_must su $user -c "$cmd"
 				elif [[ $priv =~ 'all' ]]; then
-					log_must $SU $user -c "$cmd"
+					log_must su $user -c "$cmd"
 				else
-					log_mustnot $SU $user -c "$cmd"
+					log_mustnot su $user -c "$cmd"
 					#
 					# Remove the attribute, so the next
 					# iteration starts with a known state.
@@ -118,7 +118,7 @@ function chk_attr
 	typeset attr=$3
 
 	# Extract the attribute string - just the text inside the braces
-	typeset attrstr="$($LS -d/ c $obj | $SED '1d; s/.*{\(.*\)}.*/\1/g')"
+	typeset attrstr="$(ls -d/ c $obj | sed '1d; s/.*{\(.*\)}.*/\1/g')"
 
 	if [[ $op == $add ]]; then
 		[[ $attrstr =~ $attr ]] || log_fail "$op $attr -> $attrstr"
@@ -147,7 +147,7 @@ function grant_priv
 	# If we're root, don't modify /etc/user_attr
 	[[ $user == 'root' ]] && return 0
 
-	$ECHO "$user::::type=normal;defaultpriv=basic$priv_mod" >> \
+	echo "$user::::type=normal;defaultpriv=basic$priv_mod" >> \
 	    /etc/user_attr
 	return $?
 }
@@ -167,7 +167,7 @@ function reset_privs
 
 	priv_mod=
 
-	$CP $orig_user_attr /etc/user_attr || log_fail "Couldn't modify user_attr"
+	cp $orig_user_attr /etc/user_attr || log_fail "Couldn't modify user_attr"
 	return 0
 }
 
@@ -181,12 +181,12 @@ mntpt=$(get_prop mountpoint $TESTPOOL/$TESTFS)
 orig_user_attr="/tmp/user_attr.$$"
 attributes="u i a d q m"
 
-log_must $CP /etc/user_attr $orig_user_attr
+log_must cp /etc/user_attr $orig_user_attr
 
 for owner in root $ZFS_ACL_STAFF1 $ZFS_ACL_STAFF2; do
-	$TOUCH $mntpt/file || log_fail "Failed to create $mntpt/file"
-	$MKDIR $mntpt/dir || log_fail "Failed to mkdir $mntpt/dir"
-	$CHOWN $owner $mntpt/file $mntpt/dir || log_fail "Failed to chown file"
+	touch $mntpt/file || log_fail "Failed to create $mntpt/file"
+	mkdir $mntpt/dir || log_fail "Failed to mkdir $mntpt/dir"
+	chown $owner $mntpt/file $mntpt/dir || log_fail "Failed to chown file"
 	for user in 'root' $ZFS_ACL_STAFF2; do
 		for attr in $attributes; do
 			for priv in 'file_flag_set' 'all'; do
@@ -200,8 +200,8 @@ for owner in root $ZFS_ACL_STAFF1 $ZFS_ACL_STAFF2; do
 			done
 		done
 	done
-	$RM -rf $mntpt/file $mntpt/dir || log_fail \
-	    "$($LS -d/ c $mntpt/file $mntpt/dir)"
+	rm -rf $mntpt/file $mntpt/dir || log_fail \
+	    "$(ls -d/ c $mntpt/file $mntpt/dir)"
 done
 
 log_pass "Set/Clear BSD'ish attributes succeed while user has " \
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_003_pos.ksh
index 3819bf2ea5..a47ad0277b 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cifs_attr_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -78,10 +78,10 @@ function cleanup
 
 	for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do
 		mtpt=$(get_prop mountpoint $fs)
-		log_must $RM -rf $mtpt/file.* $mtpt/dir.*
+		log_must rm -rf $mtpt/file.* $mtpt/dir.*
 	done
 
-	[[ -f $TESTFILE ]] && $RM $TESTFILE
+	[[ -f $TESTFILE ]] && rm $TESTFILE
 }
 
 #
@@ -101,7 +101,7 @@ function set_attribute
 			attr="${attr}q"
 		fi
 	fi
-	$CHMOD S+c${attr} $object
+	chmod S+c${attr} $object
 	return $?
 }
 
@@ -127,7 +127,7 @@ function clear_attribute
 		fi
 	fi
 
-	$CHMOD S-c${attr} $object
+	chmod S-c${attr} $object
 	return $?
 }
 
@@ -201,10 +201,10 @@ function unit_writefile
 	typeset user=$2
 	typeset expect=${3:-0}
 	if [[ -f $object ]]; then
-		verify_expect $expect $CHG_USR_EXEC $user \
-		    $CP $TESTFILE $object
-		verify_expect $expect $CHG_USR_EXEC $user \
-		    $EVAL "$ECHO '$TESTSTR' > $object"
+		verify_expect $expect chg_usr_exec $user \
+		    cp $TESTFILE $object
+		verify_expect $expect chg_usr_exec $user \
+		    "echo '$TESTSTR' > $object"
 	fi
 }
 
@@ -222,10 +222,10 @@ function unit_writedir
 	typeset expect=${3:-0}
 
 	if [[ -d $object ]]; then
-		verify_expect $expect $CHG_USR_EXEC $user \
-		    $CP $TESTFILE $object
-		verify_expect $expect $CHG_USR_EXEC $user \
-		    $MKDIR -p $object/$TESTDIR
+		verify_expect $expect chg_usr_exec $user \
+		    cp $TESTFILE $object
+		verify_expect $expect chg_usr_exec $user \
+		    mkdir -p $object/$TESTDIR
 	fi
 }
 
@@ -236,8 +236,8 @@ function unit_appenddata
 	typeset expect=${3:-0}
 
 	if [[ ! -d $object ]]; then
-		verify_expect $expect $CHG_USR_EXEC $user \
-		    $EVAL "$ECHO '$TESTSTR' >> $object"
+		verify_expect $expect chg_usr_exec $user \
+		    "echo '$TESTSTR' >> $object"
 	fi
 }
 
@@ -257,10 +257,10 @@ function unit_deletecontent
 	if [[ -d $object ]]; then
 		for target in $object/${TESTFILE##*/} $object/$TESTDIR ; do
 			if [[ -e $target ]]; then
-				verify_expect $expect $CHG_USR_EXEC $user \
-				    $EVAL "$MV $target $target.new"
-				verify_expect $expect $CHG_USR_EXEC $user \
-				    $EVAL "$ECHO y | $RM -r $target.new"
+				verify_expect $expect chg_usr_exec $user \
+				    "mv $target $target.new"
+				verify_expect $expect chg_usr_exec $user \
+				    "echo y | rm -r $target.new"
 			fi
 		done
 	fi
@@ -279,8 +279,8 @@ function unit_deletedata
 	typeset user=$2
 	typeset expect=${3:-0}
 
-	verify_expect $expect $CHG_USR_EXEC $user \
-	    $EVAL "$ECHO y | $RM -r $object"
+	verify_expect $expect chg_usr_exec $user \
+	    "echo y | rm -r $object"
 
 }
 
@@ -297,15 +297,15 @@ function unit_writexattr
 	typeset user=$2
 	typeset expect=${3:-0}
 
-	verify_expect $expect $CHG_USR_EXEC $user \
-	    $RUNAT $object "$CP $TESTFILE $TESTATTR"
-	verify_expect $expect $CHG_USR_EXEC $user \
-	    $EVAL "$RUNAT $object \"$ECHO '$TESTSTR' > $TESTATTR\""
-	verify_expect $expect $CHG_USR_EXEC $user \
-	    $EVAL "$RUNAT $object \"$ECHO '$TESTSTR' >> $TESTATTR\""
+	verify_expect $expect chg_usr_exec $user \
+	    runat $object "cp $TESTFILE $TESTATTR"
+	verify_expect $expect chg_usr_exec $user \
+	    "runat $object \"echo '$TESTSTR' > $TESTATTR\""
+	verify_expect $expect chg_usr_exec $user \
+	    "runat $object \"echo '$TESTSTR' >> $TESTATTR\""
 	if [[ $expect -eq 0 ]]; then
-		verify_expect $expect $CHG_USR_EXEC $user \
-		    $RUNAT $object "$RM -f $TESTATTR"
+		verify_expect $expect chg_usr_exec $user \
+		    runat $object "rm -f $TESTATTR"
 	fi
 }
 
@@ -323,9 +323,9 @@ function unit_accesstime
 	typeset expect=${3:-0}
 
 	if [[ -d $object ]]; then
-		verify_expect $expect $CHG_USR_EXEC $user $LS $object
+		verify_expect $expect chg_usr_exec $user ls $object
 	else
-		verify_expect $expect $CHG_USR_EXEC $user $CAT $object
+		verify_expect $expect chg_usr_exec $user cat $object
 	fi
 }
 
@@ -342,9 +342,9 @@ function unit_updatetime
 	typeset user=$2
 	typeset expect=${3:-0}
 	typeset immutable_expect=${4:-$expect}
-	verify_expect $expect $CHG_USR_EXEC $user $TOUCH $object
-	verify_expect $immutable_expect $CHG_USR_EXEC $user $TOUCH -a $object
-	verify_expect $expect $CHG_USR_EXEC $user $TOUCH -m $object
+	verify_expect $expect chg_usr_exec $user touch $object
+	verify_expect $immutable_expect chg_usr_exec $user touch -a $object
+	verify_expect $expect chg_usr_exec $user touch -m $object
 }
 
 #
@@ -360,12 +360,12 @@ function unit_writeacl
 	typeset user=$2
 	typeset expect=${3:-0}
 
-	verify_expect $expect $CHG_USR_EXEC $user $CHMOD A+$TESTACL $object
-	verify_expect $expect $CHG_USR_EXEC $user $CHMOD A+$TESTACL $object
-	verify_expect $expect $CHG_USR_EXEC $user $CHMOD A0- $object
-	verify_expect $expect $CHG_USR_EXEC $user $CHMOD A0- $object
+	verify_expect $expect chg_usr_exec $user chmod A+$TESTACL $object
+	verify_expect $expect chg_usr_exec $user chmod A+$TESTACL $object
+	verify_expect $expect chg_usr_exec $user chmod A0- $object
+	verify_expect $expect chg_usr_exec $user chmod A0- $object
 	oldmode=$(get_mode $object)
-	verify_expect $expect $CHG_USR_EXEC $user $CHMOD $TESTMODE $object
+	verify_expect $expect chg_usr_exec $user chmod $TESTMODE $object
 }
 
 #
@@ -385,10 +385,10 @@ function test_readonly
 
 	for user in $ZFS_ACL_CUR_USER root $ZFS_ACL_STAFF2; do
 		if [[ -d $object ]]; then
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_dir}:allow $object
 		else
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_file}:allow $object
 		fi
 
@@ -435,10 +435,10 @@ function test_immutable
 
 	for user in $ZFS_ACL_CUR_USER root $ZFS_ACL_STAFF2; do
 		if [[ -d $object ]]; then
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_dir}:allow $object
 		else
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_file}:allow $object
 		fi
 		log_must set_attribute $object "i"
@@ -474,14 +474,14 @@ function test_nounlink
 		log_fail "Object($object) not defined."
 	fi
 
-	$ECHO "Testing nounlink of $object"
+	echo "Testing nounlink of $object"
 
 	for user in $ZFS_ACL_CUR_USER root $ZFS_ACL_STAFF2; do
 		if [[ -d $object ]]; then
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_dir}:allow $object
 		else
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_file}:allow $object
 		fi
 		log_must set_attribute $object "u"
@@ -521,10 +521,10 @@ function test_appendonly
 
 	for user in $ZFS_ACL_CUR_USER root $ZFS_ACL_STAFF2; do
 		if [[ -d $object ]]; then
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_dir}:allow $object
 		else
-			log_must usr_exec $CHMOD \
+			log_must usr_exec chmod \
 			    A+user:$user:${ace_file}:allow $object
 		fi
 		log_must set_attribute $object "a"
@@ -572,14 +572,14 @@ log_assert "Verify DOS & BSD'ish attributes will provide the " \
     "access limitation as expected."
 log_onexit cleanup
 
-$ECHO "$TESTSTR" > $TESTFILE
+echo "$TESTSTR" > $TESTFILE
 
 typeset gobject
 typeset gattr
 for gattr in $ATTRS ; do
 	for fs in $FS ; do
 		mtpt=$(get_prop mountpoint $fs)
-		$CHMOD 777 $mtpt
+		chmod 777 $mtpt
 		for user in root $ZFS_ACL_STAFF1; do
 			log_must set_cur_usr $user
 			for file in $FILES ; do
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cleanup.ksh
index ea2d0aaa49..84c91fa7b0 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/cifs/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/cifs/cleanup.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
@@ -32,8 +36,8 @@ 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
+    log_must svcadm enable svc:/network/nis/client:default
+    log_must rm -f $NISSTAFILE
 fi
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/cifs/setup.ksh b/usr/src/test/zfs-tests/tests/functional/acl/cifs/setup.ksh
index 5262c178ec..99bb1e71e1 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/cifs/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/cifs/setup.ksh
@@ -25,16 +25,20 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 # 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
+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
@@ -54,6 +58,6 @@ log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER2
 
 DISK=${DISKS%% *}
 default_setup_noexit $DISK
-log_must $CHMOD 777 $TESTDIR
+log_must chmod 777 $TESTDIR
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/cleanup.ksh
index ea2d0aaa49..84c91fa7b0 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/cleanup.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
@@ -32,8 +36,8 @@ 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
+    log_must svcadm enable svc:/network/nis/client:default
+    log_must rm -f $NISSTAFILE
 fi
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/setup.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/setup.ksh
index 5262c178ec..99bb1e71e1 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/setup.ksh
@@ -25,16 +25,20 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 # 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
+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
@@ -54,6 +58,6 @@ log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER2
 
 DISK=${DISKS%% *}
 default_setup_noexit $DISK
-log_must $CHMOD 777 $TESTDIR
+log_must chmod 777 $TESTDIR
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_aclmode_restricted_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_aclmode_restricted_001_neg.ksh
index 9080bec691..e623430b1f 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_aclmode_restricted_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_aclmode_restricted_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright (c) 2013 by Paul B. Henson <henson@acm.org>.
 #                    All rights reserved.
 #
@@ -52,30 +52,30 @@ verify_runnable "both"
 function cleanup
 {
 	# reset aclmode=discard
-	log_must $ZFS set aclmode=discard $TESTPOOL/$TESTFS
+	log_must zfs set aclmode=discard $TESTPOOL/$TESTFS
 }
 
 log_assert "Verify mode bits based chmod fails on files/directories "\
     "with non-trivial ACLs when aclmode=restricted"
 log_onexit cleanup
 
-log_must $ZFS set aclmode=restricted $TESTPOOL/$TESTFS
+log_must zfs set aclmode=restricted $TESTPOOL/$TESTFS
 
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
-	log_must usr_exec $MKDIR $TESTDIR/testdir
-	log_must usr_exec $TOUCH $TESTDIR/testfile
+	log_must usr_exec mkdir $TESTDIR/testdir
+	log_must usr_exec touch $TESTDIR/testfile
 
 	# Make sure ACL is non-trival
-	log_must usr_exec $CHMOD A+user:${ZFS_ACL_STAFF1}:r::allow \
+	log_must usr_exec chmod A+user:${ZFS_ACL_STAFF1}:r::allow \
 	    $TESTDIR/testdir $TESTDIR/testfile
 
-	log_mustnot usr_exec $CHMOD u-w $TESTDIR/testdir
-	log_mustnot usr_exec $CHMOD u-w $TESTDIR/testfile
+	log_mustnot usr_exec chmod u-w $TESTDIR/testdir
+	log_mustnot usr_exec chmod u-w $TESTDIR/testfile
 
-	log_must usr_exec $RMDIR $TESTDIR/testdir
-	log_must usr_exec $RM $TESTDIR/testfile
+	log_must usr_exec rmdir $TESTDIR/testdir
+	log_must usr_exec rm $TESTDIR/testfile
 done
 
 log_pass "Verify mode bits based chmod fails on files/directories "\
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_001_neg.ksh
index 09841e17c1..e5d3f7cb8c 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_001_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -52,13 +56,13 @@ function err_opts #node
 
 	log_note "Illegal option to chmod should fail."
 	for A in ${A_opts[@]}; do
-		log_mustnot usr_exec $CHMOD ${A}owner@:read_data:allow $node
-		log_mustnot usr_exec $CHMOD A+ asd owner@:execute:deny $node
+		log_mustnot usr_exec chmod ${A}owner@:read_data:allow $node
+		log_mustnot usr_exec chmod A+ asd owner@:execute:deny $node
 	done
 
 	typeset type_opts="everyone groups owner user@ users"
 	for tp in ${type_opts[@]}; do
-		log_mustnot usr_exec $CHMOD A+$tp:read_data:deny $node
+		log_mustnot usr_exec chmod A+$tp:read_data:deny $node
 	done
 
 	return 0
@@ -72,9 +76,9 @@ function del_all_ACE #node
 	cnt=$(count_ACE $node)
 	while (( cnt > 0 )); do
 		if (( cnt == 1 )); then
-			log_mustnot $CHMOD A0- $node
+			log_mustnot chmod A0- $node
 		else
-			log_must $CHMOD A0- $node
+			log_must chmod A0- $node
 		fi
 
 		(( cnt -= 1 ))
@@ -95,9 +99,9 @@ function exceed_max_ACE #node
 	(( max = max - cnt + 1 ))
 	while (( max > 0 )); do
 		if (( max == 1 )); then
-			log_mustnot $CHMOD A+owner@:read_data:allow $node
+			log_mustnot chmod A+owner@:read_data:allow $node
 		else
-			$CHMOD A+owner@:read_data:allow $node
+			chmod A+owner@:read_data:allow $node
 			if (($? != 0)); then
 				((cnt = 1024 - max))
 				log_fail "Add No.$cnt ACL item failed."
@@ -117,14 +121,14 @@ for usr in "root" "$ZFS_ACL_STAFF1"; do
 	log_must set_cur_usr $usr
 
 	for node in $testfile $testdir; do
-		log_must usr_exec $TOUCH $testfile
-		log_must usr_exec $MKDIR $testdir
+		log_must usr_exec touch $testfile
+		log_must usr_exec mkdir $testdir
 
 		for func in $func_name; do
 			log_must eval "$func $node"
 		done
 
-		log_must usr_exec $RM -rf $testfile $testdir
+		log_must usr_exec rm -rf $testfile $testdir
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_002_pos.ksh
index 28594611d7..a4a71285b0 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -41,7 +45,7 @@ verify_runnable "both"
 
 function acl_upgrade_cleannup
 {
-	log_must $ZFS destroy -rR $ACL_UPGRADE_FS
+	log_must zfs destroy -rR $ACL_UPGRADE_FS
 }
 
 log_assert "Verify acl after upgrading."
@@ -49,13 +53,13 @@ log_onexit acl_upgrade_cleannup
 
 ACL_UPGRADE_FS=$TESTPOOL/acl_upgrade_fs.$$
 
-log_must $ZFS create -o version=2 $ACL_UPGRADE_FS
+log_must zfs create -o version=2 $ACL_UPGRADE_FS
 mntpnt=$(get_prop mountpoint $ACL_UPGRADE_FS)
-log_must $MKDIR $mntpnt/dir.$$
-log_must $CHMOD A+owner@:rwxp:f:allow,group@:rwxp:f:allow $mntpnt/dir.$$
-log_must $ZFS upgrade $ACL_UPGRADE_FS
-log_must $TOUCH $mntpnt/dir.$$/file.$$
-log_must eval "$LS -V $mntpnt/dir.$$/file.$$ > /dev/null 2>&1"
+log_must mkdir $mntpnt/dir.$$
+log_must chmod A+owner@:rwxp:f:allow,group@:rwxp:f:allow $mntpnt/dir.$$
+log_must zfs upgrade $ACL_UPGRADE_FS
+log_must touch $mntpnt/dir.$$/file.$$
+log_must eval "ls -V $mntpnt/dir.$$/file.$$ > /dev/null 2>&1"
 
 log_pass "Verify acl after upgrading."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh
index 6486f58464..764bc879fd 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -52,8 +52,8 @@ function cleanup
 {
 	(( ${#cwd} != 0 )) && cd $cwd
 
-	[[ -f $TARFILE ]] && log_must $RM -f $TARFILE
-	[[ -d $basedir ]] && log_must $RM -rf $basedir
+	[[ -f $TARFILE ]] && log_must rm -f $TARFILE
+	[[ -d $basedir ]] && log_must rm -rf $basedir
 }
 
 log_assert "Verify chmod have correct behaviour to directory and file when" \
@@ -187,7 +187,7 @@ function cal_bits # isdir bits bits_limit acl_access ctrl
 
 	tmpstr=${tmpstr#/}
 
-	$ECHO "$tmpstr"
+	echo "$tmpstr"
 }
 
 #
@@ -211,7 +211,7 @@ function translate_acl # isdir acl
 		action=${acl##*:}
 		acl=$prefix:$(cal_bits $isdir 7 7 $acl 0):$action
 	fi
-	$ECHO "$acl"
+	echo "$acl"
 }
 
 #
@@ -266,7 +266,7 @@ function check_new_acl # bit newmode isdir
 		fi
 	fi
 	new_acl=${new_acl}${dc}
-	$ECHO "$new_acl"
+	echo "$new_acl"
 }
 
 function build_new_acl # newmode isdir
@@ -285,7 +285,7 @@ function build_new_acl # newmode isdir
 		status=$(check_new_acl $bit $newmode $isdir)
 	fi
 	expect=$prefix$status:deny
-	$ECHO $expect
+	echo $expect
 }
 
 # According to inherited flag, verify subdirectories and files within it has
@@ -441,7 +441,7 @@ function verify_aclmode # <aclmode> <node> <newmode>
 			aclcur=$(get_ACE $node $count)
 			aclcur=${aclcur#$count:}
 			if [[ -n $expect1 && $expect1 != $aclcur ]]; then
-				$LS -vd $node
+				ls -vd $node
 				log_fail "$aclmode $i #$count " \
 					"ACE: $aclcur, expect to be " \
 					"$expect1"
@@ -463,7 +463,7 @@ function verify_aclmode # <aclmode> <node> <newmode>
 		fi
 
 		if [[ $? -ne 0 ]]; then
-			$LS -vd $node
+			ls -vd $node
 			log_fail "Unexpect acl: $node, $aclmode ($newmode)"
 		fi
 	fi
@@ -476,21 +476,19 @@ typeset acl
 typeset target
 typeset -i passthrough=0
 typeset -i flag=0
-cwd=$PWD
-cd $TESTDIR
 
 for mode in "${aclmode_flag[@]}"; do
-	log_must $ZFS set aclmode=$mode $TESTPOOL/$TESTFS
+	log_must zfs set aclmode=$mode $TESTPOOL/$TESTFS
 
 	for user in root $ZFS_ACL_STAFF1; do
 		log_must set_cur_usr $user
 
-		log_must usr_exec $MKDIR $basedir
+		log_must usr_exec mkdir $basedir
 
-		log_must usr_exec $MKDIR $odir
-		log_must usr_exec $TOUCH $ofile
-		log_must usr_exec $MKDIR $ndir
-		log_must usr_exec $TOUCH $nfile
+		log_must usr_exec mkdir $odir
+		log_must usr_exec touch $ofile
+		log_must usr_exec mkdir $ndir
+		log_must usr_exec touch $nfile
 
 		for obj in $allnodes; do
 			maxnumber=0
@@ -507,14 +505,14 @@ for mode in "${aclmode_flag[@]}"; do
 						;;
 					esac
 
-					log_must usr_exec $CHMOD A+$acl $obj
+					log_must usr_exec chmod A+$acl $obj
 					acls[$maxnumber]=$acl
 
 					((maxnumber = maxnumber + 1))
 				done
 			done
 			# Archive the file and directory
-			log_must $TAR cpf@ $TARFILE $basedir
+			log_must tar cpf@ $TARFILE $basedir
 
 			if [[ -d $obj ]]; then
 				target=$odir
@@ -522,14 +520,14 @@ for mode in "${aclmode_flag[@]}"; do
 				target=$ofile
 			fi
 			for newmode in "${argv[@]}"; do
-				log_must usr_exec $CHMOD $newmode $obj
-				log_must usr_exec $CHMOD $newmode $target
+				log_must usr_exec chmod $newmode $obj
+				log_must usr_exec chmod $newmode $target
 				log_must verify_aclmode $mode $obj $newmode
-				log_must $TAR xpf@ $TARFILE
+				log_must tar xpf@ $TARFILE
 			done
 		done
 
-		log_must usr_exec $RM -rf $basedir $TARFILE
+		log_must usr_exec rm -rf $basedir $TARFILE
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_compact_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_compact_001_pos.ksh
index 797cce46b2..36652a8b03 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_compact_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_compact_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -199,28 +199,28 @@ function test_chmod_map
 	typeset cur_ace=/tmp/cur_ace.$$
 
 	for operator in "A0+" "A0="; do
-		log_must usr_exec eval "$LS -Vd $node > $orig_ace"
+		log_must usr_exec eval "ls -Vd $node > $orig_ace"
 
 		# To "A=", firstly add one ACE which can't modify map
 		if [[ $operator == "A0=" ]]; then
-			log_must $CHMOD A0+user:$ZFS_ACL_OTHER1:execute:deny \
+			log_must chmod A0+user:$ZFS_ACL_OTHER1:execute:deny \
 			    $node
 		fi
-		log_must usr_exec $CHMOD ${operator}${acl_spec} $node
+		log_must usr_exec chmod ${operator}${acl_spec} $node
 
 		check_test_result "$node" "$acl_flag" "$acl_access" \
 		    "$acl_inherit_object" "$acl_inherit_strategy" "$acl_type"
 
 		# Check "chmod A-"
-		log_must usr_exec $CHMOD A0- $node
-		log_must usr_exec eval "$LS -Vd $node > $cur_ace"
+		log_must usr_exec chmod A0- $node
+		log_must usr_exec eval "ls -Vd $node > $cur_ace"
 
-		$DIFF $orig_ace $cur_ace
+		diff $orig_ace $cur_ace
 		[[ $? -ne 0 ]] && log_fail "FAIL: 'chmod A-' failed."
 	done
 
-	[[ -f $orig_ace ]] && log_must usr_exec $RM -f $orig_ace
-	[[ -f $cur_ace ]] && log_must usr_exec $RM -f $cur_ace
+	[[ -f $orig_ace ]] && log_must usr_exec rm -f $orig_ace
+	[[ -f $cur_ace ]] && log_must usr_exec rm -f $cur_ace
 }
 
 for user in root $ZFS_ACL_STAFF1; do
@@ -228,13 +228,13 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	typeset -i loop_cnt=2
 	while ((loop_cnt > 0)); do
-		log_must usr_exec $TOUCH $testfile
+		log_must usr_exec touch $testfile
 		test_chmod_map $testfile
-		log_must $RM -f $testfile
+		log_must rm -f $testfile
 
-		log_must usr_exec $MKDIR $testdir
+		log_must usr_exec mkdir $testdir
 		test_chmod_map $testdir
-		log_must $RM -rf $testdir
+		log_must rm -rf $testdir
 
 		((loop_cnt -= 1))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_delete_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_delete_001_pos.ksh
index ec96c7bae6..1624673e15 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_delete_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_delete_001_pos.ksh
@@ -62,13 +62,13 @@ verify_runnable "both"
 function cleanup
 {
 	if [[ ! -e $target ]]; then
-		log_must $TAR xpf $TESTDIR/$ARCHIVEFILE
+		log_must tar xpf $TESTDIR/$ARCHIVEFILE
 	fi
 
 	(( ${#cwd} != 0 )) && cd $cwd
 	cleanup_test_files $TESTDIR/basedir
 	if [[ -e $TESTDIR/$ARCHIVEFILE ]]; then
-		log_must $RM -f $TESTDIR/$ARCHIVEFILE
+		log_must rm -f $TESTDIR/$ARCHIVEFILE
 	fi
 	return 0
 }
@@ -107,9 +107,9 @@ function operate_node #user node
 		log_fail "user, node are not defined."
 	fi
 	if [[ -d $node ]]; then
-		chgusr_exec $user $RM -rf $node ; ret=$?
+		chgusr_exec $user rm -rf $node ; ret=$?
 	else
-		chgusr_exec $user $RM -f $node ; ret=$?
+		chgusr_exec $user rm -f $node ; ret=$?
 	fi
 
 	if [[ -e $node ]]; then
@@ -118,7 +118,7 @@ function operate_node #user node
 			return 1
 		fi
 	else
-		log_must $TAR xpf $TESTDIR/$ARCHIVEFILE
+		log_must tar xpf $TESTDIR/$ARCHIVEFILE
 		if [[ $ret -ne 0 ]]; then
 			log_note "$node removed, but return code is $ret."
 			return 1
@@ -206,25 +206,25 @@ function test_chmod_basic_access #node g_usr o_usr
 	for acl_p in "${access_parent[@]}"; do
 		i=0
 		for acl in $acl_p ; do
-			log_must usr_exec $CHMOD A+$flag:$acl $parent
+			log_must usr_exec chmod A+$flag:$acl $parent
 			(( i = i + 1))
 		done
 
 		for acl_t in "${access_target[@]}"; do
 			[[ -n $acl_t ]] && \
-				log_must usr_exec $CHMOD A+$flag:$acl_t $node
+				log_must usr_exec chmod A+$flag:$acl_t $node
 
-			log_must $TAR cpf $TESTDIR/$ARCHIVEFILE basedir
+			log_must tar cpf $TESTDIR/$ARCHIVEFILE basedir
 
 			check_chmod_results "$node" "$flag" \
 				 "$acl_p" "$acl_t" "$g_usr" "$o_usr"
 
 			[[ -n $acl_t ]] && \
-				log_must usr_exec $CHMOD A0- $node
+				log_must usr_exec chmod A0- $node
 		done
 
 		while (( i > 0 )); do
-			log_must usr_exec $CHMOD A0- $parent
+			log_must usr_exec chmod A0- $parent
 			(( i = i - 1 ))
 		done
 	done
@@ -239,8 +239,8 @@ function setup_test_files #base_node user group
 
 	cleanup_test_files $base_node
 
-	log_must $MKDIR -p $base_node
-	log_must $CHOWN $user:$group $base_node
+	log_must mkdir -p $base_node
+	log_must chown $user:$group $base_node
 
 	log_must set_cur_usr $user
 
@@ -248,13 +248,13 @@ function setup_test_files #base_node user group
 	file0=$base_node/testfile_rm
 	dir0=$base_node/testdir_rm
 
-	log_must usr_exec $TOUCH $file0
-	log_must usr_exec $CHMOD 444 $file0
+	log_must usr_exec touch $file0
+	log_must usr_exec chmod 444 $file0
 
-	log_must usr_exec $MKDIR -p $dir0
-	log_must usr_exec $CHMOD 444 $dir0
+	log_must usr_exec mkdir -p $dir0
+	log_must usr_exec chmod 444 $dir0
 
-	log_must usr_exec $CHMOD 555 $base_node
+	log_must usr_exec chmod 555 $base_node
 	return 0
 }
 
@@ -263,9 +263,9 @@ function cleanup_test_files #base_node
 	typeset base_node=$1
 
 	if [[ -d $base_node ]]; then
-		log_must $RM -rf $base_node
+		log_must rm -rf $base_node
 	elif [[ -e $base_node ]]; then
-		log_must $RM -f $base_node
+		log_must rm -f $base_node
 	fi
 
 	return 0
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_001_pos.ksh
index 0a3f23abb0..7d2ea78727 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -62,10 +66,10 @@ verify_runnable "both"
 function cleanup
 {
 	if [[ -f $basefile ]]; then
-		log_must $RM -f $basefile
+		log_must rm -f $basefile
 	fi
 	if [[ -d $basedir ]]; then
-		log_must $RM -rf $basedir
+		log_must rm -rf $basedir
 	fi
 }
 
@@ -103,8 +107,8 @@ function verify_inherit #<object> [strategy]
 	typeset obj=$1
 	typeset str=$2
 
-	log_must usr_exec $MKDIR -p $ndir3
-	log_must usr_exec $TOUCH $nfile1 $nfile2 $nfile3
+	log_must usr_exec mkdir -p $ndir3
+	log_must usr_exec touch $nfile1 $nfile2 $nfile3
 
 	# Except for inherit_only, the basedir was affected always.
 	if [[ $str != *"inherit_only"* ]]; then
@@ -129,10 +133,10 @@ function verify_inherit #<object> [strategy]
 
 	for node in $allnodes; do
 		if [[ " $inherit_nodes " == *" $node "* ]]; then
-			log_mustnot chgusr_exec $ZFS_ACL_OTHER1 $LS -vd $node \
+			log_mustnot chgusr_exec $ZFS_ACL_OTHER1 ls -vd $node \
 				> /dev/null 2>&1
 		else
-			log_must chgusr_exec $ZFS_ACL_OTHER1 $LS -vd $node \
+			log_must chgusr_exec $ZFS_ACL_OTHER1 ls -vd $node \
 				> /dev/null 2>&1
 		fi
 	done
@@ -147,25 +151,25 @@ for user in root $ZFS_ACL_STAFF1; do
 			(( ${#str} != 0 )) && inh_opt=$inh_opt/$str
 			aclspec="A+user:$ZFS_ACL_OTHER1:read_acl:$inh_opt:deny"
 
-			log_must usr_exec $MKDIR $basedir
-			log_must usr_exec $TOUCH $basefile
-			log_must usr_exec $MKDIR -p $odir3
-			log_must usr_exec $TOUCH $ofile1 $ofile2 $ofile3
+			log_must usr_exec mkdir $basedir
+			log_must usr_exec touch $basefile
+			log_must usr_exec mkdir -p $odir3
+			log_must usr_exec touch $ofile1 $ofile2 $ofile3
 
 			#
 			# Inherit flag can only be placed on a directory,
 			# otherwise it will fail.
 			#
-			log_must usr_exec $CHMOD $aclspec $basefile
+			log_must usr_exec chmod $aclspec $basefile
 
 			#
 			# Place on a directory should succeed.
 			#
-			log_must usr_exec $CHMOD $aclspec $basedir
+			log_must usr_exec chmod $aclspec $basedir
 
 			verify_inherit $obj $str
 
-			log_must usr_exec $RM -rf $basefile $basedir
+			log_must usr_exec rm -rf $basefile $basedir
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_neg.ksh
index cade1bf1be..972fe3ffc8 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -61,11 +61,11 @@ verify_runnable "both"
 
 function cleanup
 {
-	[[ -f $ofile ]] && log_must $RM -f $ofile
-	[[ -d $odir ]] && log_must $RM -rf $odir
-	[[ -d $basedir ]] && log_must $RM -rf $basedir
+	[[ -f $ofile ]] && log_must rm -f $ofile
+	[[ -d $odir ]] && log_must rm -rf $odir
+	[[ -d $basedir ]] && log_must rm -rf $basedir
 
-	log_must $ZFS set aclmode=discard $TESTPOOL/$TESTFS
+	log_must zfs set aclmode=discard $TESTPOOL/$TESTFS
 }
 
 log_assert "Verify different inherit options combined with different" \
@@ -109,8 +109,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 	# isinherit: indicate if the current target is in the inherit list.
 	typeset -i count=0 pass=0 passcnt=0 isinherit=0 no_propagate=0
 
-	log_must usr_exec $MKDIR -p $ndir3
-	log_must usr_exec $TOUCH $nfile1 $nfile2 $nfile3
+	log_must usr_exec mkdir -p $ndir3
+	log_must usr_exec touch $nfile1 $nfile2 $nfile3
 
 	# Get the inherit type/object_flag and non-inherited nodes.
 	if [[ $obj == *"file_inherit"* && $obj == *"dir_inherit"* ]]; then
@@ -192,8 +192,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 				aclcur=${aclcur#$count:}
 				if [[ $no_propagate == 0 ]]; then
 					if [[ $expacl != $aclcur ]]; then
-						$LS -vd $basedir
-						$LS -vd $node
+						ls -vd $basedir
+						ls -vd $node
 						log_fail "$inherit $i #$count" \
 						    "ACE: $aclcur," \
 						    "expected: $expacl"
@@ -202,8 +202,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 					# Compare if directory has trivial ACL
 					compare_acls $node $odir
 					if [[ $? -ne 0 ]]; then
-						$LS -vd $basedir
-						$LS -vd $node
+						ls -vd $basedir
+						ls -vd $node
 						log_fail "unexpected ACE:"
 						    "$node, $inherit ($str)"
 					fi
@@ -212,8 +212,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 			elif [[ -f $node ]]; then
 				compare_acls $node $ofile
 				if [[ $? -ne 0 ]]; then
-					$LS -vd $basedir
-					$LS -vd $node
+					ls -vd $basedir
+					ls -vd $node
 					log_fail "unexpected ACE:" \
 					    "$node, $inherit ($str)"
 				fi
@@ -231,8 +231,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 			fi
 
 			if [[ $? -ne 0 ]]; then
-				$LS -vd $basedir
-				$LS -vd $node
+				ls -vd $basedir
+				ls -vd $node
 				log_fail "Unexpected ACE: $node, $inherit ($str)"
 			fi
 		fi
@@ -243,10 +243,10 @@ typeset -i i=0 maxaces=4
 typeset acl0 acl1 acl2 acl3
 typeset acls0 acls1 acls2 acls3
 
-log_must $ZFS set aclmode=passthrough $TESTPOOL/$TESTFS
+log_must zfs set aclmode=passthrough $TESTPOOL/$TESTFS
 
 for inherit in "${aclinherit_flag[@]}"; do
-	log_must $ZFS set aclinherit=$inherit $TESTPOOL/$TESTFS
+	log_must zfs set aclinherit=$inherit $TESTPOOL/$TESTFS
 
 	for user in root $ZFS_ACL_STAFF1; do
 		log_must set_cur_usr $user
@@ -276,21 +276,21 @@ for inherit in "${aclinherit_flag[@]}"; do
 				# Create basedir and tmp dir/file
 				# for comparison.
 				#
-				log_note "$user: $CHMOD $acl $basedir"
-				log_must usr_exec $MKDIR $basedir
-				log_must usr_exec $MKDIR $odir
-				log_must usr_exec $TOUCH $ofile
+				log_note "$user: chmod $acl $basedir"
+				log_must usr_exec mkdir $basedir
+				log_must usr_exec mkdir $odir
+				log_must usr_exec touch $ofile
 
 				i=3
 				while ((i >= 0)); do
 					eval acl=\$acl$i
-					log_must usr_exec $CHMOD A+$acl $basedir
+					log_must usr_exec chmod A+$acl $basedir
 					((i = i - 1))
 				done
 				log_note "verify_inherit $inherit $obj $str"
 				log_must verify_inherit $inherit $obj $str
 
-				log_must usr_exec $RM -rf $ofile $odir $basedir
+				log_must usr_exec rm -rf $ofile $odir $basedir
 			done
 		done
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_pos.ksh
index 6e9a7f07ed..fb1e3bf817 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -67,15 +67,15 @@ function cleanup
 	# Cleanup basedir, compared file and dir.
 
 	if [[ -f $ofile ]]; then
-		log_must $RM -f $ofile
+		log_must rm -f $ofile
 	fi
 
 	for dir in $odir $basedir ; do
 		if [[ -d $dir ]]; then
-			log_must $RM -rf $dir
+			log_must rm -rf $dir
 		fi
 	done
-	log_must $ZFS set aclmode=discard $TESTPOOL/$TESTFS
+	log_must zfs set aclmode=discard $TESTPOOL/$TESTFS
 }
 
 log_assert "Verify chmod have correct behaviour to directory and file when " \
@@ -122,8 +122,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 
 	typeset -i count=0 pass=0 passcnt=0 isinherit=0 maxnumber=4
 
-	log_must usr_exec $MKDIR -p $ndir3
-	log_must usr_exec $TOUCH $nfile1 $nfile2 $nfile3
+	log_must usr_exec mkdir -p $ndir3
+	log_must usr_exec touch $nfile1 $nfile2 $nfile3
 
 	# Get the files which inherited ACE.
 	if [[ $obj == *"file_inherit"* ]]; then
@@ -238,8 +238,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 				aclcur=$(get_ACE $node $count)
 				aclcur=${aclcur#$count:}
 				if [[ -n $expect1 && $expect1 != $aclcur ]]; then
-					$LS -vd $basedir
-					$LS -vd $node
+					ls -vd $basedir
+					ls -vd $node
 					log_fail "$inherit $i #$count " \
 						"ACE: $aclcur, expect to be " \
 						"$expect1"
@@ -263,8 +263,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 			fi
 
 			if [[ $? -ne 0 ]]; then
-				$LS -vd $basedir
-				$LS -vd $node
+				ls -vd $basedir
+				ls -vd $node
 				log_fail "Unexpect acl: $node, $inherit ($str)"
 			fi
 		fi
@@ -283,7 +283,7 @@ typeset acls0 acls1 acls2 acls3
 # here we just simple test them separately.
 #
 
-log_must $ZFS set aclmode=passthrough $TESTPOOL/$TESTFS
+log_must zfs set aclmode=passthrough $TESTPOOL/$TESTFS
 
 for inherit in "${aclinherit_flag[@]}"; do
 
@@ -291,7 +291,7 @@ for inherit in "${aclinherit_flag[@]}"; do
 	# Set different value of aclinherit
 	#
 
-	log_must $ZFS set aclinherit=$inherit $TESTPOOL/$TESTFS
+	log_must zfs set aclinherit=$inherit $TESTPOOL/$TESTFS
 
 	for user in root $ZFS_ACL_STAFF1; do
 		log_must set_cur_usr $user
@@ -329,10 +329,10 @@ for inherit in "${aclinherit_flag[@]}"; do
 				# for comparison.
 				#
 
-				log_note "$user: $CHMOD $acl $basedir"
-				log_must usr_exec $MKDIR $basedir
-				log_must usr_exec $MKDIR $odir
-				log_must usr_exec $TOUCH $ofile
+				log_note "$user: chmod $acl $basedir"
+				log_must usr_exec mkdir $basedir
+				log_must usr_exec mkdir $odir
+				log_must usr_exec touch $ofile
 
 				i=3
 				while ((i >= 0)); do
@@ -341,14 +341,14 @@ for inherit in "${aclinherit_flag[@]}"; do
 				#
 				# Place on a directory should succeed.
 				#
-					log_must usr_exec $CHMOD A+$acl $basedir
+					log_must usr_exec chmod A+$acl $basedir
 
 					((i = i - 1))
 				done
 
 				verify_inherit $inherit $obj $str
 
-				log_must usr_exec $RM -rf $ofile $odir $basedir
+				log_must usr_exec rm -rf $ofile $odir $basedir
 			done
 		done
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_003_pos.ksh
index 28126d5071..febecb168e 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_003_pos.ksh
@@ -60,9 +60,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	[[ -f $ofile ]] && log_must $RM -f $ofile
-	[[ -d $odir ]] && log_must $RM -rf $odir
-	[[ -d $basedir ]] && log_must $RM -rf $basedir
+	[[ -f $ofile ]] && log_must rm -f $ofile
+	[[ -d $odir ]] && log_must rm -rf $odir
+	[[ -d $basedir ]] && log_must rm -rf $basedir
 }
 
 log_assert "Verify chmod have correct behaviour to directory and file when" \
@@ -98,8 +98,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 	typeset obj=$2
 	typeset str=$3
 
-	log_must usr_exec $MKDIR -p $ndir3
-	log_must usr_exec $TOUCH $nfile1 $nfile2 $nfile3
+	log_must usr_exec mkdir -p $ndir3
+	log_must usr_exec touch $nfile1 $nfile2 $nfile3
 
 	# Check if we have any inheritance flags set
 	if [[ $obj != "--" ]]; then
@@ -189,8 +189,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 			aclcur=$(get_ACE $node $count compact)
 			aclcur=${aclcur#$count:}
 			if [[ -n $expacl && $expacl != $aclcur ]]; then
-				$LS -Vd $basedir
-				$LS -Vd $node
+				ls -Vd $basedir
+				ls -Vd $node
 				log_fail "$inherit $i #$count" \
 				    "expected: $expacl, current: $aclcur"
 			fi
@@ -208,8 +208,8 @@ function verify_inherit #<aclinherit> <object> [strategy]
 			fi
 
 			if [[ $? -ne 0 ]]; then
-				$LS -Vd $basedir
-				$LS -Vd $node
+				ls -Vd $basedir
+				ls -Vd $node
 				log_fail "unexpected acl: $node," \
 				    "$inherit ($str)"
 			fi
@@ -222,10 +222,10 @@ typeset -i i=0 maxaces=6
 typeset acl0 acl1 acl2 acl3 acl4 acl5
 typeset acls0 acls1 acls2 acls3 acls4 acls5
 
-log_must $ZFS set aclmode=passthrough $TESTPOOL/$TESTFS
+log_must zfs set aclmode=passthrough $TESTPOOL/$TESTFS
 
 for inherit in "${aclinherit_flag[@]}"; do
-	log_must $ZFS set aclinherit=$inherit $TESTPOOL/$TESTFS
+	log_must zfs set aclinherit=$inherit $TESTPOOL/$TESTFS
 
 	for user in root $ZFS_ACL_STAFF1; do
 		log_must set_cur_usr $user
@@ -255,20 +255,20 @@ for inherit in "${aclinherit_flag[@]}"; do
 				acls4="$ace_prefix2:-------A-W----:$inh_b:allow"
 				acls5="$ace_prefix3:-------A-W----:$inh_b:deny"
 
-				log_must usr_exec $MKDIR $basedir
-				log_must usr_exec $MKDIR $odir
-				log_must usr_exec $TOUCH $ofile
+				log_must usr_exec mkdir $basedir
+				log_must usr_exec mkdir $odir
+				log_must usr_exec touch $ofile
 
 				((i = maxaces - 1))
 				while ((i >= 0)); do
 					eval acl=\$acl$i
-					log_must usr_exec $CHMOD A+$acl $basedir
+					log_must usr_exec chmod A+$acl $basedir
 					((i = i - 1))
 				done
 
 				verify_inherit $inherit $obj $str
 
-				log_must usr_exec $RM -rf $ofile $odir $basedir
+				log_must usr_exec rm -rf $ofile $odir $basedir
 			done
 		done
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_004_pos.ksh
index 98b5568e8d..3894674751 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_inherit_004_pos.ksh
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 #
 
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -46,7 +46,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	[[ -d $basedir ]] && log_must $RM -rf $basedir
+	[[ -d $basedir ]] && log_must rm -rf $basedir
 }
 
 log_assert "aclinherit=passthrough-x should inherit the execute permission" \
@@ -82,28 +82,28 @@ function verify_inherit
 {
 	typeset -i i=0
 
-	log_must usr_exec $MKDIR $basedir
+	log_must usr_exec mkdir $basedir
 
 	# Modify owner@, group@ and everyone@ ACEs to include execute
 	# permission (see above), and make them file-inheritable
 	while ((i < ${#aces[*]})); do
-		log_must usr_exec $CHMOD A$i=${aces[i]} $basedir
+		log_must usr_exec chmod A$i=${aces[i]} $basedir
 		((i = i + 1))
 	done
 
 	# Create file with 644 mode
-	log_must usr_exec $TOUCH $nfile1
+	log_must usr_exec touch $nfile1
 	# Check that execute permission wasn't inherited
 	log_mustnot check_execute_bit $nfile1
 
 	# Use cp(1) to copy over /usr/bin/true
-	log_must usr_exec $CP $TRUE $nfile2
+	log_must usr_exec cp /usr/bin/true $nfile2
 	# Check that execute permission was inherited
 	log_must check_execute_bit $nfile2
 }
 
-log_must $ZFS set aclmode=passthrough $TESTPOOL/$TESTFS
-log_must $ZFS set aclinherit=passthrough-x $TESTPOOL/$TESTFS
+log_must zfs set aclmode=passthrough $TESTPOOL/$TESTFS
+log_must zfs set aclinherit=passthrough-x $TESTPOOL/$TESTFS
 
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_owner_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_owner_001_pos.ksh
index b59cc0c2c8..6e510a56f7 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_owner_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_owner_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -51,8 +51,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	[[ -d $basedir ]] && $RM -rf $basedir
-	[[ -f $TESTDIR/$ARCHIVEFILE ]] && log_must $RM -f $TESTDIR/$ARCHIVEFILE
+	[[ -d $basedir ]] && rm -rf $basedir
+	[[ -f $TESTDIR/$ARCHIVEFILE ]] && log_must rm -f $TESTDIR/$ARCHIVEFILE
 	return 0
 }
 
@@ -71,7 +71,7 @@ function get_owner
 		log_fail "node are not defined."
 	fi
 
-	$ECHO $($LS -dl $node | $AWK '{print $3}')
+	echo $(ls -dl $node | awk '{print $3}')
 }
 
 #
@@ -85,7 +85,7 @@ function get_group
 		log_fail "node are not defined."
 	fi
 
-	$ECHO $($LS -dl $node | $AWK '{print $4}')
+	echo $(ls -dl $node | awk '{print $4}')
 }
 
 
@@ -106,7 +106,7 @@ function get_user_group
 	if [[ $? -eq 0 ]]; then
 		value=${value##*\(}
 		value=${value%%\)*}
-		$ECHO $value
+		echo $value
 	else
 		log_fail "Invalid UID (uid)."
 	fi
@@ -124,12 +124,12 @@ function operate_node_owner
 		log_fail "user, node are not defined."
 	fi
 
-	$SU $user -c "$CHOWN $expect_owner $node"
+	su $user -c "chown $expect_owner $node"
 	ret=$?
 	new_owner=$(get_owner $node)
 
 	if [[ $new_owner != $old_owner ]]; then
-		$TAR xpf $TESTDIR/$ARCHIVEFILE
+		tar xpf $TESTDIR/$ARCHIVEFILE
 	fi
 
 	if [[ $ret -eq 0 ]]; then
@@ -160,12 +160,12 @@ function operate_node_group
 		log_fail "user, node are not defined."
 	fi
 
-	$SU $user -c "$CHGRP $expect_group $node"
+	su $user -c "chgrp $expect_group $node"
 	ret=$?
 	new_group=$(get_group $node)
 
 	if [[ $new_group != $old_group ]]; then
-		$TAR xpf $TESTDIR/$ARCHIVEFILE
+		tar xpf $TESTDIR/$ARCHIVEFILE
 	fi
 
 	if [[ $ret -eq 0 ]]; then
@@ -271,14 +271,14 @@ function test_chmod_basic_access
 
 	for flag in $a_flag; do
 		for acl_t in $a_access; do
-			log_must $SU $user -c "$CHMOD A+$flag:$acl_t $node"
+			log_must su $user -c "chmod A+$flag:$acl_t $node"
 
-			$TAR cpf $TESTDIR/$ARCHIVEFILE basedir
+			tar cpf $TESTDIR/$ARCHIVEFILE basedir
 
 			check_chmod_results $user $node $flag $acl_t $g_usr \
 			    $o_usr
 
-			log_must $SU $user -c "$CHMOD A0- $node"
+			log_must su $user -c "chmod A0- $node"
 		done
 	done
 }
@@ -289,17 +289,17 @@ function setup_test_files
 	typeset user=$2
 	typeset group=$3
 
-	$RM -rf $base_node
+	rm -rf $base_node
 
-	log_must $MKDIR -p $base_node
-	log_must $CHOWN $user:$group $base_node
+	log_must mkdir -p $base_node
+	log_must chown $user:$group $base_node
 
 	# Prepare all files/sub-dirs for testing.
-	log_must $SU $user -c "$TOUCH $file"
-	log_must $SU $user -c "$CHMOD 444 $file"
-	log_must $SU $user -c "$MKDIR -p $dir"
-	log_must $SU $user -c "$CHMOD 444 $dir"
-	log_must $SU $user -c "$CHMOD 555 $base_node"
+	log_must su $user -c "touch $file"
+	log_must su $user -c "chmod 444 $file"
+	log_must su $user -c "mkdir -p $dir"
+	log_must su $user -c "chmod 444 $dir"
+	log_must su $user -c "chmod 555 $base_node"
 }
 
 typeset ARCHIVEFILE=archive.tar
@@ -313,12 +313,12 @@ cd $TESTDIR
 setup_test_files $basedir 'root' 'root'
 test_chmod_basic_access 'root' $file $ZFS_ACL_ADMIN  $ZFS_ACL_OTHER1
 test_chmod_basic_access 'root' $dir $ZFS_ACL_ADMIN  $ZFS_ACL_OTHER1
-$RM -rf $basedir
+rm -rf $basedir
 
 setup_test_files $basedir $ZFS_ACL_STAFF1 $ZFS_ACL_STAFF_GROUP
 test_chmod_basic_access $ZFS_ACL_STAFF1 $file $ZFS_ACL_STAFF2 $ZFS_ACL_OTHER1
 test_chmod_basic_access $ZFS_ACL_STAFF1 $dir $ZFS_ACL_STAFF2 $ZFS_ACL_OTHER1
-$RM -rf $basedir
+rm -rf $basedir
 
 log_pass "Verify that the chown/chgrp could take owner/group " \
     "while permission is granted."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwacl_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwacl_001_pos.ksh
index cd13c7d7de..845c2b64b8 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwacl_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwacl_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -59,7 +63,7 @@ function read_ACL #<node> <user1> <user2> ...
 
 	shift
 	for user in $@; do
-		chgusr_exec $user $LS -vd $node > /dev/null 2>&1
+		chgusr_exec $user ls -vd $node > /dev/null 2>&1
 		ret=$?
 		(( ret != 0 )) && return $ret
 
@@ -81,7 +85,7 @@ function write_ACL #<node> <user1> <user2> ...
 		ret=$?;
 		(( ret != 0 )) && return $ret
 
-		chgusr_exec $user $CHMOD A0+owner@:read_data:allow $node
+		chgusr_exec $user chmod A0+owner@:read_data:allow $node
 		ret=$?
 		(( ret != 0 )) && return $ret
 
@@ -89,7 +93,7 @@ function write_ACL #<node> <user1> <user2> ...
 		ret=$?
 		(( ret != 0 )) && return $ret
 
-		chgusr_exec $user $CHMOD A0- $node
+		chgusr_exec $user chmod A0- $node
 		ret=$?
 		(( ret != 0 )) && return $ret
 
@@ -109,10 +113,10 @@ function check_owner #<node>
 
 	for acc in allow deny; do
 		log_must usr_exec \
-			$CHMOD A0+owner@:read_acl/write_acl:$acc $node
+			chmod A0+owner@:read_acl/write_acl:$acc $node
 		log_must read_ACL $node $ZFS_ACL_CUR_USER
 		log_must write_ACL $node $ZFS_ACL_CUR_USER
-		log_must usr_exec $CHMOD A0- $node
+		log_must usr_exec chmod A0- $node
 	done
 }
 
@@ -127,15 +131,15 @@ function check_group #<node>
 		grp_usr=$ZFS_ACL_STAFF2
 	fi
 
-	log_must usr_exec $CHMOD A0+group@:read_acl/write_acl:allow $node
+	log_must usr_exec chmod A0+group@:read_acl/write_acl:allow $node
 	log_must read_ACL $node $grp_usr
 	log_must write_ACL $node $grp_usr
-	log_must usr_exec $CHMOD A0- $node
+	log_must usr_exec chmod A0- $node
 
-	log_must usr_exec $CHMOD A0+group@:read_acl/write_acl:deny $node
+	log_must usr_exec chmod A0+group@:read_acl/write_acl:deny $node
 	log_mustnot read_ACL $node $grp_usr
 	log_mustnot write_ACL $node $grp_usr
-	log_must usr_exec $CHMOD A0- $node
+	log_must usr_exec chmod A0- $node
 }
 
 function check_everyone #<node>
@@ -151,12 +155,12 @@ function check_everyone #<node>
 		fi
 
 		log_must usr_exec \
-			$CHMOD A0+everyone@:read_acl/write_acl:$flag $node
+			chmod A0+everyone@:read_acl/write_acl:$flag $node
 
 		$log read_ACL $node $ZFS_ACL_OTHER1 $ZFS_ACL_OTHER2
 		$log write_ACL $node $ZFS_ACL_OTHER1 $ZFS_ACL_OTHER2
 
-		log_must usr_exec $CHMOD A0- $node
+		log_must usr_exec chmod A0- $node
 	done
 }
 
@@ -164,9 +168,9 @@ function check_spec_user #<node>
 {
 	typeset node=$1
 
-	log_must usr_exec $CHMOD A0+everyone@:read_acl/write_acl:deny $node
+	log_must usr_exec chmod A0+everyone@:read_acl/write_acl:deny $node
 	log_must usr_exec \
-		$CHMOD A0+user:$ZFS_ACL_OTHER1:read_acl/write_acl:allow $node
+		chmod A0+user:$ZFS_ACL_OTHER1:read_acl/write_acl:allow $node
 
 	# The specified user can read and write acl
 	log_must read_ACL $node $ZFS_ACL_OTHER1
@@ -178,16 +182,16 @@ function check_spec_user #<node>
 	log_mustnot \
 		write_ACL $node $ZFS_ACL_ADMIN $ZFS_ACL_STAFF2 $ZFS_ACL_OTHER2
 
-	log_must usr_exec $CHMOD A0- $node
-	log_must usr_exec $CHMOD A0- $node
+	log_must usr_exec chmod A0- $node
+	log_must usr_exec chmod A0- $node
 }
 
 function check_spec_group #<node>
 {
 	typeset node=$1
 
-	log_must usr_exec $CHMOD A0+everyone@:read_acl/write_acl:deny $node
-	log_must usr_exec $CHMOD \
+	log_must usr_exec chmod A0+everyone@:read_acl/write_acl:deny $node
+	log_must usr_exec chmod \
 		A0+group:$ZFS_ACL_OTHER_GROUP:read_acl/write_acl:allow $node
 
 	# The specified group can read and write acl
@@ -203,17 +207,17 @@ function check_user_in_group #<node>
 {
 	typeset node=$1
 
-	log_must usr_exec $CHMOD \
+	log_must usr_exec chmod \
 		A0+group:$ZFS_ACL_OTHER_GROUP:read_acl/write_acl:deny $node
-	log_must usr_exec $CHMOD \
+	log_must usr_exec chmod \
 		A0+user:$ZFS_ACL_OTHER1:read_acl/write_acl:allow $node
 	log_must read_ACL $node $ZFS_ACL_OTHER1
 	log_must write_ACL $node $ZFS_ACL_OTHER1
 	log_mustnot read_ACL $node $ZFS_ACL_OTHER2
 	log_mustnot write_ACL $node $ZFS_ACL_OTHER2
 
-	log_must usr_exec $CHMOD A0- $node
-	log_must usr_exec $CHMOD A0- $node
+	log_must usr_exec chmod A0- $node
+	log_must usr_exec chmod A0- $node
 }
 
 set -A func_name check_owner \
@@ -226,8 +230,8 @@ set -A func_name check_owner \
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
-	log_must usr_exec $TOUCH $testfile
-	log_must usr_exec $MKDIR $testdir
+	log_must usr_exec touch $testfile
+	log_must usr_exec mkdir $testdir
 
 	typeset func node
 	for func in ${func_name[@]}; do
@@ -236,7 +240,7 @@ for user in root $ZFS_ACL_STAFF1; do
 		done
 	done
 
-	log_must usr_exec $RM -rf $testfile $testdir
+	log_must usr_exec rm -rf $testfile $testdir
 done
 
 log_pass "Verify chmod A[number]{+|-|=} read_acl/write_acl passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_001_pos.ksh
index 557ce3c3ea..8acf67d97e 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -80,9 +80,9 @@ function test_chmod_ACE_list #$opt $num $ace-spec $node
 
 	# Invoke chmod A[number]{+|-|=}<acl-specification> file|dir
 	if [[ $opt == A[0-9]*+ || $opt == A[0-9]*= ]]; then
-		log_must usr_exec $CHMOD "$opt$ace" "$node"
+		log_must usr_exec chmod "$opt$ace" "$node"
 	else
-		log_must usr_exec $CHMOD "$opt" "$node"
+		log_must usr_exec chmod "$opt" "$node"
 	fi
 
 	# Get the current ACE count and specified ACE
@@ -93,7 +93,7 @@ function test_chmod_ACE_list #$opt $num $ace-spec $node
 	# Compare with expected results
 	if [[ $opt == A[0-9]*+ || $opt == A[0-9]*= ]]; then
 		if [[ "$num:$ace" != "$cur_ace" ]]; then
-			log_fail "FAIL: $CHMOD $opt$ace $node"
+			log_fail "FAIL: chmod $opt$ace $node"
 		fi
 	fi
 	if [[ "$expect_count" != "$cur_count" ]]; then
@@ -108,15 +108,15 @@ for user in root $ZFS_ACL_STAFF1 $ZFS_ACL_OTHER1; do
 		for num in $nums; do
 			for ace in $file_ACEs; do
 				ls -l $TESTDIR
-				log_must usr_exec $TOUCH $testfile
+				log_must usr_exec touch $testfile
 				test_chmod_ACE_list $opt $num $ace $testfile
-				log_must $RM -f $testfile
+				log_must rm -f $testfile
 			done
 			for ace in $dir_ACEs; do
 				ls -l $TESTDIR
-				log_must usr_exec $MKDIR -p $testdir
+				log_must usr_exec mkdir -p $testdir
 				test_chmod_ACE_list $opt $num $ace $testdir
-				log_must $RM -rf $testdir
+				log_must rm -rf $testdir
 			done
 		done
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_002_pos.ksh
index adb332d3c2..853ac240ba 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -189,25 +193,25 @@ function test_chmod_map #<node>
 	typeset cur_ace=/tmp/cur_ace.$$
 
 	for operator in "A0+" "A0="; do
-		log_must usr_exec $CHMOD $init_mask $node
+		log_must usr_exec chmod $init_mask $node
 		init_mode=$(get_mode $node)
 		init_mode=${init_mode:1:9}
-		log_must usr_exec eval "$LS -vd $node > $orig_ace"
+		log_must usr_exec eval "ls -vd $node > $orig_ace"
 
 		# To "A=", firstly add one ACE which can't modify map
 		if [[ $operator == "A0=" ]]; then
-			log_must $CHMOD A0+user:$ZFS_ACL_OTHER1:execute:deny \
+			log_must chmod A0+user:$ZFS_ACL_OTHER1:execute:deny \
 				$node
 		fi
-		log_must usr_exec $CHMOD $operator$acl_spec $node
+		log_must usr_exec chmod $operator$acl_spec $node
 		check_test_result \
 			$init_mode $node $acl_flag $acl_access $acl_type
 
 		# Check "chmod A-"
-		log_must usr_exec $CHMOD A0- $node
-		log_must usr_exec eval "$LS -vd $node > $cur_ace"
+		log_must usr_exec chmod A0- $node
+		log_must usr_exec eval "ls -vd $node > $cur_ace"
 
-		if $DIFF $orig_ace $cur_ace; then
+		if diff $orig_ace $cur_ace; then
 			log_note "SUCCESS: current ACEs are equal to " \
 				"original ACEs. 'chmod A-' succeeded."
 		else
@@ -215,8 +219,8 @@ function test_chmod_map #<node>
 		fi
 	done
 
-	[[ -f $orig_ace ]] && log_must usr_exec $RM -f $orig_ace
-	[[ -f $cur_ace ]] && log_must usr_exec $RM -f $cur_ace
+	[[ -f $orig_ace ]] && log_must usr_exec rm -f $orig_ace
+	[[ -f $cur_ace ]] && log_must usr_exec rm -f $cur_ace
 }
 
 for user in root $ZFS_ACL_STAFF1; do
@@ -224,13 +228,13 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	typeset -i loop_cnt=20
 	while (( loop_cnt > 0 )); do
-		log_must usr_exec $TOUCH $testfile
+		log_must usr_exec touch $testfile
 		test_chmod_map $testfile
-		log_must $RM -f $testfile
+		log_must rm -f $testfile
 
-		log_must usr_exec $MKDIR $testdir
+		log_must usr_exec mkdir $testdir
 		test_chmod_map $testdir
-		log_must $RM -rf $testdir
+		log_must rm -rf $testdir
 
 		(( loop_cnt -= 1 ))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_003_pos.ksh
index 7bd341af8d..6da06fa56c 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -105,10 +109,10 @@ function test_chmod_basic_access #node group_user other_user
 		for access in ${a_access[@]}; do
 			for tp in allow deny; do
 				acl_spec="$flag:$access:$tp"
-				log_must usr_exec $CHMOD A+$acl_spec $node
+				log_must usr_exec chmod A+$acl_spec $node
 				check_chmod_results \
 					$node $acl_spec $g_usr $o_usr
-				log_must usr_exec $CHMOD A0- $node
+				log_must usr_exec chmod A0- $node
 			done
 		done
 	done
@@ -118,12 +122,12 @@ typeset -i i=0
 while (( i < ${#users[@]} )); do
 	log_must set_cur_usr ${users[i]}
 
-	log_must usr_exec $TOUCH $testfile
+	log_must usr_exec touch $testfile
 	test_chmod_basic_access $testfile ${users[((i+1))]} ${users[((i+2))]}
-	log_must usr_exec $MKDIR $testdir
+	log_must usr_exec mkdir $testdir
 	test_chmod_basic_access $testdir ${users[((i+1))]} ${users[((i+2))]}
 
-	log_must usr_exec $RM -rf $testfile $testdir
+	log_must usr_exec rm -rf $testfile $testdir
 
 	(( i += 3 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_004_pos.ksh
index 75e92282ff..c4c196f954 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_rwx_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -87,25 +87,25 @@ function verify_explicit_ACL_rule #node access flag
 		rflag=allow
 	fi
 
-	log_must usr_exec $CHMOD A+everyone@:$access:$flag $node
-	log_must usr_exec $CHMOD A+user:$ZFS_ACL_OTHER1:$access:$rflag $node
+	log_must usr_exec chmod A+everyone@:$access:$flag $node
+	log_must usr_exec chmod A+user:$ZFS_ACL_OTHER1:$access:$rflag $node
 	check_access $log $ZFS_ACL_OTHER1 $node $access $rflag
-	log_must usr_exec $CHMOD A0- $node
+	log_must usr_exec chmod A0- $node
 
 	log_must usr_exec \
-		$CHMOD A+group:$ZFS_ACL_OTHER_GROUP:$access:$rflag $node
+		chmod A+group:$ZFS_ACL_OTHER_GROUP:$access:$rflag $node
 	check_access $log $ZFS_ACL_OTHER1 $node $access $rflag
 	check_access $log $ZFS_ACL_OTHER2 $node $access $rflag
-	log_must usr_exec $CHMOD A0- $node
-	log_must usr_exec $CHMOD A0- $node
+	log_must usr_exec chmod A0- $node
+	log_must usr_exec chmod A0- $node
 
 	log_must usr_exec \
-		$CHMOD A+group:$ZFS_ACL_OTHER_GROUP:$access:$flag $node
-	log_must usr_exec $CHMOD A+user:$ZFS_ACL_OTHER1:$access:$rflag $node
+		chmod A+group:$ZFS_ACL_OTHER_GROUP:$access:$flag $node
+	log_must usr_exec chmod A+user:$ZFS_ACL_OTHER1:$access:$rflag $node
 	$log rwx_node $ZFS_ACL_OTHER1 $node $access
 	$rlog rwx_node $ZFS_ACL_OTHER2 $node $access
-	log_must usr_exec $CHMOD A0- $node
-	log_must usr_exec $CHMOD A0- $node
+	log_must usr_exec chmod A0- $node
+	log_must usr_exec chmod A0- $node
 }
 
 log_assert "Verify that explicit ACL setting to specified user or group will" \
@@ -119,9 +119,9 @@ typeset node
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
-	log_must usr_exec $TOUCH $testfile
-	log_must usr_exec $MKDIR $testdir
-	log_must usr_exec $CHMOD 755 $testfile $testdir
+	log_must usr_exec touch $testfile
+	log_must usr_exec mkdir $testdir
+	log_must usr_exec chmod 755 $testfile $testdir
 
 	for node in $testfile $testdir; do
 		for access in ${a_access[@]}; do
@@ -131,7 +131,7 @@ for user in root $ZFS_ACL_STAFF1; do
 		done
 	done
 
-	log_must usr_exec $RM -rf $testfile $testdir
+	log_must usr_exec rm -rf $testfile $testdir
 done
 
 log_pass "Explicit ACL setting to specified user or group will override " \
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_001_pos.ksh
index 5b6bdf2a48..173eac0b63 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -50,7 +54,7 @@ function cleanup
 	cleanup_test_files $TESTDIR/basedir
 
 	if [[ -e $TESTDIR/$ARCHIVEFILE ]]; then
-		log_must $RM -f $TESTDIR/$ARCHIVEFILE
+		log_must rm -f $TESTDIR/$ARCHIVEFILE
 	fi
 
 	return 0
@@ -88,13 +92,13 @@ function operate_node #user node acl
 	fi
 
 	if [[ $acl_t == *read_xattr* ]]; then
-		chgusr_exec $user $RUNAT $node $LS > /dev/null 2>&1; ret=$?
+		chgusr_exec $user runat $node ls > /dev/null 2>&1; ret=$?
 	elif [[ $acl_t == *write_xattr* ]]; then
-		chgusr_exec $user $RUNAT $node $CP $MYTESTFILE attr.1 ; ret=$?
+		chgusr_exec $user runat $node cp $MYTESTFILE attr.1 ; ret=$?
 
 		if [[ $ret -eq 0 ]]; then
 			log_must cleanup_test_files $TESTDIR/basedir
-			log_must $TAR xpf@ $TESTDIR/$ARCHIVEFILE
+			log_must tar xpf@ $TESTDIR/$ARCHIVEFILE
 		fi
 	fi
 
@@ -149,14 +153,14 @@ function test_chmod_basic_access #node g_usr o_usr
 
 	for flag in ${a_flag[@]}; do
 		for acl_t in "${a_access[@]}"; do
-			log_must usr_exec $CHMOD A+$flag:$acl_t $node
+			log_must usr_exec chmod A+$flag:$acl_t $node
 
-			log_must $TAR cpf@ $TESTDIR/$ARCHIVEFILE basedir
+			log_must tar cpf@ $TESTDIR/$ARCHIVEFILE basedir
 
 			check_chmod_results "$node" "$flag" \
 				"$acl_t" "$g_usr" "$o_usr"
 
-			log_must usr_exec $CHMOD A0- $node
+			log_must usr_exec chmod A0- $node
 		done
 	done
 }
@@ -169,8 +173,8 @@ function setup_test_files #base_node user group
 
 	cleanup_test_files $base_node
 
-	log_must $MKDIR -p $base_node
-	log_must $CHOWN $user:$group $base_node
+	log_must mkdir -p $base_node
+	log_must chown $user:$group $base_node
 
 	log_must set_cur_usr $user
 
@@ -180,17 +184,17 @@ function setup_test_files #base_node user group
 
 	dir0=$base_node/testdir_rm
 
-	log_must usr_exec $TOUCH $file0
-	log_must usr_exec $CHMOD 444 $file0
+	log_must usr_exec touch $file0
+	log_must usr_exec chmod 444 $file0
 
-	log_must usr_exec $RUNAT $file0 $CP $MYTESTFILE attr.0
+	log_must usr_exec runat $file0 cp $MYTESTFILE attr.0
 
-	log_must usr_exec $MKDIR -p $dir0
-	log_must usr_exec $CHMOD 555 $dir0
+	log_must usr_exec mkdir -p $dir0
+	log_must usr_exec chmod 555 $dir0
 
-	log_must usr_exec $RUNAT $dir0 $CP $MYTESTFILE attr.0
+	log_must usr_exec runat $dir0 cp $MYTESTFILE attr.0
 
-	log_must usr_exec $CHMOD 777 $base_node
+	log_must usr_exec chmod 777 $base_node
 	return 0
 }
 
@@ -199,9 +203,9 @@ function cleanup_test_files #base_node
 	typeset base_node=$1
 
 	if [[ -d $base_node ]]; then
-		log_must $RM -rf $base_node
+		log_must rm -rf $base_node
 	elif [[ -e $base_node ]]; then
-		log_must $RM -f $base_node
+		log_must rm -f $base_node
 	fi
 
 	return 0
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_002_pos.ksh
index 5f84781230..c0a44e31bb 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_chmod_xattr_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -48,7 +52,7 @@ function cleanup
 	cleanup_test_files $TESTDIR/basedir
 
 	if [[ -e $TESTDIR/$ARCHIVEFILE ]]; then
-		log_must $RM -f $TESTDIR/$ARCHIVEFILE
+		log_must rm -f $TESTDIR/$ARCHIVEFILE
 	fi
 
 	return 0
@@ -83,11 +87,11 @@ function operate_node #user node acl
 		log_fail "user, node are not defined."
 	fi
 
-	chgusr_exec $user $RUNAT $node $RM -f attr.0 ; ret=$?
+	chgusr_exec $user runat $node rm -f attr.0 ; ret=$?
 
 	if [[ $ret -eq 0 ]]; then
 		log_must cleanup_test_files $TESTDIR/basedir
-		log_must $TAR xpf@ $TESTDIR/$ARCHIVEFILE
+		log_must tar xpf@ $TESTDIR/$ARCHIVEFILE
 	fi
 
 	return $ret
@@ -144,14 +148,14 @@ function test_chmod_basic_access #node owner g_usr o_usr
 
 	for flag in ${a_flag[@]}; do
 		for acl_t in "${a_access[@]}"; do
-			log_must usr_exec $CHMOD A+$flag:$acl_t $node
+			log_must usr_exec chmod A+$flag:$acl_t $node
 
-			log_must $TAR cpf@ $TESTDIR/$ARCHIVEFILE basedir
+			log_must tar cpf@ $TESTDIR/$ARCHIVEFILE basedir
 
 			check_chmod_results "$node" "$flag" \
 				"$acl_t" "$owner" "$g_usr" "$o_usr"
 
-			log_must usr_exec $CHMOD A0- $node
+			log_must usr_exec chmod A0- $node
 		done
 	done
 }
@@ -164,8 +168,8 @@ function setup_test_files #base_node user group
 
 	cleanup_test_files $base_node
 
-	log_must $MKDIR -p $base_node
-	log_must $CHOWN $user:$group $base_node
+	log_must mkdir -p $base_node
+	log_must chown $user:$group $base_node
 
 	log_must set_cur_usr $user
 
@@ -175,17 +179,17 @@ function setup_test_files #base_node user group
 
 	dir0=$base_node/testdir_rm
 
-	log_must usr_exec $TOUCH $file0
-	log_must usr_exec $CHMOD 444 $file0
+	log_must usr_exec touch $file0
+	log_must usr_exec chmod 444 $file0
 
-	log_must usr_exec $RUNAT $file0 $CP $MYTESTFILE attr.0
+	log_must usr_exec runat $file0 cp $MYTESTFILE attr.0
 
-	log_must usr_exec $MKDIR -p $dir0
-	log_must usr_exec $CHMOD 555 $dir0
+	log_must usr_exec mkdir -p $dir0
+	log_must usr_exec chmod 555 $dir0
 
-	log_must usr_exec $RUNAT $dir0 $CP $MYTESTFILE attr.0
+	log_must usr_exec runat $dir0 cp $MYTESTFILE attr.0
 
-	log_must usr_exec $CHMOD 555 $base_node
+	log_must usr_exec chmod 555 $base_node
 	return 0
 }
 
@@ -194,9 +198,9 @@ function cleanup_test_files #base_node
 	typeset base_node=$1
 
 	if [[ -d $base_node ]]; then
-		log_must $RM -rf $base_node
+		log_must rm -rf $base_node
 	elif [[ -e $base_node ]]; then
-		log_must $RM -f $base_node
+		log_must rm -f $base_node
 	fi
 
 	return 0
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_001_pos.ksh
index daa67d511a..cfc720d078 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -46,20 +50,20 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	fi
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
-log_assert "Verify that '$CP [-p]' supports ZFS ACLs."
+log_assert "Verify that 'cp [-p]' supports ZFS ACLs."
 log_onexit cleanup
 
 log_note "Create the second zfs file system: $TESTPOOL/$TESTFS1."
-log_must $ZFS create $TESTPOOL/$TESTFS1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
-log_must $ZFS set aclmode=passthrough $TESTPOOL/$TESTFS1
-log_must $CHMOD 777 $TESTDIR1
+log_must zfs create $TESTPOOL/$TESTFS1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
+log_must zfs set aclmode=passthrough $TESTPOOL/$TESTFS1
+log_must chmod 777 $TESTDIR1
 
 # Define target directory.
 dstdir=$TESTDIR1/dstdir.$$
@@ -70,15 +74,15 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	for obj in $testfile $testdir; do
 		# Create source object and target directroy
-		log_must usr_exec $TOUCH $testfile
-		log_must usr_exec $MKDIR $testdir $dstdir
+		log_must usr_exec touch $testfile
+		log_must usr_exec mkdir $testdir $dstdir
 
 		# Add the new ACE on the head.
-		log_must usr_exec $CHMOD \
+		log_must usr_exec chmod \
 			A0+user:$ZFS_ACL_OTHER1:read_acl:deny $obj
 
-		cmd_str="$CP -p"
-		[[ -d $obj ]] && cmd_str="$CP -rp"
+		cmd_str="cp -p"
+		[[ -d $obj ]] && cmd_str="cp -rp"
 		log_must usr_exec $cmd_str $obj $dstdir
 		log_must usr_exec $cmd_str $obj $TESTDIR1
 
@@ -88,8 +92,8 @@ for user in root $ZFS_ACL_STAFF1; do
 		done
 
 		# Delete all the test file and directory
-		log_must usr_exec $RM -rf $TESTDIR/* $TESTDIR1/*
+		log_must usr_exec rm -rf $TESTDIR/* $TESTDIR1/*
 	done
 done
 
-log_pass "'$CP [-p]' succeeds to support ZFS ACLs."
+log_pass "'cp [-p]' succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_002_pos.ksh
index 0e644cec77..6f122607a4 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cp_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -47,20 +51,20 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	fi
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
-log_assert "Verify that '$CP [-p]' supports ZFS ACLs."
+log_assert "Verify that 'cp [-p]' supports ZFS ACLs."
 log_onexit cleanup
 
 log_note "Create the second zfs file system: $TESTPOOL/$TESTFS1."
-log_must $ZFS create $TESTPOOL/$TESTFS1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
-log_must $ZFS set aclmode=passthrough $TESTPOOL/$TESTFS1
-log_must $CHMOD 777 $TESTDIR1
+log_must zfs create $TESTPOOL/$TESTFS1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
+log_must zfs set aclmode=passthrough $TESTPOOL/$TESTFS1
+log_must chmod 777 $TESTDIR1
 
 # Define target directory.
 dstdir=$TESTDIR1/dstdir.$$
@@ -72,18 +76,18 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	for obj in $testfile $testdir; do
 		# Create source object and target directroy
-		log_must usr_exec $TOUCH $testfile
-		log_must usr_exec $MKDIR $testdir $dstdir
+		log_must usr_exec touch $testfile
+		log_must usr_exec mkdir $testdir $dstdir
 
-		log_must usr_exec $RUNAT $testfile $CP $mytestfile attr.0
-		log_must usr_exec $RUNAT $testdir $CP $mytestfile attr.0
+		log_must usr_exec runat $testfile cp $mytestfile attr.0
+		log_must usr_exec runat $testdir cp $mytestfile attr.0
 
 		# Add the new ACE on the head.
-		log_must usr_exec $CHMOD \
+		log_must usr_exec chmod \
 			A0+user:$ZFS_ACL_OTHER1:read_acl:deny $obj
 
-		cmd_str="$CP -p@"
-		[[ -d $obj ]] && cmd_str="$CP -rp@"
+		cmd_str="cp -p@"
+		[[ -d $obj ]] && cmd_str="cp -rp@"
 		log_must usr_exec $cmd_str $obj $dstdir
 		log_must usr_exec $cmd_str $obj $TESTDIR1
 
@@ -94,8 +98,8 @@ for user in root $ZFS_ACL_STAFF1; do
 		done
 
 		# Delete all the test file and directory
-		log_must usr_exec $RM -rf $TESTDIR/* $TESTDIR1/*
+		log_must usr_exec rm -rf $TESTDIR/* $TESTDIR1/*
 	done
 done
 
-log_pass "'$CP [-p@]' succeeds to support ZFS ACLs."
+log_pass "'cp [-p@]' succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_001_pos.ksh
index 739a7b0d5b..9880db45a9 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_001_pos.ksh
@@ -26,16 +26,21 @@
 #
 # Copyright (c) 2012 by Marcelo Leal. All rights reserved.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
 # DESCRIPTION:
-# Verify that '$CPIO' command with -P option supports to archive ZFS ACLs
+# Verify that 'cpio' command with -P option supports to archive ZFS ACLs
 #
 # STRATEGY:
 # 1. Create file and directory in zfs filesystem
 # 2. Add new ACE in ACL or change mode of file and directory
-# 3. Use $CPIO to archive file and directory
+# 3. Use cpio to archive file and directory
 # 4. Extract the archive file
 # 5. Verify that the restored ACLs of file and directory identify
 #    with the origional ones.
@@ -46,16 +51,16 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	fi
 	if (( ${#orig_dir} != 0 )); then
 		cd $orig_dir
 	fi
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
-log_assert "Verify that '$CPIO' command supports to archive ZFS ACLs."
+log_assert "Verify that 'cpio' command supports to archive ZFS ACLs."
 log_onexit cleanup
 
 set -A ops "A+user:$ZFS_ACL_OTHER1:execute:allow" \
@@ -66,9 +71,9 @@ set -A ops "A+user:$ZFS_ACL_OTHER1:execute:allow" \
 	"A1=group:$ZFS_ACL_STAFF_GROUP:write_data:deny"
 
 log_note "Create second zfs file system to restore the cpio archive."
-log_must $ZFS create $TESTPOOL/$TESTFS1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
-log_must $CHMOD 777 $TESTDIR1
+log_must zfs create $TESTPOOL/$TESTFS1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
+log_must chmod 777 $TESTDIR1
 
 # Define test fine and record the original directory.
 CPIOFILE=cpiofile.$$
@@ -86,25 +91,25 @@ for user in root $ZFS_ACL_STAFF1; do
 		log_note "Create file $file and directory $dir " \
 			"in zfs filesystem. "
 		cd $TESTDIR
-		log_must usr_exec $TOUCH $file
-		log_must usr_exec $MKDIR $dir
+		log_must usr_exec touch $file
+		log_must usr_exec mkdir $dir
 
 		log_note "Change the ACLs of file and directory with " \
-			"'$CHMOD ${ops[i]}'."
+			"'chmod ${ops[i]}'."
 		for obj in $file $dir; do
-			log_must usr_exec $CHMOD ${ops[i]} $obj
+			log_must usr_exec chmod ${ops[i]} $obj
 		done
 
 		log_note "Archive the file and directory."
 		cd $TESTDIR
-		log_must eval "usr_exec $LS | " \
-			"usr_exec $CPIO -ocP -O $CPIOFILE > /dev/null 2>&1"
+		log_must eval "usr_exec ls | " \
+			"usr_exec cpio -ocP -O $CPIOFILE > /dev/null 2>&1"
 
 		log_note "Restore the cpio archive."
-		log_must usr_exec $MV $CPIOFILE $TESTDIR1
+		log_must usr_exec mv $CPIOFILE $TESTDIR1
 		cd $TESTDIR1
-		log_must eval "usr_exec $CAT $CPIOFILE | " \
-			"usr_exec $CPIO -icP > /dev/null 2>&1"
+		log_must eval "usr_exec cat $CPIOFILE | " \
+			"usr_exec cpio -icP > /dev/null 2>&1"
 
 		log_note "Verify that the ACLs of restored file/directory " \
 			"have no changes."
@@ -113,10 +118,10 @@ for user in root $ZFS_ACL_STAFF1; do
 			log_must compare_acls $TESTDIR/$obj $TESTDIR1/$obj
 		done
 
-		log_must usr_exec $RM -rf $TESTDIR/* $TESTDIR1/*
+		log_must usr_exec rm -rf $TESTDIR/* $TESTDIR1/*
 
 		(( i = i + 1 ))
 	done
 done
 
-log_pass "'$CPIO' command succeeds to support ZFS ACLs."
+log_pass "'cpio' command succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_002_pos.ksh
index a8f9769102..f66781d22b 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_cpio_002_pos.ksh
@@ -27,17 +27,21 @@
 # Copyright (c) 2012 by Marcelo Leal. All rights reserved.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
 # DESCRIPTION:
-# Verify that '$CPIO' command with -P@ option supports to archive ZFS ACLs
+# Verify that 'cpio' command with -P@ option supports to archive ZFS ACLs
 #
 # STRATEGY:
 # 1. Create file and directory in zfs filesystem
 # 2. Add new ACE in ACL or change mode of file and directory
 # 3. Create xattr of the file and directory
-# 4. Use $CPIO to archive file and directory
+# 4. Use cpio to archive file and directory
 # 5. Extract the archive file
 # 6. Verify that the restored ACLs of file and directory identify
 #    with the origional ones.
@@ -48,16 +52,16 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	fi
 	if (( ${#orig_dir} != 0 )); then
 		cd $orig_dir
 	fi
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
-log_assert "Verify that '$CPIO' command supports to archive ZFS ACLs & xattrs."
+log_assert "Verify that 'cpio' command supports to archive ZFS ACLs & xattrs."
 log_onexit cleanup
 
 set -A ops "A+user:$ZFS_ACL_OTHER1:execute:allow" \
@@ -68,9 +72,9 @@ set -A ops "A+user:$ZFS_ACL_OTHER1:execute:allow" \
 	"A1=group:$ZFS_ACL_STAFF_GROUP:write_data:deny"
 
 log_note "Create second zfs file system to restore the cpio archive."
-log_must $ZFS create $TESTPOOL/$TESTFS1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
-log_must $CHMOD 777 $TESTDIR1
+log_must zfs create $TESTPOOL/$TESTFS1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
+log_must chmod 777 $TESTDIR1
 
 # Define test fine and record the original directory.
 CPIOFILE=cpiofile.$$
@@ -89,27 +93,27 @@ for user in root $ZFS_ACL_STAFF1; do
 		log_note "Create file $file and directory $dir " \
 			"in zfs filesystem. "
 		cd $TESTDIR
-		log_must usr_exec $TOUCH $file
-		log_must usr_exec $MKDIR $dir
-		log_must usr_exec $RUNAT $file $CP $mytestfile attr.0
-		log_must usr_exec $RUNAT $dir $CP $mytestfile attr.0
+		log_must usr_exec touch $file
+		log_must usr_exec mkdir $dir
+		log_must usr_exec runat $file cp $mytestfile attr.0
+		log_must usr_exec runat $dir cp $mytestfile attr.0
 
 		log_note "Change the ACLs of file and directory with " \
-			"'$CHMOD ${ops[i]}'."
+			"'chmod ${ops[i]}'."
 		for obj in $file $dir; do
-			log_must usr_exec $CHMOD ${ops[i]} $obj
+			log_must usr_exec chmod ${ops[i]} $obj
 		done
 
 		log_note "Archive the file and directory."
 		cd $TESTDIR
-		log_must eval "usr_exec $LS | " \
-			"usr_exec $CPIO -ocP@ -O $CPIOFILE > /dev/null 2>&1"
+		log_must eval "usr_exec ls | " \
+			"usr_exec cpio -ocP@ -O $CPIOFILE > /dev/null 2>&1"
 
 		log_note "Restore the cpio archive."
-		log_must usr_exec $MV $CPIOFILE $TESTDIR1
+		log_must usr_exec mv $CPIOFILE $TESTDIR1
 		cd $TESTDIR1
-		log_must eval "usr_exec $CAT $CPIOFILE | " \
-			"usr_exec $CPIO -icP@ > /dev/null 2>&1"
+		log_must eval "usr_exec cat $CPIOFILE | " \
+			"usr_exec cpio -icP@ > /dev/null 2>&1"
 
 		log_note "Verify that the ACLs of restored file/directory " \
 			"have no changes."
@@ -119,10 +123,10 @@ for user in root $ZFS_ACL_STAFF1; do
 			log_must compare_xattrs $TESTDIR/$obj $TESTDIR1/$obj
 		done
 
-		log_must usr_exec $RM -rf $TESTDIR/* $TESTDIR1/*
+		log_must usr_exec rm -rf $TESTDIR/* $TESTDIR1/*
 
 		(( i = i + 1 ))
 	done
 done
 
-log_pass "'$CPIO' command succeeds to support ZFS ACLs & xattrs."
+log_pass "'cpio' command succeeds to support ZFS ACLs & xattrs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_find_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_find_001_pos.ksh
index 9ac8dff8e5..2b0fdc9614 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_find_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_find_001_pos.ksh
@@ -26,30 +26,30 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
 # DESCRIPTION:
-# Verify that '$FIND' command with '-ls' and '-acl' options supports ZFS ACL
+# Verify that 'find' command with '-ls' and '-acl' options supports ZFS ACL
 #
 # STRATEGY:
 # 1. Create 5 files and 5 directories in zfs filesystem
 # 2. Select a file or directory and add a few ACEs to it
-# 3. Use $FIND -ls to check the "+" existen only with the selected file or
+# 3. Use find -ls to check the "+" existen only with the selected file or
 #    directory
-# 4. Use $FIND -acl to check only the selected file/directory in the list
+# 4. Use find -acl to check only the selected file/directory in the list
 #
 
 verify_runnable "both"
 
 function cleanup
 {
-	[[ -d $TESTDIR ]] && $RM -rf $TESTDIR/*
+	[[ -d $TESTDIR ]] && rm -rf $TESTDIR/*
 	(( ${#cmd} != 0 )) && cd $cwd
-	(( ${#mask} != 0 )) && $UMASK $mask
+	(( ${#mask} != 0 )) && umask $mask
 }
 
 function find_ls_acl #<opt> <obj>
@@ -59,9 +59,9 @@ function find_ls_acl #<opt> <obj>
 	typeset rst_str=""
 
 	if [[ $opt == "ls" ]]; then
-		rst_str=`$FIND . -ls | $GREP "+" | $AWK '{print $11}'`
+		rst_str=`find . -ls | grep "+" | awk '{print $11}'`
 	else
-		rst_str=`$FIND . -acl`
+		rst_str=`find . -acl`
 	fi
 
 	if [[ $rst_str == "./$obj" ]]; then
@@ -71,7 +71,7 @@ function find_ls_acl #<opt> <obj>
 	fi
 }
 
-log_assert "Verify that '$FIND' command supports ZFS ACLs."
+log_assert "Verify that 'find' command supports ZFS ACLs."
 
 log_onexit cleanup
 
@@ -81,16 +81,16 @@ set -A ops " A+user:$ZFS_ACL_STAFF1:read_data:allow" \
 f_base=testfile.$$ # Base file name for tested files
 d_base=testdir.$$ # Base directory name for tested directory
 cwd=$PWD
-mask=`$UMASK`
+mask=`umask`
 
 log_note "Create five files and directories in the zfs filesystem. "
 cd $TESTDIR
-$UMASK 0777
+umask 0777
 typeset -i i=0
 while ((i < 5))
 do
-	log_must $TOUCH ${f_base}.$i
-	log_must $MKDIR ${d_base}.$i
+	log_must touch ${f_base}.$i
+	log_must mkdir ${d_base}.$i
 
 	((i = i + 1))
 done
@@ -100,7 +100,7 @@ do
 	i=0
 	while ((i < ${#ops[*]}))
 	do
-		log_must $CHMOD ${ops[i]} $obj
+		log_must chmod ${ops[i]} $obj
 
 		((i = i + 1))
 	done
@@ -120,10 +120,10 @@ do
 	i=0
 	while ((i < ${#ops[*]}))
 	do
-		log_must $CHMOD A0- $obj
+		log_must chmod A0- $obj
 
 		((i = i + 1))
 	done
 done
 
-log_pass "'$FIND' command succeeds to support ZFS ACLs."
+log_pass "'find' command succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_ls_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_ls_001_pos.ksh
index 9a710ae0ad..fa112ea8f7 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_ls_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_ls_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -45,61 +49,61 @@ verify_runnable "both"
 function cleanup
 {
 	(( ${#cwd} != 0 )) && cd $cwd
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
-	(( ${#mask} != 0 )) && log_must $UMASK $mask
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR/*
+	(( ${#mask} != 0 )) && log_must umask $mask
 }
 
-log_assert "Verify that '$LS' command supports ZFS ACLs."
+log_assert "Verify that 'ls' command supports ZFS ACLs."
 
 log_onexit cleanup
 
 file=$TESTFILE0
 dir=dir.$$
 cwd=$PWD
-mask=`$UMASK`
+mask=`umask`
 spec_ace="everyone@:write_acl:allow"
 
-$UMASK 0022
+umask 0022
 
 log_note "Create file and directory in the zfs filesystem. "
 cd $TESTDIR
-log_must $TOUCH $file
-log_must $MKDIR $dir
+log_must touch $file
+log_must mkdir $dir
 
-log_note "Verify that '$LS [-dv]' can list file/directory ACEs of its acl."
+log_note "Verify that 'ls [-dv]' can list file/directory ACEs of its acl."
 
 typeset -i ace_num=0
 for obj in $file $dir
 do
 	typeset ls_str=""
 	if [[ -f $obj ]]; then
-		ls_str="$LS -v"
+		ls_str="ls -v"
 	else
-		ls_str="$LS -dv"
+		ls_str="ls -dv"
 	fi
 
 	for ace_type in "owner@" "group@" "everyone@"
 	do
-		$ls_str $obj | $GREP $ace_type > /dev/null 2>&1
+		$ls_str $obj | grep $ace_type > /dev/null 2>&1
 		(( $? == 0 )) && (( ace_num += 1 ))
 	done
 
 	(( ace_num < 1 )) && \
-		log_fail "'$LS [-dv] fails to list file/directroy acls."
+		log_fail "'ls [-dv] fails to list file/directroy acls."
 done
 
-log_note "Verify that '$LS [-dl] [-dv]' can output '+' to indicate " \
+log_note "Verify that 'ls [-dl] [-dv]' can output '+' to indicate " \
 	"the acl existent."
 
 for obj in $file $dir
 do
-	$CHMOD A0+$spec_ace $obj
+	chmod A0+$spec_ace $obj
 
-	log_must eval "$LS -ld -vd $obj | $GREP "+" > /dev/null"
+	log_must eval "ls -ld -vd $obj | grep "+" > /dev/null"
 	log_must plus_sign_check_v $obj
 
-	log_must eval "$LS -ld -vd $obj | $GREP $spec_ace > /dev/null"
+	log_must eval "ls -ld -vd $obj | grep $spec_ace > /dev/null"
 	log_must plus_sign_check_l $obj
 done
 
-log_pass "'$LS' command succeeds to support ZFS ACLs."
+log_pass "'ls' command succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_mv_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_mv_001_pos.ksh
index 9c9725d69c..d9ab83f2d3 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_mv_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_mv_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -42,9 +47,9 @@ verify_runnable "both"
 function cleanup
 {
 	(( ${#cwd} != 0 )) && cd $cwd
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1
-	(( ${#mask} != 0 )) && log_must $UMASK $mask
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
+	(( ${#mask} != 0 )) && log_must umask $mask
 }
 
 function testing_mv #<flag for file|dir> <file1|dir1> <file2|dir2>
@@ -63,18 +68,18 @@ function testing_mv #<flag for file|dir> <file1|dir1> <file2|dir2>
 		orig_acl="$(get_acl ${obj[i]})"
 		orig_mode="$(get_mode ${obj[i]})"
 		if (( i < 1 )); then
-			log_must $MV ${obj[i]} $dst_file
+			log_must mv ${obj[i]} $dst_file
 			dst_acl=$(get_acl $dst_file)
 			dst_mode=$(get_mode $dst_file)
 		else
-			log_must $MV ${obj[i]} $TESTDIR1
+			log_must mv ${obj[i]} $TESTDIR1
 			dst_acl=$(get_acl $TESTDIR1/${obj[i]})
 			dst_mode=$(get_mode $TESTDIR1/${obj[i]})
 		fi
 
 		if [[ "$dst_mode" != "$orig_mode" ]] || \
 			[[ "$dst_acl" != "$orig_acl" ]]; then
-			log_fail "$MV fails to keep the acl for file."
+			log_fail "mv fails to keep the acl for file."
 		fi
 
 		(( i = i + 1 ))
@@ -92,13 +97,13 @@ function testing_mv #<flag for file|dir> <file1|dir1> <file2|dir2>
 		orig_nested_acl=$(get_acl ${obj[i]}/$nestedfile)
 		orig_nested_mode=$(get_mode ${obj[i]}/$nestedfile)
 		if (( i < 1 )); then
-			log_must $MV ${obj[i]} $dst_dir
+			log_must mv ${obj[i]} $dst_dir
 			dst_acl=$(get_acl $dst_dir)
 			dst_mode=$(get_mode $dst_dir)
 			dst_nested_acl=$(get_acl $dst_dir/$nestedfile)
 			dst_nested_mode=$(get_mode $dst_dir/$nestedfile)
 		else
-			log_must $MV ${obj[i]} $TESTDIR1
+			log_must mv ${obj[i]} $TESTDIR1
 			dst_acl=$(get_acl $TESTDIR1/${obj[i]})
 			dst_mode=$(get_mode $TESTDIR1/${obj[i]})
 			dst_nested_acl=$(get_acl \
@@ -111,7 +116,7 @@ function testing_mv #<flag for file|dir> <file1|dir1> <file2|dir2>
 		   [[ "$orig_acl" != "$dst_acl" ]] || \
 		   [[ "$dst_nested_mode" != "$orig_nested_mode" ]] || \
 		   [[ "$dst_nested_acl" != "$orig_nested_acl" ]]; then
-			log_fail "$MV fails to recursively keep the acl for " \
+			log_fail "mv fails to recursively keep the acl for " \
 				"directory."
 		fi
 
@@ -120,7 +125,7 @@ function testing_mv #<flag for file|dir> <file1|dir1> <file2|dir2>
 	fi
 }
 
-log_assert "Verify that '$MV' supports ZFS ACLs."
+log_assert "Verify that 'mv' supports ZFS ACLs."
 
 log_onexit cleanup
 
@@ -131,8 +136,8 @@ nestedfile="nestedfile.$$"
 dst_file=dstfile.$$
 dst_dir=dstdir.$$
 cwd=$PWD
-mask=`$UMASK`
-$UMASK 0022
+mask=`umask`
+umask 0022
 
 #
 # This assertion should only test 'mv' within the same filesystem
@@ -140,26 +145,26 @@ $UMASK 0022
 TESTDIR1=$TESTDIR/testdir1$$
 
 [[ ! -d $TESTDIR1 ]] && \
-	log_must $MKDIR -p $TESTDIR1
+	log_must mkdir -p $TESTDIR1
 
 log_note "Create files and directories and set special ace on them for testing. "
 cd $TESTDIR
 typeset -i i=0
 while (( i < ${#orig_file[*]} ))
 do
-	log_must $TOUCH ${orig_file[i]}
-	log_must $CHMOD A0+$spec_ace ${orig_file[i]}
+	log_must touch ${orig_file[i]}
+	log_must chmod A0+$spec_ace ${orig_file[i]}
 
 	(( i = i + 1 ))
 done
 i=0
 while (( i < ${#orig_dir[*]} ))
 do
-	log_must $MKDIR ${orig_dir[i]}
-	log_must $TOUCH ${orig_dir[i]}/$nestedfile
+	log_must mkdir ${orig_dir[i]}
+	log_must touch ${orig_dir[i]}/$nestedfile
 
 	for obj in ${orig_dir[i]} ${orig_dir[i]}/$nestedfile; do
-		log_must $CHMOD A0+$spec_ace $obj
+		log_must chmod A0+$spec_ace $obj
 	done
 
 	(( i = i + 1 ))
@@ -168,4 +173,4 @@ done
 testing_mv "f" ${orig_file[0]} ${orig_file[1]}
 testing_mv "d" ${orig_dir[0]} ${orig_dir[1]}
 
-log_pass "'$MV' succeeds to support ZFS ACLs."
+log_pass "'mv' succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_001_pos.ksh
index 99396acdd5..91d90e1c7f 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_001_pos.ksh
@@ -26,16 +26,21 @@
 #
 # Copyright (c) 2012 by Marcelo Leal. All rights reserved.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
 # DESCRIPTION:
-# Verify that '$TAR' command with -p option supports to archive ZFS ACLs
+# Verify that 'tar' command with -p option supports to archive ZFS ACLs
 #
 # STRATEGY:
 # 1. Create file and directory in zfs filesystem
 # 2. Add new ACE in ACL of file and directory
-# 3. Use $TAR to archive file and directory
+# 3. Use tar to archive file and directory
 # 4. Extract the archive file
 # 5. Verify that the restored ACLs of file and directory identify
 #    with the origional ones.
@@ -46,15 +51,15 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	fi
 
 	(( ${#cwd} != 0 )) && cd $cwd
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1
-	[[ -d $TESTDIR/ ]] && log_must $RM -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
+	[[ -d $TESTDIR/ ]] && log_must rm -rf $TESTDIR/*
 }
 
-log_assert "Verify that '$TAR' command supports to archive ZFS ACLs."
+log_assert "Verify that 'tar' command supports to archive ZFS ACLs."
 
 log_onexit cleanup
 
@@ -66,32 +71,32 @@ dir=dir.$$
 cwd=$PWD
 
 log_note "Create second zfs file system to restore the tar archive."
-log_must $ZFS create $TESTPOOL/$TESTFS1
+log_must zfs create $TESTPOOL/$TESTFS1
 [[ ! -d $TESTDIR1 ]] && \
-	log_must $MKDIR -p $TESTDIR1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
+	log_must mkdir -p $TESTDIR1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
 
 log_note "Create a file: $file, and directory: $dir, in zfs filesystem. "
 cd $TESTDIR
-log_must $TOUCH $file
-log_must $MKDIR $dir
+log_must touch $file
+log_must mkdir $dir
 
 typeset -i i=0
 while (( i < ${#ops[*]} ))
 do
 	log_note "Change the ACLs of file and directory with " \
-		"'$CHMOD ${ops[i]}'."
+		"'chmod ${ops[i]}'."
 	cd $TESTDIR
 	for obj in $file $dir; do
-		log_must $CHMOD ${ops[i]} $obj
+		log_must chmod ${ops[i]} $obj
 	done
 	log_note "Archive the file and directory."
-	log_must $TAR cpf $TARFILE $file $dir
+	log_must tar cpf $TARFILE $file $dir
 
 	log_note "Restore the tar archive."
-	log_must $MV $TARFILE $TESTDIR1
+	log_must mv $TARFILE $TESTDIR1
 	cd $TESTDIR1
-	log_must $TAR xpf $TARFILE
+	log_must tar xpf $TARFILE
 
 	log_note "Verify the ACLs of restored file/directory have no changes."
 	for obj in $file $dir; do
@@ -99,9 +104,9 @@ do
 		log_must compare_acls $TESTDIR/$obj $TESTDIR1/$obj
 	done
 
-	log_must $RM -rf $TESTDIR1/*
+	log_must rm -rf $TESTDIR1/*
 
 	(( i = i + 1 ))
 done
 
-log_pass "'$TAR' command succeeds to support ZFS ACLs."
+log_pass "'tar' command succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_002_pos.ksh
index 4d96bd3742..4fae77709c 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/nontrivial/zfs_acl_tar_002_pos.ksh
@@ -27,19 +27,23 @@
 # Copyright (c) 2012 by Marcelo Leal. All rights reserved.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
 # DESCRIPTION:
-# Verify that '$TAR' command with -p@ option supports to archive ZFS ACLs
+# Verify that 'tar' command with -p@ option supports to archive ZFS ACLs
 #	& xattrs
 #
 # STRATEGY:
 # 1. Create file and directory in zfs filesystem
 # 2. Add new ACE in ACL of file and directory
 # 3. Create xattr of the file and directory
-# 4. Use $TAR cf@ to archive file and directory
-# 5. Use $TAR xf@ to extract the archive file
+# 4. Use tar cf@ to archive file and directory
+# 5. Use tar xf@ to extract the archive file
 # 6. Verify that the restored ACLs & xttrs of file and directory identify
 #    with the origional ones.
 #
@@ -49,15 +53,15 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	fi
 
 	(( ${#cwd} != 0 )) && cd $cwd
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1
-	[[ -d $TESTDIR/ ]] && log_must $RM -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1
+	[[ -d $TESTDIR/ ]] && log_must rm -rf $TESTDIR/*
 }
 
-log_assert "Verify that '$TAR' command supports to archive ZFS ACLs & xattrs."
+log_assert "Verify that 'tar' command supports to archive ZFS ACLs & xattrs."
 
 log_onexit cleanup
 
@@ -69,10 +73,10 @@ TARFILE=tarfile.$$.tar
 cwd=$PWD
 
 log_note "Create second zfs file system to restore the tar archive."
-log_must $ZFS create $TESTPOOL/$TESTFS1
+log_must zfs create $TESTPOOL/$TESTFS1
 [[ ! -d $TESTDIR1 ]] && \
-	log_must $MKDIR -p $TESTDIR1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
+	log_must mkdir -p $TESTDIR1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL/$TESTFS1
 
 log_note "Create a file: $testfile, and directory: $testdir, in zfs " \
     "filesystem. And prepare for there xattr files."
@@ -83,24 +87,24 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	# Create source object and target directroy
 	cd $TESTDIR
-	log_must usr_exec $TOUCH $testfile
-	log_must usr_exec $MKDIR $testdir
+	log_must usr_exec touch $testfile
+	log_must usr_exec mkdir $testdir
 
-	log_must usr_exec $RUNAT $testfile $CP $mytestfile attr.0
-	log_must usr_exec $RUNAT $testdir $CP $mytestfile attr.0
+	log_must usr_exec runat $testfile cp $mytestfile attr.0
+	log_must usr_exec runat $testdir cp $mytestfile attr.0
 
 	# Add the new ACE on the head.
 	log_note "Change the ACLs of file and directory with " \
-		"'$CHMOD ${ops[0]}'."
-	log_must usr_exec $CHMOD ${ops[0]} $testfile
-	log_must usr_exec $CHMOD ${ops[0]} $testdir
+		"'chmod ${ops[0]}'."
+	log_must usr_exec chmod ${ops[0]} $testfile
+	log_must usr_exec chmod ${ops[0]} $testdir
 
 	log_note "Archive the file and directory."
-	log_must $TAR cpf@ $TARFILE ${testfile#$TESTDIR/} ${testdir#$TESTDIR/}
+	log_must tar cpf@ $TARFILE ${testfile#$TESTDIR/} ${testdir#$TESTDIR/}
 
 	log_note "Restore the tar archive."
 	cd $TESTDIR1
-	log_must $TAR xpf@ $TESTDIR/$TARFILE
+	log_must tar xpf@ $TESTDIR/$TARFILE
 
 	log_note "Verify the ACLs of restored file/directory have no changes."
 	for obj in $testfile $testdir; do
@@ -109,7 +113,7 @@ for user in root $ZFS_ACL_STAFF1; do
 		log_must compare_xattrs $obj $TESTDIR1/${obj##*/}
 	done
 
-	log_must $RM -rf $TESTDIR/* $TESTDIR1/*
+	log_must rm -rf $TESTDIR/* $TESTDIR1/*
 done
 
-log_pass "'$TAR' command succeeds to support ZFS ACLs."
+log_pass "'tar' command succeeds to support ZFS ACLs."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/cleanup.ksh
index ea2d0aaa49..84c91fa7b0 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/cleanup.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
@@ -32,8 +36,8 @@ 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
+    log_must svcadm enable svc:/network/nis/client:default
+    log_must rm -f $NISSTAFILE
 fi
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/setup.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/setup.ksh
index 5262c178ec..99bb1e71e1 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/setup.ksh
@@ -25,16 +25,20 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 # 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
+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
@@ -54,6 +58,6 @@ log_must add_user $ZFS_ACL_OTHER_GROUP $ZFS_ACL_OTHER2
 
 DISK=${DISKS%% *}
 default_setup_noexit $DISK
-log_must $CHMOD 777 $TESTDIR
+log_must chmod 777 $TESTDIR
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_aclmode_restricted_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_aclmode_restricted_001_pos.ksh
index 86b23980c9..e77f9d7d7c 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_aclmode_restricted_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_aclmode_restricted_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright (c) 2013 by Paul B. Henson <henson@acm.org>. All rights reserved.
 #
 
@@ -49,7 +49,7 @@ verify_runnable "both"
 function cleanup
 {
 	# reset aclmode=discard
-	log_must $ZFS set aclmode=discard $TESTPOOL/$TESTFS
+	log_must zfs set aclmode=discard $TESTPOOL/$TESTFS
 }
 
 #	"init_map" "options" "expect_map"
@@ -81,14 +81,14 @@ function test_chmod_mapping #<file-dir>
 	typeset -i i=0
 
 	while ((i < ${#argv[@]})); do
-		usr_exec $CHMOD ${argv[i]} $node
+		usr_exec chmod ${argv[i]} $node
 		if (($? != 0)); then
-			log_note "usr_exec $CHMOD ${argv[i]} $node"
+			log_note "usr_exec chmod ${argv[i]} $node"
 			return 1
 		fi
-		usr_exec $CHMOD ${argv[((i + 1))]} $node
+		usr_exec chmod ${argv[((i + 1))]} $node
 		if (($? != 0)); then
-			log_note "usr_exec $CHMOD ${argv[((i + 1))]} $node"
+			log_note "usr_exec chmod ${argv[((i + 1))]} $node"
 			return 1
 		fi
 
@@ -109,21 +109,21 @@ function test_chmod_mapping #<file-dir>
 }
 
 # set aclmode=restricted
-log_must $ZFS set aclmode=restricted $TESTPOOL/$TESTFS
+log_must zfs set aclmode=restricted $TESTPOOL/$TESTFS
 
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
 	# Test file
-	log_must usr_exec $TOUCH $testfile
+	log_must usr_exec touch $testfile
 	log_must test_chmod_mapping $testfile
 
 	# Test directory
-	log_must usr_exec $MKDIR $testdir
+	log_must usr_exec mkdir $testdir
 	log_must test_chmod_mapping $testdir
 
-	log_must usr_exec $RM $testfile
-	log_must usr_exec $RM -rf $testdir
+	log_must usr_exec rm $testfile
+	log_must usr_exec rm -rf $testdir
 done
 
 log_pass "Setting permissions using 'chmod' for aclmode=restricted completed " \
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_chmod_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_chmod_001_pos.ksh
index c817a2e856..c1eb631b4e 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_chmod_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_chmod_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
@@ -51,7 +51,7 @@ verify_runnable "both"
 function cleanup
 {
 	# reset aclmode=discard
-	log_must $ZFS set aclmode=discard $TESTPOOL/$TESTFS
+	log_must zfs set aclmode=discard $TESTPOOL/$TESTFS
 }
 
 #	"init_map" "options" "expect_map"
@@ -82,14 +82,14 @@ function test_chmod_mapping #<file-dir>
 	typeset -i i=0
 
 	while ((i < ${#argv[@]})); do
-		usr_exec $CHMOD ${argv[i]} $node
+		usr_exec chmod ${argv[i]} $node
 		if (($? != 0)); then
-			log_note "usr_exec $CHMOD ${argv[i]} $node"
+			log_note "usr_exec chmod ${argv[i]} $node"
 			return 1
 		fi
-		usr_exec $CHMOD ${argv[((i + 1))]} $node
+		usr_exec chmod ${argv[((i + 1))]} $node
 		if (($? != 0)); then
-			log_note "usr_exec $CHMOD ${argv[((i + 1))]} $node"
+			log_note "usr_exec chmod ${argv[((i + 1))]} $node"
 			return 1
 		fi
 
@@ -110,20 +110,20 @@ function test_chmod_mapping #<file-dir>
 }
 
 # set aclmode=passthrough
-log_must $ZFS set aclmode=passthrough $TESTPOOL/$TESTFS
+log_must zfs set aclmode=passthrough $TESTPOOL/$TESTFS
 
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
 	# Test file
-	log_must usr_exec $TOUCH $testfile
+	log_must usr_exec touch $testfile
 	log_must test_chmod_mapping $testfile
-	log_must usr_exec $CHMOD A+user:$ZFS_ACL_STAFF2:write_acl:allow $testfile
+	log_must usr_exec chmod A+user:$ZFS_ACL_STAFF2:write_acl:allow $testfile
 
 	# Test directory
-	log_must usr_exec $MKDIR $testdir
+	log_must usr_exec mkdir $testdir
 	log_must test_chmod_mapping $testdir
-	log_must usr_exec $CHMOD A+user:$ZFS_ACL_STAFF2:write_acl:allow $testdir
+	log_must usr_exec chmod A+user:$ZFS_ACL_STAFF2:write_acl:allow $testdir
 
 	# Grant privileges of write_acl and retest the chmod commands.
 
@@ -133,8 +133,8 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	log_must set_cur_usr $user
 
-	log_must usr_exec $RM $testfile
-	log_must usr_exec $RM -rf $testdir
+	log_must usr_exec rm $testfile
+	log_must usr_exec rm -rf $testdir
 done
 
 log_pass "Setting permissions using 'chmod' completed successfully."
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_compress_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_compress_001_pos.ksh
index a0c1927504..0cbc8a125e 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_compress_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_compress_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -58,9 +62,9 @@ for user in root $ZFS_ACL_STAFF1; do
 	log_must create_files $TESTDIR
 
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
-	log_must usr_exec $COMPRESS $INI_DIR/*
-	log_must usr_exec $MV $INI_DIR/* $TST_DIR
-	log_must usr_exec $UNCOMPRESS $TST_DIR/*
+	log_must usr_exec compress $INI_DIR/*
+	log_must usr_exec mv $INI_DIR/* $TST_DIR
+	log_must usr_exec uncompress $TST_DIR/*
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_001_pos.ksh
index bb1958edb0..230bd7147f 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -55,12 +59,12 @@ for user in root $ZFS_ACL_STAFF1; do
 	log_must create_files $TESTDIR
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
 
-	initfiles=$($LS -R $INI_DIR/*)
+	initfiles=$(ls -R $INI_DIR/*)
 	typeset -i i=0
 	while ((i < NUM_FILE)); do
 		f=$(getitem $i $initfiles)
 
-		usr_exec $CP -@p $f $TST_DIR
+		usr_exec cp -@p $f $TST_DIR
 
 		((i += 1))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_002_neg.ksh
index a788c54f2a..190543cda9 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_002_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -49,15 +53,15 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	log_must create_files $TESTDIR
 
-	initfiles=$($LS -R $INI_DIR/*)
+	initfiles=$(ls -R $INI_DIR/*)
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
 		typeset f=$(getitem $i $initfiles)
-		usr_exec $CP $f $TST_DIR
+		usr_exec cp $f $TST_DIR
 
-		testfiles=$($LS -R $TST_DIR/*)
+		testfiles=$(ls -R $TST_DIR/*)
 		tf=$(getitem $i $testfiles)
-		ls_attr=$($LS -@ $tf | $AWK '{print substr($1, 11, 1)}')
+		ls_attr=$(ls -@ $tf | awk '{print substr($1, 11, 1)}')
 		if [[ $ls_attr == "@" ]]; then
 			log_fail "cp of attribute should fail without " \
 				"-@ or -p option"
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_003_neg.ksh
index 576b60be29..ed7f1f33fc 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_cp_003_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -47,7 +51,7 @@ log_onexit cleanup
 
 function test_unreadable_attr
 {
-	typeset initfiles=$($LS -R $INI_DIR/*)
+	typeset initfiles=$(ls -R $INI_DIR/*)
 
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
@@ -55,7 +59,7 @@ function test_unreadable_attr
 		typeset -i j=0
 		while (( j < NUM_ATTR )); do
 			# chmod all the attribute files to '000'.
-			usr_exec $RUNAT $f $CHMOD 000 attribute.$j
+			usr_exec runat $f chmod 000 attribute.$j
 
 			(( j += 1 ))
 		done
@@ -64,12 +68,12 @@ function test_unreadable_attr
 		# Implement 'cp -@p' to the file whose attribute files
 		# models are '000'.
 		#
-		usr_exec $CP -@p $f $TST_DIR > /dev/null 2>&1
+		usr_exec cp -@p $f $TST_DIR > /dev/null 2>&1
 
-		typeset testfiles=$($LS -R $TST_DIR/*)
+		typeset testfiles=$(ls -R $TST_DIR/*)
 		typeset tf=$(getitem $i $testfiles)
-		typeset ls_attr=$(usr_exec $LS -@ $tf | \
-			$AWK '{print substr($1, 11, 1)}')
+		typeset ls_attr=$(usr_exec ls -@ $tf | \
+			awk '{print substr($1, 11, 1)}')
 
 		case $ZFS_ACL_CUR_USER in
 		root)
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_001_pos.ksh
index c49c7f8de7..56fb2b6a0b 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -48,12 +52,12 @@ for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
 	log_must create_files $TESTDIR
-	initfiles=$($LS -R $INI_DIR/*)
+	initfiles=$(ls -R $INI_DIR/*)
 
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
 		f=$(getitem $i $initfiles)
-		ff=$(usr_exec $FIND $INI_DIR -type f -name ${f##*/} \
+		ff=$(usr_exec find $INI_DIR -type f -name ${f##*/} \
 			-xattr -print)
 		if [[ $ff != $f ]]; then
 			log_fail "find file containing attribute fail."
@@ -64,7 +68,7 @@ for user in root $ZFS_ACL_STAFF1; do
 		typeset -i j=0
 		while (( j < NUM_ATTR )); do
 			typeset af=attribute.$j
-			fa=$(usr_exec $FIND $INI_DIR -type f -name ${f##*/} \
+			fa=$(usr_exec find $INI_DIR -type f -name ${f##*/} \
 				-xattr -exec runat {} ls $af \\\;)
 			if [[ $fa != $af ]]; then
 				log_fail "find file attribute fail"
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_002_neg.ksh
index 9f68c5022b..43c60e3a52 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_find_002_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -50,18 +54,18 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	log_must create_files $TESTDIR
 
-	initfiles=$($LS -R $INI_DIR/*)
+	initfiles=$(ls -R $INI_DIR/*)
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
 		f=$(getitem $i $initfiles)
-		usr_exec $RUNAT $f $RM attribute*
+		usr_exec runat $f rm attribute*
 		(( i += 1 ))
 	done
 
 	i=0
 	while (( i < NUM_FILE )); do
 		f=$(getitem $i $initfiles)
-		ff=$(usr_exec $FIND $INI_DIR -type f -name ${f##*/} \
+		ff=$(usr_exec find $INI_DIR -type f -name ${f##*/} \
 			-xattr -print)
 		if [[ $ff == $f ]]; then
 			log_fail "find not containing attribute should fail."
@@ -69,8 +73,8 @@ for user in root $ZFS_ACL_STAFF1; do
 
 		typeset -i j=0
 		while (( j < NUM_ATTR )); do
-			fa=$(usr_exec $FIND $INI_DIR -type f -name ${f##*/} \
-				-xattr -exec $RUNAT {} $LS attribute.$j \\\;)
+			fa=$(usr_exec find $INI_DIR -type f -name ${f##*/} \
+				-xattr -exec runat {} ls attribute.$j \\\;)
 			if [[ $fa == attribute.$j ]]; then
 				log_fail "find file attribute should fail."
 			fi
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_001_pos.ksh
index 728b6a764c..497189cdcc 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -48,11 +52,11 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	log_must create_files $TESTDIR
 
-	initfiles=$($LS -R $INI_DIR/*)
+	initfiles=$(ls -R $INI_DIR/*)
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
 		f=$(getitem $i $initfiles)
-		ls_attr=$(usr_exec $LS -@ $f | $AWK '{print substr($1, 11, 1)}')
+		ls_attr=$(usr_exec ls -@ $f | awk '{print substr($1, 11, 1)}')
 		if [[ $ls_attr != "@" ]]; then
 			log_fail "ls -@ $f with attribute should success."
 		else
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_002_neg.ksh
index 58582da69e..2b6027fe39 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_ls_002_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -49,13 +53,13 @@ for user in root $ZFS_ACL_STAFF1; do
 
 	log_must create_files $TESTDIR
 
-	initfiles=$($LS -R $INI_DIR/*)
+	initfiles=$(ls -R $INI_DIR/*)
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
 		f=$(getitem $i $initfiles)
-		log_must usr_exec $RUNAT $f $RM attribute*
+		log_must usr_exec runat $f rm attribute*
 
-		ls_attr=$(usr_exec $LS -l $f | $AWK '{print substr($1, 11, 1)}')
+		ls_attr=$(usr_exec ls -l $f | awk '{print substr($1, 11, 1)}')
 		if [[ $ls_attr == "@" ]]; then
 			log_fail "ls with attribute shouldn't success."
 		fi
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_mv_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_mv_001_pos.ksh
index d975d7dfaa..0a82defc0c 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_mv_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_mv_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -55,7 +59,7 @@ for user in root $ZFS_ACL_STAFF1; do
 	log_must create_files $TESTDIR
 
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
-	log_must usr_exec $MV $INI_DIR/* $TST_DIR
+	log_must usr_exec mv $INI_DIR/* $TST_DIR
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pack_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pack_001_pos.ksh
index c09a990619..10ef180888 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pack_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pack_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -58,9 +62,9 @@ for user in root $ZFS_ACL_STAFF1; do
 	log_must create_files $TESTDIR
 
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
-	log_must eval "usr_exec $PACK -f $INI_DIR/* > /dev/null 2>&1"
-	log_must usr_exec $MV $INI_DIR/* $TST_DIR
-	log_must eval "usr_exec $UNPACK $TST_DIR/* > /dev/null 2>&1"
+	log_must eval "usr_exec pack -f $INI_DIR/* > /dev/null 2>&1"
+	log_must usr_exec mv $INI_DIR/* $TST_DIR
+	log_must eval "usr_exec unpack $TST_DIR/* > /dev/null 2>&1"
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_001_pos.ksh
index 2b2929cdf4..65444dce67 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -50,33 +54,33 @@ log_onexit cleanup
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
-	[[ ! -d $INI_DIR ]] && log_must usr_exec $MKDIR -m 777 -p $INI_DIR
-	log_must usr_exec $MKTREE -b $INI_DIR -l 6 -d 2 -f 2
+	[[ ! -d $INI_DIR ]] && log_must usr_exec mkdir -m 777 -p $INI_DIR
+	log_must usr_exec mktree -b $INI_DIR -l 6 -d 2 -f 2
 
 	#
 	# Enter into initial directory and record all directory information,
 	# then pax all the files to $TMP_DIR/files.pax.
 	#
-	[[ ! -d $TMP_DIR ]] && log_must usr_exec $MKDIR $TMP_DIR
+	[[ ! -d $TMP_DIR ]] && log_must usr_exec mkdir $TMP_DIR
 	initout=$TMP_DIR/initout.$$
 	paxout=$TMP_DIR/files.pax
 
 	cd $INI_DIR
 	log_must eval "record_cksum $INI_DIR $initout > /dev/null 2>&1"
-	log_must eval "usr_exec $PAX -w -@ -f $paxout * > /dev/null 2>&1"
+	log_must eval "usr_exec pax -w -@ -f $paxout * > /dev/null 2>&1"
 
 	#
 	# Enter into test directory and pax $TMP_DIR/files.pax to current
 	# directory. Record all directory information and compare with initial
 	# directory record.
 	#
-	[[ ! -d $TST_DIR ]] && log_must usr_exec $MKDIR -m 777 $TST_DIR
+	[[ ! -d $TST_DIR ]] && log_must usr_exec mkdir -m 777 $TST_DIR
 	testout=$TMP_DIR/testout.$$
 	cd $TST_DIR
-	log_must eval "usr_exec $PAX -r -@ -f $paxout > /dev/null 2>&1"
+	log_must eval "usr_exec pax -r -@ -f $paxout > /dev/null 2>&1"
 	log_must eval "record_cksum $TST_DIR $testout > /dev/null 2>&1"
 
-	log_must usr_exec $DIFF $initout $testout
+	log_must usr_exec diff $initout $testout
 
 	log_must cleanup
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_002_pos.ksh
index eda3a6ec2c..f12b905547 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -50,32 +54,32 @@ log_onexit cleanup
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
-	[[ ! -d $INI_DIR ]] && log_must usr_exec $MKDIR -m 777 $INI_DIR
-	log_must usr_exec $MKTREE -b $INI_DIR -l 6 -d 2 -f 2
+	[[ ! -d $INI_DIR ]] && log_must usr_exec mkdir -m 777 $INI_DIR
+	log_must usr_exec mktree -b $INI_DIR -l 6 -d 2 -f 2
 
 	#
 	# Enter into initial directory and record all directory information,
 	# then pax all the files to $TMP_DIR/files.pax.
 	#
-	[[ ! -d $TMP_DIR ]] && log_must usr_exec $MKDIR -m 777 $TMP_DIR
+	[[ ! -d $TMP_DIR ]] && log_must usr_exec mkdir -m 777 $TMP_DIR
 	initout=$TMP_DIR/initout.$$
 	paxout=$TMP_DIR/files.tar
 	cd $INI_DIR
 	log_must eval "record_cksum $INI_DIR $initout > /dev/null 2>&1"
-	log_must eval "usr_exec $PAX -w -x ustar -@ -f $paxout *>/dev/null 2>&1"
+	log_must eval "usr_exec pax -w -x ustar -@ -f $paxout *>/dev/null 2>&1"
 
 	#
 	# Enter into test directory and tar $TMP_DIR/files.pax to current
 	# directory. Record all directory information and compare with initial
 	# directory record.
 	#
-	[[ ! -d $TST_DIR ]] && log_must usr_exec $MKDIR -m 777 $TST_DIR
+	[[ ! -d $TST_DIR ]] && log_must usr_exec mkdir -m 777 $TST_DIR
 	testout=$TMP_DIR/testout.$$
 	cd $TST_DIR
-	log_must eval "usr_exec $TAR xpf@ $paxout > /dev/null 2>&1"
+	log_must eval "usr_exec tar xpf@ $paxout > /dev/null 2>&1"
 	log_must eval "record_cksum $TST_DIR $testout > /dev/null 2>&1"
 
-	log_must usr_exec $DIFF $initout $testout
+	log_must usr_exec diff $initout $testout
 
 	log_must cleanup
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_003_pos.ksh
index 8936c67212..7d97b0d1e1 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -50,27 +54,27 @@ log_onexit cleanup
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
-	[[ ! -d $INI_DIR ]] && log_must usr_exec $MKDIR -m 777 -p $INI_DIR
-	log_must usr_exec $MKTREE -b $INI_DIR -l 6 -d 2 -f 2
+	[[ ! -d $INI_DIR ]] && log_must usr_exec mkdir -m 777 -p $INI_DIR
+	log_must usr_exec mktree -b $INI_DIR -l 6 -d 2 -f 2
 
 	initout=$TMP_DIR/initout.$$
 	paxout=$TMP_DIR/files.cpio
 	cd $INI_DIR
 	log_must eval "record_cksum $INI_DIR $initout > /dev/null 2>&1"
-	log_must eval "usr_exec $PAX -w -x cpio -@ -f $paxout * >/dev/null 2>&1"
+	log_must eval "usr_exec pax -w -x cpio -@ -f $paxout * >/dev/null 2>&1"
 
 	#
 	# Enter into test directory and cpio $TMP_DIR/files.pax to current
 	# directory. Record all directory information and compare with initial
 	# directory record.
 	#
-	[[ ! -d $TST_DIR ]] && log_must usr_exec $MKDIR -m 777 $TST_DIR
+	[[ ! -d $TST_DIR ]] && log_must usr_exec mkdir -m 777 $TST_DIR
 	testout=$TMP_DIR/testout.$$
 	cd $TST_DIR
-	log_must eval "usr_exec $CPIO -ivd@ < $paxout" > /dev/null 2>&1
+	log_must eval "usr_exec cpio -ivd@ < $paxout" > /dev/null 2>&1
 	log_must eval "record_cksum $TST_DIR $testout > /dev/null 2>&1"
 
-	log_must usr_exec $DIFF $initout $testout
+	log_must usr_exec diff $initout $testout
 
 	log_must cleanup
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_004_pos.ksh
index 8f7442f6b8..438b5b87e2 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_004_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -64,7 +68,7 @@ for user in root $ZFS_ACL_STAFF1; do
 	paxout=$TMP_DIR/files.pax
 	cd $INI_DIR
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
-	log_must eval "usr_exec $PAX -w -@ -f $paxout * > /dev/null 2>&1"
+	log_must eval "usr_exec pax -w -@ -f $paxout * > /dev/null 2>&1"
 
 	#
 	# Enter into test directory and pax $TMP_DIR/files.pax to current
@@ -72,7 +76,7 @@ for user in root $ZFS_ACL_STAFF1; do
 	# directory record.
 	#
 	cd $TST_DIR
-	log_must eval "usr_exec $PAX -r -@ -f $paxout > /dev/null 2>&1"
+	log_must eval "usr_exec pax -r -@ -f $paxout > /dev/null 2>&1"
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_005_pos.ksh
index 3079cf9e8b..bd58428b27 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_005_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -64,7 +68,7 @@ for user in root $ZFS_ACL_STAFF1; do
 	paxout=$TMP_DIR/files.cpio
 	cd $INI_DIR
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
-	log_must eval "usr_exec $PAX -w -x cpio -@ -f $paxout * >/dev/null 2>&1"
+	log_must eval "usr_exec pax -w -x cpio -@ -f $paxout * >/dev/null 2>&1"
 
 	#
 	# Enter into test directory and pax $TMP_DIR/files.cpio to current
@@ -72,14 +76,14 @@ for user in root $ZFS_ACL_STAFF1; do
 	# directory record.
 	#
 	cd $TST_DIR
-	log_must eval "usr_exec $PAX -r -x cpio -@ -f $paxout > /dev/null 2>&1"
+	log_must eval "usr_exec pax -r -x cpio -@ -f $paxout > /dev/null 2>&1"
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
 	log_must compare_cksum BEFORE_ACKSUM AFTER_ACKSUM
 
-	log_must usr_exec $RM -rf *
-	log_must eval "usr_exec $CPIO -iv@ < $paxout > /dev/null 2>&1"
+	log_must usr_exec rm -rf *
+	log_must eval "usr_exec cpio -iv@ < $paxout > /dev/null 2>&1"
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_006_pos.ksh
index c713c03261..f66b9abec2 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_pax_006_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -64,7 +68,7 @@ for user in root $ZFS_ACL_STAFF1; do
 	paxout=$TMP_DIR/files.tar
 	cd $INI_DIR
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
-	log_must eval "usr_exec $PAX -w -x ustar -@ -f $paxout *>/dev/null 2>&1"
+	log_must eval "usr_exec pax -w -x ustar -@ -f $paxout *>/dev/null 2>&1"
 
 	#
 	# Enter into test directory and pax $TMP_DIR/files.tar to current
@@ -72,14 +76,14 @@ for user in root $ZFS_ACL_STAFF1; do
 	# directory record.
 	#
 	cd $TST_DIR
-	log_must eval "usr_exec $PAX -r -x ustar -@ -f $paxout > /dev/null 2>&1"
+	log_must eval "usr_exec pax -r -x ustar -@ -f $paxout > /dev/null 2>&1"
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
 	log_must compare_cksum BEFORE_ACKSUM AFTER_ACKSUM
 
-	log_must usr_exec $RM -rf *
-	log_must usr_exec $TAR xf@ $paxout
+	log_must usr_exec rm -rf *
+	log_must usr_exec tar xf@ $paxout
 	log_must cksum_files $TST_DIR AFTER_FCKSUM AFTER_ACKSUM
 
 	log_must compare_cksum BEFORE_FCKSUM AFTER_FCKSUM
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_001_pos.ksh
index d9ea49b9ff..5cbc23abbf 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -49,32 +53,32 @@ log_onexit cleanup
 for user in root $ZFS_ACL_STAFF1; do
 	log_must set_cur_usr $user
 
-	[[ ! -d $INI_DIR ]] && $MKDIR -m 777 -p $INI_DIR
-	log_must usr_exec $MKTREE -b $INI_DIR -l 5 -d 2 -f 2
+	[[ ! -d $INI_DIR ]] && mkdir -m 777 -p $INI_DIR
+	log_must usr_exec mktree -b $INI_DIR -l 5 -d 2 -f 2
 
 	#
 	# Enter into initial directory and record all directory information,
 	# then tar all the files to $TMP_DIR/files.tar.
 	#
-	[[ ! -d $TMP_DIR ]] && usr_exec $MKDIR $TMP_DIR
+	[[ ! -d $TMP_DIR ]] && usr_exec mkdir $TMP_DIR
 	initout=$TMP_DIR/initout.$$
 	tarout=$TMP_DIR/files.tar
 	cd $INI_DIR
 	log_must record_cksum $INI_DIR $initout
-	log_must usr_exec $TAR cpf@ $tarout *
+	log_must usr_exec tar cpf@ $tarout *
 
 	#
 	# Enter into test directory and tar $TMP_DIR/files.tar to current
 	# directory. Record all directory information and compare with initial
 	# directory record.
 	#
-	[[ ! -d $TST_DIR ]] && $MKDIR -m 777 $TST_DIR
+	[[ ! -d $TST_DIR ]] && mkdir -m 777 $TST_DIR
 	testout=$TMP_DIR/testout.$$
 	cd $TST_DIR
-	log_must usr_exec $TAR xpf@ $tarout
+	log_must usr_exec tar xpf@ $tarout
 	log_must record_cksum $TST_DIR $testout
 
-	log_must usr_exec $DIFF $initout $testout
+	log_must usr_exec diff $initout $testout
 
 	log_must cleanup
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_002_neg.ksh
index eabb85c341..a605fdabd8 100644
--- a/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/acl/trivial/zfs_acl_tar_002_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/acl/acl_common.kshlib
 
 #
@@ -64,7 +68,7 @@ for user in root $ZFS_ACL_STAFF1; do
 	tarout=$TMP_DIR/files.tar
 	cd $INI_DIR
 	log_must cksum_files $INI_DIR BEFORE_FCKSUM BEFORE_ACKSUM
-	log_must usr_exec $TAR cpf $tarout *
+	log_must usr_exec tar cpf $tarout *
 
 	#
 	# Enter into test directory and tar $TMP_DIR/files.tar to current
@@ -72,14 +76,14 @@ for user in root $ZFS_ACL_STAFF1; do
 	# directory record.
 	#
 	cd $TST_DIR
-	log_must usr_exec $CP $tarout $TST_DIR
-	log_must usr_exec $TAR xpf $tarout
+	log_must usr_exec cp $tarout $TST_DIR
+	log_must usr_exec tar xpf $tarout
 
-	testfiles=$($LS -R $TST_DIR/*)
+	testfiles=$(ls -R $TST_DIR/*)
 	typeset -i i=0
 	while (( i < NUM_FILE )); do
 		f=$(getitem $i $testfiles)
-		ls_attr=$($LS -@ $f | $AWK '{print substr($1, 11, 1)}')
+		ls_attr=$(ls -@ $f | awk '{print substr($1, 11, 1)}')
 		if [[ $ls_attr == "@" ]]; then
 			log_fail "extraction of attribute successful w/ -@ flag"
 		fi
diff --git a/usr/src/test/zfs-tests/tests/functional/atime/atime_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/atime/atime_001_pos.ksh
index 891e22102e..05df97df36 100644
--- a/usr/src/test/zfs-tests/tests/functional/atime/atime_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/atime/atime_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/atime/atime_common.kshlib
 
 #
@@ -58,7 +62,7 @@ do
 		mtpt=$(snapshot_mountpoint $dst)
 		log_mustnot check_atime_updated $mtpt/$TESTFILE
 	else
-		log_must $ZFS set atime=on $dst
+		log_must zfs set atime=on $dst
 		log_must check_atime_updated $mtpt/$TESTFILE
 	fi
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/atime/atime_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/atime/atime_002_neg.ksh
index 06a35cc117..c8579337c0 100644
--- a/usr/src/test/zfs-tests/tests/functional/atime/atime_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/atime/atime_002_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/atime/atime_common.kshlib
 
 #
@@ -58,7 +62,7 @@ do
 	if [[ $dst == $TESTPOOL/$TESTFS@$TESTSNAP ]]; then
 		mtpt=$(snapshot_mountpoint $dst)
 	else
-		log_must $ZFS set atime=off $dst
+		log_must zfs set atime=off $dst
 	fi
 
 	log_mustnot check_atime_updated $mtpt/$TESTFILE
diff --git a/usr/src/test/zfs-tests/tests/functional/atime/atime_common.kshlib b/usr/src/test/zfs-tests/tests/functional/atime/atime_common.kshlib
index 5e0cde90f9..64ffdf0854 100644
--- a/usr/src/test/zfs-tests/tests/functional/atime/atime_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/atime/atime_common.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/atime/atime.cfg
 . $STF_SUITE/include/libtest.shlib
 
@@ -40,9 +44,9 @@ function check_atime_updated
 {
 	typeset filename=$1
 
-	typeset before=$($LS -Eu $filename | $AWK '{print $7}')
-	log_must $CAT $filename
-	typeset after=$($LS -Eu $filename | $AWK '{print $7}')
+	typeset before=$(ls -Eu $filename | awk '{print $7}')
+	log_must cat $filename
+	typeset after=$(ls -Eu $filename | awk '{print $7}')
 
 	if [[ $before != $after ]]; then
 		return 0
@@ -54,7 +58,7 @@ function check_atime_updated
 function setup_snap_clone
 {
 	# Create two file to verify snapshot.
-	log_must $TOUCH $TESTDIR/$TESTFILE
+	log_must touch $TESTDIR/$TESTFILE
 
 	create_snapshot $TESTPOOL/$TESTFS $TESTSNAP
 	create_clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_001_pos.ksh
index 8b0f98305b..4472bf2e38 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_001_pos.ksh
@@ -28,7 +28,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,15 +47,15 @@ verify_runnable "global"
 
 function cleanup {
 	if poolexists $TESTPOOL ; then
-		log_must $ZPOOL destroy $TESTPOOL
+		log_must zpool destroy $TESTPOOL
 	fi
 
 	if [[ -f $VDEV ]]; then
-		log_must $RM -f $VDEV
+		log_must rm -f $VDEV
 	fi
 }
 
-$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
+zpool set 2>&1 | grep bootfs > /dev/null
 if [ $? -ne 0 ]
 then
         log_unsupported "bootfs pool property not supported on this release."
@@ -66,17 +66,17 @@ log_onexit cleanup
 
 typeset VDEV=/bootfs_001_pos_a.$$.dat
 
-log_must $MKFILE $MINVDEVSIZE $VDEV
+log_must mkfile $MINVDEVSIZE $VDEV
 create_pool "$TESTPOOL" "$VDEV"
-log_must $ZFS create $TESTPOOL/$TESTFS
+log_must zfs create $TESTPOOL/$TESTFS
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap
-log_must $ZFS clone $TESTPOOL/$TESTFS@snap $TESTPOOL/clone
+log_must zfs snapshot $TESTPOOL/$TESTFS@snap
+log_must zfs clone $TESTPOOL/$TESTFS@snap $TESTPOOL/clone
 
-log_must $ZPOOL set bootfs=$TESTPOOL/$TESTFS $TESTPOOL
-log_must $ZPOOL set bootfs=$TESTPOOL/$TESTFS@snap $TESTPOOL
-log_must $ZPOOL set bootfs=$TESTPOOL/clone $TESTPOOL
+log_must zpool set bootfs=$TESTPOOL/$TESTFS $TESTPOOL
+log_must zpool set bootfs=$TESTPOOL/$TESTFS@snap $TESTPOOL
+log_must zpool set bootfs=$TESTPOOL/clone $TESTPOOL
 
-log_must $ZFS promote $TESTPOOL/clone
-log_must $ZPOOL set bootfs=$TESTPOOL/clone $TESTPOOL
+log_must zfs promote $TESTPOOL/clone
+log_must zpool set bootfs=$TESTPOOL/clone $TESTPOOL
 log_pass "Valid datasets are accepted as bootfs property values"
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
index 2ee502a4b7..9bb685dfc5 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_002_neg.ksh
@@ -28,7 +28,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,19 +49,19 @@ verify_runnable "global"
 function cleanup {
 	if datasetexists $TESTPOOL/vol
 	then
-		log_must $ZFS destroy $TESTPOOL/vol
+		log_must zfs destroy $TESTPOOL/vol
 	fi
 	if poolexists $TESTPOOL
 	then
-		log_must $ZPOOL destroy $TESTPOOL
+		log_must zpool destroy $TESTPOOL
 	fi
 	if [[ -f $VDEV ]]; then
-		log_must $RM -f $VDEV
+		log_must rm -f $VDEV
 	fi
 }
 
 
-$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
+zpool set 2>&1 | grep bootfs > /dev/null
 if [ $? -ne 0 ]
 then
 	log_unsupported "bootfs pool property not supported on this release."
@@ -72,10 +72,10 @@ log_onexit cleanup
 
 typeset VDEV=/bootfs_002_neg_a.$$.dat
 
-log_must $MKFILE 400m $VDEV
+log_must mkfile 400m $VDEV
 create_pool "$TESTPOOL" "$VDEV"
-log_must $ZFS create -V 10m $TESTPOOL/vol
+log_must zfs create -V 10m $TESTPOOL/vol
 
-log_mustnot $ZPOOL set bootfs=$TESTPOOL/vol $TESTPOOL
+log_mustnot zpool set bootfs=$TESTPOOL/vol $TESTPOOL
 
 log_pass "Invalid datasets are rejected as boot property values"
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_003_pos.ksh
index a488a35e02..2aa37d6a5a 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,13 +48,13 @@ set -A pools "pool.$$" "pool123" "mypool"
 
 function cleanup {
 	if poolexists $POOL ; then
-		log_must $ZPOOL destroy $POOL
+		log_must zpool destroy $POOL
 	fi
-	$RM /bootfs_003.$$.dat
+	rm /bootfs_003.$$.dat
 }
 
 
-$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
+zpool set 2>&1 | grep bootfs > /dev/null
 if [ $? -ne 0 ]
 then
         log_unsupported "bootfs pool property not supported on this release."
@@ -63,23 +63,23 @@ fi
 log_onexit cleanup
 
 log_assert "Valid pool names are accepted by zpool set bootfs"
-$MKFILE $MINVDEVSIZE /bootfs_003.$$.dat
+mkfile $MINVDEVSIZE /bootfs_003.$$.dat
 
 typeset -i i=0;
 
 while [ $i -lt "${#pools[@]}" ]
 do
 	POOL=${pools[$i]}
-	log_must $ZPOOL create $POOL /bootfs_003.$$.dat
-	log_must $ZFS create $POOL/$TESTFS
+	log_must zpool create $POOL /bootfs_003.$$.dat
+	log_must zfs create $POOL/$TESTFS
 
-	log_must $ZPOOL set bootfs=$POOL/$TESTFS $POOL
-	RES=$($ZPOOL get bootfs $POOL | $TAIL -1 | $AWK '{print $3}' )
+	log_must zpool set bootfs=$POOL/$TESTFS $POOL
+	RES=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
 	if [ $RES != "$POOL/$TESTFS" ]
 	then
 		log_fail "Expected $RES == $POOL/$TESTFS"
 	fi
-	log_must $ZPOOL destroy $POOL
+	log_must zpool destroy $POOL
 	i=$(( $i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_004_neg.ksh
index 5c57545938..a55249f9e0 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_004_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,13 +49,13 @@ set -A pools "pool//$$" "pool%d123" "mirror" "c0t0d0s0" "pool*23*" "*po!l" \
 
 function cleanup {
 	if poolexists $POOL; then
-		log_must $ZPOOL destroy $POOL
+		log_must zpool destroy $POOL
 	fi
-	$RM /bootfs_004.$$.dat
+	rm /bootfs_004.$$.dat
 }
 
 
-$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
+zpool set 2>&1 | grep bootfs > /dev/null
 if [ $? -ne 0 ]
 then
         log_unsupported "bootfs pool property not supported on this release."
@@ -78,16 +78,16 @@ pools[${#pools[@]}]="$bigname"
 
 
 
-$MKFILE $MINVDEVSIZE /bootfs_004.$$.dat
+mkfile $MINVDEVSIZE /bootfs_004.$$.dat
 
 typeset -i i=0;
 
 while [ $i -lt "${#pools[@]}" ]
 do
 	POOL=${pools[$i]}/$TESTFS
-	log_mustnot $ZPOOL create $POOL /bootfs_004.$$.dat
-	log_mustnot $ZFS create $POOL/$TESTFS
-	log_mustnot $ZPOOL set bootfs=$POOL/$TESTFS $POOL
+	log_mustnot zpool create $POOL /bootfs_004.$$.dat
+	log_mustnot zfs create $POOL/$TESTFS
+	log_mustnot zpool set bootfs=$POOL/$TESTFS $POOL
 
 	i=$(( $i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_005_neg.ksh
index e555be23a3..78bd2cc955 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,14 +52,14 @@ function cleanup {
 	#
 	typeset pool_name
 	for config in $CONFIGS; do
-		pool_name=$(eval $ECHO \$ZPOOL_VERSION_${config}_NAME)
+		pool_name=$(eval echo \$ZPOOL_VERSION_${config}_NAME)
 		if poolexists $pool_name; then
-			log_must $ZPOOL destroy $pool_name
+			log_must zpool destroy $pool_name
 		fi
 	done
 
 	if poolexists $TESTPOOL ; then
-		log_must $ZPOOL destroy $TESTPOOL
+		log_must zpool destroy $TESTPOOL
 	fi
 }
 
@@ -69,14 +69,14 @@ log_assert "Boot properties cannot be set on pools with older versions"
 CONFIGS="1 2 3"
 
 log_onexit cleanup
-log_must $ZPOOL create -f $TESTPOOL $DISKS
+log_must zpool create -f $TESTPOOL $DISKS
 
 for config in $CONFIGS
 do
 	create_old_pool $config
-	POOL_NAME=$(eval $ECHO \$ZPOOL_VERSION_${config}_NAME)
-	log_must $ZFS create $POOL_NAME/$TESTFS
-	log_mustnot $ZPOOL set bootfs=$POOL_NAME/$TESTFS $POOL_NAME
+	POOL_NAME=$(eval echo \$ZPOOL_VERSION_${config}_NAME)
+	log_must zfs create $POOL_NAME/$TESTFS
+	log_mustnot zpool set bootfs=$POOL_NAME/$TESTFS $POOL_NAME
 	log_must destroy_upgraded_pool $config
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_006_pos.ksh
index 45bf94d270..327c98fd65 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -44,7 +44,7 @@
 verify_runnable "global"
 
 
-$ZPOOL set 2>&1 | $GREP bootfs > /dev/null
+zpool set 2>&1 | grep bootfs > /dev/null
 if [ $? -ne 0 ]
 then
 	log_unsupported "bootfs pool property not supported on this release."
@@ -57,38 +57,38 @@ VDEV4=/bootfs_006_pos_d.$$.dat
 
 function verify_bootfs { # $POOL
 	POOL=$1
-	log_must $ZFS create $POOL/$TESTFS
+	log_must zfs create $POOL/$TESTFS
 
-	log_must $ZPOOL set bootfs=$POOL/$TESTFS $POOL
-	VAL=$($ZPOOL get bootfs $POOL | $TAIL -1 | $AWK '{print $3}' )
+	log_must zpool set bootfs=$POOL/$TESTFS $POOL
+	VAL=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
 	if [ $VAL != "$POOL/$TESTFS" ]
 	then
-		log_must $ZPOOL status -v $POOL
+		log_must zpool status -v $POOL
 		log_fail \
 		    "set/get failed on $POOL - expected $VAL == $POOL/$TESTFS"
 	fi
-	log_must $ZPOOL destroy $POOL
+	log_must zpool destroy $POOL
 }
 
 function verify_no_bootfs { # $POOL
 	POOL=$1
-	log_must $ZFS create $POOL/$TESTFS
-	log_mustnot $ZPOOL set bootfs=$POOL/$TESTFS $POOL
-	VAL=$($ZPOOL get bootfs $POOL | $TAIL -1 | $AWK '{print $3}' )
+	log_must zfs create $POOL/$TESTFS
+	log_mustnot zpool set bootfs=$POOL/$TESTFS $POOL
+	VAL=$(zpool get bootfs $POOL | tail -1 | awk '{print $3}' )
 	if [ $VAL == "$POOL/$TESTFS" ]
 	then
-		log_must $ZPOOL status -v $POOL
+		log_must zpool status -v $POOL
 		log_fail "set/get unexpectedly failed $VAL != $POOL/$TESTFS"
 	fi
-	log_must $ZPOOL destroy $POOL
+	log_must zpool destroy $POOL
 }
 
 function cleanup {
 	if poolexists $TESTPOOL
 	then
-		log_must $ZPOOL destroy $TESTPOOL
+		log_must zpool destroy $TESTPOOL
 	fi
-	log_must $RM $VDEV1 $VDEV2 $VDEV3 $VDEV4
+	log_must rm $VDEV1 $VDEV2 $VDEV3 $VDEV4
 }
 
 log_assert "Pools of correct vdev types accept boot property"
@@ -96,51 +96,51 @@ log_assert "Pools of correct vdev types accept boot property"
 
 
 log_onexit cleanup
-log_must $MKFILE $MINVDEVSIZE $VDEV1 $VDEV2 $VDEV3 $VDEV4
+log_must mkfile $MINVDEVSIZE $VDEV1 $VDEV2 $VDEV3 $VDEV4
 
 
 ## the following configurations are supported bootable pools
 
 # normal
-log_must $ZPOOL create $TESTPOOL $VDEV1
+log_must zpool create $TESTPOOL $VDEV1
 verify_bootfs $TESTPOOL
 
 # normal + hotspare
-log_must $ZPOOL create $TESTPOOL $VDEV1 spare $VDEV2
+log_must zpool create $TESTPOOL $VDEV1 spare $VDEV2
 verify_bootfs $TESTPOOL
 
 # mirror
-log_must $ZPOOL create $TESTPOOL mirror $VDEV1 $VDEV2
+log_must zpool create $TESTPOOL mirror $VDEV1 $VDEV2
 verify_bootfs $TESTPOOL
 
 # mirror + hotspare
-log_must $ZPOOL create $TESTPOOL mirror $VDEV1 $VDEV2 spare $VDEV3
+log_must zpool create $TESTPOOL mirror $VDEV1 $VDEV2 spare $VDEV3
 verify_bootfs $TESTPOOL
 
 ## the following configurations are not supported as bootable pools
 
 # stripe
-log_must $ZPOOL create $TESTPOOL $VDEV1 $VDEV2
+log_must zpool create $TESTPOOL $VDEV1 $VDEV2
 verify_no_bootfs $TESTPOOL
 
 # stripe + hotspare
-log_must $ZPOOL create $TESTPOOL $VDEV1 $VDEV2 spare $VDEV3
+log_must zpool create $TESTPOOL $VDEV1 $VDEV2 spare $VDEV3
 verify_no_bootfs $TESTPOOL
 
 # raidz
-log_must $ZPOOL create $TESTPOOL raidz $VDEV1 $VDEV2
+log_must zpool create $TESTPOOL raidz $VDEV1 $VDEV2
 verify_no_bootfs $TESTPOOL
 
 # raidz + hotspare
-log_must $ZPOOL create $TESTPOOL raidz $VDEV1 $VDEV2 spare $VDEV3
+log_must zpool create $TESTPOOL raidz $VDEV1 $VDEV2 spare $VDEV3
 verify_no_bootfs $TESTPOOL
 
 # raidz2
-log_must $ZPOOL create $TESTPOOL raidz2 $VDEV1 $VDEV2 $VDEV3
+log_must zpool create $TESTPOOL raidz2 $VDEV1 $VDEV2 $VDEV3
 verify_no_bootfs $TESTPOOL
 
 # raidz2 + hotspare
-log_must $ZPOOL create $TESTPOOL raidz2 $VDEV1 $VDEV2 $VDEV3 spare $VDEV4
+log_must zpool create $TESTPOOL raidz2 $VDEV1 $VDEV2 $VDEV3 spare $VDEV4
 verify_no_bootfs $TESTPOOL
 
 log_pass "Pools of correct vdev types accept boot property"
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_007_pos.ksh
index 17cfc5017b..e6aee0c579 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_007_pos.ksh
@@ -27,6 +27,10 @@
 # Copyright 2015 Nexenta Systems, Inc.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -58,8 +62,8 @@ typeset assert_mesg="setting bootfs on a pool which was configured with the \
 
 log_assert $assert_mesg
 create_pool "$TESTPOOL" "$DISK"
-log_must $ZFS create $EFI_BOOTFS
+log_must zfs create $EFI_BOOTFS
 
-log_must $ZPOOL set bootfs=$EFI_BOOTFS $TESTPOOL
+log_must zpool set bootfs=$EFI_BOOTFS $TESTPOOL
 
 log_pass $assert_mesg
diff --git a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_008_neg.ksh
index 0bdefe6d10..c62fcb0ed5 100644
--- a/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/bootfs/bootfs_008_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,7 +51,7 @@ function cleanup {
 	fi
 
 	if [[ -f $VDEV ]]; then
-		log_must $RM -f $VDEV
+		log_must rm -f $VDEV
 	fi
 }
 
@@ -64,18 +64,18 @@ typeset COMP_FS=$TESTPOOL/COMP_FS
 log_onexit cleanup
 log_assert $assert_msg
 
-log_must $MKFILE $MINVDEVSIZE $VDEV
-log_must $ZPOOL create $TESTPOOL $VDEV
-log_must $ZFS create $COMP_FS
+log_must mkfile $MINVDEVSIZE $VDEV
+log_must zpool create $TESTPOOL $VDEV
+log_must zfs create $COMP_FS
 
 typeset -i i=0
 set -A gtype "gzip" "gzip-1" "gzip-2" "gzip-3" "gzip-4" "gzip-5" \
 	     "gzip-6" "gzip-7" "gzip-8" "gzip-9"
 
 while (( i < ${#gtype[@]} )); do
-	log_must $ZFS set compression=${gtype[i]} $COMP_FS
-	log_mustnot $ZPOOL set bootfs=$COMP_FS $TESTPOOL
-	log_must $ZFS set compression=off $COMP_FS
+	log_must zfs set compression=${gtype[i]} $COMP_FS
+	log_mustnot zpool set bootfs=$COMP_FS $TESTPOOL
+	log_must zfs set compression=off $COMP_FS
 	(( i += 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib b/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib
index ef367e1dba..26b56f68e5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -33,10 +33,10 @@
 function cleanup
 {
 	if datasetexists $TESTPOOL ; then
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 	fi
 	if datasetexists $TESTPOOL2 ; then
-		log_must $ZPOOL destroy -f $TESTPOOL2
+		log_must zpool destroy -f $TESTPOOL2
 	fi
 }
 
@@ -50,17 +50,17 @@ function display_status
 	typeset pool=$1
 
 	typeset -i ret=0
-	$ZPOOL status -xv $pool > /dev/null 2>&1
+	zpool status -xv $pool > /dev/null 2>&1
 	ret=$?
 
-	$ZPOOL iostat > /dev/null 2>&1
+	zpool iostat > /dev/null 2>&1
 	((ret |= $?))
 
 	typeset mntpnt=$(get_prop mountpoint $pool)
-	$DD if=/dev/random of=$mntpnt/testfile.$$ &
+	dd if=/dev/random of=$mntpnt/testfile.$$ &
 	typeset pid=$!
 
-	$ZPOOL iostat -v 1 3 > /dev/null
+	zpool iostat -v 1 3 > /dev/null
 	((ret |= $?))
 
 	kill -9 $pid
@@ -93,7 +93,7 @@ function verify_cache_device
 	#
 	# mirror:/disks/d ONLINE mirror:/disks/e ONLINE stripe:/disks/f ONLINE
 	#
-	set -A dev_stat_tab $($ZPOOL status -v $pool | $NAWK 'BEGIN {start=0} \
+	set -A dev_stat_tab $(zpool status -v $pool | nawk 'BEGIN {start=0} \
 				/\tcache/ {start=1}
 				/\tmirror/ || /\tspares/ || /^$/ {start=0}
 				(start==1) && /\t  (\/|[a-zA-Z])/ \
@@ -148,6 +148,6 @@ function verify_cache_device
 
 function verify_cache_support
 {
-	$ZPOOL upgrade -v | $GREP "Cache devices" > /dev/null 2>&1
+	zpool upgrade -v | grep "Cache devices" > /dev/null 2>&1
 	return $?
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_001_pos.ksh
index 7b4f560c83..955c9f1201 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -49,17 +49,17 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV \
+	log_must zpool create $TESTPOOL $type $VDEV \
 		cache $LDEV
 	log_must display_status $TESTPOOL
 
 	ldev=$(random_get $LDEV)
 	log_must verify_cache_device $TESTPOOL $ldev 'ONLINE'
 
-	log_must $ZPOOL remove $TESTPOOL $ldev
+	log_must zpool remove $TESTPOOL $ldev
 	log_must check_vdev_state $TESTPOOL $ldev ""
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Creating a pool with a cache device succeeds."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_002_pos.ksh
index 5c2c34e14b..888645c353 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -50,16 +50,16 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV
-	log_must $ZPOOL add $TESTPOOL cache $LDEV
+	log_must zpool create $TESTPOOL $type $VDEV
+	log_must zpool add $TESTPOOL cache $LDEV
 	log_must display_status $TESTPOOL
 	typeset ldev=$(random_get $LDEV)
 	log_must verify_cache_device $TESTPOOL $ldev 'ONLINE'
 
-	log_must $ZPOOL remove $TESTPOOL $ldev
+	log_must zpool remove $TESTPOOL $ldev
 	log_must check_vdev_state $TESTPOOL $ldev ""
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Adding a cache device to normal pool works."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_003_pos.ksh
index 73b5d34d54..566c5c6ac6 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -51,19 +51,19 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV \
+	log_must zpool create $TESTPOOL $type $VDEV \
 		cache $LDEV
-	log_must $ZPOOL add $TESTPOOL \
+	log_must zpool add $TESTPOOL \
 		cache $LDEV2
 
 	log_must display_status $TESTPOOL
 	ldev=$(random_get $LDEV2)
 	log_must verify_cache_device $TESTPOOL $ldev 'ONLINE'
 
-	log_must $ZPOOL remove $TESTPOOL $ldev
+	log_must zpool remove $TESTPOOL $ldev
 	log_must check_vdev_state $TESTPOOL $ldev ""
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Adding an extra cache device works."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_004_neg.ksh
index e71d4d093a..38fee608bb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_004_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -50,15 +50,15 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV \
+	log_must zpool create $TESTPOOL $type $VDEV \
 		cache $LDEV
 
 	ldev=$(random_get $LDEV)
 	typeset ldev2=$(random_get $LDEV2)
-	log_mustnot $ZPOOL attach $TESTPOOL $ldev $ldev2
+	log_mustnot zpool attach $TESTPOOL $ldev $ldev2
 	log_must check_vdev_state $TESTPOOL $ldev2 ""
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Attaching a cache device fails for an existing cache device."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_005_neg.ksh
index 6f61326fd9..35e15abe26 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -51,15 +51,15 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV \
+	log_must zpool create $TESTPOOL $type $VDEV \
 		cache $LDEV
 	sdev=$(random_get $LDEV)
 	tdev=$(random_get $LDEV2)
-	log_mustnot $ZPOOL replace $TESTPOOL $sdev $tdev
+	log_mustnot zpool replace $TESTPOOL $sdev $tdev
 	log_must verify_cache_device $TESTPOOL $sdev 'ONLINE'
 	log_must check_vdev_state $TESTPOOL $tdev ""
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Replacing a cache device fails."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_006_pos.ksh
index 1ced5abe01..46bd5fc8b3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -53,7 +53,7 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV \
+	log_must zpool create $TESTPOOL $type $VDEV \
 		cache $LDEV $LDEV2
 	ldev=$(random_get $LDEV $LDEV2)
 	log_must verify_cache_device \
@@ -62,8 +62,8 @@ do
 	#
 	# Nomal export/import operating
 	#
-	log_must $ZPOOL export $TESTPOOL
-	log_must $ZPOOL import -d $VDIR $TESTPOOL
+	log_must zpool export $TESTPOOL
+	log_must zpool import -d $VDIR $TESTPOOL
 	log_must display_status $TESTPOOL
 	ldev=$(random_get $LDEV $LDEV2)
 	log_must verify_cache_device \
@@ -72,14 +72,14 @@ do
 	#
 	# Destroy the pool and import again
 	#
-	log_must $ZPOOL destroy $TESTPOOL
-	log_must $ZPOOL import -Df -d $VDIR $TESTPOOL
+	log_must zpool destroy $TESTPOOL
+	log_must zpool import -Df -d $VDIR $TESTPOOL
 	log_must display_status $TESTPOOL
 	ldev=$(random_get $LDEV $LDEV2)
 	log_must verify_cache_device \
 		$TESTPOOL $ldev 'ONLINE'
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Exporting and importing pool with cache devices passes."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_007_neg.ksh
index 3f204ef4bd..e2cdc0a28d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_007_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -51,7 +51,7 @@ for type in "" "mirror" "raidz" "raidz2"
 do
 	for cachetype in "mirror" "raidz" "raidz1" "raidz2"
 	do
-		log_mustnot $ZPOOL create $TESTPOOL $type $VDEV \
+		log_mustnot zpool create $TESTPOOL $type $VDEV \
 			cache $cachetype $LDEV $LDEV2
 		ldev=$(random_get $LDEV $LDEV2)
 		log_mustnot verify_cache_device \
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_008_neg.ksh
index c251c5afbb..93866dd309 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_008_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -52,15 +52,15 @@ for type in "" "mirror" "raidz" "raidz2"
 do
 	for cachetype in "mirror" "raidz" "raidz1" "raidz2"
 	do
-		log_must $ZPOOL create $TESTPOOL $type $VDEV \
+		log_must zpool create $TESTPOOL $type $VDEV \
 			cache $LDEV
 
-		log_mustnot $ZPOOL add $TESTPOOL cache $cachetype $LDEV2
+		log_mustnot zpool add $TESTPOOL cache $cachetype $LDEV2
 		ldev=$(random_get $LDEV2)
 		log_mustnot verify_cache_device \
 			$TESTPOOL $ldev 'ONLINE' $cachetype
 
-		log_must $ZPOOL destroy $TESTPOOL
+		log_must zpool destroy $TESTPOOL
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_009_pos.ksh
index f4c5f50d94..7a0586648f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -51,19 +51,19 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV \
+	log_must zpool create $TESTPOOL $type $VDEV \
 		cache $LDEV $LDEV2
 
 	ldev=$(random_get $LDEV $LDEV2)
-	log_must $ZPOOL offline $TESTPOOL $ldev
+	log_must zpool offline $TESTPOOL $ldev
 	log_must display_status $TESTPOOL
 	log_must verify_cache_device $TESTPOOL $ldev 'OFFLINE' ''
 
-	log_must $ZPOOL online $TESTPOOL $ldev
+	log_must zpool online $TESTPOOL $ldev
 	log_must display_status $TESTPOOL
 	log_must verify_cache_device $TESTPOOL $ldev 'ONLINE' ''
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Offline and online a cache device succeed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_010_neg.ksh
index f17b286c3f..f3dcf6873c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_010_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -48,7 +48,7 @@ function cleanup_testenv
 {
 	cleanup
 	if [[ -n $lofidev ]]; then
-		log_must $LOFIADM -d $lofidev
+		log_must lofiadm -d $lofidev
 	fi
 }
 
@@ -57,28 +57,28 @@ log_onexit cleanup_testenv
 
 TESTVOL=testvol1$$
 dsk1=${DISKS%% *}
-log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1}
+log_must zpool create $TESTPOOL ${DISKS#$dsk1}
 
 # Add nomal /dev/rdsk device
-log_mustnot $ZPOOL add $TESTPOOL cache /dev/rdsk/${dsk1}s0
+log_mustnot zpool add $TESTPOOL cache /dev/rdsk/${dsk1}s0
 #log_must verify_cache_device $TESTPOOL $dsk1 'ONLINE'
 
 # Add nomal file
-log_mustnot $ZPOOL add $TESTPOOL cache $VDEV2
+log_mustnot zpool add $TESTPOOL cache $VDEV2
 
 # Add /dev/rlofi device
 lofidev=${VDEV2%% *}
-log_must $LOFIADM -a $lofidev
-lofidev=$($LOFIADM $lofidev)
-log_mustnot $ZPOOL add $TESTPOOL cache "/dev/rlofi/${lofidev#/dev/lofi/}"
+log_must lofiadm -a $lofidev
+lofidev=$(lofiadm $lofidev)
+log_mustnot zpool add $TESTPOOL cache "/dev/rlofi/${lofidev#/dev/lofi/}"
 if [[ -n $lofidev ]]; then
-	log_must $LOFIADM -d $lofidev
+	log_must lofiadm -d $lofidev
 	lofidev=""
 fi
 
 # Add /dev/zvol/rdsk device
-log_must $ZPOOL create $TESTPOOL2 $VDEV2
-log_must $ZFS create -V $SIZE $TESTPOOL2/$TESTVOL
-log_mustnot $ZPOOL add $TESTPOOL cache /dev/zvol/rdsk/$TESTPOOL2/$TESTVOL
+log_must zpool create $TESTPOOL2 $VDEV2
+log_must zfs create -V $SIZE $TESTPOOL2/$TESTVOL
+log_mustnot zpool add $TESTPOOL cache /dev/zvol/rdsk/$TESTPOOL2/$TESTVOL
 
 log_pass "Cache device can only be block devices."
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cache_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cache_011_pos.ksh
index 5f9e6db278..caa7e6e900 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cache_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cache_011_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -47,7 +47,7 @@ verify_disk_count "$LDEV2"
 
 function cleanup {
 	if datasetexists $TESTPOOL ; then
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 	fi
 }
 
@@ -56,13 +56,13 @@ log_onexit cleanup
 
 for type in "" "mirror" "raidz" "raidz2"
 do
-	log_must $ZPOOL create $TESTPOOL $type $VDEV \
+	log_must zpool create $TESTPOOL $type $VDEV \
 		cache $LDEV spare $LDEV2
 
-	log_must $ZPOOL remove $TESTPOOL $LDEV
+	log_must zpool remove $TESTPOOL $LDEV
 	log_must display_status $TESTPOOL
 
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 done
 
 log_pass "Remove cache device from pool with spare device should succeed"
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/cache/cleanup.ksh
index 020324f720..82c035ab9f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -35,12 +35,12 @@
 verify_runnable "global"
 
 if datasetexists $TESTPOOL ; then
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 fi
 if datasetexists $TESTPOOL2 ; then
-	log_must $ZPOOL destroy -f $TESTPOOL2
+	log_must zpool destroy -f $TESTPOOL2
 fi
 
-log_must $RM -rf $VDIR $VDIR2
+log_must rm -rf $VDIR $VDIR2
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/cache/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cache/setup.ksh
index 10b617feab..aa8d6cd06e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cache/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cache/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cache/cache.cfg
@@ -38,8 +38,8 @@ if ! $(is_physical_device $LDEV) ; then
 	log_unsupported "Only physical disk could be cache device"
 fi
 
-log_must $RM -rf $VDIR $VDIR2
-log_must $MKDIR -p $VDIR $VDIR2
-log_must $MKFILE $SIZE $VDEV $VDEV2
+log_must rm -rf $VDIR $VDIR2
+log_must mkdir -p $VDIR $VDIR2
+log_must mkfile $SIZE $VDEV $VDEV2
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile.kshlib b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile.kshlib
index 85fe65fedd..e22c681562 100644
--- a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile.kshlib
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -38,7 +38,7 @@ function pool_in_cache {
 	# the given cachefile, default is /etc/zfs/zpool.cache
 	typeset cachefile=${2:-$CPATH}
 
-	RESULT=$($STRINGS $cachefile | $GREP -w $1)
+	RESULT=$(strings $cachefile | grep -w $1)
 	if [ -z "$RESULT" ]
 	then
 		return 1
diff --git a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_001_pos.ksh
index f6481be9d0..13f89fc5e8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,7 +56,7 @@ function cleanup
         fi
 	for file in $CPATH1 $CPATH2 ; do
 		if [[ -f $file ]] ; then
-			log_must $RM $file
+			log_must rm $file
 		fi
 	done
 }
@@ -74,7 +74,7 @@ set -A opts "none" "false" "none" \
 typeset -i i=0
 
 while (( i < ${#opts[*]} )); do
-	log_must $ZPOOL create -o cachefile=${opts[i]} $TESTPOOL $DISKS
+	log_must zpool create -o cachefile=${opts[i]} $TESTPOOL $DISKS
 	case ${opts[((i+1))]} in
 		false) log_mustnot pool_in_cache $TESTPOOL
 			;;
@@ -87,7 +87,7 @@ while (( i < ${#opts[*]} )); do
 		log_fail "cachefile property not set as expected. " \
 			"Expect: ${opts[((i+2))]}, Current: $PROP"
 	fi
-	log_must $ZPOOL destroy $TESTPOOL
+	log_must zpool destroy $TESTPOOL
 	(( i = i + 3 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_002_pos.ksh
index b8d5b0a110..1712664703 100644
--- a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -61,22 +61,22 @@ verify_runnable "global"
 log_assert "Importing a pool with \"cachefile\" set doesn't update zpool.cache"
 log_onexit cleanup
 
-log_must $ZPOOL create -o cachefile=none $TESTPOOL $DISKS
+log_must zpool create -o cachefile=none $TESTPOOL $DISKS
 typeset DEVICEDIR=$(get_device_dir $DISKS)
 log_mustnot pool_in_cache $TESTPOOL
 
-log_must $ZPOOL export $TESTPOOL
-log_must $ZPOOL import -d $DEVICEDIR $TESTPOOL
+log_must zpool export $TESTPOOL
+log_must zpool import -d $DEVICEDIR $TESTPOOL
 log_must pool_in_cache $TESTPOOL
 
-log_must $ZPOOL export $TESTPOOL
-log_must $ZPOOL import -o cachefile=none -d $DEVICEDIR $TESTPOOL
+log_must zpool export $TESTPOOL
+log_must zpool import -o cachefile=none -d $DEVICEDIR $TESTPOOL
 log_mustnot pool_in_cache $TESTPOOL
 
-log_must $ZPOOL export $TESTPOOL
-log_must $ZPOOL import -o cachefile=$CPATH -d $DEVICEDIR $TESTPOOL
+log_must zpool export $TESTPOOL
+log_must zpool import -o cachefile=$CPATH -d $DEVICEDIR $TESTPOOL
 log_must pool_in_cache $TESTPOOL
 
-log_must $ZPOOL destroy $TESTPOOL
+log_must zpool destroy $TESTPOOL
 
 log_pass "Importing a pool with \"cachefile\" set doesn't update zpool.cache"
diff --git a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh
index c4eb0fba19..750bdba00d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,13 +56,13 @@ function cleanup
 
         for file in $CPATH1 $CPATH2 ; do
                 if [[ -f $file ]] ; then
-                        log_must $RM $file
+                        log_must rm $file
                 fi
         done
 
 	if [ -d $TESTDIR ]
 	then
-		$RMDIR $TESTDIR
+		rmdir $TESTDIR
 	fi
 }
 
@@ -80,7 +80,7 @@ set -A opts "none" "none" \
 
 
 while (( i < ${#opts[*]} )); do
-	log_must $ZPOOL create -o altroot=$TESTDIR -o cachefile=${opts[i]} \
+	log_must zpool create -o altroot=$TESTDIR -o cachefile=${opts[i]} \
 		$TESTPOOL $DISKS
 	if [[ ${opts[i]} != none ]]; then
 		log_must pool_in_cache $TESTPOOL ${opts[i]}
@@ -93,7 +93,7 @@ while (( i < ${#opts[*]} )); do
 		log_fail "cachefile property not set as expected. " \
 			"Expect: ${opts[((i+1))]}, Current: $PROP"
 	fi
-	log_must $ZPOOL destroy $TESTPOOL
+	log_must zpool destroy $TESTPOOL
 	(( i = i + 2 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh
index ea12cf2b6e..ae54a9365f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cachefile/cachefile_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -59,7 +59,7 @@ function cleanup
 	typeset -i i=0
 	while ((i < 2)); do
 		if [[ -e $mntpnt/vdev$i ]]; then
-			log_must $RM -f $mntpnt/vdev$i
+			log_must rm -f $mntpnt/vdev$i
 		fi
 		((i += 1))
 	done
@@ -70,7 +70,7 @@ function cleanup
 
 	for file in $CPATH1 $CPATH2 ; do
 		if [[ -f $file ]] ; then
-			log_must $RM $file
+			log_must rm $file
 		fi
 	done
 }
@@ -79,44 +79,44 @@ function cleanup
 log_assert "Verify set, export and destroy when cachefile is set on pool."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL $DISKS
+log_must zpool create $TESTPOOL $DISKS
 
 mntpnt=$(get_prop mountpoint $TESTPOOL)
 typeset -i i=0
 while ((i < 2)); do
-	log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev$i
+	log_must mkfile $MINVDEVSIZE $mntpnt/vdev$i
 	eval vdev$i=$mntpnt/vdev$i
 	((i += 1))
 done
 
-log_must $ZPOOL create -o cachefile=$CPATH1 $TESTPOOL1 $vdev0
+log_must zpool create -o cachefile=$CPATH1 $TESTPOOL1 $vdev0
 log_must pool_in_cache $TESTPOOL1 $CPATH1
-log_must $ZPOOL create -o cachefile=$CPATH1 $TESTPOOL2 $vdev1
+log_must zpool create -o cachefile=$CPATH1 $TESTPOOL2 $vdev1
 log_must pool_in_cache $TESTPOOL2 $CPATH1
 
-log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL1
+log_must zpool set cachefile=$CPATH2 $TESTPOOL1
 log_must pool_in_cache $TESTPOOL1 $CPATH2
-log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL2
+log_must zpool set cachefile=$CPATH2 $TESTPOOL2
 log_must pool_in_cache $TESTPOOL2 $CPATH2
 if [[ -f $CPATH1 ]]; then
 	log_fail "Verify set when cachefile is set on pool."
 fi
 
-log_must $ZPOOL export $TESTPOOL1
-log_must $ZPOOL export $TESTPOOL2
+log_must zpool export $TESTPOOL1
+log_must zpool export $TESTPOOL2
 if [[ -f $CPATH2 ]]; then
 	log_fail "Verify export when cachefile is set on pool."
 fi
 
-log_must $ZPOOL import -d $mntpnt $TESTPOOL1
-log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL1
+log_must zpool import -d $mntpnt $TESTPOOL1
+log_must zpool set cachefile=$CPATH2 $TESTPOOL1
 log_must pool_in_cache $TESTPOOL1 $CPATH2
-log_must $ZPOOL import -d $mntpnt $TESTPOOL2
-log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL2
+log_must zpool import -d $mntpnt $TESTPOOL2
+log_must zpool set cachefile=$CPATH2 $TESTPOOL2
 log_must pool_in_cache $TESTPOOL2 $CPATH2
 
-log_must $ZPOOL destroy $TESTPOOL1
-log_must $ZPOOL destroy $TESTPOOL2
+log_must zpool destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL2
 if [[ -f $CPATH2 ]]; then
 	log_fail "Verify destroy when cachefile is set on pool."
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.cfg b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.cfg
index ffad2fb9f9..9e8e456863 100644
--- a/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.cfg
+++ b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.cfg
@@ -13,12 +13,16 @@
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
-NAME_C_ORIG=$($ECHO 'F\0303\0257L\0303\0253N\0303\0204m\0303\0253')
-NAME_C_UPPER=$($ECHO 'F\0303\0217L\0303\0213N\0303\0204M\0303\0213')
-NAME_C_LOWER=$($ECHO 'f\0303\0257l\0303\0253n\0303\0244m\0303\0253')
-NAME_D_ORIG=$($ECHO 'Fi\0314\0210Le\0314\0210NA\0314\0210me\0314\0210')
-NAME_D_UPPER=$($ECHO 'FI\0314\0210LE\0314\0210NA\0314\0210ME\0314\0210')
-NAME_D_LOWER=$($ECHO 'fi\0314\0210le\0314\0210na\0314\0210me\0314\0210')
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
+NAME_C_ORIG=$(echo 'F\0303\0257L\0303\0253N\0303\0204m\0303\0253')
+NAME_C_UPPER=$(echo 'F\0303\0217L\0303\0213N\0303\0204M\0303\0213')
+NAME_C_LOWER=$(echo 'f\0303\0257l\0303\0253n\0303\0244m\0303\0253')
+NAME_D_ORIG=$(echo 'Fi\0314\0210Le\0314\0210NA\0314\0210me\0314\0210')
+NAME_D_UPPER=$(echo 'FI\0314\0210LE\0314\0210NA\0314\0210ME\0314\0210')
+NAME_D_LOWER=$(echo 'fi\0314\0210le\0314\0210na\0314\0210me\0314\0210')
 NAMES_ORIG="$NAME_C_ORIG $NAME_D_ORIG"
 NAMES_UPPER="$NAME_C_UPPER $NAME_D_UPPER"
 NAMES_LOWER="$NAME_C_LOWER $NAME_D_LOWER"
diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.kshlib b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.kshlib
index ff1206fdb6..273522406b 100644
--- a/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/casenorm/casenorm.kshlib
@@ -13,6 +13,10 @@
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/casenorm/casenorm.cfg
 
@@ -20,18 +24,18 @@ function create_testfs
 {
 	typeset opts=$1
 
-	$RM -rf $TESTDIR || log_unresolved Could not remove $TESTDIR
-	$MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR
+	rm -rf $TESTDIR || log_unresolved Could not remove $TESTDIR
+	mkdir -p $TESTDIR || log_unresolved Could not create $TESTDIR
 
-	log_must $ZFS create $opts $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs create $opts $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 function destroy_testfs
 {
 	if datasetexists $TESTPOOL/$TESTFS ; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS
-		$RM -rf $TESTDIR || log_unresolved Could not remove $TESTDIR
+		log_must zfs destroy -f $TESTPOOL/$TESTFS
+		rm -rf $TESTDIR || log_unresolved Could not remove $TESTDIR
 	fi
 }
 
@@ -39,14 +43,14 @@ function create_file
 {
 	typeset name=$TESTDIR/$1
 
-	$ECHO $name > $name
+	echo $name > $name
 }
 
 function delete_file
 {
 	typeset name=$TESTDIR/$1
 
-	$RM $name >/dev/null 2>&1
+	rm $name >/dev/null 2>&1
 
 	if [[ $? -ne 0 ]] ; then
 		return 1
@@ -61,14 +65,14 @@ function lookup_file
 {
 	typeset name=$1
 
-	$ZLOOK -l $TESTDIR $name >/dev/null 2>&1
+	zlook -l $TESTDIR $name >/dev/null 2>&1
 }
 
 function lookup_file_ci
 {
 	typeset name=$1
 
-	$ZLOOK -il $TESTDIR $name >/dev/null 2>&1
+	zlook -il $TESTDIR $name >/dev/null 2>&1
 }
 
 function lookup_any
diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/norm_all_values.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/norm_all_values.ksh
index c5af81c0b7..0037d3a835 100644
--- a/usr/src/test/zfs-tests/tests/functional/casenorm/norm_all_values.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/casenorm/norm_all_values.ksh
@@ -15,6 +15,10 @@
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/casenorm/casenorm.kshlib
 
 # DESCRIPTION:
@@ -39,7 +43,7 @@ log_assert "Can create FS with all supported normalization forms"
 for form in none formC formD formKC formKD; do
 	create_testfs "-o normalization=$form"
 	if [[ $form != "none" ]] ; then
-		utf8only=$($ZFS get -H -o value utf8only $TESTPOOL/$TESTFS)
+		utf8only=$(zfs get -H -o value utf8only $TESTPOOL/$TESTFS)
 		if [[ $utf8only != "on" ]]; then
 			log_fail "Turning on normalization didn't set " \
 			    "utf8only to on"
@@ -49,7 +53,7 @@ for form in none formC formD formKC formKD; do
 done
 
 for form in formC formD formKC formKD; do
-	log_mustnot $ZFS create -o utf8only=off -o normalization=$form \
+	log_mustnot zfs create -o utf8only=off -o normalization=$form \
 	    $TESTPOOL/$TESTFS
 	destroy_testfs
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/casenorm/setup.ksh b/usr/src/test/zfs-tests/tests/functional/casenorm/setup.ksh
index b57431c8a5..d2c9020b6f 100644
--- a/usr/src/test/zfs-tests/tests/functional/casenorm/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/casenorm/setup.ksh
@@ -15,9 +15,13 @@
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 verify_runnable "global"
 DISK=${DISKS%% *}
-log_must $ZPOOL create $TESTPOOL $DISK
+log_must zpool create $TESTPOOL $DISK
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/run_edonr_test.ksh b/usr/src/test/zfs-tests/tests/functional/checksum/run_edonr_test.ksh
index 54ea27158e..75d7de22c9 100644
--- a/usr/src/test/zfs-tests/tests/functional/checksum/run_edonr_test.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/checksum/run_edonr_test.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -25,7 +25,7 @@
 log_assert "Run the tests for the EdonR hash algorithm."
 
 freq=$(get_cpu_freq)
-for isa in $($ISAINFO); do
+for isa in $(isainfo); do
 	log_must $STF_SUITE/tests/functional/checksum/edonr_test.$isa $freq
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/run_sha2_test.ksh b/usr/src/test/zfs-tests/tests/functional/checksum/run_sha2_test.ksh
index 7ebe897010..c37be9d9ae 100644
--- a/usr/src/test/zfs-tests/tests/functional/checksum/run_sha2_test.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/checksum/run_sha2_test.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -25,7 +25,7 @@
 log_assert "Run the tests for the SHA-2 hash algorithm."
 
 freq=$(get_cpu_freq)
-for isa in $($ISAINFO); do
+for isa in $(isainfo); do
 	log_must $STF_SUITE/tests/functional/checksum/sha2_test.$isa $freq
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/checksum/run_skein_test.ksh b/usr/src/test/zfs-tests/tests/functional/checksum/run_skein_test.ksh
index 4ca9e1a60a..52dfa6c08c 100644
--- a/usr/src/test/zfs-tests/tests/functional/checksum/run_skein_test.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/checksum/run_skein_test.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -25,7 +25,7 @@
 log_assert "Run the tests for the Skein hash algorithm."
 
 freq=$(get_cpu_freq)
-for isa in $($ISAINFO); do
+for isa in $(isainfo); do
 	log_must $STF_SUITE/tests/functional/checksum/skein_test.$isa $freq
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/clean_mirror/clean_mirror_common.kshlib b/usr/src/test/zfs-tests/tests/functional/clean_mirror/clean_mirror_common.kshlib
index 91a6d132d2..e88f6c4431 100644
--- a/usr/src/test/zfs-tests/tests/functional/clean_mirror/clean_mirror_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/clean_mirror/clean_mirror_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/clean_mirror/default.cfg
@@ -45,20 +45,20 @@ function sync_pool #pool
 {
 	typeset pool=$1
 
-	log_must $SYNC
-	log_must $SLEEP 2
+	log_must sync
+	log_must sleep 2
 	# Flush all the pool data.
 	typeset -i ret
-	$ZPOOL scrub $pool >/dev/null 2>&1
+	zpool scrub $pool >/dev/null 2>&1
 	ret=$?
 	(( $ret != 0 )) && \
-		log_fail "$ZPOOL scrub $pool failed."
+		log_fail "zpool scrub $pool failed."
 
 	while ! is_pool_scrubbed $pool; do
 		if is_pool_resilvered $pool ; then
 			log_fail "$pool should not be resilver completed."
 		fi
-		log_must $SLEEP 2
+		log_must sleep 2
 	done
 }
 
@@ -74,14 +74,14 @@ function overwrite_verify_mirror
 
 	while (( atfile < FILE_COUNT )); do
 		files[$atfile]=$TESTDIR/file.$atfile
-		log_must $FILE_WRITE -o create -f $TESTDIR/file.$atfile \
+		log_must file_write -o create -f $TESTDIR/file.$atfile \
 			-b $FILE_SIZE -c 1
-		cksums[$atfile]=$($CKSUM ${files[$atfile]})
+		cksums[$atfile]=$(cksum ${files[$atfile]})
 		(( atfile = atfile + 1 ))
 	done
 
 	# dd the primary side of the mirror
-	log_must $DD if=$OVERWRITING_DEVICE of=/dev/dsk/$AFFECTED_DEVICE \
+	log_must dd if=$OVERWRITING_DEVICE of=/dev/dsk/$AFFECTED_DEVICE \
 		seek=8 bs=$DD_BLOCK count=$(( DD_COUNT - 8 )) conv=notrunc
 
 	atfile=0
@@ -89,17 +89,17 @@ function overwrite_verify_mirror
 	#
 	# Flush out the cache so that we ensure we're reading from disk.
 	#
-	log_must $ZPOOL export $TESTPOOL
-	log_must $ZPOOL import $TESTPOOL
+	log_must zpool export $TESTPOOL
+	log_must zpool import $TESTPOOL
 
 	typeset -i failedcount=0
 	while (( atfile < FILE_COUNT )); do
 		files[$atfile]=$TESTDIR/file.$atfile
-		newcksum=$($CKSUM ${files[$atfile]})
+		newcksum=$(cksum ${files[$atfile]})
 		if [[ $newcksum != ${cksums[$atfile]} ]]; then
 			(( failedcount = failedcount + 1 ))
 		fi
-		$RM -f ${files[$atfile]}
+		rm -f ${files[$atfile]}
 		(( atfile = atfile + 1 ))
 	done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/clean_mirror/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/clean_mirror/cleanup.ksh
index 6311004564..5cf11f38bf 100644
--- a/usr/src/test/zfs-tests/tests/functional/clean_mirror/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/clean_mirror/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/clean_mirror/default.cfg
@@ -34,8 +34,8 @@
 
 verify_runnable "global"
 
-$DF -F zfs -h | $GREP "$TESTFS " >/dev/null
-[[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR
+df -F zfs -h | grep "$TESTFS " >/dev/null
+[[ $? == 0 ]] && log_must zfs umount -f $TESTDIR
 destroy_pool $TESTPOOL
 
 # recreate and destroy a zpool over the disks to restore the partitions to
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/cli_common.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/cli_common.kshlib
index 06e794ed85..4788de5986 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/cli_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/cli_common.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -31,7 +35,7 @@
 #
 function get_cksum # <file path>
 {
-	return $($CKSUM $1 | $AWK '{print $1 $2}')
+	return $(cksum $1 | awk '{print $1 $2}')
 }
 
 #
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/zdb_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/zdb_001_neg.ksh
index bf93693dc8..8205ec3104 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/zdb_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zdb/zdb_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -65,7 +65,7 @@ log_assert "Execute zdb using invalid parameters."
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZDB ${args[i]}
+	log_mustnot zdb ${args[i]}
 
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_001_neg.ksh
index bfcc864913..c8fafc339d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_001_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -65,7 +70,7 @@ log_assert "Badly-formed zfs sub-command should return an error."
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZFS ${args[i]}
+	log_mustnot zfs ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_002_pos.ksh
index 31823d6e82..7a4d3a0eaf 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,11 +49,11 @@ function cleanup
 	unset ZFS_ABORT
 
 	if [[ -d $corepath ]]; then
-		$RM -rf $corepath
+		rm -rf $corepath
 	fi
 	for ds in $fs1 $fs $ctr; do
 		if datasetexists $ds; then
-			log_must $ZFS destroy -rRf $ds
+			log_must zfs destroy -rRf $ds
 		fi
 	done
 }
@@ -65,12 +65,12 @@ log_onexit cleanup
 #preparation work for testing
 corepath=$TESTDIR/core
 if [[ -d $corepath ]]; then
-	$RM -rf $corepath
+	rm -rf $corepath
 fi
-log_must $MKDIR $corepath
+log_must mkdir $corepath
 
 ctr=$TESTPOOL/$TESTCTR
-log_must $ZFS create $ctr
+log_must zfs create $ctr
 
 fs=$ctr/$TESTFS
 fs1=$ctr/$TESTFS1
@@ -89,17 +89,17 @@ typeset badparams=("" "create" "destroy" "snapshot" "rollback" "clone" \
     "promote" "rename" "list -*" "set" "get -*" "inherit" "mount -A" \
     "unmount" "share" "unshare" "send" "receive")
 
-log_must $COREADM -p ${corepath}/core.%f
+log_must coreadm -p ${corepath}/core.%f
 log_must export ZFS_ABORT=yes
 
 for subcmd in "${cmds[@]}" "${badparams[@]}"; do
-	$ZFS $subcmd >/dev/null 2>&1 && log_fail "$subcmd passed incorrectly."
+	zfs $subcmd >/dev/null 2>&1 && log_fail "$subcmd passed incorrectly."
 	corefile=${corepath}/core.zfs
 	if [[ ! -e $corefile ]]; then
-		log_fail "$ZFS $subcmd cannot generate core file with " \
+		log_fail "zfs $subcmd cannot generate core file with " \
 		    "ZFS_ABORT set."
 	fi
-	log_must $RM -f $corefile
+	log_must rm -f $corefile
 done
 
 log_pass "With ZFS_ABORT set, zfs command can abort and generate core file " \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_003_neg.ksh
index 608f45b0e7..481f98725d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs/zfs_003_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -48,12 +53,12 @@ MNTTAB=/etc/mnttab
 
 for file in $ZFS_DEV $MNTTAB; do
 	if [[ -e $file ]]; then
-		$MV $file ${file}.bak
+		mv $file ${file}.bak
 	fi
 	for cmd in "" "list" "get all" "mount"; do
-		log_mustnot eval "$ZFS $cmd >/dev/null 2>&1"
+		log_mustnot eval "zfs $cmd >/dev/null 2>&1"
 	done
-	$MV ${file}.bak $file
+	mv ${file}.bak $file
 done
 
 log_pass "zfs fails with unexpected scenarios as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_001_neg.ksh
index e98b0d8915..20cd6d3961 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -90,7 +90,7 @@ function setup_all
 
 	for snap in $SNAPFS $SNAPFS1 ; do
 		if ! snapexists $snap ; then
-			log_must $ZFS snapshot $snap
+			log_must zfs snapshot $snap
 		fi
 	done
 
@@ -100,11 +100,11 @@ function setup_all
 function cleanup_all
 {
 	for fs in $targets; do
-		datasetexists $fs && log_must $ZFS destroy -f $fs
+		datasetexists $fs && log_must zfs destroy -f $fs
 	done
 
 	for snap in $SNAPFS $SNAPFS1 ; do
-		snapexists $snap && log_must $ZFS destroy -Rf $snap
+		snapexists $snap && log_must zfs destroy -Rf $snap
 	done
 
 	return 0
@@ -118,7 +118,7 @@ setup_all
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZFS clone ${args[i]}
+	log_mustnot zfs clone ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_002_pos.ksh
index 1b376eb00d..8e69a7adcc 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function setup_all
 
 	for snap in $SNAPFS $SNAPFS1 ; do
 		if ! snapexists $snap ; then
-			log_must $ZFS snapshot $snap
+			log_must zfs snapshot $snap
 		fi
 	done
 
@@ -61,12 +61,12 @@ function cleanup_all
 {
 
 	if datasetexists $TESTPOOL/notexist ; then
-		log_must $ZFS destroy -rRf $TESTPOOL/notexist
+		log_must zfs destroy -rRf $TESTPOOL/notexist
 	fi
 
 	for snap in $SNAPFS $SNAPFS1 ; do
 		if snapexists $snap ; then
-			log_must $ZFS destroy -Rf $snap
+			log_must zfs destroy -Rf $snap
 		fi
 	done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_003_pos.ksh
index 103f2d3ab2..5222757598 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists $SNAPFS ; then
-		log_must $ZFS destroy -Rf $SNAPFS
+		log_must zfs destroy -Rf $SNAPFS
 	fi
 }
 
@@ -59,16 +59,16 @@ log_onexit cleanup
 log_assert "'zfs clone -o property=value filesystem' can successfully create" \
 	   "a ZFS clone filesystem with correct property set."
 
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
 typeset -i i=0
 while (( $i < ${#RW_FS_PROP[*]} )); do
-	log_must $ZFS clone -o ${RW_FS_PROP[$i]} $SNAPFS $TESTPOOL/$TESTCLONE
+	log_must zfs clone -o ${RW_FS_PROP[$i]} $SNAPFS $TESTPOOL/$TESTCLONE
 	datasetexists $TESTPOOL/$TESTCLONE || \
 		log_fail "zfs clone $TESTPOOL/$TESTCLONE fail."
 	propertycheck $TESTPOOL/$TESTCLONE ${RW_FS_PROP[i]} || \
 		log_fail "${RW_FS_PROP[i]} is failed to set."
-	log_must $ZFS destroy -f $TESTPOOL/$TESTCLONE
+	log_must zfs destroy -f $TESTPOOL/$TESTCLONE
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_004_pos.ksh
index 03bf7d7652..8d86f55018 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists $SNAPFS ; then
-		log_must $ZFS destroy -Rf $SNAPFS
+		log_must zfs destroy -Rf $SNAPFS
 	fi
 }
 
@@ -61,7 +61,7 @@ log_assert "'zfs clone -o property=value filesystem' can successfully create" \
 typeset -i i=0
 typeset opts=""
 
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
 while (( $i < ${#RW_FS_PROP[*]} )); do
         if [[ ${RW_FS_PROP[$i]} != *"checksum"* ]]; then
@@ -70,7 +70,7 @@ while (( $i < ${#RW_FS_PROP[*]} )); do
 	(( i = i + 1 ))
 done
 
-log_must $ZFS clone $opts $SNAPFS $TESTPOOL/$TESTCLONE
+log_must zfs clone $opts $SNAPFS $TESTPOOL/$TESTCLONE
 datasetexists $TESTPOOL/$TESTCLONE || \
 	log_fail "zfs create $TESTPOOL/$TESTCLONE fail."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_005_pos.ksh
index 776dfd5c28..879f837a66 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ verify_runnable "global"
 function cleanup
 {
 	if snapexists $SNAPFS1 ; then
-		log_must $ZFS destroy -Rf $SNAPFS1
+		log_must zfs destroy -Rf $SNAPFS1
 	fi
 }
 
@@ -58,15 +58,15 @@ log_onexit cleanup
 log_assert "'zfs clone -o property=value -V size volume' can successfully" \
 	   "create a ZFS clone volume with correct property set."
 
-log_must $ZFS snapshot $SNAPFS1
+log_must zfs snapshot $SNAPFS1
 typeset -i i=0
 while (( $i < ${#RW_VOL_CLONE_PROP[*]} )); do
-	log_must $ZFS clone -o ${RW_VOL_CLONE_PROP[$i]} $SNAPFS1 $TESTPOOL/$TESTCLONE
+	log_must zfs clone -o ${RW_VOL_CLONE_PROP[$i]} $SNAPFS1 $TESTPOOL/$TESTCLONE
 	datasetexists $TESTPOOL/$TESTCLONE || \
 		log_fail "zfs clone $TESTPOOL/$TESTCLONE fail."
 	propertycheck $TESTPOOL/$TESTCLONE ${RW_VOL_CLONE_PROP[i]} || \
 		log_fail "${RW_VOL_CLONE_PROP[i]} is failed to set."
-	log_must $ZFS destroy -f $TESTPOOL/$TESTCLONE
+	log_must zfs destroy -f $TESTPOOL/$TESTCLONE
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_006_pos.ksh
index 84f55c8447..fd790674e1 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 
@@ -50,7 +50,7 @@ verify_runnable "global"
 function cleanup
 {
 	if snapexists $SNAPFS1 ; then
-		log_must $ZFS destroy -Rf $SNAPFS1
+		log_must zfs destroy -Rf $SNAPFS1
 	fi
 }
 
@@ -62,7 +62,7 @@ log_assert "'zfs clone -o property=value volume' can successfully" \
 typeset -i i=0
 typeset opts=""
 
-log_must $ZFS snapshot $SNAPFS1
+log_must zfs snapshot $SNAPFS1
 
 while (( $i < ${#RW_VOL_CLONE_PROP[*]} )); do
 	if [[ ${RW_VOL_CLONE_PROP[$i]} != *"checksum"* ]]; then
@@ -71,7 +71,7 @@ while (( $i < ${#RW_VOL_CLONE_PROP[*]} )); do
 	(( i = i + 1 ))
 done
 
-log_must $ZFS clone $opts $SNAPFS1 $TESTPOOL/$TESTCLONE
+log_must zfs clone $opts $SNAPFS1 $TESTPOOL/$TESTCLONE
 
 i=0
 while (( $i < ${#RW_VOL_CLONE_PROP[*]} )); do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_007_pos.ksh
index 370a98f4de..6fba72b580 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -40,15 +40,15 @@
 # 2. Verify it succeed while upgrade, but fails while the version downgraded.
 #
 
-ZFS_VERSION=$($ZFS upgrade | $HEAD -1 | $AWK '{print $NF}' \
-	| $SED -e 's/\.//g')
+ZFS_VERSION=$(zfs upgrade | head -1 | awk '{print $NF}' \
+	| sed -e 's/\.//g')
 
 verify_runnable "both"
 
 function cleanup
 {
 	if snapexists $SNAPFS ; then
-			log_must $ZFS destroy -Rf $SNAPFS
+			log_must zfs destroy -Rf $SNAPFS
 	fi
 }
 
@@ -57,7 +57,7 @@ log_onexit cleanup
 log_assert "'zfs clone -o version=' could upgrade version," \
 	"but downgrade is denied."
 
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
 typeset -i ver
 
@@ -67,14 +67,14 @@ fi
 
 (( ver = ZFS_TEST_VERSION ))
 while (( ver <= ZFS_VERSION )); do
-	log_must $ZFS clone -o version=$ver $SNAPFS $TESTPOOL/$TESTCLONE
+	log_must zfs clone -o version=$ver $SNAPFS $TESTPOOL/$TESTCLONE
 	cleanup
 	(( ver = ver + 1 ))
 done
 
 (( ver = 0 ))
 while (( ver < ZFS_TEST_VERSION  )); do
-	log_mustnot $ZFS clone -o version=$ver \
+	log_mustnot zfs clone -o version=$ver \
 		$SNAPFS $TESTPOOL/$TESTCLONE
 	log_mustnot datasetexists $TESTPOOL/$TESTCLONE
 	cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_008_neg.ksh
index d54c87dfaa..8e306fd445 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_008_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists $SNAPFS ; then
-		log_must $ZFS destroy -Rf $SNAPFS
+		log_must zfs destroy -Rf $SNAPFS
 	fi
 }
 
@@ -57,22 +57,22 @@ log_onexit cleanup
 
 log_assert "Verify 'zfs clone -o <filesystem>' fails with bad <filesystem> argument."
 
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
 typeset -i i=0
 while (( $i < ${#RW_FS_PROP[*]} )); do
-	log_mustnot $ZFS clone -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
+	log_mustnot zfs clone -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
 		$SNAPFS $TESTPOOL/$TESTCLONE
-	log_mustnot $ZFS clone -p -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
+	log_mustnot zfs clone -p -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
 		$SNAPFS $TESTPOOL/$TESTCLONE
 	((i = i + 1))
 done
 
 i=0
 while (( $i < ${#VOL_ONLY_PROP[*]} )); do
-	log_mustnot $ZFS clone -o ${VOL_ONLY_PROP[i]} \
+	log_mustnot zfs clone -o ${VOL_ONLY_PROP[i]} \
 		$SNAPFS $TESTPOOL/$TESTCLONE
-	log_mustnot $ZFS clone -p -o ${VOL_ONLY_PROP[i]} \
+	log_mustnot zfs clone -p -o ${VOL_ONLY_PROP[i]} \
 		$SNAPFS $TESTPOOL/$TESTCLONE
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_009_neg.ksh
index 286cbf8534..030c6af7ae 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ verify_runnable "global"
 function cleanup
 {
 	if snapexists $SNAPFS1 ; then
-		log_must $ZFS destroy -Rf $SNAPFS1
+		log_must zfs destroy -Rf $SNAPFS1
 	fi
 }
 
@@ -57,22 +57,22 @@ log_onexit cleanup
 
 log_assert "Verify 'zfs clone -o <volume>' fails with bad <volume> argument."
 
-log_must $ZFS snapshot $SNAPFS1
+log_must zfs snapshot $SNAPFS1
 
 typeset -i i=0
 while (( $i < ${#RW_VOL_PROP[*]} )); do
-	log_mustnot $ZFS clone -o ${RW_VOL_PROP[i]} -o ${RW_VOL_PROP[i]} \
+	log_mustnot zfs clone -o ${RW_VOL_PROP[i]} -o ${RW_VOL_PROP[i]} \
 		$SNAPFS1 $TESTPOOL/$TESTCLONE
-	log_mustnot $ZFS clone -p -o ${RW_VOL_PROP[i]} -o ${RW_VOL_PROP[i]} \
+	log_mustnot zfs clone -p -o ${RW_VOL_PROP[i]} -o ${RW_VOL_PROP[i]} \
 		$SNAPFS1 $TESTPOOL/$TESTCLONE
 	((i = i + 1))
 done
 
 i=0
 while (( $i < ${#FS_ONLY_PROP[*]} )); do
-	log_mustnot $ZFS clone  -o ${FS_ONLY_PROP[i]} \
+	log_mustnot zfs clone  -o ${FS_ONLY_PROP[i]} \
 		$SNAPFS1 $TESTPOOL/$TESTCLONE
-	log_mustnot $ZFS clone -p -o ${FS_ONLY_PROP[i]} \
+	log_mustnot zfs clone -p -o ${FS_ONLY_PROP[i]} \
 		$SNAPFS1 $TESTPOOL/$TESTCLONE
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
index 8f405a0a52..cd471999e0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
@@ -15,7 +15,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -39,8 +39,8 @@ function local_cleanup
 	typeset -i i=1
 	for ds in $datasets; do
                 datasetexists $ds/$TESTCLONE.$i && \
-		    log_must $ZFS destroy -rf $ds/$TESTCLONE.$i
-                datasetexists $ds && log_must $ZFS destroy -Rf $ds
+		    log_must zfs destroy -rf $ds/$TESTCLONE.$i
+                datasetexists $ds && log_must zfs destroy -Rf $ds
 		((i=i+1))
 	done
 }
@@ -50,7 +50,7 @@ function setup_ds
 {
 	typeset -i i=1
 	# create nested datasets
-	log_must $ZFS create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
+	log_must zfs create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
 
 	# verify dataset creation
 	for ds in $datasets; do
@@ -58,14 +58,14 @@ function setup_ds
 	done
 
 	# create recursive nested snapshot
-	log_must $ZFS snapshot -r $TESTPOOL/$TESTFS1@snap
+	log_must zfs snapshot -r $TESTPOOL/$TESTFS1@snap
 	for ds in $datasets; do
 		datasetexists $ds@snap || \
 		    log_fail "Create $ds@snap snapshot fail."
 	done
 	for ds in $datasets; do
 		for fs in $datasets; do
-			log_must $ZFS clone $ds@snap $fs/$TESTCLONE.$i
+			log_must zfs clone $ds@snap $fs/$TESTCLONE.$i
 		done
 		((i=i+1))
 	done
@@ -82,8 +82,8 @@ function verify_clones
 		if [[ -n $clone_snap ]]; then
 			clone_snap=/$TESTCLONE.$i
 		fi
-		snapshot=$($ECHO "$names" | $GREP $ds$clone_snap@snap)
-		actual_clone=$($ZFS list -t all -o clones $snapshot | $TAIL -1)
+		snapshot=$(echo "$names" | grep $ds$clone_snap@snap)
+		actual_clone=$(zfs list -t all -o clones $snapshot | tail -1)
 		save=$IFS
 		IFS=','
 		typeset -a clones=()
@@ -147,16 +147,16 @@ i=1
 log_must setup_ds
 
 log_note "Verify zfs clone propery for multiple clones"
-names=$($ZFS list -rt all -o name $TESTPOOL)
+names=$(zfs list -rt all -o name $TESTPOOL)
 log_must verify_clones 3 0
 
 log_note "verfify clone property for clone deletion"
 i=1
 for ds in $datasets; do
-	log_must $ZFS destroy $ds/$TESTCLONE.$i
+	log_must zfs destroy $ds/$TESTCLONE.$i
 	((i=i+1))
 done
-names=$($ZFS list -rt all -o name $TESTPOOL)
+names=$(zfs list -rt all -o name $TESTPOOL)
 i=1
 log_must verify_clones 2 1
 
@@ -165,9 +165,9 @@ log_must setup_ds
 
 log_note "verify zfs deferred destroy on clones property"
 i=1
-names=$($ZFS list -rt all -o name $TESTPOOL)
+names=$(zfs list -rt all -o name $TESTPOOL)
 for ds in $datasets; do
-	log_must $ZFS destroy -d $ds@snap
+	log_must zfs destroy -d $ds@snap
 	deferred_snaps=( "${deferred_snaps[@]}" "$ds@snap" )
 	((i=i+1))
 done
@@ -178,20 +178,20 @@ d_clones=()
 i=1
 for ds in $datasets; do
 	for fs in $datasets; do
-		log_must $ZFS destroy $fs/$TESTCLONE.$i
+		log_must zfs destroy $fs/$TESTCLONE.$i
 		d_clones=( "${d_clones[@]}" "$fs/$TESTCLONE.$i" )
 	done
 	((i=i+1))
 done
-names=$($ZFS list -rtall -o name $TESTPOOL)
+names=$(zfs list -rtall -o name $TESTPOOL)
 for snap in ${deferred_snaps[@]}; do
-	status=$($ECHO "$names" | $GREP $snap)
+	status=$(echo "$names" | grep $snap)
 	[[ -z $status ]] || \
 	    log_fail "$snap exist after deferred destroy"
 done
 for dclone in ${d_clones[@]}; do
 	log_note "D CLONE = $dclone"
-	status=$($ECHO "$names" | $GREP $dclone)
+	status=$(echo "$names" | grep $dclone)
 	[[ -z $status ]] || \
 	    log_fail "$dclone exist after deferred destroy"
 done
@@ -201,14 +201,14 @@ log_must setup_ds
 log_note "verify clone property for zfs promote"
 i=1
 for ds in $datasets; do
-	log_must $ZFS promote $ds/$TESTCLONE.$i
+	log_must zfs promote $ds/$TESTCLONE.$i
 	((i=i+1))
 done
-names=$($ZFS list -rt all -o name,clones $TESTPOOL)
+names=$(zfs list -rt all -o name,clones $TESTPOOL)
 log_must verify_clones 3 1 $TESTCLONE
 i=1
 for ds in $datasets; do
-	log_must $ZFS promote $ds
+	log_must zfs promote $ds
 	((i=i+1))
 done
 log_must local_cleanup
@@ -217,15 +217,15 @@ log_note "verify clone list truncated correctly"
 typeset -i j=200
 i=1
 fs=$TESTPOOL/$TESTFS1
-log_must $ZFS create $fs
-log_must $ZFS snapshot $fs@snap
+log_must zfs create $fs
+log_must zfs snapshot $fs@snap
 while((i < 7)); do
-	log_must $ZFS clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i
+	log_must zfs clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i
 	((i=i+1))
 	((j=j+200))
 done
-clone_list=$($ZFS list -o clones $fs@snap)
-char_count=$($ECHO "$clone_list" | $TAIL -1 | wc | $AWK '{print $3}')
+clone_list=$(zfs list -o clones $fs@snap)
+char_count=$(echo "$clone_list" | tail -1 | wc | awk '{print $3}')
 [[ $char_count -eq 1024 ]] || \
     log_fail "Clone list not truncated correctly. Unexpected character count" \
         "$char_count"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/cleanup.ksh
index 1df446116a..f2d478ff5a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
@@ -37,8 +37,8 @@
 #
 
 if ismounted $UFS_MNTPOINT ufs ; then
-	log_must $UMOUNT -f $UFS_MNTPOINT
-	$RM -fr $UFS_MNTPOINT
+	log_must umount -f $UFS_MNTPOINT
+	rm -fr $UFS_MNTPOINT
 fi
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
index d99262d072..2ddd67d1cf 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,12 +58,12 @@ function get_used_prop
 	typeset ds=$1
 	typeset used
 
-	used=`$ZFS list -H -o used $ds`
+	used=`zfs list -H -o used $ds`
 	used=${used%[m|M]}
 	if [[ $used == *K ]]; then
 		used=0
 	fi
-	$ECHO $used
+	echo $used
 }
 
 #
@@ -102,14 +102,14 @@ function do_vol_test
 	vol_b_path=/dev/zvol/dsk/$TESTPOOL/$TESTVOL1
 	vol_r_path=/dev/zvol/rdsk/$TESTPOOL/$TESTVOL1
 
-	log_must $ZFS create -V $VOLSIZE -o copies=$copy $vol
-	log_must $ZFS set refreservation=none $vol
+	log_must zfs create -V $VOLSIZE -o copies=$copy $vol
+	log_must zfs set refreservation=none $vol
 	if [[ $type == "ufs" ]]; then
-		log_must $ECHO y | $NEWFS $vol_r_path >/dev/null 2>&1
-		log_must $MOUNT -F ufs -o rw $vol_b_path $mntp
+		log_must echo y | newfs $vol_r_path >/dev/null 2>&1
+		log_must mount -F ufs -o rw $vol_b_path $mntp
 	else
-		log_must $ZPOOL create $TESTPOOL1 $vol_b_path
-		log_must $ZFS create $TESTPOOL1/$TESTFS1
+		log_must zpool create $TESTPOOL1 $vol_b_path
+		log_must zfs create $TESTPOOL1/$TESTFS1
 	fi
 
 	((nfilesize = copy * ${FILESIZE%m}))
@@ -117,9 +117,9 @@ function do_vol_test
 	((target_size = pre_used + nfilesize))
 
 	if [[ $type == "ufs" ]]; then
-		log_must $MKFILE $FILESIZE $mntp/$FILE
+		log_must mkfile $FILESIZE $mntp/$FILE
 	else
-		log_must $MKFILE $FILESIZE /$TESTPOOL1/$TESTFS1/$FILE
+		log_must mkfile $FILESIZE /$TESTPOOL1/$TESTFS1/$FILE
 	fi
 
 	post_used=$(get_used_prop $vol)
@@ -135,10 +135,10 @@ function do_vol_test
 	fi
 
 	if [[ $type == "ufs" ]]; then
-		$UMOUNT $mntp
+		umount $mntp
 	else
-		log_must $ZPOOL destroy $TESTPOOL1
+		log_must zpool destroy $TESTPOOL1
 	fi
 
-	log_must $ZFS destroy $vol
+	log_must zfs destroy $vol
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_001_pos.ksh
index f484e055a3..b7525c3942 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
 
@@ -46,7 +50,7 @@ function cleanup
 
 	for ds in $fs1 $fs2 $vol1 $vol2; do
 		if datasetexists $ds; then
-			log_must $ZFS destroy $ds
+			log_must zfs destroy $ds
 		fi
 	done
 }
@@ -69,38 +73,38 @@ for ds in $fs $vol; do
 done
 
 for val in 1 2 3; do
-	log_must $ZFS create -o copies=$val $fs1
+	log_must zfs create -o copies=$val $fs1
 	if is_global_zone; then
-		log_must $ZFS create -V $VOLSIZE -o copies=$val $vol1
+		log_must zfs create -V $VOLSIZE -o copies=$val $vol1
 	else
-		log_must $ZFS create -o copies=$val $vol1
+		log_must zfs create -o copies=$val $vol1
 	fi
 	for ds in $fs1 $vol1; do
 		cmp_prop $ds $val
 	done
 
 	for val2 in 3 2 1; do
-		log_must $ZFS create -o copies=$val2 $fs2
+		log_must zfs create -o copies=$val2 $fs2
 		if is_global_zone; then
-			log_must $ZFS create -V $VOLSIZE -o copies=$val2 $vol2
+			log_must zfs create -V $VOLSIZE -o copies=$val2 $vol2
 		else
-			log_must $ZFS create -o copies=$val2 $vol2
+			log_must zfs create -o copies=$val2 $vol2
 		fi
 		for ds in $fs2 $vol2; do
 			cmp_prop $ds $val2
-			log_must $ZFS destroy $ds
+			log_must zfs destroy $ds
 		done
 	done
 
 	for ds in $fs1 $vol1; do
-		log_must $ZFS destroy $ds
+		log_must zfs destroy $ds
 	done
 
 done
 
 for val in 3 2 1; do
 	for ds in $fs $vol; do
-		log_must $ZFS set copies=$val $ds
+		log_must zfs set copies=$val $ds
 		cmp_prop $ds $val
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh
index 46fe0f5a4b..54a7ee8456 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
 
@@ -47,7 +51,7 @@ function cleanup
 
 	for val in 1 2 3; do
 		if datasetexists $TESTPOOL/fs_$val; then
-			log_must $ZFS destroy $TESTPOOL/fs_$val
+			log_must zfs destroy $TESTPOOL/fs_$val
 		fi
 	done
 }
@@ -56,15 +60,15 @@ log_assert "Verify that the space used by multiple copies is charged correctly."
 log_onexit cleanup
 
 for val in 1 2 3; do
-	log_must $ZFS create -o copies=$val $TESTPOOL/fs_$val
+	log_must zfs create -o copies=$val $TESTPOOL/fs_$val
 
-	log_must $MKFILE $FILESIZE /$TESTPOOL/fs_$val/$FILE
+	log_must mkfile $FILESIZE /$TESTPOOL/fs_$val/$FILE
 done
 
 #
 # Sync up the filesystem
 #
-$SYNC
+sync
 
 #
 # Verify 'zfs list' can correctly list the space charged
@@ -78,21 +82,21 @@ done
 
 log_note "Verify 'ls -s' can correctly list the space charged."
 for val in 1 2 3; do
-	blks=`$LS -ls /$TESTPOOL/fs_$val/$FILE | $AWK '{print $1}'`
+	blks=`ls -ls /$TESTPOOL/fs_$val/$FILE | awk '{print $1}'`
 	(( used = blks * 512 / (1024 * 1024) ))
 	check_used $used $val
 done
 
 log_note "Verify df(1M) can corectly display the space charged."
 for val in 1 2 3; do
-	used=`$DF -F zfs -h /$TESTPOOL/fs_$val/$FILE | $GREP $TESTPOOL/fs_$val \
-		| $AWK '{print $3}'`
+	used=`df -F zfs -h /$TESTPOOL/fs_$val/$FILE | grep $TESTPOOL/fs_$val \
+		| awk '{print $3}'`
 	check_used $used $val
 done
 
 log_note "Verify du(1) can correctly display the space charged."
 for val in 1 2 3; do
-	used=`$DU -h /$TESTPOOL/fs_$val/$FILE | $AWK '{print $1}'`
+	used=`du -h /$TESTPOOL/fs_$val/$FILE | awk '{print $1}'`
 	check_used $used $val
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_003_pos.ksh
index 4b67e691a4..98420cb7f2 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
 
 #
@@ -48,7 +52,7 @@ function cleanup
 	fi
 
 	if datasetexists $vol; then
-		log_must $ZFS destroy $vol
+		log_must zfs destroy $vol
 	fi
 }
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_004_neg.ksh
index 132e2b07b6..8e48b21232 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_004_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
 
@@ -44,10 +48,10 @@ log_assert "Verify that copies property cannot be set to any value other than 1,
 set -A badval 0 01 02 03 0 -1 -2 -3 10 20 30 4 5 6 blah
 
 for val in ${badval[@]}; do
-	log_mustnot $ZFS create -o copies=$val $TESTPOOL/$TESTFS1
-	log_mustnot $ZFS create -V $VOLSIZE -o copies=$val $TESTPOOL/$TESTVOL1
-	log_mustnot $ZFS set copies=$val $TESTPOOL/$TESTFS
-	log_mustnot $ZFS set copies=$val $TESTPOOL/$TESTVOL
+	log_mustnot zfs create -o copies=$val $TESTPOOL/$TESTFS1
+	log_mustnot zfs create -V $VOLSIZE -o copies=$val $TESTPOOL/$TESTVOL1
+	log_mustnot zfs set copies=$val $TESTPOOL/$TESTFS
+	log_mustnot zfs set copies=$val $TESTPOOL/$TESTVOL
 done
 
 log_pass "The copies property cannot be set to any value other than 1,2 or 3 as expected"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh
index a10ca594e9..ae81ae964e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_005_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
 
@@ -53,18 +57,18 @@ function cleanup
 log_assert "Verify that copies cannot be set with pool version 1"
 log_onexit cleanup
 
-$CP $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/$ZPOOL_VERSION_1_FILES $TESTDIR
-$BUNZIP2 $TESTDIR/$ZPOOL_VERSION_1_FILES
-log_must $ZPOOL import -d $TESTDIR $ZPOOL_VERSION_1_NAME
-log_must $ZFS create $ZPOOL_VERSION_1_NAME/$TESTFS
-log_must $ZFS create -V 1m $ZPOOL_VERSION_1_NAME/$TESTVOL
+cp $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/$ZPOOL_VERSION_1_FILES $TESTDIR
+bunzip2 $TESTDIR/$ZPOOL_VERSION_1_FILES
+log_must zpool import -d $TESTDIR $ZPOOL_VERSION_1_NAME
+log_must zfs create $ZPOOL_VERSION_1_NAME/$TESTFS
+log_must zfs create -V 1m $ZPOOL_VERSION_1_NAME/$TESTVOL
 
 for val in 3 2 1; do
 	for ds in $ZPOOL_VERSION_1_NAME/$TESTFS $ZPOOL_VERSION_1_NAME/$TESTVOL; do
-		log_mustnot $ZFS set copies=$val $ds
+		log_mustnot zfs set copies=$val $ds
 	done
 	for ds in $ZPOOL_VERSION_1_NAME/$TESTFS1 $ZPOOL_VERSION_1_NAME/$TESTVOL1; do
-		log_mustnot $ZFS create -o copies=$val $ds
+		log_mustnot zfs create -o copies=$val $ds
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_006_pos.ksh
index 5607d89b8e..887e6a3d60 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_006_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_copies/zfs_copies.kshlib
 
 #
@@ -44,15 +48,15 @@ verify_runnable "global"
 function cleanup
 {
 	if ismounted $mntp ufs ; then
-		log_must $UMOUNT $mntp
+		log_must umount $mntp
 	fi
 
 	if datasetexists $vol; then
-		log_must $ZFS destroy $vol
+		log_must zfs destroy $vol
 	fi
 
 	if [[ -d $mntp ]]; then
-                $RM -rf $mntp
+                rm -rf $mntp
         fi
 }
 
@@ -63,7 +67,7 @@ mntp=$UFS_MNTPOINT
 vol=$TESTPOOL/$TESTVOL1
 
 if [[ ! -d $mntp ]]; then
-	$MKDIR -p $mntp
+	mkdir -p $mntp
 fi
 
 for val in 1 2 3; do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_001_pos.ksh
index 63cf619dcf..0e580a8474 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,7 +48,7 @@ function cleanup
 	typeset -i i=0
 	while (( $i < ${#datasets[*]} )); do
 		datasetexists ${datasets[$i]} && \
-			log_must $ZFS destroy -f ${datasets[$i]}
+			log_must zfs destroy -f ${datasets[$i]}
 		((i = i + 1))
 	done
 }
@@ -57,7 +62,7 @@ log_assert "'zfs create <filesystem>' can create a ZFS filesystem in the namespa
 
 typeset -i i=0
 while (( $i < ${#datasets[*]} )); do
-	log_must $ZFS create ${datasets[$i]}
+	log_must zfs create ${datasets[$i]}
 	datasetexists ${datasets[$i]} || \
 		log_fail "zfs create ${datasets[$i]} fail."
 	((i = i + 1))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_002_pos.ksh
index bb066467e6..2498e4a4c9 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_002_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_create/zfs_create.cfg
 
@@ -43,7 +48,7 @@ function cleanup
 	typeset -i j=0
 	while [[ $j -lt ${#size[*]} ]]; do
 		if datasetexists $TESTPOOL/${TESTVOL}${size[j]}; then
-			log_must $ZFS destroy $TESTPOOL/${TESTVOL}${size[j]}
+			log_must zfs destroy $TESTPOOL/${TESTVOL}${size[j]}
 		fi
 		((j = j + 1))
 	done
@@ -56,7 +61,7 @@ log_assert "'zfs create -s -V <size> <volume>' succeeds"
 
 typeset -i j=0
 while (( $j < ${#size[*]} )); do
-	typeset cmdline="$ZFS create -s -V ${size[j]}  \
+	typeset cmdline="zfs create -s -V ${size[j]}  \
 			 $TESTPOOL/${TESTVOL}${size[j]}"
 
 	str=$(eval $cmdline 2>&1)
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh
index bffe8cda4d..918ca4410d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "global"
 function cleanup
 {
 	datasetexists $vol && \
-		log_must $ZFS destroy -f $vol
+		log_must zfs destroy -f $vol
 }
 
 log_assert "Verify creating volume with specified blocksize works."
@@ -58,11 +58,11 @@ vol=$TESTPOOL/$TESTVOL
 
 typeset -i i=0
 while (( i < ${#options[*]} )); do
-	log_must $ZFS create ${options[i]} -V $VOLSIZE $vol
+	log_must zfs create ${options[i]} -V $VOLSIZE $vol
 	datasetexists $vol || \
 		log_fail "zfs create ${options[i]} -V $VOLSIZE $vol fail."
 
-	log_must $ZFS destroy -f $vol
+	log_must zfs destroy -f $vol
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_004_pos.ksh
index 5d2a21a8d6..200b4a0915 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_004_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_create/zfs_create_common.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_create/properties.kshlib
@@ -45,7 +49,7 @@ verify_runnable "both"
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTFS1 && \
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 }
 
 log_onexit cleanup
@@ -56,12 +60,12 @@ log_assert "'zfs create -o property=value filesystem' can successfully create \
 
 typeset -i i=0
 while (( $i < ${#RW_FS_PROP[*]} )); do
-	log_must $ZFS create -o ${RW_FS_PROP[$i]} $TESTPOOL/$TESTFS1
+	log_must zfs create -o ${RW_FS_PROP[$i]} $TESTPOOL/$TESTFS1
 	datasetexists $TESTPOOL/$TESTFS1 || \
 		log_fail "zfs create $TESTPOOL/$TESTFS1 fail."
 	propertycheck $TESTPOOL/$TESTFS1 ${RW_FS_PROP[i]} || \
 		log_fail "${RW_FS_PROP[i]} is failed to set."
-	log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+	log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_005_pos.ksh
index ce84a5c7b2..e953c65ded 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_005_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_create/zfs_create_common.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_create/properties.kshlib
@@ -45,7 +49,7 @@ verify_runnable "both"
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTFS1 && \
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 }
 
 log_onexit cleanup
@@ -64,7 +68,7 @@ while (( $i < ${#RW_FS_PROP[*]} )); do
 	(( i = i + 1 ))
 done
 
-log_must $ZFS create $opts $TESTPOOL/$TESTFS1
+log_must zfs create $opts $TESTPOOL/$TESTFS1
 datasetexists $TESTPOOL/$TESTFS1 || \
 	log_fail "zfs create $TESTPOOL/$TESTFS1 fail."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh
index e47b06444f..fe90fd316c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ verify_runnable "global"
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTVOL1 && \
-		log_must $ZFS destroy -f $TESTPOOL/$TESTVOL1
+		log_must zfs destroy -f $TESTPOOL/$TESTVOL1
 }
 
 log_onexit cleanup
@@ -61,21 +61,21 @@ log_assert "'zfs create -o property=value -V size volume' can successfully \
 
 typeset -i i=0
 while (( $i < ${#RW_VOL_PROP[*]} )); do
-	log_must $ZFS create -o ${RW_VOL_PROP[$i]} -V $VOLSIZE \
+	log_must zfs create -o ${RW_VOL_PROP[$i]} -V $VOLSIZE \
 		$TESTPOOL/$TESTVOL1
 	datasetexists $TESTPOOL/$TESTVOL1 || \
 		log_fail "zfs create -V size $TESTPOOL/$TESTVOL1 fail."
 	propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \
 		log_fail "${RW_VOL_PROP[i]} is failed to set."
-	log_must $ZFS destroy -f $TESTPOOL/$TESTVOL1
+	log_must zfs destroy -f $TESTPOOL/$TESTVOL1
 
-	log_must $ZFS create -s -o ${RW_VOL_PROP[$i]} -V $VOLSIZE \
+	log_must zfs create -s -o ${RW_VOL_PROP[$i]} -V $VOLSIZE \
 		$TESTPOOL/$TESTVOL1
 	datasetexists $TESTPOOL/$TESTVOL1 || \
 		log_fail "zfs create -s -V $TESTPOOL/$TESTVOL1 fail."
 	propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \
 		log_fail "${RW_VOL_PROP[i]} is failed to set."
-	log_must $ZFS destroy -f $TESTPOOL/$TESTVOL1
+	log_must zfs destroy -f $TESTPOOL/$TESTVOL1
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_007_pos.ksh
index a34b46d02f..747f6d2f0e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,9 +50,9 @@ verify_runnable "global"
 function cleanup
 {
         datasetexists $TESTPOOL/$TESTVOL && \
-                log_must $ZFS destroy -f $TESTPOOL/$TESTVOL
+                log_must zfs destroy -f $TESTPOOL/$TESTVOL
 	datasetexists $TESTPOOL/$TESTVOL1 && \
-		log_must $ZFS destroy -f $TESTPOOL/$TESTVOL1
+		log_must zfs destroy -f $TESTPOOL/$TESTVOL1
 }
 
 log_onexit cleanup
@@ -71,10 +71,10 @@ while (( $i < ${#RW_VOL_PROP[*]} )); do
 	(( i = i + 1 ))
 done
 
-log_must $ZFS create $opts -V $VOLSIZE $TESTPOOL/$TESTVOL
+log_must zfs create $opts -V $VOLSIZE $TESTPOOL/$TESTVOL
 datasetexists $TESTPOOL/$TESTVOL || \
 	log_fail "zfs create $TESTPOOL/$TESTVOL fail."
-log_must $ZFS create -s $opts -V $VOLSIZE $TESTPOOL/$TESTVOL1
+log_must zfs create -s $opts -V $VOLSIZE $TESTPOOL/$TESTVOL1
 datasetexists $TESTPOOL/$TESTVOL1 || \
 	log_fail "zfs create $TESTPOOL/$TESTVOL1 fail."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_008_neg.ksh
index 27b5f9cb86..08ede0592f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_008_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1 ; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+		log_must zfs destroy -f $TESTPOOL/$TESTFS1
 	fi
 }
 
@@ -93,8 +93,8 @@ log_assert "'zfs create' should return an error with badly-formed parameters."
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZFS create ${args[i]} $TESTPOOL/$TESTFS1
-	log_mustnot $ZFS create -p ${args[i]} $TESTPOOL/$TESTFS1
+	log_mustnot zfs create ${args[i]} $TESTPOOL/$TESTFS1
+	log_mustnot zfs create -p ${args[i]} $TESTPOOL/$TESTFS1
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_009_neg.ksh
index 1144191795..28c6f0cc2d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -61,8 +61,8 @@ function cleanup
 	# check to see if there is any new fs created during the test
 	# if so destroy it.
 	#
-	for dset in $($ZFS list -H | \
-		$AWK '{print $1}' | $GREP / ); do
+	for dset in $(zfs list -H | \
+		awk '{print $1}' | grep / ); do
 		found=false
 		i=0
 		while (( $i < ${#existed_fs[*]} )); do
@@ -77,7 +77,7 @@ function cleanup
 		# new fs created during the test, cleanup it
 		#
 		if [[ $found == "false" ]]; then
-			log_must $ZFS destroy -f $dset
+			log_must zfs destroy -f $dset
 		fi
 	done
 }
@@ -94,33 +94,33 @@ set -A args  "$TESTPOOL/" "$TESTPOOL//blah" "$TESTPOOL/@blah" \
 log_assert "Verify 'zfs create <filesystem>' fails with bad <filesystem> argument."
 
 datasetexists $TESTPOOL/$TESTFS || \
-	log_must $ZFS create $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
 
-set -A existed_fs $($ZFS list -H | $AWK '{print $1}' | $GREP / )
+set -A existed_fs $(zfs list -H | awk '{print $1}' | grep / )
 
-log_mustnot $ZFS create $TESTPOOL
-log_mustnot $ZFS create $TESTPOOL/$TESTFS
+log_mustnot zfs create $TESTPOOL
+log_mustnot zfs create $TESTPOOL/$TESTFS
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZFS create ${args[$i]}
-	log_mustnot $ZFS create -p ${args[$i]}
+	log_mustnot zfs create ${args[$i]}
+	log_mustnot zfs create -p ${args[$i]}
 	((i = i + 1))
 done
 
 i=0
 while (( $i < ${#RW_FS_PROP[*]} )); do
-	log_mustnot $ZFS create -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
+	log_mustnot zfs create -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
 		$TESTPOOL/$TESTFS1
-	log_mustnot $ZFS create -p -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
+	log_mustnot zfs create -p -o ${RW_FS_PROP[i]} -o ${RW_FS_PROP[i]} \
 		$TESTPOOL/$TESTFS1
 	((i = i + 1))
 done
 
 i=0
 while (( $i < ${#VOL_ONLY_PROP[*]} )); do
-	log_mustnot $ZFS create -o ${VOL_ONLY_PROP[i]} $TESTPOOL/$TESTFS1
-	log_mustnot $ZFS create -p -o ${VOL_ONLY_PROP[i]} $TESTPOOL/$TESTFS1
+	log_mustnot zfs create -o ${VOL_ONLY_PROP[i]} $TESTPOOL/$TESTFS1
+	log_mustnot zfs create -p -o ${VOL_ONLY_PROP[i]} $TESTPOOL/$TESTFS1
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_010_neg.ksh
index f7773c0727..ec5599b153 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_010_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -62,8 +62,8 @@ function cleanup
 	# check to see if there is any new fs created during the test
 	# if so destroy it.
 	#
-	for dset in $($ZFS list -H | \
-		$AWK '{print $1}' | $GREP / ); do
+	for dset in $(zfs list -H | \
+		awk '{print $1}' | grep / ); do
 		found=false
 		i=0
 		while (( $i < ${#existed_fs[*]} )); do
@@ -78,7 +78,7 @@ function cleanup
 		# new fs created during the test, cleanup it
 		#
 		if [[ $found == "false" ]]; then
-			log_must $ZFS destroy -f $dset
+			log_must zfs destroy -f $dset
 		fi
 	done
 }
@@ -106,12 +106,12 @@ set -A args "$VOLSIZE" "$TESTVOL1" \
 set -A options "" "-s"
 
 datasetexists $TESTPOOL/$TESTVOL || \
-		log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
+		log_must zfs create -V $VOLSIZE $TESTPOOL/$TESTVOL
 
-set -A existed_fs $($ZFS list -H | $AWK '{print $1}' | $GREP / )
+set -A existed_fs $(zfs list -H | awk '{print $1}' | grep / )
 
-log_mustnot $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
-log_mustnot $ZFS create -s -V $VOLSIZE $TESTPOOL/$TESTVOL
+log_mustnot zfs create -V $VOLSIZE $TESTPOOL/$TESTVOL
+log_mustnot zfs create -s -V $VOLSIZE $TESTPOOL/$TESTVOL
 
 typeset -i i=0
 typeset -i j=0
@@ -119,26 +119,26 @@ while (( i < ${#options[*]} )); do
 
 	j=0
 	while (( j < ${#args[*]} )); do
-		log_mustnot $ZFS create ${options[$i]} -V ${args[$j]}
-		log_mustnot $ZFS create -p ${options[$i]} -V ${args[$j]}
+		log_mustnot zfs create ${options[$i]} -V ${args[$j]}
+		log_mustnot zfs create -p ${options[$i]} -V ${args[$j]}
 
 		((j = j + 1))
 	done
 
 	j=0
 	while (( $j < ${#RW_VOL_PROP[*]} )); do
-		log_mustnot $ZFS create ${options[$i]} -o ${RW_VOL_PROP[j]} \
+		log_mustnot zfs create ${options[$i]} -o ${RW_VOL_PROP[j]} \
 		    -o ${RW_VOL_PROP[j]} -V $VOLSIZE $TESTPOOL/$TESTVOL1
-		log_mustnot $ZFS create -p ${options[$i]} -o ${RW_VOL_PROP[j]} \
+		log_mustnot zfs create -p ${options[$i]} -o ${RW_VOL_PROP[j]} \
 		    -o ${RW_VOL_PROP[j]} -V $VOLSIZE $TESTPOOL/$TESTVOL1
 		((j = j + 1))
 	done
 
 	j=0
 	while (( $j < ${#FS_ONLY_PROP[*]} )); do
-		log_mustnot $ZFS create ${options[$i]} -o ${FS_ONLY_PROP[j]} \
+		log_mustnot zfs create ${options[$i]} -o ${FS_ONLY_PROP[j]} \
 		    -V $VOLSIZE $TESTPOOL/$TESTVOL1
-		log_mustnot $ZFS create -p ${options[$i]} -o ${FS_ONLY_PROP[j]} \
+		log_mustnot zfs create -p ${options[$i]} -o ${FS_ONLY_PROP[j]} \
 		    -V $VOLSIZE $TESTPOOL/$TESTVOL1
 		((j = j + 1))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_011_pos.ksh
index ba2e55f583..0144b050d7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_011_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -44,7 +49,7 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1 ; then
-		log_must $ZFS destroy -rf $TESTPOOL/$TESTFS1
+		log_must zfs destroy -rf $TESTPOOL/$TESTFS1
 	fi
 }
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_012_pos.ksh
index fe50460615..d8aa064077 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_012_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -36,15 +41,15 @@
 # 2. Verify only the leaf filesystem to be version=1, others use the current version
 #
 
-ZFS_VERSION=$($ZFS upgrade | $HEAD -1 | $AWK '{print $NF}' \
-	| $SED -e 's/\.//g')
+ZFS_VERSION=$(zfs upgrade | head -1 | awk '{print $NF}' \
+	| sed -e 's/\.//g')
 
 verify_runnable "both"
 
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS1 ; then
-		log_must $ZFS destroy -rf $TESTPOOL/$TESTFS1
+		log_must zfs destroy -rf $TESTPOOL/$TESTFS1
 	fi
 }
 
@@ -55,7 +60,7 @@ typeset newdataset1="$TESTPOOL/$TESTFS1/$TESTFS/$TESTFS1"
 
 log_assert "'zfs create -p -o version=1' only cause the leaf filesystem to be version=1."
 
-log_must $ZFS create -p -o version=1 $newdataset1
+log_must zfs create -p -o version=1 $newdataset1
 log_must datasetexists $newdataset1
 
 log_must check_fs_version $TESTPOOL/$TESTFS1/$TESTFS/$TESTFS1 1
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_013_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_013_pos.ksh
index 460ee8fd24..b24d39fd40 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_013_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_013_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_create/zfs_create.cfg
 
@@ -44,7 +49,7 @@ function cleanup
 	typeset -i j=0
 	while [[ $j -lt ${#size[*]} ]]; do
 		datasetexists $TESTPOOL/${LONGFSNAME}${size[j]} && \
-		    log_must $ZFS destroy $TESTPOOL/${LONGFSNAME}${size[j]}
+		    log_must zfs destroy $TESTPOOL/${LONGFSNAME}${size[j]}
 		((j = j + 1))
 	done
 }
@@ -56,7 +61,7 @@ log_assert "'zfs create -s -V <size> <volume>' succeeds"
 
 typeset -i j=0
 while (( $j < ${#size[*]} )); do
-	typeset cmdline="$ZFS create -s -V ${size[j]} \
+	typeset cmdline="zfs create -s -V ${size[j]} \
 			 $TESTPOOL/${LONGFSNAME}${size[j]}"
 
 	str=$(eval $cmdline 2>&1)
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_common.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_common.kshlib
index bbc1273daa..222b8e8f57 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_common.kshlib
@@ -19,12 +19,15 @@
 # CDDL HEADER END
 #
 
-#!/bin/ksh -p
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -38,9 +41,9 @@ function propertycheck
 	typeset dtst=$1
 	typeset propstr=$2
 
-	typeset prop=$($ECHO $propstr | $AWK -F= '{print $1}')
-	typeset expect_value=$($ECHO $propstr | $AWK -F= '{print $2}')
-	typeset value=$($ZFS get -H -o value $prop $dtst)
+	typeset prop=$(echo $propstr | awk -F= '{print $1}')
+	typeset expect_value=$(echo $propstr | awk -F= '{print $2}')
+	typeset value=$(zfs get -H -o value $prop $dtst)
 
 
 	if [[ "$expect_value" == "$value" ]]; then
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh
index 4aef51e0ae..bd15e296ea 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -78,7 +78,7 @@ function test_n_check
 
 	# Clean the test environment and make it clear.
 	if datasetexists $CTR; then
-		log_must $ZFS destroy -Rf $CTR
+		log_must zfs destroy -Rf $CTR
 	fi
 
 	# According to option create test compatible environment.
@@ -98,47 +98,47 @@ function test_n_check
 		$CTR|$FS)
 			if [[ $opt == *f* ]]; then
 				mpt_dir=$(get_prop mountpoint $FS)
-				pidlist="$pidlist $($MKBUSY \
+				pidlist="$pidlist $(mkbusy \
 				    $mpt_dir/$TESTFILE0)"
-				log_note "$MKBUSY $mpt_dir/$TESTFILE0 " \
+				log_note "mkbusy $mpt_dir/$TESTFILE0 " \
 				    "(pidlist: $pidlist)"
 				[[ -z $pidlist ]] && \
-				    log_fail "Failure from $MKBUSY"
-				log_mustnot $ZFS destroy -rR $dtst
+				    log_fail "Failure from mkbusy"
+				log_mustnot zfs destroy -rR $dtst
 			fi
 			;;
 		$VOL)
 			if [[ $opt == *f* ]]; then
-				pidlist="$pidlist $($MKBUSY \
+				pidlist="$pidlist $(mkbusy \
 				    $TESTDIR1/$TESTFILE0)"
-				log_note "$MKBUSY $TESTDIR1/$TESTFILE0 " \
+				log_note "mkbusy $TESTDIR1/$TESTFILE0 " \
 				    "(pidlist: $pidlist)"
 				[[ -z $pidlist ]] && \
-				    log_fail "Failure from $MKBUSY"
-				log_mustnot $ZFS destroy -rR $dtst
+				    log_fail "Failure from mkbusy"
+				log_mustnot zfs destroy -rR $dtst
 			fi
 			;;
 		$VOLSNAP)
 			if [[ $opt == *f* ]]; then
-				pidlist="$pidlist $($MKBUSY \
+				pidlist="$pidlist $(mkbusy \
 				    $TESTDIR1/$TESTFILE0)"
-				log_note "$MKBUSY $TESTDIR1/$TESTFILE0 " \
+				log_note "mkbusy $TESTDIR1/$TESTFILE0 " \
 				    "(pidlist: $pidlist)"
 				[[ -z $pidlist ]] && \
-				    log_fail "Failure from $MKBUSY"
-				log_must $ZFS destroy -rR $dtst
-				log_must $ZFS snapshot $dtst
+				    log_fail "Failure from mkbusy"
+				log_must zfs destroy -rR $dtst
+				log_must zfs snapshot $dtst
 			fi
 			;;
 		$FSSNAP)
 			if [[ $opt == *f* ]]; then
 				mpt_dir=$(snapshot_mountpoint $dtst)
-				pidlist="$pidlist $($MKBUSY $mpt_dir)"
-				log_note "$MKBUSY $mpt_dir (pidlist: $pidlist)"
+				pidlist="$pidlist $(mkbusy $mpt_dir)"
+				log_note "mkbusy $mpt_dir (pidlist: $pidlist)"
 				[[ -z $pidlist ]] && \
-				    log_fail "Failure from $MKBUSY"
-				log_must $ZFS destroy -rR $dtst
-				log_must $ZFS snapshot $dtst
+				    log_fail "Failure from mkbusy"
+				log_must zfs destroy -rR $dtst
+				log_must zfs snapshot $dtst
 			fi
 			;;
 		*)	log_fail "Unsupported dataset: '$dtst'."
@@ -146,16 +146,16 @@ function test_n_check
 
 	# Firstly, umount ufs filesystem which was created by zfs volume.
 	if is_global_zone; then
-		log_must $UMOUNT -f $TESTDIR1
+		log_must umount -f $TESTDIR1
 	fi
 
 	# Invoke 'zfs destroy [-rRf] <dataset>'
-	log_must $ZFS destroy $opt $dtst
+	log_must zfs destroy $opt $dtst
 
 	# Kill any lingering instances of mkbusy, and clear the list.
-	[[ -z $pidlist ]] || log_must $KILL -TERM $pidlist
+	[[ -z $pidlist ]] || log_must kill -TERM $pidlist
 	pidlist=""
-	log_mustnot $PGREP -fl $MKBUSY
+	log_mustnot pgrep -fl mkbusy
 
 	case $dtst in
 		$CTR)	check_dataset datasetnonexists \
@@ -201,7 +201,7 @@ function test_n_check
 			;;
 	esac
 
-	log_note "'$ZFS destroy $opt $dtst' passed."
+	log_note "'zfs destroy $opt $dtst' passed."
 }
 
 log_assert "'zfs destroy -r|-R|-f|-rf|-Rf <fs|ctr|vol|snap>' should " \
@@ -213,7 +213,7 @@ typeset opt=""
 typeset pidlist=""
 for dtst in $CTR $FS $VOL $FSSNAP $VOLSNAP; do
 	for opt in "-r" "-R" "-f" "-rf" "-Rf"; do
-		log_note "Starting test: $ZFS destroy $opt $dtst"
+		log_note "Starting test: zfs destroy $opt $dtst"
 		test_n_check $opt $dtst
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
index 5e27ce10fb..0ff212190d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function cleanup
 	typeset -i i=0
 	while (( $i < ${#data_objs[*]} )); do
 		datasetexists "${data_objs[i]}" && \
-			$ZFS destroy -rf ${data_objs[i]}
+			zfs destroy -rf ${data_objs[i]}
 		((i = i + 1))
 	done
 }
@@ -66,16 +66,16 @@ else
 	set -A data_objs "$TESTPOOL/$TESTFS@$TESTSNAP" "$TESTPOOL/$TESTFS1"
 fi
 
-log_must $ZFS create $TESTPOOL/$TESTFS1
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_must zfs create $TESTPOOL/$TESTFS1
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
 
 if is_global_zone ; then
-	log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
+	log_must zfs create -V $VOLSIZE $TESTPOOL/$TESTVOL
 
 	# Max volume size is 1TB on 32-bit systems
-	[[ $($ISAINFO -b) == 32 ]] && \
+	[[ $(isainfo -b) == 32 ]] && \
 		BIGVOLSIZE=1Tb
-	log_must $ZFS create -sV $BIGVOLSIZE $TESTPOOL/$TESTVOL1
+	log_must zfs create -sV $BIGVOLSIZE $TESTPOOL/$TESTVOL1
 fi
 
 typeset -i i=0
@@ -87,7 +87,7 @@ done
 
 i=0
 while (( $i < ${#data_objs[*]} )); do
-	log_must $ZFS destroy ${data_objs[i]}
+	log_must zfs destroy ${data_objs[i]}
 	datasetexists ${data_objs[i]} && \
 		log_fail "'zfs destroy <filesystem>|<volume>|<snapshot>' fail."
 	((i = i + 1))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
index a18c0d6161..5ffe51ebef 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,12 +51,12 @@ function cleanup
 {
 	for obj in $ctr2 $ctr1 $ctr; do
 		datasetexists $obj && \
-			log_must $ZFS destroy -Rf $obj
+			log_must zfs destroy -Rf $obj
 	done
 
 	for mntp in $TESTDIR1 $TESTDIR2; do
 		[[ -d $mntp ]] && \
-			log_must $RM -rf $mntp
+			log_must rm -rf $mntp
 	done
 }
 
@@ -69,7 +69,7 @@ log_onexit cleanup
 #
 for dir in $TESTDIR1 $TESTDIR2; do
 	[[ ! -d $dir ]] && \
-		log_must $MKDIR -p $dir
+		log_must mkdir -p $dir
 done
 
 ctr=$TESTPOOL/$TESTCTR
@@ -93,46 +93,46 @@ child_fs1_snap_clone1=$ctr/${TESTCLONE1}_across_ctr
 #
 # Create two datasets in the storage pool
 #
-log_must $ZFS create $ctr
-log_must $ZFS create $ctr1
+log_must zfs create $ctr
+log_must zfs create $ctr1
 
 #
 # Create children datasets fs,vol,snapshot in the datasets, and
 # clones across two datasets
 #
-log_must $ZFS create $ctr2
+log_must zfs create $ctr2
 
 for fs in $child_fs $child_fs1; do
-	log_must $ZFS create $fs
+	log_must zfs create $fs
 done
 
-log_must $ZFS set mountpoint=$child_fs_mntp $child_fs
-log_must $ZFS set mountpoint=$child_fs1_mntp $child_fs1
+log_must zfs set mountpoint=$child_fs_mntp $child_fs
+log_must zfs set mountpoint=$child_fs1_mntp $child_fs1
 
 for snap in $child_fs_snap $child_fs1_snap; do
-	log_must $ZFS snapshot $snap
+	log_must zfs snapshot $snap
 done
 
 if is_global_zone ; then
 	for vol in $child_vol $child_vol1; do
-		log_must $ZFS create -V $VOLSIZE $vol
+		log_must zfs create -V $VOLSIZE $vol
 	done
 fi
 
 for clone in $child_fs_snap_clone $child_fs_snap_clone1; do
-	log_must $ZFS clone $child_fs_snap $clone
+	log_must zfs clone $child_fs_snap $clone
 done
 
 
 for clone in $child_fs1_snap_clone $child_fs1_snap_clone1; do
-	log_must $ZFS clone $child_fs1_snap $clone
+	log_must zfs clone $child_fs1_snap $clone
 done
 
 log_note "Verify that 'zfs destroy -r' fails to destroy dataset " \
 	"with clone dependant outside it."
 
 for obj in $child_fs $child_fs1 $ctr $ctr1; do
-	log_mustnot $ZFS destroy -r $obj
+	log_mustnot zfs destroy -r $obj
 	datasetexists $obj || \
 		log_fail "'zfs destroy -r' fails to keep clone " \
 			"dependant outside the hirearchy."
@@ -142,14 +142,14 @@ done
 log_note "Verify that 'zfs destroy -R' succeeds to destroy dataset " \
 	"with clone dependant outside it."
 
-log_must $ZFS destroy -R $ctr1
+log_must zfs destroy -R $ctr1
 datasetexists $ctr1 && \
 	log_fail "'zfs destroy -R' fails to destroy dataset with clone outside it."
 
 log_note "Verify that 'zfs destroy -r' succeeds to destroy dataset " \
 	"without clone dependant outside it."
 
-log_must $ZFS destroy -r $ctr
+log_must zfs destroy -r $ctr
 datasetexists $ctr && \
 	log_fail "'zfs destroy -r' fails to destroy dataset with clone outside it."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_004_pos.ksh
index 6919bdf427..04e666964a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,19 +50,19 @@ function cleanup
 	cd $olddir
 
 	datasetexists $clone && \
-		log_must $ZFS destroy -f $clone
+		log_must zfs destroy -f $clone
 
 	snapexists $snap && \
-		log_must $ZFS destroy -f $snap
+		log_must zfs destroy -f $snap
 
 	for fs in $fs1 $fs2; do
 		datasetexists $fs && \
-			log_must $ZFS destroy -f $fs
+			log_must zfs destroy -f $fs
 	done
 
 	for dir in $TESTDIR1 $TESTDIR2; do
 		[[ -d $dir ]] && \
-			log_must $RM -rf $dir
+			log_must rm -rf $dir
 	done
 }
 
@@ -77,7 +77,7 @@ olddir=$PWD
 
 for dir in $TESTDIR1 $TESTDIR2; do
 	[[ ! -d $dir ]] && \
-		log_must $MKDIR -p $dir
+		log_must mkdir -p $dir
 done
 
 fs1=$TESTPOOL/$TESTFS1
@@ -92,25 +92,25 @@ mntp2=$TESTDIR2
 # make the mountpoint busy
 #
 for fs in $fs1 $fs2; do
-	log_must $ZFS create $fs
+	log_must zfs create $fs
 done
 
-log_must $ZFS snapshot $snap
-log_must $ZFS clone $snap $clone
+log_must zfs snapshot $snap
+log_must zfs clone $snap $clone
 
-log_must $ZFS set mountpoint=$mntp1 $fs1
-log_must $ZFS set mountpoint=$mntp2 $clone
+log_must zfs set mountpoint=$mntp1 $fs1
+log_must zfs set mountpoint=$mntp2 $clone
 
 for arg in "$fs1 $mntp1" "$clone $mntp2"; do
-	fs=`$ECHO $arg | $AWK '{print $1}'`
-	mntp=`$ECHO $arg | $AWK '{print $2}'`
+	fs=`echo $arg | awk '{print $1}'`
+	mntp=`echo $arg | awk '{print $2}'`
 
 	log_note "Verify that 'zfs destroy' fails to" \
 			"destroy filesystem when it is busy."
 	cd $mntp
-	log_mustnot $ZFS destroy $fs
+	log_mustnot zfs destroy $fs
 
-	log_must $ZFS destroy -f $fs
+	log_must zfs destroy -f $fs
 	datasetexists $fs && \
 		log_fail "'zfs destroy -f' fails to destroy busy filesystem."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh
index baf182a622..f4ede8dc53 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -76,7 +76,7 @@ function negative_test
 			fi
 		fi
 		for opt in $options; do
-			log_mustnot $ZFS destroy $opt $dtst
+			log_mustnot zfs destroy $opt $dtst
 		done
 	done
 }
@@ -101,8 +101,8 @@ negative_test "-r -rf" "$CTR $FS $VOL"
 # an explanation of what 'correct' means for this test.
 #
 mntpt=$(get_prop mountpoint $FS)
-pidlist=$($MKBUSY $mntpt/$TESTFILE0)
-log_note "$MKBUSY $mntpt/$TESTFILE0 (pidlist: $pidlist)"
+pidlist=$(mkbusy $mntpt/$TESTFILE0)
+log_note "mkbusy $mntpt/$TESTFILE0 (pidlist: $pidlist)"
 [[ -z $pidlist ]] && log_fail "Failure from mkbusy"
 negative_test "-R -rR" $CTR
 
@@ -124,7 +124,7 @@ elif datasetexists $FSSNAP && datasetnonexists $VOLSNAP; then
 	check_dataset datasetnonexists $VOLSNAP $VOLCLONE
 	check_dataset datasetexists $FSSNAP $FSCLONE
 else
-	log_must $ZFS list -rtall
+	log_must zfs list -rtall
 	log_fail "Unexpected datasets remaining"
 fi
 
@@ -138,8 +138,8 @@ negative_test "-R -rR" $FS
 check_dataset datasetexists $CTR $FS $VOL $VOLSNAP $VOLCLONE
 check_dataset datasetnonexists $FSSNAP $FSCLONE
 
-log_must $KILL $pidlist
-log_mustnot $PGREP -fl $MKBUSY
+log_must kill $pidlist
+log_mustnot pgrep -fl mkbusy
 pidlist=""
 
 #
@@ -150,8 +150,8 @@ pidlist=""
 #
 if is_global_zone; then
 	setup_testenv clone
-	pidlist=$($MKBUSY $TESTDIR1/$TESTFILE0)
-	log_note "$MKBUSY $TESTDIR1/$TESTFILE0 (pidlist: $pidlist)"
+	pidlist=$(mkbusy $TESTDIR1/$TESTFILE0)
+	log_note "mkbusy $TESTDIR1/$TESTFILE0 (pidlist: $pidlist)"
 	[[ -z $pidlist ]] && log_fail "Failure from mkbusy"
 	negative_test "-R -rR" $CTR
 	check_dataset datasetexists $CTR $VOL
@@ -181,8 +181,8 @@ if is_global_zone; then
 	check_dataset datasetnonexists $VOLSNAP $VOLCLONE
 fi
 
-log_must $KILL $pidlist
-log_mustnot $PGREP -fl $MKBUSY
+log_must kill $pidlist
+log_mustnot pgrep -fl mkbusy
 pidlist=""
 
 #
@@ -193,19 +193,19 @@ pidlist=""
 #
 
 mntpt=$(snapshot_mountpoint $FSSNAP)
-pidlist=$($MKBUSY $mntpt)
-log_note "$MKBUSY $mntpt (pidlist: $pidlist)"
+pidlist=$(mkbusy $mntpt)
+log_note "mkbusy $mntpt (pidlist: $pidlist)"
 [[ -z $pidlist ]] && log_fail "Failure from mkbusy"
 
 for option in -R -rR ; do
 	setup_testenv clone
-	log_must $ZFS destroy $option $FSSNAP
+	log_must zfs destroy $option $FSSNAP
 	check_dataset datasetexists $CTR $FS $VOL
 	check_dataset datasetnonexists $FSSNAP $FSCLONE
 done
 
-log_must $KILL $pidlist
-log_mustnot $PGREP -fl $MKBUSY
+log_must kill $pidlist
+log_mustnot pgrep -fl mkbusy
 pidlist=""
 
 log_pass "zfs destroy -f|-r|-rf|-R|-rR <dataset>' failed in different " \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_006_neg.ksh
index 7e383c26a7..7dbcb24204 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_006_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -60,7 +60,7 @@ log_assert "'zfs destroy' should return an error with badly-formed parameters."
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZFS destroy ${args[i]}
+	log_mustnot zfs destroy ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh
index 72272a5c90..70ad45af04 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_007_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,10 +49,10 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $clonesnap; then
-		log_must $ZFS promote $fs
+		log_must zfs promote $fs
 	fi
-	datasetexists $clone && log_must $ZFS destroy $clone
-	datasetexists $fssnap && log_must $ZFS destroy $fssnap
+	datasetexists $clone && log_must zfs destroy $clone
+	datasetexists $fssnap && log_must zfs destroy $fssnap
 }
 
 log_assert "Destroy dataset which is namespace-parent of origin should failed."
@@ -67,10 +67,10 @@ clonesnap=$fs/clone@snap
 # Define key word for expected failure.
 KEY_WORDS="filesystem has children"
 
-log_must $ZFS snapshot $fssnap
-log_must $ZFS clone $fssnap $clone
-log_must $ZFS promote $clone
-log_mustnot_expect "$KEY_WORDS" $ZFS destroy $fs
-log_mustnot_expect "$KEY_WORDS" $ZFS destroy $clone
+log_must zfs snapshot $fssnap
+log_must zfs clone $fssnap $clone
+log_must zfs promote $clone
+log_mustnot_expect "$KEY_WORDS" zfs destroy $fs
+log_mustnot_expect "$KEY_WORDS" zfs destroy $clone
 
 log_pass "Destroy dataset which is namespace-parent of origin passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_008_pos.ksh
index b9a866a3ff..e78fde0f7d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_008_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -44,7 +44,7 @@ log_onexit cleanup_testenv
 setup_testenv snap
 
 for snap in $FSSNAP $VOLSNAP; do
-    log_must $ZFS destroy -d $snap
+    log_must zfs destroy -d $snap
     log_mustnot datasetexists $snap
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_009_pos.ksh
index b602a3ec38..c2f8c40eb6 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_009_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,10 +49,10 @@ setup_testenv clone
 for dstype in FS VOL; do
     snap=$(eval echo \$${dstype}SNAP)
     clone=$(eval echo \$${dstype}CLONE)
-    log_must $ZFS destroy -d $snap
+    log_must zfs destroy -d $snap
     log_must datasetexists $snap
     log_must eval "[[ $(get_prop defer_destroy $snap) == 'on' ]]"
-    log_must $ZFS destroy $clone
+    log_must zfs destroy $clone
     log_mustnot datasetexists $snap
     log_mustnot datasetexists $clone
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_010_pos.ksh
index 150d0b3ead..7df49d3139 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_010_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,15 +49,15 @@ log_assert "'zfs destroy -R' works on deferred destroyed snapshots"
 log_onexit cleanup_testenv
 
 setup_testenv clone
-log_must $UMOUNT -f $TESTDIR1
+log_must umount -f $TESTDIR1
 
 for dstype in FS VOL; do
     ds=$(eval echo \$${dstype})
     snap=$(eval echo \$${dstype}SNAP)
     clone=$(eval echo \$${dstype}CLONE)
-    log_must $ZFS destroy -d $snap
+    log_must zfs destroy -d $snap
     log_must datasetexists $snap
-    log_must $ZFS destroy -R $ds
+    log_must zfs destroy -R $ds
     log_mustnot datasetexists $snap
     log_mustnot datasetexists $clone
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_011_pos.ksh
index 6039202ed2..e7f53cee15 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_011_pos.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -39,11 +39,11 @@ setup_testenv snap
 
 for dstype in FS VOL; do
     snap=$(eval echo \$${dstype}SNAP)
-    log_must $ZFS hold zfstest $snap
-    log_must $ZFS destroy -d $snap
+    log_must zfs hold zfstest $snap
+    log_must zfs destroy -d $snap
     log_must datasetexists $snap
     log_must eval "[[ $(get_prop defer_destroy $snap) == 'on' ]]"
-    log_must $ZFS release zfstest $snap
+    log_must zfs release zfstest $snap
     log_mustnot datasetexists $snap
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_012_pos.ksh
index 076e905159..e25c3430e0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_012_pos.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -39,23 +39,23 @@ setup_testenv snap
 
 for dstype in FS VOL; do
     snap=$(eval echo \$${dstype}SNAP)
-    log_must $ZFS hold zfstest1 $snap
-    log_must $ZFS destroy -d $snap
+    log_must zfs hold zfstest1 $snap
+    log_must zfs destroy -d $snap
     log_must datasetexists $snap
     log_must eval "[[ $(get_prop defer_destroy $snap) == 'on' ]]"
 
-    log_must $ZFS hold zfstest2 $snap
-    log_mustnot $ZFS hold zfstest1 $snap
-    log_mustnot $ZFS hold zfstest2 $snap
+    log_must zfs hold zfstest2 $snap
+    log_mustnot zfs hold zfstest1 $snap
+    log_mustnot zfs hold zfstest2 $snap
 
-    log_must $ZFS release zfstest1 $snap
+    log_must zfs release zfstest1 $snap
     log_must datasetexists $snap
-    log_mustnot $ZFS release zfstest1 $snap
+    log_mustnot zfs release zfstest1 $snap
     log_must datasetexists $snap
-    log_mustnot $ZFS release zfstest3 $snap
+    log_mustnot zfs release zfstest3 $snap
     log_must datasetexists $snap
 
-    log_must $ZFS release zfstest2 $snap
+    log_must zfs release zfstest2 $snap
     log_mustnot datasetexists $snap
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_013_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_013_neg.ksh
index 198573d421..5dd29ceef4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_013_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_013_neg.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -38,11 +38,11 @@ setup_testenv snap
 
 for dstype in FS VOL; do
     snap=$(eval echo \$${dstype}SNAP)
-    log_must $ZFS hold zfstest $snap
-    log_mustnot $ZFS destroy $snap
+    log_must zfs hold zfstest $snap
+    log_mustnot zfs destroy $snap
     log_must datasetexists $snap
-    log_must $ZFS release zfstest $snap
-    log_must $ZFS destroy $snap
+    log_must zfs release zfstest $snap
+    log_must zfs destroy $snap
     log_mustnot datasetexists $snap
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_014_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_014_pos.ksh
index 5625785986..df7cfcf527 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_014_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_014_pos.ksh
@@ -15,7 +15,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,12 +45,12 @@ datasets="$TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS1/$TESTFS2
 function cleanup
 {
 	for ds in $datasets; do
-		datasetexists $ds && $ZFS destroy -rf $ds
+		datasetexists $ds && zfs destroy -rf $ds
 	done
 }
 
 # create nested datasets
-log_must $ZFS create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
+log_must zfs create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
 
 # verify dataset creation
 for ds in $datasets; do
@@ -58,13 +58,13 @@ for ds in $datasets; do
 done
 
 # create recursive nestedd snapshot
-log_must $ZFS snapshot -r $TESTPOOL/$TESTFS1@snap
+log_must zfs snapshot -r $TESTPOOL/$TESTFS1@snap
 for ds in $datasets; do
 	datasetexists $ds@snap || log_fail "Create $ds@snap snapshot fail."
 done
 
 # destroy nested snapshot recursively
-log_must $ZFS destroy -R $TESTPOOL/$TESTFS1@snap
+log_must zfs destroy -R $TESTPOOL/$TESTFS1@snap
 
 # verify snapshot destroy
 for ds in $datasets; do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_015_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_015_pos.ksh
index c59159f0cd..487c7a6422 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_015_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_015_pos.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 # DESCRIPTION
@@ -30,109 +30,109 @@
 
 function cleanup
 {
-	datasetexists $TESTPOOL/$TESTFS1 && $ZFS destroy -R $TESTPOOL/$TESTFS1
-	datasetexists $TESTPOOL/$TESTFS2 && $ZFS destroy -R $TESTPOOL/$TESTFS2
-	poolexists $TESTPOOL2 && $ZPOOL destroy $TESTPOOL2
-	$RM -rf $VIRTUAL_DISK
+	datasetexists $TESTPOOL/$TESTFS1 && zfs destroy -R $TESTPOOL/$TESTFS1
+	datasetexists $TESTPOOL/$TESTFS2 && zfs destroy -R $TESTPOOL/$TESTFS2
+	poolexists $TESTPOOL2 && zpool destroy $TESTPOOL2
+	rm -rf $VIRTUAL_DISK
 }
 
 log_assert "zfs destroy for multiple snapshot is handled correctly"
 log_onexit cleanup
 
-$ZFS create $TESTPOOL/$TESTFS1
+zfs create $TESTPOOL/$TESTFS1
 typeset -i i=1
 snaplist=""
 log_note "zfs destroy on valid snapshot names"
 for i in 1 2 3 4 5; do
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
 	snaplist=$snaplist,snap$i
 done
 snaplist=${snaplist#,}
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@$snaplist
+log_must zfs destroy $TESTPOOL/$TESTFS1@$snaplist
 for i in 1 2 3 4 5; do
 	log_mustnot snapexists $TESTPOOL/$TESFS1@snap$i
 done
 
 log_note "zfs destroy with all bogus snapshot names"
-log_mustnot $ZFS destroy $TESTPOOL/$TESTFS1@snap12,snap21,sna@pple1@,s""nappy2
+log_mustnot zfs destroy $TESTPOOL/$TESTFS1@snap12,snap21,sna@pple1@,s""nappy2
 
 log_note "zfs destroy with some bogus snapshot names"
 for i in 1 2 3; do
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
 done
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap1,snap2,snapple1,snappy2,snap3
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap1,snap2,snapple1,snappy2,snap3
 for i in 1 2 3; do
 	log_mustnot snapexists $TESTPOOL/$TESTFS1@snap$i
 done
 
 log_note "zfs destroy with some snapshot names having special characters"
 for i in 1 2 3; do
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
 done
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap1,@,snap2,,,,snap3,
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap1,@,snap2,,,,snap3,
 for i in 1 2 3; do
 	log_mustnot snapexists $TESTPOOL/$TESTFS1@snap$i
 done
 log_note "zfs destroy for too many snapshots"
 snaplist=""
 for i in {1..100}; do
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
 	snaplist=$snaplist,snap$i
 done
 snaplist=${snaplist#,}
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@$snaplist
+log_must zfs destroy $TESTPOOL/$TESTFS1@$snaplist
 for i in {1..100}; do
 	log_mustnot snapexists $TESTPOOL/$TESTFS1@snap$i
 done
 log_note "zfs destroy multiple snapshots with hold"
 snaplist=""
 for i in 1 2 3 4 5; do
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
-	log_must $ZFS hold keep $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs hold keep $TESTPOOL/$TESTFS1@snap$i
 	snaplist=$snaplist,snap$i
 done
 snaplist=${snaplist#,}
-log_mustnot $ZFS destroy $TESTPOOL/$TESTFS1@$snaplist
+log_mustnot zfs destroy $TESTPOOL/$TESTFS1@$snaplist
 for i in 1 2 3 4 5; do
-	log_must $ZFS release keep $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs release keep $TESTPOOL/$TESTFS1@snap$i
 done
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@$snaplist
+log_must zfs destroy $TESTPOOL/$TESTFS1@$snaplist
 
 log_note "zfs destroy for multiple snapshots having clones"
 for i in 1 2 3 4 5; do
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
 done
 snaplist=""
 for i in 1 2 3 4 5; do
-	log_must $ZFS clone $TESTPOOL/$TESTFS1@snap$i $TESTPOOL/$TESTFS1/clone$i
+	log_must zfs clone $TESTPOOL/$TESTFS1@snap$i $TESTPOOL/$TESTFS1/clone$i
 	snaplist=$snaplist,snap$i
 done
 snaplist=${snaplist#,}
-log_mustnot $ZFS destroy $TESTPOOL/$TESTFS1@$snaplist
+log_mustnot zfs destroy $TESTPOOL/$TESTFS1@$snaplist
 for i in 1 2 3 4 5; do
 	log_must snapexists $TESTPOOL/$TESTFS1@snap$i
-	log_must $ZFS destroy $TESTPOOL/$TESTFS1/clone$i
+	log_must zfs destroy $TESTPOOL/$TESTFS1/clone$i
 done
 
 log_note "zfs destroy for snapshots for different datasets"
-log_must $ZFS create $TESTPOOL/$TESTFS2
-log_must $ZFS snapshot $TESTPOOL/$TESTFS2@fs2snap
-log_must $ZFS create $TESTPOOL/$TESTFS1/$TESTFS2
-log_must $ZFS snapshot $TESTPOOL/$TESTFS1/$TESTFS2@fs12snap
+log_must zfs create $TESTPOOL/$TESTFS2
+log_must zfs snapshot $TESTPOOL/$TESTFS2@fs2snap
+log_must zfs create $TESTPOOL/$TESTFS1/$TESTFS2
+log_must zfs snapshot $TESTPOOL/$TESTFS1/$TESTFS2@fs12snap
 
 long_arg=$TESTPOOL/$TESTFS1@snap1,$TESTPOOL/$TESTFS2@fs2snap,
 long_arg=$long_arg$TESTPOOL/$TESTFS1/$TESTFS2@fs12snap
-log_must $ZFS destroy $long_arg
+log_must zfs destroy $long_arg
 log_mustnot snapexists $TESTPOOL/$TESTFS1@snap1
 log_must snapexists $TESTPOOL/$TESTFS2@fs2snap
 log_must snapexists $TESTPOOL/$TESTFS1/$TESTFS2@fs12snap
 
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@fs2snap,fs12snap,snap2
+log_must zfs destroy $TESTPOOL/$TESTFS1@fs2snap,fs12snap,snap2
 log_must snapexists $TESTPOOL/$TESTFS2@fs2snap
 log_must snapexists $TESTPOOL/$TESTFS1/$TESTFS2@fs12snap
 log_mustnot snapexists $TESTPOOL/$TESTFS1@snap2
 
-log_must $ZFS destroy $TESTPOOL/$TESTFS2@fs2snap,fs12snap,snap3
+log_must zfs destroy $TESTPOOL/$TESTFS2@fs2snap,fs12snap,snap3
 log_mustnot snapexists $TESTPOOL/$TESTFS2@fs2snap
 log_must snapexists $TESTPOOL/$TESTFS1/$TESTFS2@fs12snap
 log_must snapexists $TESTPOOL/$TESTFS1@snap3
@@ -140,20 +140,20 @@ log_must snapexists $TESTPOOL/$TESTFS1@snap3
 log_note "zfs destroy for snapshots from different pools"
 VIRTUAL_DISK=/var/tmp/disk
 log_must mkfile $MINVDEVSIZE $VIRTUAL_DISK
-log_must $ZPOOL create $TESTPOOL2 $VIRTUAL_DISK
+log_must zpool create $TESTPOOL2 $VIRTUAL_DISK
 log_must poolexists $TESTPOOL2
 
-log_must $ZFS create $TESTPOOL2/$TESTFS1
-log_must $ZFS snapshot $TESTPOOL2/$TESTFS1@snap
+log_must zfs create $TESTPOOL2/$TESTFS1
+log_must zfs snapshot $TESTPOOL2/$TESTFS1@snap
 long_arg=$TESTPOOL2/$TESTFS1@snap,$TESTPOOL/$TESTFS1@snap3,
 long_arg=$long_arg$TESTPOOL/$TESTFS1@snap5
-log_must $ZFS destroy $long_arg
+log_must zfs destroy $long_arg
 log_mustnot snapexists $TESTPOOL2/$TESTFS1@snap
 log_must snapexists $TESTPOOL/$TESTFS1@snap3
 log_must snapexists $TESTPOOL/$TESTFS1@snap5
 
-log_must $ZFS snapshot $TESTPOOL2/$TESTFS1@snap
-log_must $ZFS destroy $TESTPOOL2/$TESTFS1@snap5,snap3,snap
+log_must zfs snapshot $TESTPOOL2/$TESTFS1@snap
+log_must zfs destroy $TESTPOOL2/$TESTFS1@snap5,snap3,snap
 log_mustnot snapexists $TESTPOOL2/$TESTFS1@snap
 log_must snapexists $TESTPOOL/$TESTFS1@snap3
 log_must snapexists $TESTPOOL/$TESTFS1@snap5
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_016_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_016_pos.ksh
index 3acdd93c80..b8e9110e80 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_016_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_016_pos.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 # DESCRIPTION
@@ -30,20 +30,20 @@
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTFS1 && \
-	    log_must $ZFS destroy -R $TESTPOOL/$TESTFS1
+	    log_must zfs destroy -R $TESTPOOL/$TESTFS1
 	datasetexists $TESTPOOL/$TESTVOL && \
-	    log_must $ZFS destroy -Rf $TESTPOOL/$TESTVOL
+	    log_must zfs destroy -Rf $TESTPOOL/$TESTVOL
 }
 
 function setup_snapshots
 {
 	for i in $snaps; do
 		datasetexists $TESTPOOL/$TESTFS1@snap$i && \
-		    log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap$i
+		    log_must zfs destroy $TESTPOOL/$TESTFS1@snap$i
 		datasetexists $TESTPOOL/$TESTVOL@snap$i && \
-		    log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap$i
-		log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
-		log_must $ZFS snapshot $TESTPOOL/$TESTVOL@snap$i
+		    log_must zfs destroy $TESTPOOL/$TESTVOL@snap$i
+		log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
+		log_must zfs snapshot $TESTPOOL/$TESTVOL@snap$i
 	done
 }
 
@@ -78,30 +78,30 @@ valid_args="@snap1%snap5 @%"
 log_assert "zfs destroy deletes ranges of snapshots"
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS1
-log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
+log_must zfs create $TESTPOOL/$TESTFS1
+log_must zfs create -V $VOLSIZE $TESTPOOL/$TESTVOL
 snaps="1 2 3 4 5"
 log_note "Verify the valid arguments"
 range="1 2 3 4 5"
 for args in $valid_args; do
 	setup_snapshots
-	log_must $ZFS destroy $TESTPOOL/$TESTFS1$args
-	log_must $ZFS destroy $TESTPOOL/$TESTVOL$args
+	log_must zfs destroy $TESTPOOL/$TESTFS1$args
+	log_must zfs destroy $TESTPOOL/$TESTVOL$args
 	verify_snapshots
 done
 
 log_note "Verify invalid arguements"
 setup_snapshots
 for args in $invalid_args; do
-	log_mustnot $ZFS destroy $TESTPOOL/$TESTFS1$args
-	log_mustnot $ZFS destroy $TESTPOOL/$TESTVOL$args
+	log_mustnot zfs destroy $TESTPOOL/$TESTFS1$args
+	log_mustnot zfs destroy $TESTPOOL/$TESTVOL$args
 	log_must verify_snapshots 1
 done
 
 log_note "Destroy the begining range"
 
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@%snap3
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@%snap3
+log_must zfs destroy $TESTPOOL/$TESTFS1@%snap3
+log_must zfs destroy $TESTPOOL/$TESTVOL@%snap3
 range="1 2 3"
 verify_snapshots
 range="4 5"
@@ -109,19 +109,19 @@ verify_snapshots 1
 
 setup_snapshots
 log_note "Destroy the mid range"
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap2%snap4
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap2%snap4
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap2%snap4
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap2%snap4
 range="2 3 4"
 verify_snapshots
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap1%snap5
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap1%snap5
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap1%snap5
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap1%snap5
 range="1 5"
 verify_snapshots
 
 setup_snapshots
 log_note "Destroy the end range"
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap3%
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap3%
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap3%
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap3%
 range="1 2"
 verify_snapshots 1
 range="3 4 5"
@@ -129,8 +129,8 @@ verify_snapshots
 
 setup_snapshots
 log_note "Destroy a simple list"
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap2,snap4
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap2,snap4
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap2,snap4
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap2,snap4
 range="2 4"
 verify_snapshots
 range="1 3 5"
@@ -138,8 +138,8 @@ verify_snapshots 1
 
 setup_snapshots
 log_note "Destroy a list and range together"
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap1%snap3,snap5
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap1%snap3,snap5
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap1%snap3,snap5
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap1%snap3,snap5
 range="1 2 3 5"
 verify_snapshots
 range=4
@@ -148,8 +148,8 @@ verify_snapshots 1
 snaps="1 2 3 5 6 7 8 9 10"
 setup_snapshots
 log_note "Destroy a list of ranges"
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap1%snap3,snap5
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap1%snap3,snap5
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap1%snap3,snap5
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap1%snap3,snap5
 range="1 2 3 5"
 verify_snapshots
 range=4
@@ -160,27 +160,27 @@ setup_snapshots
 log_note "Snapshot destory with hold"
 range="1 2 3 4 5"
 for i in 1 2 3 4 5; do
-	log_must $ZFS hold keep $TESTPOOL/$TESTFS1@snap$i
-	log_must $ZFS hold keep $TESTPOOL/$TESTVOL@snap$i
+	log_must zfs hold keep $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs hold keep $TESTPOOL/$TESTVOL@snap$i
 done
-log_mustnot $ZFS destroy $TESTPOOL/$TESTFS1@snap1%snap5
-log_mustnot $ZFS destroy $TESTPOOL/$TESTVOL@snap1%snap5
+log_mustnot zfs destroy $TESTPOOL/$TESTFS1@snap1%snap5
+log_mustnot zfs destroy $TESTPOOL/$TESTVOL@snap1%snap5
 verify_snapshots 1
 for i in 1 2 3 4 5; do
-	log_must $ZFS release keep $TESTPOOL/$TESTFS1@snap$i
-	log_must $ZFS release keep $TESTPOOL/$TESTVOL@snap$i
+	log_must zfs release keep $TESTPOOL/$TESTFS1@snap$i
+	log_must zfs release keep $TESTPOOL/$TESTVOL@snap$i
 done
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap1%snap5
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap1%snap5
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap1%snap5
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap1%snap5
 verify_snapshots
 
 log_note "Range destroy for snapshots having clones"
 setup_snapshots
 for i in 1 2 3 4 5; do
-	log_must $ZFS clone $TESTPOOL/$TESTFS1@snap$i $TESTPOOL/$TESTFS1/clone$i
+	log_must zfs clone $TESTPOOL/$TESTFS1@snap$i $TESTPOOL/$TESTFS1/clone$i
 done
-log_must $ZFS destroy -R $TESTPOOL/$TESTFS1@snap1%snap5
-log_must $ZFS destroy $TESTPOOL/$TESTVOL@snap1%snap5
+log_must zfs destroy -R $TESTPOOL/$TESTFS1@snap1%snap5
+log_must zfs destroy $TESTPOOL/$TESTVOL@snap1%snap5
 verify_snapshots
 
 log_pass "'zfs destroy' successfully destroys ranges of snapshots"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_common.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_common.kshlib
index ffec48c133..1979883435 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,43 +51,43 @@ function setup_testenv #[dtst]
 	typeset dtst=$1
 
 	if ! datasetexists $CTR; then
-		log_must $ZFS create $CTR
+		log_must zfs create $CTR
 	fi
 	if ! datasetexists $FS; then
-		log_must $ZFS create $FS
+		log_must zfs create $FS
 	fi
 	# Volume test is only availible on globle zone
 	if ! datasetexists $VOL && is_global_zone; then
-		log_must $ZFS create -V $VOLSIZE $VOL
+		log_must zfs create -V $VOLSIZE $VOL
 
-		$ECHO "y" | $NEWFS /dev/zvol/dsk/$VOL > /dev/null 2>&1
+		echo "y" | newfs /dev/zvol/dsk/$VOL > /dev/null 2>&1
 		if (( $? == 0 )); then
-			log_note "SUCCESS: $NEWFS /dev/zvol/dsk/$VOL>/dev/null"
+			log_note "SUCCESS: newfs /dev/zvol/dsk/$VOL>/dev/null"
 		else
-			log_fail "$NEWFS /dev/zvol/dsk/$VOL > /dev/null"
+			log_fail "newfs /dev/zvol/dsk/$VOL > /dev/null"
 		fi
 
 		if [[ ! -d $TESTDIR1 ]]; then
-			log_must $MKDIR $TESTDIR1
+			log_must mkdir $TESTDIR1
 		fi
-		log_must $MOUNT /dev/zvol/dsk/$VOL $TESTDIR1
+		log_must mount /dev/zvol/dsk/$VOL $TESTDIR1
 	fi
 
 	if [[ $dtst == snap || $dtst == clone ]]; then
 		if ! datasetexists $FSSNAP; then
-			log_must $ZFS snapshot $FSSNAP
+			log_must zfs snapshot $FSSNAP
 		fi
 		if ! datasetexists $VOLSNAP && is_global_zone; then
-			log_must $ZFS snapshot $VOLSNAP
+			log_must zfs snapshot $VOLSNAP
 		fi
 	fi
 
 	if [[ $dtst == clone ]]; then
 		if ! datasetexists $FSCLONE; then
-			log_must $ZFS clone $FSSNAP $FSCLONE
+			log_must zfs clone $FSSNAP $FSCLONE
 		fi
 		if ! datasetexists $VOLCLONE && is_global_zone; then
-			log_must $ZFS clone $VOLSNAP $VOLCLONE
+			log_must zfs clone $VOLSNAP $VOLCLONE
 		fi
 	fi
 }
@@ -97,16 +97,16 @@ function setup_testenv #[dtst]
 function cleanup_testenv
 {
 	if is_global_zone && ismounted "$TESTDIR1" "ufs" ; then
-		log_must $UMOUNT -f $TESTDIR1
+		log_must umount -f $TESTDIR1
 	fi
 	if [[ -d $TESTDIR1 ]]; then
-		log_must $RM -rf $TESTDIR1
+		log_must rm -rf $TESTDIR1
 	fi
 
-	$PKILL $MKBUSY
+	pkill mkbusy
 
 	if datasetexists $CTR; then
-		log_must $ZFS destroy -Rf $CTR
+		log_must zfs destroy -Rf $CTR
 	fi
 }
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_001_pos.ksh
index 033a2d42a9..d12b1dc9a5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
 
@@ -34,7 +38,7 @@
 # correct property value.
 #
 # STRATEGY:
-# 1. Create pool, filesystem, volume and snapshot.
+# 1. Create pool, filesystem, volume, snapshot, and bookmark.
 # 2. Setting valid parameter, 'zfs get' should succeed.
 # 3. Compare the output property name with the original input property.
 #
@@ -65,6 +69,9 @@ typeset all_props=("${zfs_props[@]}" "${userquota_props[@]}")
 typeset dataset=($TESTPOOL/$TESTCTR $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \
 	$TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTVOL@$TESTSNAP)
 
+typeset bookmark_props=(creation)
+typeset bookmark=($TESTPOOL/$TESTFS#$TESTBKMARK $TESTPOOL/$TESTVOL#$TESTBKMARK)
+
 #
 # According to dataset and option, checking if 'zfs get' return correct
 # property information.
@@ -86,7 +93,7 @@ function check_return_value
 
 		while read line; do
 			typeset item
-			item=$($ECHO $line | $AWK '{print $2}' 2>&1)
+			item=$(echo $line | awk '{print $2}' 2>&1)
 
 			if [[ $item == $p ]]; then
 				((found += 1))
@@ -100,7 +107,7 @@ function check_return_value
 		fi
 	done
 
-	log_note "SUCCESS: '$ZFS get $opt $prop $dst'."
+	log_note "SUCCESS: 'zfs get $opt $prop $dst'."
 }
 
 log_assert "Setting the valid options and properties 'zfs get' should return " \
@@ -111,15 +118,19 @@ log_onexit cleanup
 create_snapshot $TESTPOOL/$TESTFS $TESTSNAP
 create_snapshot $TESTPOOL/$TESTVOL $TESTSNAP
 
+# Create filesystem and volume's bookmark
+create_bookmark $TESTPOOL/$TESTFS $TESTSNAP $TESTBKMARK
+create_bookmark $TESTPOOL/$TESTVOL $TESTSNAP $TESTBKMARK
+
 typeset -i i=0
 while ((i < ${#dataset[@]})); do
 	for opt in "${options[@]}"; do
 		for prop in ${all_props[@]}; do
-			eval "$ZFS get $opt $prop ${dataset[i]} > \
+			eval "zfs get $opt $prop ${dataset[i]} > \
 			    $TESTDIR/$TESTFILE0"
 			ret=$?
 			if [[ $ret != 0 ]]; then
-				log_fail "$ZFS get returned: $ret"
+				log_fail "zfs get returned: $ret"
 			fi
 			check_return_value ${dataset[i]} "$prop" "$opt"
 		done
@@ -127,5 +138,21 @@ while ((i < ${#dataset[@]})); do
 	((i += 1))
 done
 
+i=0
+while ((i < ${#bookmark[@]})); do
+	for opt in "${options[@]}"; do
+		for prop in ${bookmark_props[@]}; do
+			eval "$ZFS get $opt $prop ${bookmark[i]} > \
+			    $TESTDIR/$TESTFILE0"
+			ret=$?
+			if [[ $ret != 0 ]]; then
+				log_fail "$ZFS get returned: $ret"
+			fi
+			check_return_value ${bookmark[i]} "$prop" "$opt"
+		done
+	done
+	((i += 1))
+done
+
 log_pass "Setting the valid options to dataset, it should succeed and return " \
     "valid value. 'zfs get' pass."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_002_pos.ksh
index 1221d83b0f..145a77d033 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 
 #
@@ -75,10 +79,10 @@ for dst in ${dataset[@]}; do
 	for opt in "" $(gen_option_str "${options[*]}" "-" "" $opt_numb); do
 		for prop in $(gen_option_str "${props[*]}" "" "," $prop_numb)
 		do
-			$ZFS get $opt $prop $dst > /dev/null 2>&1
+			zfs get $opt $prop $dst > /dev/null 2>&1
 			ret=$?
 			if [[ $ret != 0 ]]; then
-				log_fail "$ZFS get $opt $prop $dst (Code: $ret)"
+				log_fail "zfs get $opt $prop $dst (Code: $ret)"
 			fi
 		done
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_003_pos.ksh
index 77a58e10f6..2ea5aa0cb4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -42,18 +46,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS mount -o remount,atime $TESTPOOL/$TESTFS
+	log_must zfs mount -o remount,atime $TESTPOOL/$TESTFS
 }
 
 log_assert "'zfs get' should get consistent report with different option."
 log_onexit cleanup
 
-log_must $ZFS set atime=on $TESTPOOL/$TESTFS
-log_must $ZFS mount -o remount,noatime $TESTPOOL/$TESTFS
+log_must zfs set atime=on $TESTPOOL/$TESTFS
+log_must zfs mount -o remount,noatime $TESTPOOL/$TESTFS
 
-value1=$($ZFS get -H atime $TESTPOOL/$TESTFS | $AWK '{print $3}')
-value2=$($ZFS get -H all $TESTPOOL/$TESTFS | $AWK '{print $2 " " $3}' | \
-	$GREP ^atime | $AWK '{print $2}')
+value1=$(zfs get -H atime $TESTPOOL/$TESTFS | awk '{print $3}')
+value2=$(zfs get -H all $TESTPOOL/$TESTFS | awk '{print $2 " " $3}' | \
+	grep ^atime | awk '{print $2}')
 if [[ $value1 != $value2 ]]; then
 	log_fail "value1($value1) != value2($value2)"
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_004_pos.ksh
index 566da2272a..f57628c163 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,27 +45,27 @@ verify_runnable "both"
 
 function cleanup
 {
-	[[ -e $propfile ]] && $RM -f $propfile
+	[[ -e $propfile ]] && rm -f $propfile
 
 	datasetexists $clone  && \
-		log_must $ZFS destroy $clone
+		log_must zfs destroy $clone
 	for snap in $fssnap $volsnap ; do
 		snapexists $snap && \
-			log_must $ZFS destroy $snap
+			log_must zfs destroy $snap
 	done
 
 	if [[ -n $globalzone ]] ; then
 		for pool in $TESTPOOL1 $TESTPOOL2 $TESTPOOL3; do
 			poolexists $pool && \
-				log_must $ZPOOL destroy -f $pool
+				log_must zpool destroy -f $pool
 		done
-		for file in `$LS $TESTDIR1/poolfile*`; do
-			$RM -f $file
+		for file in `ls $TESTDIR1/poolfile*`; do
+			rm -f $file
 		done
 	else
 		for fs in $TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS2 $TESTPOOL/$TESTFS3; do
 			datasetexists $fs && \
-				log_must $ZFS destroy -rf $fs
+				log_must zfs destroy -rf $fs
 		done
 	fi
 }
@@ -92,12 +92,12 @@ volsnap=$TESTPOOL/$TESTVOL@$TESTSNAP
 
 #set user defined properties for $TESTPOOL
 for usrprop in ${usrprops[@]}; do
-	log_must $ZFS set $usrprop $TESTPOOL
+	log_must zfs set $usrprop $TESTPOOL
 done
 # create snapshot and clone in $TESTPOOL
-log_must $ZFS snapshot $fssnap
-log_must $ZFS clone $fssnap $clone
-log_must $ZFS snapshot $volsnap
+log_must zfs snapshot $fssnap
+log_must zfs clone $fssnap $clone
+log_must zfs snapshot $volsnap
 
 # collect datasets which can be set user defined properties
 usrpropds="$clone $fs"
@@ -120,31 +120,31 @@ while (( availspace > DFILESIZE )) && (( i < 3 )) ; do
 	(( i += 1 ))
 
 	if [[ -n $globalzone ]] ; then
-		log_must $MKFILE $FILESIZE ${file}$i
+		log_must mkfile $FILESIZE ${file}$i
 		eval pool=\$TESTPOOL$i
-		log_must $ZPOOL create $pool ${file}$i
+		log_must zpool create $pool ${file}$i
 	else
 		eval pool=$TESTPOOL/\$TESTFS$i
-		log_must $ZFS create $pool
+		log_must zfs create $pool
 	fi
 
 	#set user defined properties for testing
 	for usrprop in ${usrprops[@]}; do
-		log_must $ZFS set $usrprop $pool
+		log_must zfs set $usrprop $pool
 	done
 
 	#create datasets in pool
-	log_must $ZFS create $pool/$TESTFS
-	log_must $ZFS snapshot $pool/$TESTFS@$TESTSNAP
-	log_must $ZFS clone $pool/$TESTFS@$TESTSNAP $pool/$TESTCLONE
+	log_must zfs create $pool/$TESTFS
+	log_must zfs snapshot $pool/$TESTFS@$TESTSNAP
+	log_must zfs clone $pool/$TESTFS@$TESTSNAP $pool/$TESTCLONE
 
 	if [[ -n $globalzone ]] ; then
-		log_must $ZFS create -V $VOLSIZE $pool/$TESTVOL
+		log_must zfs create -V $VOLSIZE $pool/$TESTVOL
 	else
-		log_must $ZFS create $pool/$TESTVOL
+		log_must zfs create $pool/$TESTVOL
 	fi
 
-	ds=`$ZFS list -H -r -o name -t filesystem,volume $pool`
+	ds=`zfs list -H -r -o name -t filesystem,volume $pool`
 	usrpropds="$usrpropds $pool/$TESTFS $pool/$TESTCLONE $pool/$TESTVOL"
 	allds="$allds $pool/$TESTFS $pool/$TESTCLONE $pool/$TESTVOL \
 		$pool/$TESTFS@$TESTSNAP"
@@ -162,18 +162,18 @@ typeset -i i=0
 typeset -i propnum=0
 typeset -i failflag=0
 while (( i < ${#opts[*]} )); do
-	[[ -e $propfile ]] && $RM -f $propfile
-	log_must eval "$ZFS get ${opts[i]} all >$propfile"
+	[[ -e $propfile ]] && rm -f $propfile
+	log_must eval "zfs get ${opts[i]} all >$propfile"
 
 	for ds in $allds; do
-		$GREP $ds $propfile >/dev/null 2>&1
+		grep $ds $propfile >/dev/null 2>&1
 		(( $? != 0 )) && \
 			log_fail "There is no property for" \
 				"dataset $ds in 'get all' output."
 
-		propnum=`$CAT $propfile | $AWK '{print $1}' | \
-			$GREP "${ds}$" | $WC -l`
-		ds_type=`$ZFS get -H -o value type $ds`
+		propnum=`cat $propfile | awk '{print $1}' | \
+			grep "${ds}$" | wc -l`
+		ds_type=`zfs get -H -o value type $ds`
 		case $ds_type in
 			filesystem )
 				(( propnum < fspropnum )) && \
@@ -208,7 +208,7 @@ function do_particular_prop_test #<property> <suitable datasets>
 	typeset ds="$2"
 
 	for prop in ${commprops[*]}; do
-		ds=`$ZFS get -H -o name $prop`
+		ds=`zfs get -H -o name $prop`
 
 		[[ "$ds" != "$allds" ]] && \
 			log_fail "The result datasets are $ds, but all suitable" \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_005_neg.ksh
index 018dbee49a..0d70fba54e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_005_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 
 #
@@ -66,6 +70,9 @@ val_props_str=$(gen_option_str "${val_props[*]}" "" "," $prop_numb)
 inval_opts_str=$(gen_option_str "${inval_opts[*]}" "-" "" $opt_numb)
 inval_props_str=$(gen_option_str "${inval_props[*]}" "" "," $prop_numb)
 
+typeset val_bookmark_props=(creation)
+typeset bookmark=($TESTPOOL/$TESTFS#$TESTBKMARK $TESTPOOL/$TESTVOL#$TESTBKMARK)
+
 #
 # Test different options and properties combination.
 #
@@ -80,6 +87,31 @@ function test_options
 	for dst in ${dataset[@]}; do
 		for opt in $opts; do
 			for prop in $props; do
+				zfs get $opt -- $prop $dst > /dev/null 2>&1
+				ret=$?
+				if [[ $ret == 0 ]]; then
+					log_fail "zfs get $opt -- $prop " \
+					    "$dst unexpectedly succeeded."
+				fi
+			done
+		done
+	done
+}
+
+#
+# Test different options and properties combination for bookmarks.
+#
+# $1 options
+# $2 properties
+#
+function test_options_bookmarks
+{
+	typeset opts=$1
+	typeset props=$2
+
+	for dst in ${bookmark[@]}; do
+		for opt in $opts; do
+			for prop in $props; do
 				$ZFS get $opt -- $prop $dst > /dev/null 2>&1
 				ret=$?
 				if [[ $ret == 0 ]]; then
@@ -99,13 +131,20 @@ log_onexit cleanup
 create_snapshot $TESTPOOL/$TESTFS $TESTSNAP
 create_snapshot $TESTPOOL/$TESTVOL $TESTSNAP
 
+# Create filesystem and volume's bookmark
+create_bookmark $TESTPOOL/$TESTFS $TESTSNAP $TESTBKMARK
+create_bookmark $TESTPOOL/$TESTVOL $TESTSNAP $TESTBKMARK
+
 log_note "Valid options + invalid properties, 'zfs get' should fail."
 test_options "$val_opts_str" "$inval_props_str"
+test_options_bookmark "$val_opts_str" "$inval_props_str"
 
 log_note "Invalid options + valid properties, 'zfs get' should fail."
 test_options "$inval_opts_str" "$val_props_str"
+test_options_bookmark "$inval_opts_str" "$val_bookmark_props"
 
 log_note "Invalid options + invalid properties, 'zfs get' should fail."
 test_options "$inval_opts_str" "$inval_props_str"
+test_options_bookmarks "$inval_opts_str" "$inval_props_str"
 
 log_pass "Setting the invalid options to dataset, 'zfs get' pass."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_006_neg.ksh
index 58b08261d2..d006748e55 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_006_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 
 #
@@ -52,7 +56,7 @@ set -A  bad_combine "ALL" "\-R all" "-P all" "-h all" "-rph all" "-RpH all" "-Pr
 typeset -i i=0
 while (( i < ${#bad_combine[*]} ))
 do
-	log_mustnot eval "$ZFS get ${bad_combine[i]} >/dev/null"
+	log_mustnot eval "zfs get ${bad_combine[i]} >/dev/null"
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_007_neg.ksh
index 850c1ca248..9bb00807f1 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_007_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 
 #
@@ -52,7 +56,7 @@ set -A  badargs "o name,property,value,resource" "o name" \
 typeset -i i=0
 while (( i < ${#badargs[*]} ))
 do
-	log_mustnot eval "$ZFS get \"${badargs[i]}\" >/dev/null 2>&1"
+	log_mustnot eval "zfs get \"${badargs[i]}\" >/dev/null 2>&1"
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_008_pos.ksh
index 40d4553f63..b81a974370 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_008_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
 
@@ -33,7 +37,7 @@
 # Verify "-d <n>" can work with other options
 #
 # STRATEGY:
-# 1. Create pool, filesystem, dataset, volume and snapshot.
+# 1. Create pool, filesystem, dataset, volume, snapshot, and bookmark.
 # 2. Getting an -d option, other options and properties random combination.
 # 3. Using the combination as the parameters of 'zfs get' to check the
 # command line return value.
@@ -53,7 +57,7 @@ set -A props type used available creation volsize referenced compressratio \
 	usedbychildren usedbydataset usedbyrefreservation usedbysnapshots \
 	userquota@root groupquota@root userused@root groupused@root
 
-$ZFS upgrade -v > /dev/null 2>&1
+zfs upgrade -v > /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
 	set -A all_props ${all_props[*]} version
 fi
@@ -61,6 +65,9 @@ fi
 set -A dataset $TESTPOOL/$TESTCTR $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \
 	$TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTVOL@$TESTSNAP
 
+set -A bookmark_props creation
+set -A bookmark $TESTPOOL/$TESTFS#$TESTBKMARK $TESTPOOL/$TESTVOL#$TESTBKMARK
+
 log_assert "Verify '-d <n>' can work with other options"
 log_onexit cleanup
 
@@ -68,6 +75,10 @@ log_onexit cleanup
 create_snapshot $TESTPOOL/$TESTFS $TESTSNAP
 create_snapshot $TESTPOOL/$TESTVOL $TESTSNAP
 
+# Create filesystem and volume's bookmark
+create_bookmark $TESTPOOL/$TESTFS $TESTSNAP $TESTBKMARK
+create_bookmark $TESTPOOL/$TESTVOL $TESTSNAP $TESTBKMARK
+
 typeset -i opt_numb=16
 typeset -i prop_numb=16
 typeset -i i=0
@@ -81,11 +92,21 @@ for dst in ${dataset[@]}; do
 		(( depth_item = $RANDOM % ${#depth_options[@]} ))
 		for prop in $(gen_option_str "${props[*]}" "" "," $prop_numb)
 		do
-			log_must eval "$ZFS get -${depth_options[depth_item]} ${options[item]} $prop $dst > /dev/null 2>&1"
+			log_must eval "zfs get -${depth_options[depth_item]} ${options[item]} $prop $dst > /dev/null 2>&1"
 		done
 		(( i += 1 ))
 	done
 done
 
+for dst in ${bookmark[@]}; do
+	(( i=0 ))
+	while (( i < opt_numb )); do
+		(( item = $RANDOM % ${#options[@]} ))
+		(( depth_item = $RANDOM % ${#depth_options[@]} ))
+		log_must eval "$ZFS get -${depth_options[depth_item]} ${options[item]} $bookmark_props $dst > /dev/null 2>&1"
+		(( i += 1 ))
+	done
+done
+
 log_pass "Verify '-d <n>' can work with other options"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_009_pos.ksh
index 10ebf5fc4c..8ecb877d43 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_009_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
 
@@ -51,7 +55,7 @@ set -A all_props type used available creation volsize referenced \
 	usedbychildren usedbydataset usedbyrefreservation usedbysnapshots \
 	userquota@root groupquota@root userused@root groupused@root
 
-$ZFS upgrade -v > /dev/null 2>&1
+zfs upgrade -v > /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
 	set -A all_props ${all_props[*]} version
 fi
@@ -72,9 +76,9 @@ for dp in ${depth_array[@]}; do
 		(( j+=1 ))
 	done
 	for prop in $(gen_option_str "${all_props[*]}" "" "," $prop_numb); do
-		log_must eval "$ZFS get -H -d $dp -o name $prop $DEPTH_FS > $DEPTH_OUTPUT"
-		log_must eval "$ZFS get -rH -o name $prop $DEPTH_FS | $EGREP -e '$eg_opt' > $EXPECT_OUTPUT"
-		log_must $DIFF $DEPTH_OUTPUT $EXPECT_OUTPUT
+		log_must eval "zfs get -H -d $dp -o name $prop $DEPTH_FS > $DEPTH_OUTPUT"
+		log_must eval "zfs get -rH -o name $prop $DEPTH_FS | egrep -e '$eg_opt' > $EXPECT_OUTPUT"
+		log_must diff $DEPTH_OUTPUT $EXPECT_OUTPUT
 	done
 	(( old_val=dp ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_010_neg.ksh
index e8c36073a9..e1f53845fd 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_010_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
 
@@ -46,7 +50,7 @@ set -A  badargs "a" "AB" "aBc" "2A" "a2b" "aB2" "-1" "-32" "-999"
 typeset -i i=0
 while (( i < ${#badargs[*]} ))
 do
-	log_mustnot eval "$ZFS get -d ${badargs[i]} $TESTPOOL/$TESTFS >/dev/null 2>&1"
+	log_mustnot eval "zfs get -d ${badargs[i]} $TESTPOOL/$TESTFS >/dev/null 2>&1"
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
index b1978cb6c0..d8cb9af028 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_common.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -83,8 +87,8 @@ function gen_option_str # $elements $prefix $separator $counter
 }
 
 #
-# Cleanup the volume snapshot and filesystem snapshot were created for
-# this test case.
+# Cleanup the volume snapshot, filesystem snapshot, volume bookmark, and
+# filesystem bookmark that were created for this test case.
 #
 function cleanup
 {
@@ -93,5 +97,10 @@ function cleanup
 	datasetexists $TESTPOOL/$TESTFS@$TESTSNAP && \
 		destroy_snapshot $TESTPOOL/$TESTFS@$TESTSNAP
 
-	[[ -e $TESTFILE0 ]] && log_must $RM $TESTFILE0
+	bkmarkexists $TESTPOOL/$TESTVOL#$TESTBKMARK && \
+		destroy_bookmark $TESTPOOL/$TESTVOL#$TESTBKMARK
+	bkmarkexists $TESTPOOL/$TESTFS#$TESTBKMARK && \
+		destroy_bookmark $TESTPOOL/$TESTFS#$TESTBKMARK
+
+	[[ -e $TESTFILE0 ]] && log_must rm $TESTFILE0
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
index 874cfa3b5e..8ef8d9aa16 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 DEPTH_FS=$TESTPOOL/depth_fs
@@ -40,7 +44,7 @@ function depth_fs_setup
 	typeset -i i j k
 	typeset fslist
 
-	log_must $ZFS create $DEPTH_FS
+	log_must zfs create $DEPTH_FS
 
 	(( i=1 ))
 	while (( i<=MAX_DEPTH )); do
@@ -48,7 +52,7 @@ function depth_fs_setup
 			fslist=$DEPTH_FS
 		else
 			(( k=i-1 ))
-			fslist=$($ZFS list -rH -t filesystem -o name $DEPTH_FS|$GREP depth"$k"$)
+			fslist=$(zfs list -rH -t filesystem -o name $DEPTH_FS|grep depth"$k"$)
 			if (( $? != 0 )); then
 				log_fail "No depth$k filesystem"
 			fi
@@ -56,11 +60,11 @@ function depth_fs_setup
 		for fs in $fslist; do
 			(( j=1 ))
 			while (( j<=DS_COUNT )); do
-				log_must $ZFS create $fs/fs_"$j"_depth"$i"
+				log_must zfs create $fs/fs_"$j"_depth"$i"
 				if is_global_zone ; then
-					log_must $ZFS create -V 8M $fs/vol_"$j"_depth"$i"
+					log_must zfs create -V 8M $fs/vol_"$j"_depth"$i"
 				fi
-				log_must $ZFS snapshot $fs@snap_"$j"_depth"$i"
+				log_must zfs snapshot $fs@snap_"$j"_depth"$i"
 				(( j=j+1 ))
 			done
 		done
@@ -73,7 +77,7 @@ function depth_fs_setup
 #
 function depth_fs_cleanup
 {
-	log_must $ZFS destroy -rR $DEPTH_FS
+	log_must zfs destroy -rR $DEPTH_FS
 }
 
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_001_neg.ksh
index 891e0e9df0..62f255ca38 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_001_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,7 +49,7 @@ typeset props_str="type used available avail creation referenced refer \
 		compressratio ratio mounted origin quota reservation \
 		reserv volsize volblocksize volblock"
 
-$ZFS upgrade -v > /dev/null 2>&1
+zfs upgrade -v > /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
 	props_str="$props_str version"
 fi
@@ -62,7 +66,7 @@ for obj in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL; do
 	while [[ $i -lt ${#prop[*]} ]]; do
 		orig_val=$(get_prop ${prop[i]} $obj)
 
-		log_mustnot $ZFS inherit ${prop[i]} $obj
+		log_mustnot zfs inherit ${prop[i]} $obj
 
 		new_val=$(get_prop ${prop[i]} $obj)
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_002_neg.ksh
index 3fefa316c3..584039f543 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2011 by Delphix. All rights reserved.
+# Copyright (c) 2011, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists $TESTPOOL/$TESTFS@$TESTSNAP; then
-		log_must $ZFS destroy $TESTPOOL/$TESTFS@$TESTSNAP
+		log_must zfs destroy $TESTPOOL/$TESTFS@$TESTSNAP
 	fi
 }
 
@@ -60,7 +60,7 @@ set -A props "recordsize" "mountpoint" "sharenfs" "checksum" "compression" \
     "aclinherit" "xattr" "copies"
 set -A illprops "recordsiz" "mountpont" "sharen" "compres" "atme" "blah"
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
 
 typeset -i i=0
 for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \
@@ -69,23 +69,23 @@ for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \
 	# zfs inherit should fail with bad options
 	for opt in ${badopts[@]}; do
 		for prop in ${props[@]}; do
-			log_mustnot eval "$ZFS inherit $opt $prop $ds \
+			log_mustnot eval "zfs inherit $opt $prop $ds \
 			    >/dev/null 2>&1"
 		done
 	done
 
 	# zfs inherit should fail with invalid properties
 	for prop in "${illprops[@]}"; do
-		log_mustnot eval "$ZFS inherit $prop $ds >/dev/null 2>&1"
-		log_mustnot eval "$ZFS inherit -r $prop $ds >/dev/null 2>&1"
+		log_mustnot eval "zfs inherit $prop $ds >/dev/null 2>&1"
+		log_mustnot eval "zfs inherit -r $prop $ds >/dev/null 2>&1"
 	done
 
 	# zfs inherit should fail with too many arguments
 	(( i = 0 ))
 	while (( i < ${#props[*]} -1 )); do
-		log_mustnot eval "$ZFS inherit ${props[(( i ))]} \
+		log_mustnot eval "zfs inherit ${props[(( i ))]} \
 				${props[(( i + 1 ))]} $ds >/dev/null 2>&1"
-		log_mustnot eval "$ZFS inherit -r ${props[(( i ))]} \
+		log_mustnot eval "zfs inherit -r ${props[(( i ))]} \
 				${props[(( i + 1 ))]} $ds >/dev/null 2>&1"
 
 		(( i = i + 2 ))
@@ -95,8 +95,8 @@ done
 
 # zfs inherit should fail with missing datasets
 for prop in ${props[@]}; do
-	log_mustnot eval "$ZFS inherit $prop >/dev/null 2>&1"
-	log_mustnot eval "$ZFS inherit -r $prop >/dev/null 2>&1"
+	log_mustnot eval "zfs inherit $prop >/dev/null 2>&1"
+	log_mustnot eval "zfs inherit -r $prop >/dev/null 2>&1"
 done
 
 log_pass "'zfs inherit' failed as expected when passing illegal arguments."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_003_pos.ksh
index b2f09dba7e..bc0d8c59c0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_inherit/zfs_inherit_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
@@ -44,7 +48,7 @@ function cleanup
 {
 	for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL ; do
 		if snapexists $ds@$TESTSNAP; then
-			log_must $ZFS destroy $ds@$TESTSNAP
+			log_must zfs destroy $ds@$TESTSNAP
 		fi
 	done
 	cleanup_user_prop $TESTPOOL
@@ -57,9 +61,9 @@ for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL ; do
         typeset prop_name=$(valid_user_property 10)
         typeset value=$(user_property_value 16)
 
-	log_must eval "$ZFS set $prop_name='$value' $ds"
+	log_must eval "zfs set $prop_name='$value' $ds"
 
-	log_must $ZFS snapshot $ds@$TESTSNAP
+	log_must zfs snapshot $ds@$TESTSNAP
 
 	typeset snapvalue=$(get_prop $prop_name $ds@$TESTSNAP)
 
@@ -69,9 +73,9 @@ for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL ; do
 	fi
 
 	snapvalue=$(user_property_value 16)
-	log_must eval "$ZFS set $prop_name='$snapvalue' $ds@$TESTSNAP"
+	log_must eval "zfs set $prop_name='$snapvalue' $ds@$TESTSNAP"
 
-	log_must $ZFS inherit $prop_name $ds@$TESTSNAP
+	log_must zfs inherit $prop_name $ds@$TESTSNAP
 
 	snapvalue=$(get_prop $prop_name $ds@$TESTSNAP)
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
index d144496064..41cd9698cc 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.cfg
 
@@ -33,7 +37,7 @@ function force_unmount #dev
 
 	ismounted $dev
 	if (( $? == 0 )); then
-		log_must $ZFS $unmountforce $dev
+		log_must zfs $unmountforce $dev
 	fi
 	return 0
 }
@@ -74,19 +78,19 @@ function setup_filesystem #disklist #pool #fs #mntpoint #type #vdev
 	datasetexists $pool/$fs && \
 		log_must cleanup_filesystem $pool $fs
 
-	$RMDIR $mntpoint > /dev/null 2>&1
+	rmdir $mntpoint > /dev/null 2>&1
 	if [[ ! -d $mntpoint ]]; then
-		log_must $MKDIR -p $mntpoint
+		log_must mkdir -p $mntpoint
 	fi
 
 	case "$type" in
-		'ctr')	log_must $ZFS create $pool/$fs
-			log_must $ZFS set mountpoint=$mntpoint $pool/$fs
+		'ctr')	log_must zfs create $pool/$fs
+			log_must zfs set mountpoint=$mntpoint $pool/$fs
 			;;
-		'vol')	log_must $ZFS create -V $VOLSIZE $pool/$fs
+		'vol')	log_must zfs create -V $VOLSIZE $pool/$fs
 			;;
-		*)	log_must $ZFS create $pool/$fs
-			log_must $ZFS set mountpoint=$mntpoint $pool/$fs
+		*)	log_must zfs create $pool/$fs
+			log_must zfs set mountpoint=$mntpoint $pool/$fs
 			;;
 	esac
 
@@ -107,10 +111,10 @@ function cleanup_filesystem #pool #fs
 
 	if datasetexists "$pool/$fs" ; then
 		mtpt=$(get_prop mountpoint "$pool/$fs")
-		log_must $ZFS destroy -r $pool/$fs
+		log_must zfs destroy -r $pool/$fs
 
 		[[ -d $mtpt ]] && \
-			log_must $RM -rf $mtpt
+			log_must rm -rf $mtpt
 	else
 		return 1
 	fi
@@ -124,7 +128,7 @@ function verify_mount_display
 {
 	typeset fs
 
-	for fs in $($ZFS $mountcmd | $AWK '{print $1}') ; do
+	for fs in $(zfs $mountcmd | awk '{print $1}') ; do
 		log_must mounted $fs
 	done
 	return 0
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_001_pos.ksh
index b474dc8e1f..c46a356954 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
@@ -47,17 +51,17 @@ function cleanup
 	return 0
 }
 
-log_assert "Verify that '$ZFS $mountcmd <filesystem>' succeeds as root."
+log_assert "Verify that 'zfs $mountcmd <filesystem>' succeeds as root."
 
 log_onexit cleanup
 
 unmounted $TESTPOOL/$TESTFS || \
 	log_must cleanup
 
-log_must $ZFS $mountcmd $TESTPOOL/$TESTFS
+log_must zfs $mountcmd $TESTPOOL/$TESTFS
 
 log_note "Make sure the filesystem $TESTPOOL/$TESTFS is mounted"
 mounted $TESTPOOL/$TESTFS || \
 	log_fail Filesystem $TESTPOOL/$TESTFS is unmounted
 
-log_pass "'$ZFS $mountcmd <filesystem>' succeeds as root."
+log_pass "'zfs $mountcmd <filesystem>' succeeds as root."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_002_pos.ksh
index 8b39306fbd..8ee3e029fb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
@@ -50,25 +54,25 @@ function cleanup
 }
 
 
-log_assert "Verify that '$ZFS $mountcmd' with a filesystem " \
+log_assert "Verify that 'zfs $mountcmd' with a filesystem " \
 	"whose name is not in 'zfs list' will fail with return code 1."
 
 log_onexit cleanup
 
 log_note "Make sure the filesystem $TESTPOOL/$NONEXISTFSNAME " \
 	"is not in 'zfs list'"
-log_mustnot $ZFS list $TESTPOOL/$NONEXISTFSNAME
+log_mustnot zfs list $TESTPOOL/$NONEXISTFSNAME
 
 typeset -i ret=0
-$ZFS $mountcmd $TESTPOOL/$NONEXISTFSNAME
+zfs $mountcmd $TESTPOOL/$NONEXISTFSNAME
 ret=$?
 (( ret == 1 )) || \
-	log_fail "'$ZFS $mountcmd $TESTPOOL/$NONEXISTFSNAME' " \
+	log_fail "'zfs $mountcmd $TESTPOOL/$NONEXISTFSNAME' " \
 		"unexpected return code of $ret."
 
 log_note "Make sure the filesystem $TESTPOOL/$NONEXISTFSNAME is unmounted"
 unmounted $TESTPOOL/$NONEXISTFSNAME || \
 	log_fail Filesystem $TESTPOOL/$NONEXISTFSNAME is mounted
 
-log_pass "'$ZFS $mountcmd' with a filesystem " \
+log_pass "'zfs $mountcmd' with a filesystem " \
 	"whose name is not in 'zfs list' failed with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_003_pos.ksh
index 2dd14daecd..59d8c235f8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
@@ -46,12 +50,12 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 	log_must force_unmount $TESTPOOL/$TESTFS
 	return 0
 }
 
-log_assert "Verify that '$ZFS $mountcmd' with a filesystem " \
+log_assert "Verify that 'zfs $mountcmd' with a filesystem " \
 	"whose mountpoint property is 'legacy' or 'none' " \
 	"will fail with return code 1."
 
@@ -66,12 +70,12 @@ while (( i < ${#mopt[*]} )); do
 	unmounted $TESTPOOL/$TESTFS || \
 		log_must cleanup
 
-	log_must $ZFS set mountpoint=${mopt[i]} $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=${mopt[i]} $TESTPOOL/$TESTFS
 
-	$ZFS $mountcmd $TESTPOOL/$TESTFS
+	zfs $mountcmd $TESTPOOL/$TESTFS
 	ret=$?
 	(( ret == 1)) || \
-		log_fail "'$ZFS $mountcmd $TESTPOOL/$TESTFS' " \
+		log_fail "'zfs $mountcmd $TESTPOOL/$TESTFS' " \
 			"unexpected return code of $ret."
 
 	log_note "Make sure the filesystem $TESTPOOL/$TESTFS is unmounted"
@@ -81,6 +85,6 @@ while (( i < ${#mopt[*]} )); do
 	((i = i + 1))
 done
 
-log_pass "Verify that '$ZFS $mountcmd' with a filesystem " \
+log_pass "Verify that 'zfs $mountcmd' with a filesystem " \
 	"whose mountpoint property is 'legacy' or 'none' " \
 	"will fail with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_004_pos.ksh
index 524aed1855..4874c6d653 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_004_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
@@ -52,7 +56,7 @@ function cleanup
 
 typeset -i ret=0
 
-log_assert "Verify that '$ZFS $mountcmd <filesystem>' " \
+log_assert "Verify that 'zfs $mountcmd <filesystem>' " \
 	"with a mounted filesystem will fail with return code 1."
 
 log_onexit cleanup
@@ -60,20 +64,20 @@ log_onexit cleanup
 unmounted $TESTPOOL/$TESTFS || \
 	log_must cleanup
 
-log_must $ZFS $mountcmd $TESTPOOL/$TESTFS
+log_must zfs $mountcmd $TESTPOOL/$TESTFS
 
 mounted $TESTPOOL/$TESTFS || \
 	log_unresolved "Filesystem $TESTPOOL/$TESTFS is unmounted"
 
-$ZFS $mountcmd $TESTPOOL/$TESTFS
+zfs $mountcmd $TESTPOOL/$TESTFS
 ret=$?
 (( ret == 1 )) || \
-	log_fail "'$ZFS $mountcmd $TESTPOOL/$TESTFS' " \
+	log_fail "'zfs $mountcmd $TESTPOOL/$TESTFS' " \
 		"unexpected return code of $ret."
 
 log_note "Make sure the filesystem $TESTPOOL/$TESTFS is mounted"
 mounted $TESTPOOL/$TESTFS || \
 	log_fail Filesystem $TESTPOOL/$TESTFS is unmounted
 
-log_pass "'$ZFS $mountcmd <filesystem>' with a mounted filesystem " \
+log_pass "'zfs $mountcmd <filesystem>' with a mounted filesystem " \
 	"will fail with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_005_pos.ksh
index 1e5610434f..d17c99e9cf 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_005_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
@@ -47,14 +51,14 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 	log_must force_unmount $TESTPOOL/$TESTFS
 	return 0
 }
 
 typeset -i ret=0
 
-log_assert "Verify that '$ZFS $mountcmd' with a filesystem " \
+log_assert "Verify that 'zfs $mountcmd' with a filesystem " \
 	"whose mountpoint is currently in use will fail with return code 1."
 
 log_onexit cleanup
@@ -63,20 +67,20 @@ unmounted $TESTPOOL/$TESTFS || \
 	log_must cleanup
 
 [[ -d $TESTDIR ]] || \
-	log_must $MKDIR -p $TESTDIR
+	log_must mkdir -p $TESTDIR
 
 cd $TESTDIR || \
 	log_unresolved "Unable change directory to $TESTDIR"
 
-$ZFS $mountcmd $TESTPOOL/$TESTFS
+zfs $mountcmd $TESTPOOL/$TESTFS
 ret=$?
 (( ret == 1 )) || \
-	log_fail "'$ZFS $mountcmd $TESTPOOL/$TESTFS' " \
+	log_fail "'zfs $mountcmd $TESTPOOL/$TESTFS' " \
 		"unexpected return code of $ret."
 
 log_note "Make sure the filesystem $TESTPOOL/$TESTFS is unmounted"
 unmounted $TESTPOOL/$TESTFS || \
 	log_fail Filesystem $TESTPOOL/$TESTFS is mounted
 
-log_pass "'$ZFS $mountcmd' with a filesystem " \
+log_pass "'zfs $mountcmd' with a filesystem " \
 	"whose mountpoint is currently in use failed with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_006_pos.ksh
index f8b40219bd..d1e89616bf 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_006_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
@@ -53,8 +57,8 @@ function cleanup
 		cleanup_filesystem $TESTPOOL $TESTFS1
 
 	[[ -d $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+		log_must rm -rf $TESTDIR
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 	log_must force_unmount $TESTPOOL/$TESTFS
 
 	return 0
@@ -62,7 +66,7 @@ function cleanup
 
 typeset -i ret=0
 
-log_assert "Verify that '$ZFS $mountcmd <filesystem>' " \
+log_assert "Verify that 'zfs $mountcmd <filesystem>' " \
 	"which mountpoint be the identical or the top of an existing one " \
 	"will fail with return code 1."
 
@@ -72,7 +76,7 @@ unmounted $TESTPOOL/$TESTFS || \
 	log_must force_unmount $TESTPOOL/$TESTFS
 
 [[ -d $TESTDIR ]] && \
-	log_must $RM -rf $TESTDIR
+	log_must rm -rf $TESTDIR
 
 typeset -i MAXDEPTH=3
 typeset -i depth=0
@@ -83,25 +87,25 @@ while (( depth < MAXDEPTH )); do
 	(( depth = depth + 1))
 done
 
-log_must $ZFS set mountpoint=$mtpt $TESTPOOL/$TESTFS
-log_must $ZFS $mountcmd $TESTPOOL/$TESTFS
+log_must zfs set mountpoint=$mtpt $TESTPOOL/$TESTFS
+log_must zfs $mountcmd $TESTPOOL/$TESTFS
 
 mounted $TESTPOOL/$TESTFS || \
 	log_unresolved "Filesystem $TESTPOOL/$TESTFS is unmounted"
 
-log_must $ZFS create $TESTPOOL/$TESTFS1
+log_must zfs create $TESTPOOL/$TESTFS1
 
 unmounted $TESTPOOL/$TESTFS1 || \
 	log_must force_unmount $TESTPOOL/$TESTFS1
 
 while [[ -n $mtpt ]] ; do
 	(( depth == MAXDEPTH )) && \
-		log_note "Verify that '$ZFS $mountcmd <filesystem>' " \
+		log_note "Verify that 'zfs $mountcmd <filesystem>' " \
 		"which mountpoint be the identical of an existing one " \
 		"will fail with return code 1."
 
-	log_must $ZFS set mountpoint=$mtpt $TESTPOOL/$TESTFS1
-	log_mustnot $ZFS $mountcmd $TESTPOOL/$TESTFS1
+	log_must zfs set mountpoint=$mtpt $TESTPOOL/$TESTFS1
+	log_mustnot zfs $mountcmd $TESTPOOL/$TESTFS1
 
 	unmounted $TESTPOOL/$TESTFS1 || \
 		log_fail "Filesystem $TESTPOOL/$TESTFS1 is mounted."
@@ -109,12 +113,12 @@ while [[ -n $mtpt ]] ; do
 	mtpt=${mtpt%/*}
 
 	(( depth == MAXDEPTH )) && \
-		log_note "Verify that '$ZFS $mountcmd <filesystem>' " \
+		log_note "Verify that 'zfs $mountcmd <filesystem>' " \
 		"which mountpoint be the top of an existing one " \
 		"will fail with return code 1."
 	(( depth = depth - 1 ))
 done
 
-log_pass "'$ZFS $mountcmd <filesystem>' " \
+log_pass "'zfs $mountcmd <filesystem>' " \
 	"which mountpoint be the identical or the top of an existing one " \
 	"will fail with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh
index 577de09579..fe275672e3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
 #
@@ -50,7 +54,7 @@
 function cleanup
 {
 	if ! ismounted $TESTPOOL/$TESTFS; then
-		log_must $ZFS mount $TESTPOOL/$TESTFS
+		log_must zfs mount $TESTPOOL/$TESTFS
 	fi
 }
 
@@ -99,7 +103,7 @@ function get_reverse_option
 		(( ind = i * 2 + 1 ))
 	fi
 
-	$ECHO ${values[$ind]}
+	echo ${values[$ind]}
 }
 
 fs=$TESTPOOL/$TESTFS
@@ -111,7 +115,7 @@ for property in ${properties[@]}; do
 
 	# Set filesystem property temporarily
 	reverse_opt=$(get_reverse_option $fs $property)
-	log_must $ZFS mount -o remount,$reverse_opt $fs
+	log_must zfs mount -o remount,$reverse_opt $fs
 
 	cur_val=$(get_prop $property $fs)
 	(($? != 0)) && log_fail "get_prop $property $fs"
@@ -128,8 +132,8 @@ for property in ${properties[@]}; do
 	fi
 
 	# unmount & mount will revert property to the original value
-	log_must $ZFS unmount $fs
-	log_must $ZFS mount $fs
+	log_must zfs unmount $fs
+	log_must zfs mount $fs
 
 	cur_val=$(get_prop $property $fs)
 	(($? != 0)) && log_fail "get_prop $property $fs"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_008_pos.ksh
index a273272a7c..e7222bbe3c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_008_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
 #
@@ -41,14 +45,14 @@
 
 function cleanup
 {
-	! ismounted $fs && log_must $ZFS mount $fs
+	! ismounted $fs && log_must zfs mount $fs
 
 	if datasetexists $fs1; then
-		log_must $ZFS destroy $fs1
+		log_must zfs destroy $fs1
 	fi
 
 	if [[ -f $testfile ]]; then
-		log_must $RM -f $testfile
+		log_must rm -f $testfile
 	fi
 }
 
@@ -61,32 +65,32 @@ cleanup
 
 # Get the original mountpoint of $fs and $fs1
 mntpnt=$(get_prop mountpoint $fs)
-log_must $ZFS create $fs1
+log_must zfs create $fs1
 mntpnt1=$(get_prop mountpoint $fs1)
 
 testfile=$mntpnt/$TESTFILE0; testfile1=$mntpnt1/$TESTFILE1
-log_must $MKFILE 1M $testfile $testfile1
+log_must mkfile 1M $testfile $testfile1
 
-log_must $ZFS unmount $fs1
-log_must $ZFS set mountpoint=$mntpnt $fs1
-log_mustnot $ZFS mount $fs1
-log_must $ZFS mount -O $fs1
+log_must zfs unmount $fs1
+log_must zfs set mountpoint=$mntpnt $fs1
+log_mustnot zfs mount $fs1
+log_must zfs mount -O $fs1
 
 # Create new file in override mountpoint
-log_must $MKFILE 1M $mntpnt/$TESTFILE2
+log_must mkfile 1M $mntpnt/$TESTFILE2
 
 # Verify the underlying file system inaccessible
-log_mustnot $LS $testfile
-log_must $LS $mntpnt/$TESTFILE1 $mntpnt/$TESTFILE2
+log_mustnot ls $testfile
+log_must ls $mntpnt/$TESTFILE1 $mntpnt/$TESTFILE2
 
 # Verify $TESTFILE2 was created in $fs1, rather then $fs
-log_must $ZFS unmount $fs1
-log_must $ZFS set mountpoint=$mntpnt1 $fs1
-log_must $ZFS mount $fs1
-log_must $LS $testfile1 $mntpnt1/$TESTFILE2
+log_must zfs unmount $fs1
+log_must zfs set mountpoint=$mntpnt1 $fs1
+log_must zfs mount $fs1
+log_must ls $testfile1 $mntpnt1/$TESTFILE2
 
 # Verify $TESTFILE2 was not created in $fs, and $fs is accessable again.
-log_mustnot $LS $mntpnt/$TESTFILE2
-log_must $LS $testfile
+log_mustnot ls $mntpnt/$TESTFILE2
+log_must ls $testfile
 
 log_pass "Verify 'zfs mount -O' override mount point passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_009_neg.ksh
index c6a372ac66..978a5a4f2e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -72,10 +72,10 @@ function cleanup_all
 	typeset fs
 
 	cleanup_filesystem "$TESTPOOL" "$TESTFS1"
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
 	[[ -d ${TEST_BASE_DIR%%/}/testroot$$ ]] && \
-		$RM -rf ${TEST_BASE_DIR%%/}/testroot$$
+		rm -rf ${TEST_BASE_DIR%%/}/testroot$$
 
 
 	return 0
@@ -97,11 +97,11 @@ log_onexit cleanup_all
 
 log_must setup_all
 
-log_must $ZFS $unmountall
+log_must zfs $unmountall
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZFS ${args[i]}
+	log_mustnot zfs ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_010_neg.ksh
index f4cb321636..b333e45e79 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_010_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,7 +47,7 @@ verify_runnable "both"
 function cleanup
 {
 	if ! ismounted $fs; then
-		log_must $ZFS mount $fs
+		log_must zfs mount $fs
 	fi
 }
 
@@ -52,16 +56,16 @@ log_onexit cleanup
 
 fs=$TESTPOOL/$TESTFS
 if ! ismounted $fs; then
-	log_must $ZFS mount $fs
+	log_must zfs mount $fs
 fi
 
-log_mustnot $ZFS mount $fs
+log_mustnot zfs mount $fs
 
 mpt=$(get_prop mountpoint $fs)
-log_must $ZFS umount $fs
-curpath=`$DIRNAME $0`
+log_must zfs umount $fs
+curpath=`dirname $0`
 cd $mpt
-log_mustnot $ZFS mount $fs
+log_mustnot zfs mount $fs
 cd $curpath
 
 log_pass "zfs mount fails with mounted filesystem or busy moutpoint as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_011_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_011_neg.ksh
index 97fc4b3b0d..795fc31142 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_011_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_011_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -42,11 +46,11 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists $TESTPOOL/$TESTFS@$TESTSNAP; then
-		log_must $ZFS destroy $TESTPOOL/$TESTFS@$TESTSNAP
+		log_must zfs destroy $TESTPOOL/$TESTFS@$TESTSNAP
 	fi
 
 	if is_global_zone && datasetexists $TESTPOOL/$TESTVOL; then
-		log_must $ZFS destroy $TESTPOOL/$TESTVOL
+		log_must zfs destroy $TESTPOOL/$TESTVOL
 	fi
 }
 
@@ -57,21 +61,21 @@ fs=$TESTPOOL/$TESTFS
 set -A badargs "A" "-A" "-" "-x" "-?" "=" "-o *" "-a"
 
 for arg in "${badargs[@]}"; do
-	log_mustnot eval "$ZFS mount $arg $fs >/dev/null 2>&1"
+	log_mustnot eval "zfs mount $arg $fs >/dev/null 2>&1"
 done
 
 #verify that zfs mount fails with invalid dataset
 for opt in "-o abc" "-O"; do
-	log_mustnot eval "$ZFS mount $opt /$fs >/dev/null 2>&1"
+	log_mustnot eval "zfs mount $opt /$fs >/dev/null 2>&1"
 done
 
 #verify that zfs mount fails with volume and snapshot
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
-log_mustnot eval "$ZFS mount $TESTPOOL/$TESTFS@$TESTSNAP >/dev/null 2>&1"
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_mustnot eval "zfs mount $TESTPOOL/$TESTFS@$TESTSNAP >/dev/null 2>&1"
 
 if is_global_zone; then
-	log_must $ZFS create -V 10m $TESTPOOL/$TESTVOL
-	log_mustnot eval "$ZFS mount $TESTPOOL/$TESTVOL >/dev/null 2>&1"
+	log_must zfs create -V 10m $TESTPOOL/$TESTVOL
+	log_mustnot eval "zfs mount $TESTPOOL/$TESTVOL >/dev/null 2>&1"
 fi
 
 log_pass "zfs mount fails with bad parameters as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh
index 8973558533..765e242796 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_all_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 
@@ -119,7 +124,7 @@ function cleanup_all
 	done
 
 	[[ -d ${TEST_BASE_DIR%%/}/testroot$$ ]] && \
-		$RM -rf ${TEST_BASE_DIR%%/}/testroot$$
+		rm -rf ${TEST_BASE_DIR%%/}/testroot$$
 }
 
 #
@@ -177,13 +182,13 @@ log_onexit cleanup_all
 log_must setup_all
 
 export __ZFS_POOL_RESTRICT="$TESTPOOL"
-log_must $ZFS $unmountall
+log_must zfs $unmountall
 unset __ZFS_POOL_RESTRICT
 
 verify_all false
 
 export __ZFS_POOL_RESTRICT="$TESTPOOL"
-log_must $ZFS $mountall
+log_must zfs $mountall
 unset __ZFS_POOL_RESTRICT
 
 verify_all true
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_001_pos.ksh
index 2c2b9a5bff..0bf7c5b6a1 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_promote/zfs_promote.cfg
@@ -48,14 +48,14 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists $csnap; then
-		log_must $ZFS promote $fs
+		log_must zfs promote $fs
 	fi
 	snapexists $snap && \
-		log_must $ZFS destroy -rR $snap
+		log_must zfs destroy -rR $snap
 
 	typeset data
 	for data in $file0 $file1; do
-		[[ -e $data ]] && $RM -f $data
+		[[ -e $data ]] && rm -f $data
 	done
 }
 
@@ -89,7 +89,7 @@ function testing_verify
 		log_fail "There exists data file losing after zfs promote."
 	fi
 
-	log_mustnot $ZFS destroy -r $c_ds
+	log_mustnot zfs destroy -r $c_ds
 }
 
 log_assert "'zfs promote' can promote a clone filesystem."
@@ -106,19 +106,19 @@ csnap=$clone@$TESTSNAP
 csnapfile=/$clone/.zfs/snapshot/$TESTSNAP/$TESTFILE0
 
 # setup for promte testing
-log_must $MKFILE $FILESIZE $file0
-log_must $ZFS snapshot $snap
-log_must $MKFILE $FILESIZE $file1
-log_must $RM -f $file0
-log_must $ZFS clone $snap $clone
-log_must $MKFILE $FILESIZE $cfile
-
-log_must $ZFS promote $clone
+log_must mkfile $FILESIZE $file0
+log_must zfs snapshot $snap
+log_must mkfile $FILESIZE $file1
+log_must rm -f $file0
+log_must zfs clone $snap $clone
+log_must mkfile $FILESIZE $cfile
+
+log_must zfs promote $clone
 # verify the 'promote' operation
 testing_verify $fs $file1 $snapfile $clone $cfile $csnapfile
 
 log_note "Verify 'zfs promote' can change back the dependency relationship."
-log_must $ZFS promote $fs
+log_must zfs promote $fs
 #verify the result
 testing_verify $clone $cfile $csnapfile $fs $file1 $snapfile
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_002_pos.ksh
index b6ff94b520..1a774da2c1 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_promote/zfs_promote.cfg
@@ -47,16 +47,16 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists $csnap1; then
-		log_must $ZFS promote $fs
+		log_must zfs promote $fs
 	fi
 
 	typeset ds
 	typeset data
 	for ds in $snap $snap1; do
-		log_must $ZFS destroy -rR $ds
+		log_must zfs destroy -rR $ds
 	done
 	for file in $TESTDIR/$TESTFILE0 $TESTDIR/$TESTFILE1; do
-		[[ -e $file ]] && $RM -f $file
+		[[ -e $file ]] && rm -f $file
 	done
 }
 
@@ -71,15 +71,15 @@ csnap=$clone@$TESTSNAP
 csnap1=$clone@$TESTSNAP1
 
 # setup for promote testing
-log_must $MKFILE $FILESIZE $TESTDIR/$TESTFILE0
-log_must $ZFS snapshot $snap
-log_must $MKFILE $FILESIZE $TESTDIR/$TESTFILE1
-log_must $RM -f $testdir/$TESTFILE0
-log_must $ZFS snapshot $snap1
-log_must $ZFS clone $snap1 $clone
-log_must $MKFILE $FILESIZE /$clone/$CLONEFILE
+log_must mkfile $FILESIZE $TESTDIR/$TESTFILE0
+log_must zfs snapshot $snap
+log_must mkfile $FILESIZE $TESTDIR/$TESTFILE1
+log_must rm -f $testdir/$TESTFILE0
+log_must zfs snapshot $snap1
+log_must zfs clone $snap1 $clone
+log_must mkfile $FILESIZE /$clone/$CLONEFILE
 
-log_must $ZFS promote $clone
+log_must zfs promote $clone
 
 # verify the 'promote' operation
 for ds in $csnap $csnap1; do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_003_pos.ksh
index 44a6aa9fe2..6d84b2b5de 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_promote/zfs_promote.cfg
@@ -48,17 +48,17 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists ${csnap[2]}; then
-		log_must $ZFS promote $fs
+		log_must zfs promote $fs
 	fi
 
 	typeset ds
 	typeset data
 	for ds in ${snap[*]}; do
 		snapexists $ds && \
-			log_must $ZFS destroy -rR $ds
+			log_must zfs destroy -rR $ds
 	done
 	for data in ${file[*]}; do
-		[[ -e $data ]] && $RM -f $data
+		[[ -e $data ]] && rm -f $data
 	done
 
 }
@@ -91,18 +91,18 @@ set -A csnapfile "${csnapdir}/$TESTSNAP/$TESTFILE0" "${csnapdir}/$TESTSNAP1/$TES
 # setup for promote testing
 typeset -i i=0
 while (( i < 4 )); do
-	log_must $MKFILE $FILESIZE ${file[i]}
-	(( i>0 )) && log_must $RM -f ${file[((i-1))]}
-	log_must $ZFS snapshot ${snap[i]}
+	log_must mkfile $FILESIZE ${file[i]}
+	(( i>0 )) && log_must rm -f ${file[((i-1))]}
+	log_must zfs snapshot ${snap[i]}
 
 	(( i = i + 1 ))
 done
-log_must $ZFS clone ${snap[2]} $clone
-log_must $MKFILE $FILESIZE /$clone/$CLONEFILE
-log_must $RM -f /$clone/$TESTFILE2
-log_must $ZFS snapshot ${csnap[3]}
+log_must zfs clone ${snap[2]} $clone
+log_must mkfile $FILESIZE /$clone/$CLONEFILE
+log_must rm -f /$clone/$TESTFILE2
+log_must zfs snapshot ${csnap[3]}
 
-log_must $ZFS promote $clone
+log_must zfs promote $clone
 
 # verify the 'promote' operation
 for ds in ${snap[3]} ${csnap[*]}; do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_004_pos.ksh
index a90da8ebb1..23b5991084 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_promote/zfs_promote.cfg
@@ -47,17 +47,17 @@ verify_runnable "both"
 function cleanup
 {
 	if snapexists ${c1snap[1]}; then
-		log_must $ZFS promote $clone
+		log_must zfs promote $clone
 	fi
 
 	typeset ds
 	typeset data
 	for ds in ${snap[*]}; do
 		snapexists $ds && \
-			log_must $ZFS destroy -rR $ds
+			log_must zfs destroy -rR $ds
 	done
 	for data in ${file[*]}; do
-		[[ -e $data ]] && $RM -f $data
+		[[ -e $data ]] && rm -f $data
 	done
 }
 
@@ -91,30 +91,30 @@ set -A c1snapfile "${c1snapdir}/$TESTSNAP3/$CLONEFILE" \
 # setup for promote testing
 typeset -i i=0
 while (( i < 4 )); do
-	log_must $MKFILE $FILESIZE ${file[i]}
-	(( i>0 )) && log_must $RM -f ${file[((i-1))]}
-	log_must $ZFS snapshot ${snap[i]}
+	log_must mkfile $FILESIZE ${file[i]}
+	(( i>0 )) && log_must rm -f ${file[((i-1))]}
+	log_must zfs snapshot ${snap[i]}
 
 	(( i = i + 1 ))
 done
-log_must $ZFS clone ${snap[2]} $clone
+log_must zfs clone ${snap[2]} $clone
 
-log_must $RM -f /$clone/$TESTFILE2
+log_must rm -f /$clone/$TESTFILE2
 i=0
 while (( i < 3 )); do
-	log_must $MKFILE $FILESIZE ${cfile[i]}
-	(( i>0 )) && log_must $RM -f ${cfile[(( i-1 ))]}
-	log_must $ZFS snapshot ${csnap[i]}
+	log_must mkfile $FILESIZE ${cfile[i]}
+	(( i>0 )) && log_must rm -f ${cfile[(( i-1 ))]}
+	log_must zfs snapshot ${csnap[i]}
 
 	(( i = i + 1 ))
 done
 
-log_must $ZFS clone ${csnap[1]} $clone1
-log_must $MKFILE $FILESIZE /$clone1/$CLONEFILE2
-log_must $RM -f /$clone1/$CLONEFILE1
-log_must $ZFS snapshot ${c1snap[2]}
+log_must zfs clone ${csnap[1]} $clone1
+log_must mkfile $FILESIZE /$clone1/$CLONEFILE2
+log_must rm -f /$clone1/$CLONEFILE1
+log_must zfs snapshot ${c1snap[2]}
 
-log_must $ZFS promote $clone1
+log_must zfs promote $clone1
 
 # verify the 'promote' operation
 for ds in ${snap[*]} ${csnap[2]} ${c1snap[*]}; do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_005_pos.ksh
index e505951222..c669a44eb0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_005_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -42,13 +46,13 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $fssnap ; then
-		datasetexists $clone && log_must $ZFS destroy $clone
-		log_must $ZFS destroy $fssnap
+		datasetexists $clone && log_must zfs destroy $clone
+		log_must zfs destroy $fssnap
 	fi
 	if datasetexists $clone ; then
-		log_must $ZFS promote $fs
-		log_must $ZFS destroy $clone
-		log_must $ZFS destroy $fssnap
+		log_must zfs promote $fs
+		log_must zfs destroy $clone
+		log_must zfs destroy $fssnap
 	fi
 }
 
@@ -59,11 +63,11 @@ fs=$TESTPOOL/$TESTFS
 clone=$TESTPOOL/$TESTCLONE
 fssnap=$fs@fssnap
 
-log_must $ZFS snapshot $fssnap
-log_must $ZFS clone $fssnap $clone
-log_must $ZFS unmount $fs
-log_must $ZFS promote $clone
-log_must $ZFS unmount $clone
-log_must $ZFS promote $fs
+log_must zfs snapshot $fssnap
+log_must zfs clone $fssnap $clone
+log_must zfs unmount $fs
+log_must zfs promote $clone
+log_must zfs unmount $clone
+log_must zfs promote $fs
 
 log_pass "Unmount original fs, 'zfs promote' passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_006_neg.ksh
index 9c1fb3e96f..ffe2c43561 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_006_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -54,7 +59,7 @@ set -A args "" \
 function cleanup
 {
 	if datasetexists $clone; then
-		log_must $ZFS destroy $clone
+		log_must zfs destroy $clone
 	fi
 
 	if snapexists $snap; then
@@ -67,12 +72,12 @@ log_onexit cleanup
 
 snap=$TESTPOOL/$TESTFS@$TESTSNAP
 clone=$TESTPOOL/$TESTCLONE
-log_must $ZFS snapshot $snap
-log_must $ZFS clone $snap $clone
+log_must zfs snapshot $snap
+log_must zfs clone $snap $clone
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZFS promote ${args[i]}
+	log_mustnot zfs promote ${args[i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_007_neg.ksh
index 83a5231105..3f8ee1941d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_007_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_promote/zfs_promote.cfg
@@ -48,11 +48,11 @@ verify_runnable "both"
 function cleanup
 {
 	snapexists $snap && \
-		log_must $ZFS destroy -rR $snap
+		log_must zfs destroy -rR $snap
 
 	typeset data
 	for data in $TESTDIR/$TESTFILE0 $TESTDIR/$TESTFILE1; do
-		[[ -e $data ]] && $RM -f $data
+		[[ -e $data ]] && rm -f $data
 	done
 }
 
@@ -64,15 +64,15 @@ clone=$TESTPOOL/$TESTCLONE
 clonesnap=$TESTPOOL/$TESTCLONE@$TESTSNAP
 
 # setup for promte testing
-log_must $MKFILE $FILESIZE $TESTDIR/$TESTFILE0
-log_must $ZFS snapshot $snap
-log_must $MKFILE $FILESIZE $TESTDIR/$TESTFILE1
-log_must $RM -f $TESTDIR/$TESTFILE0
-log_must $ZFS clone $snap $clone
-log_must $MKFILE $FILESIZE /$clone/$CLONEFILE
-log_must $ZFS snapshot $clonesnap
+log_must mkfile $FILESIZE $TESTDIR/$TESTFILE0
+log_must zfs snapshot $snap
+log_must mkfile $FILESIZE $TESTDIR/$TESTFILE1
+log_must rm -f $TESTDIR/$TESTFILE0
+log_must zfs clone $snap $clone
+log_must mkfile $FILESIZE /$clone/$CLONEFILE
+log_must zfs snapshot $clonesnap
 
-log_mustnot $ZFS promote $clone
+log_mustnot zfs promote $clone
 
 log_pass "'zfs promote' deals with name conflicts as expected."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh
index e4e6aa6011..05d482c405 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_promote/zfs_promote_008_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -41,10 +46,10 @@ verify_runnable "global"
 function cleanup
 {
 	if snapexists $csnap; then
-		log_must $ZFS promote $vol
+		log_must zfs promote $vol
 	fi
 
-	log_must $ZFS destroy -rR $snap
+	log_must zfs destroy -rR $snap
 }
 
 log_assert "'zfs promote' can promote a volume clone."
@@ -56,11 +61,11 @@ clone=$TESTPOOL/volclone
 csnap=$clone@$TESTSNAP
 
 if ! snapexists $snap ; then
-	log_must $ZFS snapshot $snap
-	log_must $ZFS clone $snap $clone
+	log_must zfs snapshot $snap
+	log_must zfs clone $snap $clone
 fi
 
-log_must $ZFS promote $clone
+log_must zfs promote $clone
 
 # verify the 'promote' operation
 ! snapexists $csnap && \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh
index fc58735972..9e562a2824 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -36,7 +36,7 @@
 function cleanup
 {
 	for ds in $datasets; do
-		datasetexists $ds && log_must $ZFS destroy -R $TESTPOOL/$TESTFS1
+		datasetexists $ds && log_must zfs destroy -R $TESTPOOL/$TESTFS1
 	done
 }
 function get_prop_mb
@@ -45,7 +45,7 @@ function get_prop_mb
 	typeset dataset=$2
 	typeset -l value=$(get_prop $prop $dataset)
 	((value = value / mb_block))
-	$ECHO $value
+	echo $value
 }
 
 datasets="$TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS1/$TESTFS2 \
@@ -67,12 +67,12 @@ typeset -l mb_block=0
 ((mb_block = 1024 * 1024))
 
 log_note "verify written property statistics for dataset"
-log_must $ZFS create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
+log_must zfs create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
 for i in 1 2 3; do
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$i
-	log_must $DD if=/dev/urandom of=/$TESTPOOL/$TESTFS1/testfile.$i bs=1M \
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$i
+	log_must dd if=/dev/urandom of=/$TESTPOOL/$TESTFS1/testfile.$i bs=1M \
 	    count=$blocks
-	log_must $SYNC
+	log_must sync
 	written=$(get_prop written $TESTPOOL/$TESTFS1)
 	((expected_written=blocks * mb_block))
 	within_percent $written $expected_written 99.5 || \
@@ -114,9 +114,9 @@ for i in 1 2 3; do
 done
 log_note "delete data"
 before_written=$(get_prop written $TESTPOOL/$TESTFS1)
-log_must $RM /$TESTPOOL/$TESTFS1/testfile.3
+log_must rm /$TESTPOOL/$TESTFS1/testfile.3
 snap3_size=0
-log_must $SYNC
+log_must sync
 written=$(get_prop written $TESTPOOL/$TESTFS1)
 writtenat3=$(get_prop written@snap3 $TESTPOOL/$TESTFS1)
 [[ $written -eq $writtenat3 ]] || \
@@ -136,9 +136,9 @@ within_percent $writtenat $expected_writtenat 99.5 || \
 
 log_note "write data"
 blocks=20
-log_must $DD if=/dev/urandom of=/$TESTPOOL/$TESTFS1/testfile.3 bs=1M \
+log_must dd if=/dev/urandom of=/$TESTPOOL/$TESTFS1/testfile.3 bs=1M \
     count=$blocks
-log_must $SYNC
+log_must sync
 written=$(get_prop written $TESTPOOL/$TESTFS1)
 writtenat1=$(get_prop written@snap1 $TESTPOOL/$TESTFS1)
 writtenat2=$(get_prop written@snap2 $TESTPOOL/$TESTFS1)
@@ -160,8 +160,8 @@ within_percent $writtenat1 $expected_writtenat 99.5 || \
 
 log_note "write data to a clone"
 before_clone=$(get_prop written $TESTPOOL/$TESTFS1)
-log_must $ZFS clone $TESTPOOL/$TESTFS1@snap1 $TESTPOOL/$TESTFS1/snap1.clone
-log_must $DD if=/dev/urandom of=/$TESTPOOL/$TESTFS1/snap1.clone/testfile bs=1M \
+log_must zfs clone $TESTPOOL/$TESTFS1@snap1 $TESTPOOL/$TESTFS1/snap1.clone
+log_must dd if=/dev/urandom of=/$TESTPOOL/$TESTFS1/snap1.clone/testfile bs=1M \
     count=40
 after_clone=$(get_prop written $TESTPOOL/$TESTFS1)
 [[ $before_clone -eq $after_clone ]] || \
@@ -172,9 +172,9 @@ typeset -l before_written1=$(get_prop_mb written@snap1 $TESTPOOL/$TESTFS1)
 typeset -l before_written3=$(get_prop_mb written@snap3 $TESTPOOL/$TESTFS1)
 typeset -l snap_before_written2=$(get_prop_mb written $TESTPOOL/$TESTFS1@snap2)
 typeset -l snap_before_written3=$(get_prop_mb written $TESTPOOL/$TESTFS1@snap3)
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap2
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap2
 log_mustnot snapexists $TESTPOOL/$TESTFS1@snap2
-log_must $SYNC
+log_must sync
 written1=$(get_prop_mb written@snap1 $TESTPOOL/$TESTFS1)
 written3=$(get_prop_mb written@snap3 $TESTPOOL/$TESTFS1)
 [[ $before_written1 -eq $written1 && $before_written3 -eq $written3 ]] || \
@@ -185,7 +185,7 @@ prev_written=$(get_prop_mb written $TESTPOOL/$TESTFS1@snap3)
 within_percent $prev_written $expected_written3 99.5 || \
     log_fail "unexpected written value $prev_written $expected_written3"
 
-log_must $ZFS destroy $TESTPOOL/$TESTFS1@snap3
+log_must zfs destroy $TESTPOOL/$TESTFS1@snap3
 log_mustnot snapexists $TESTPOOL/$TESTFS1@snap3
 written=$(get_prop written $TESTPOOL/$TESTFS1)
 writtenat1=$(get_prop written@snap1 $TESTPOOL/$TESTFS1)
@@ -194,13 +194,13 @@ writtenat1=$(get_prop written@snap1 $TESTPOOL/$TESTFS1)
 
 log_note "verify written@ property for recursive datasets"
 blocks=10
-log_must $ZFS snapshot -r $TESTPOOL/$TESTFS1@now
+log_must zfs snapshot -r $TESTPOOL/$TESTFS1@now
 for ds in $datasets; do
 	writtenat=$(get_prop written@now $ds)
 	[[ $writtenat -ne 0 ]] && \
 	    log_fail "Unexpected written@ value"
-	log_must $DD if=/dev/urandom of=/$ds/testfile bs=1M count=$blocks
-	log_must $SYNC
+	log_must dd if=/dev/urandom of=/$ds/testfile bs=1M count=$blocks
+	log_must sync
 	writtenat=$(get_prop written@now $ds)
 	((expected_writtenat = blocks * mb_block))
 	within_percent $writtenat $expected_writtenat 0.1 || \
@@ -211,18 +211,18 @@ done
 log_note "verify written@ output for recursive datasets"
 blocks=20
 for ds in $datasets; do
-	log_must $ZFS snapshot $ds@current
-	log_must $DD if=/dev/urandom of=/$ds/testfile bs=1M \
+	log_must zfs snapshot $ds@current
+	log_must dd if=/dev/urandom of=/$ds/testfile bs=1M \
 	    count=$blocks
-	log_must $SYNC
+	log_must sync
 done
-recursive_output=$($ZFS get -r written@current $TESTPOOL | \
-    $GREP -v $TESTFS1@ | $GREP -v $TESTFS2@ | $GREP -v $TESTFS3@ | \
-    $GREP -v "VALUE" | $GREP -v "-")
+recursive_output=$(zfs get -r written@current $TESTPOOL | \
+    grep -v $TESTFS1@ | grep -v $TESTFS2@ | grep -v $TESTFS3@ | \
+    grep -v "VALUE" | grep -v "-")
 expected="20.0M"
 for ds in $datasets; do
-	writtenat=$($ECHO "$recursive_output" | $GREP -v $ds/)
-	writtenat=$($ECHO "$writtenat" | $GREP $ds | $AWK '{print $3}')
+	writtenat=$(echo "$recursive_output" | grep -v $ds/)
+	writtenat=$(echo "$writtenat" | grep $ds | awk '{print $3}')
 	[[ $writtenat == $expected ]] || \
 	    log_fail "recursive written property output mismatch"
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_001_pos.ksh
index 288372a6e0..96cc0aae81 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
@@ -49,27 +49,27 @@ function cleanup
 	typeset -i i=0
 
 	datasetexists $rst_root && \
-		log_must $ZFS destroy -Rf $rst_root
+		log_must zfs destroy -Rf $rst_root
 	while (( i < 2 )); do
 		snapexists ${orig_snap[$i]} && \
-			log_must $ZFS destroy -f ${orig_snap[$i]}
-		log_must $RM -f ${bkup[$i]}
+			log_must zfs destroy -f ${orig_snap[$i]}
+		log_must rm -f ${bkup[$i]}
 
 		(( i = i + 1 ))
 	done
 
-	log_must $RM -rf $TESTDIR1
+	log_must rm -rf $TESTDIR1
 }
 
 function recreate_root
 {
 	datasetexists $rst_root && \
-		log_must $ZFS destroy -Rf $rst_root
+		log_must zfs destroy -Rf $rst_root
 	if [[ -d $TESTDIR1 ]] ; then
-		log_must $RM -rf $TESTDIR1
+		log_must rm -rf $TESTDIR1
 	fi
-	log_must $ZFS create $rst_root
-	log_must $ZFS set mountpoint=$TESTDIR1 $rst_root
+	log_must zfs create $rst_root
+	log_must zfs set mountpoint=$TESTDIR1 $rst_root
 }
 
 log_assert "Verifying 'zfs receive [<filesystem|snapshot>] -d <filesystem>' works."
@@ -108,15 +108,15 @@ for orig_fs in $datasets ; do
 
 	typeset -i i=0
 	while (( i < ${#orig_snap[*]} )); do
-		$FILE_WRITE -o create -f ${orig_data[$i]} -b 512 \
+		file_write -o create -f ${orig_data[$i]} -b 512 \
 		    -c 8 >/dev/null 2>&1
 		(( $? != 0 )) && \
 			log_fail "Writing data into zfs filesystem fails."
-		log_must $ZFS snapshot ${orig_snap[$i]}
+		log_must zfs snapshot ${orig_snap[$i]}
 		if (( i < 1 )); then
-			log_must eval "$ZFS send ${orig_snap[$i]} > ${bkup[$i]}"
+			log_must eval "zfs send ${orig_snap[$i]} > ${bkup[$i]}"
 		else
-			log_must eval "$ZFS send -i ${orig_snap[(( i - 1 ))]} \
+			log_must eval "zfs send -i ${orig_snap[(( i - 1 ))]} \
 				${orig_snap[$i]} > ${bkup[$i]}"
 		fi
 
@@ -127,9 +127,9 @@ for orig_fs in $datasets ; do
 	i=0
 	while (( i < ${#bkup[*]} )); do
 		if (( i > 0 )); then
-			log_must $ZFS rollback ${rst_snap[0]}
+			log_must zfs rollback ${rst_snap[0]}
 		fi
-		log_must eval "$ZFS receive $rst_fs < ${bkup[$i]}"
+		log_must eval "zfs receive $rst_fs < ${bkup[$i]}"
 		snapexists ${rst_snap[$i]} || \
 			log_fail "Restoring filesystem fails. ${rst_snap[$i]} not exist"
 		compare_cksum ${orig_data[$i]} ${rst_data[$i]}
@@ -137,15 +137,15 @@ for orig_fs in $datasets ; do
 		(( i = i + 1 ))
 	done
 
-	log_must $ZFS destroy -Rf $rst_fs
+	log_must zfs destroy -Rf $rst_fs
 
 	log_note "Verifying 'zfs receive <snapshot>' works."
 	i=0
 	while (( i < ${#bkup[*]} )); do
 		if (( i > 0 )); then
-			log_must $ZFS rollback ${rst_snap[0]}
+			log_must zfs rollback ${rst_snap[0]}
 		fi
-		log_must eval "$ZFS receive ${rst_snap[$i]} <${bkup[$i]}"
+		log_must eval "zfs receive ${rst_snap[$i]} <${bkup[$i]}"
 		snapexists ${rst_snap[$i]} || \
 			log_fail "Restoring filesystem fails. ${rst_snap[$i]} not exist"
 		compare_cksum ${orig_data[$i]} ${rst_data[$i]}
@@ -153,16 +153,16 @@ for orig_fs in $datasets ; do
 		(( i = i + 1 ))
 	done
 
-	log_must $ZFS destroy -Rf $rst_fs
+	log_must zfs destroy -Rf $rst_fs
 
 	log_note "Verfiying 'zfs receive -d <filesystem>' works."
 
 	i=0
 	while (( i < ${#bkup[*]} )); do
 		if (( i > 0 )); then
-			log_must $ZFS rollback ${rst_snap2[0]}
+			log_must zfs rollback ${rst_snap2[0]}
 		fi
-		log_must eval "$ZFS receive -d -F $rst_root <${bkup[$i]}"
+		log_must eval "zfs receive -d -F $rst_root <${bkup[$i]}"
 		snapexists ${rst_snap2[$i]} || \
 			log_fail "Restoring filesystem fails. ${rst_snap2[$i]} not exist"
 		compare_cksum ${orig_data[$i]} ${rst_data2[$i]}
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_002_pos.ksh
index 27f9ae2e2e..e33112ea15 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
 
 #
@@ -47,18 +51,18 @@ function cleanup
 
 	while (( i < ${#orig_snap[*]} )); do
 		snapexists ${rst_snap[$i]} && \
-			log_must $ZFS destroy -f ${rst_snap[$i]}
+			log_must zfs destroy -f ${rst_snap[$i]}
 		snapexists ${orig_snap[$i]} && \
-			log_must $ZFS destroy -f ${orig_snap[$i]}
+			log_must zfs destroy -f ${orig_snap[$i]}
 		[[ -e ${bkup[$i]} ]] && \
-			log_must $RM -rf ${bkup[$i]}
+			log_must rm -rf ${bkup[$i]}
 
 		(( i = i + 1 ))
 	done
 
 	for ds in $rst_vol $rst_root; do
 		datasetexists $ds && \
-			log_must $ZFS destroy -Rf $ds
+			log_must zfs destroy -Rf $ds
 	done
 }
 
@@ -74,18 +78,18 @@ set -A rst_snap "${rst_vol}@init_snap" "${rst_vol}@inc_snap"
 #
 # Preparations for testing
 #
-log_must $ZFS create $rst_root
+log_must zfs create $rst_root
 [[ ! -d $TESTDIR1 ]] && \
-	log_must $MKDIR -p $TESTDIR1
-log_must $ZFS set mountpoint=$TESTDIR1 $rst_root
+	log_must mkdir -p $TESTDIR1
+log_must zfs set mountpoint=$TESTDIR1 $rst_root
 
 typeset -i i=0
 while (( i < ${#orig_snap[*]} )); do
-	log_must $ZFS snapshot ${orig_snap[$i]}
+	log_must zfs snapshot ${orig_snap[$i]}
 	if (( i < 1 )); then
-		log_must eval "$ZFS send ${orig_snap[$i]} > ${bkup[$i]}"
+		log_must eval "zfs send ${orig_snap[$i]} > ${bkup[$i]}"
 	else
-		log_must eval "$ZFS send -i ${orig_snap[(( i - 1 ))]} \
+		log_must eval "zfs send -i ${orig_snap[(( i - 1 ))]} \
 				${orig_snap[$i]} > ${bkup[$i]}"
 	fi
 
@@ -94,7 +98,7 @@ done
 
 i=0
 while (( i < ${#bkup[*]} )); do
-	log_must eval "$ZFS receive $rst_vol < ${bkup[$i]}"
+	log_must eval "zfs receive $rst_vol < ${bkup[$i]}"
 	! datasetexists $rst_vol || ! snapexists ${rst_snap[$i]} && \
 		log_fail "Restoring volume fails."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_003_pos.ksh
index e7d4bf4a16..a6935acc7b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,10 +49,10 @@ verify_runnable "both"
 function cleanup
 {
 	for snap in $snap2 $snap1; do
-		datasetexists $snap && log_must $ZFS destroy -rf $snap
+		datasetexists $snap && log_must zfs destroy -rf $snap
 	done
 	for file in $ibackup $mntpnt/file1 $mntpnt/file2; do
-		[[ -f $file ]] && log_must $RM -f $file
+		[[ -f $file ]] && log_must rm -f $file
 	done
 }
 
@@ -59,31 +63,31 @@ ibackup=/var/tmp/ibackup.$$
 fs=$TESTPOOL/$TESTFS; snap1=$fs@snap1; snap2=$fs@snap2
 
 mntpnt=$(get_prop mountpoint $fs) || log_fail "get_prop mountpoint $fs"
-log_must $MKFILE 10m $mntpnt/file1
-log_must $ZFS snapshot $snap1
-log_must $MKFILE 10m $mntpnt/file2
-log_must $ZFS snapshot $snap2
+log_must mkfile 10m $mntpnt/file1
+log_must zfs snapshot $snap1
+log_must mkfile 10m $mntpnt/file2
+log_must zfs snapshot $snap2
 
-log_must eval "$ZFS send -i $snap1 $snap2 > $ibackup"
+log_must eval "zfs send -i $snap1 $snap2 > $ibackup"
 
 log_note "Verify 'zfs receive' succeed, if filesystem was not modified."
-log_must $ZFS rollback -r $snap1
-log_must eval "$ZFS receive $fs < $ibackup"
+log_must zfs rollback -r $snap1
+log_must eval "zfs receive $fs < $ibackup"
 if [[ ! -f $mntpnt/file1 || ! -f $mntpnt/file2 ]]; then
-	log_fail "'$ZFS receive' failed."
+	log_fail "'zfs receive' failed."
 fi
 
 log_note "Verify 'zfs receive' failed if filesystem was modified."
-log_must $ZFS rollback -r $snap1
-log_must $RM -rf $mntpnt/file1
-log_mustnot eval "$ZFS receive $fs < $ibackup"
+log_must zfs rollback -r $snap1
+log_must rm -rf $mntpnt/file1
+log_mustnot eval "zfs receive $fs < $ibackup"
 
 # Verify 'zfs receive -F' to force rollback whatever filesystem was modified.
-log_must $ZFS rollback -r $snap1
-log_must $RM -rf $mntpnt/file1
-log_must eval "$ZFS receive -F $fs < $ibackup"
+log_must zfs rollback -r $snap1
+log_must rm -rf $mntpnt/file1
+log_must eval "zfs receive -F $fs < $ibackup"
 if [[ ! -f $mntpnt/file1 || ! -f $mntpnt/file2 ]]; then
-	log_fail "'$ZFS receive -F' failed."
+	log_fail "'zfs receive -F' failed."
 fi
 
 log_pass "'zfs recv -F' to force rollback passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_004_neg.ksh
index 7f1c053ac5..ad73c585ac 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_004_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
@@ -50,12 +50,12 @@ function cleanup
 
 	for snap in $init_snap $inc_snap $init_topsnap $inc_topsnap ; do
 		snapexists $snap && \
-			log_must $ZFS destroy -Rf $snap
+			log_must zfs destroy -Rf $snap
 	done
 
 	for bkup in $full_bkup $inc_bkup $full_topbkup $inc_topbkup; do
 		[[ -e $bkup ]] && \
-			log_must $RM -f $bkup
+			log_must rm -f $bkup
 	done
 }
 
@@ -72,23 +72,23 @@ inc_topsnap=$TESTPOOL@incsnap
 full_topbkup=/var/tmp/full_topbkup.$$
 inc_topbkup=/var/tmp/inc_topbkup.$$
 
-log_must $ZFS snapshot $init_topsnap
-log_must eval "$ZFS send $init_topsnap > $full_topbkup"
-log_must $TOUCH /$TESTPOOL/foo
+log_must zfs snapshot $init_topsnap
+log_must eval "zfs send $init_topsnap > $full_topbkup"
+log_must touch /$TESTPOOL/foo
 
-log_must $ZFS snapshot $inc_topsnap
-log_must eval "$ZFS send -i $init_topsnap $inc_topsnap > $inc_topbkup"
-log_must $TOUCH /$TESTPOOL/bar
+log_must zfs snapshot $inc_topsnap
+log_must eval "zfs send -i $init_topsnap $inc_topsnap > $inc_topbkup"
+log_must touch /$TESTPOOL/bar
 
-log_must $ZFS snapshot $init_snap
-log_must eval "$ZFS send $init_snap > $full_bkup"
-log_must $TOUCH /$TESTDIR/foo
+log_must zfs snapshot $init_snap
+log_must eval "zfs send $init_snap > $full_bkup"
+log_must touch /$TESTDIR/foo
 
-log_must $ZFS snapshot $inc_snap
-log_must eval "$ZFS send -i $init_snap $inc_snap > $inc_bkup"
-log_must $TOUCH /$TESTDIR/bar
+log_must zfs snapshot $inc_snap
+log_must eval "zfs send -i $init_snap $inc_snap > $inc_bkup"
+log_must touch /$TESTDIR/bar
 
-$SYNC
+sync
 
 set -A badargs \
     "" "nonexistent-snap" "blah@blah" "-d" "-d nonexistent-dataset" \
@@ -106,7 +106,7 @@ typeset -i i=0
 while (( i < ${#badargs[*]} ))
 do
 	for bkup in $full_bkup $inc_bkup $full_topbkup $inc_topbkup ; do
-		log_mustnot eval "$ZFS receive ${badargs[i]} < $bkup"
+		log_mustnot eval "zfs receive ${badargs[i]} < $bkup"
 	done
 
 	(( i = i + 1 ))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_005_neg.ksh
index 86bd9441ce..17d9be9114 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_005_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
 
 #
@@ -50,15 +54,15 @@ function cleanup
 
 	for snap in $init_snap $inc_snap; do
 		snapexists $snap && \
-			log_must $ZFS destroy -f $snap
+			log_must zfs destroy -f $snap
 	done
 
 	datasetexists $rst_root && \
-		log_must $ZFS destroy -Rf $rst_root
+		log_must zfs destroy -Rf $rst_root
 
 	for bkup in $full_bkup $inc_bkup; do
 		[[ -e $bkup ]] && \
-			log_must $RM -f $bkup
+			log_must rm -f $bkup
 	done
 }
 
@@ -73,23 +77,23 @@ rst_inc_snap=$rst_root/$TESTFS@inc_snap
 full_bkup=/var/tmp/full_bkup.$$
 inc_bkup=/var/tmp/inc_bkup.$$
 
-log_must $ZFS create $rst_root
-log_must $ZFS snapshot $init_snap
-log_must eval "$ZFS send $init_snap > $full_bkup"
+log_must zfs create $rst_root
+log_must zfs snapshot $init_snap
+log_must eval "zfs send $init_snap > $full_bkup"
 
 log_note "'zfs receive' fails with invalid send streams."
-log_mustnot eval "$ZFS receive $rst_init_snap < /dev/zero"
-log_mustnot eval "$ZFS receive -d $rst_root </dev/zero"
+log_mustnot eval "zfs receive $rst_init_snap < /dev/zero"
+log_mustnot eval "zfs receive -d $rst_root </dev/zero"
 
-log_must eval "$ZFS receive $rst_init_snap < $full_bkup"
+log_must eval "zfs receive $rst_init_snap < $full_bkup"
 
 log_note "Unmatched send stream with restoring filesystem" \
 	" cannot be received."
-log_must $ZFS snapshot $inc_snap
-log_must eval "$ZFS send -i $init_snap $inc_snap > $inc_bkup"
+log_must zfs snapshot $inc_snap
+log_must eval "zfs send -i $init_snap $inc_snap > $inc_bkup"
 #make changes on the restoring filesystem
-log_must $TOUCH $ZFSROOT/$rst_root/$TESTFS/tmpfile
-log_mustnot eval "$ZFS receive $rst_inc_snap < $inc_bkup"
-log_mustnot eval "$ZFS receive -d $rst_root < $inc_bkup"
+log_must touch $ZFSROOT/$rst_root/$TESTFS/tmpfile
+log_mustnot eval "zfs receive $rst_inc_snap < $inc_bkup"
+log_mustnot eval "zfs receive -d $rst_root < $inc_bkup"
 
 log_pass "Unsupported scenarios to 'zfs receive' fail as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_006_pos.ksh
index 8f973b1068..eeeea4e9b2 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_006_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -47,18 +51,18 @@ verify_runnable "both"
 function cleanup
 {
 	for snap in $snap2 $snap1; do
-		datasetexists $snap && log_must $ZFS destroy -rf $snap
+		datasetexists $snap && log_must zfs destroy -rf $snap
 	done
 	for file in $fbackup1 $fbackup2 $mntpnt/file1 $mntpnt/file2; do
-		[[ -f $file ]] && log_must $RM -f $file
+		[[ -f $file ]] && log_must rm -f $file
 	done
 
 	if is_global_zone; then
 		datasetexists $TESTPOOL/$TESTFS/$TESTFS1 && \
-			log_must $ZFS destroy -rf $TESTPOOL/$TESTFS/$TESTFS1
+			log_must zfs destroy -rf $TESTPOOL/$TESTFS/$TESTFS1
 	else
 		datasetexists $TESTPOOL/${ZONE_CTR}0 && \
-			log_must $ZFS destroy -rf $TESTPOOL/${ZONE_CTR}0
+			log_must zfs destroy -rf $TESTPOOL/${ZONE_CTR}0
 	fi
 
 }
@@ -75,30 +79,30 @@ fbackup1=/var/tmp/fbackup1.$$
 fbackup2=/var/tmp/fbackup2.$$
 
 datasetexists $ancestor_fs || \
-	log_must $ZFS create $ancestor_fs
-log_must $ZFS create $fs
+	log_must zfs create $ancestor_fs
+log_must zfs create $fs
 
 mntpnt=$(get_prop mountpoint $fs) || log_fail "get_prop mountpoint $fs"
-log_must $MKFILE 10m $mntpnt/file1
-log_must $ZFS snapshot $snap1
-log_must $MKFILE 10m $mntpnt/file2
-log_must $ZFS snapshot $snap2
+log_must mkfile 10m $mntpnt/file1
+log_must zfs snapshot $snap1
+log_must mkfile 10m $mntpnt/file2
+log_must zfs snapshot $snap2
 
-log_must eval "$ZFS send $snap1 > $fbackup1"
-log_must eval "$ZFS send $snap2 > $fbackup2"
+log_must eval "zfs send $snap1 > $fbackup1"
+log_must eval "zfs send $snap2 > $fbackup2"
 
 log_note "Verify 'zfs receive -d' succeed and create ancestor filesystem \
 	 if it did not exist. "
-log_must $ZFS destroy -rf $ancestor_fs
-log_must eval "$ZFS receive -d $TESTPOOL < $fbackup1"
+log_must zfs destroy -rf $ancestor_fs
+log_must eval "zfs receive -d $TESTPOOL < $fbackup1"
 is_global_zone || ancestor_fs=$TESTPOOL/${ZONE_CTR}0/$TESTFS
 datasetexists $ancestor_fs || \
 	log_fail "ancestor filesystem is not created"
 
 log_note "Verify 'zfs receive -d' still succeed if ancestor filesystem exists"
 is_global_zone || fs=$TESTPOOL/${ZONE_CTR}0/$TESTFS/$TESTFS1
-log_must $ZFS destroy -rf $fs
-log_must eval "$ZFS receive -d $TESTPOOL < $fbackup2"
+log_must zfs destroy -rf $fs
+log_must eval "zfs receive -d $TESTPOOL < $fbackup2"
 
 log_pass "'zfs recv -d <fs>' should succeed no matter ancestor filesystem \
 	exists."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_007_neg.ksh
index b2f6dc673d..b7b92800d5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_007_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,10 +47,10 @@ verify_runnable "both"
 function cleanup
 {
 	for snap in $snap2 $snap1; do
-		datasetexists $snap && log_must $ZFS destroy -rf $snap
+		datasetexists $snap && log_must zfs destroy -rf $snap
 	done
 	for file in $ibackup $mntpnt/file1 $mntpnt/file2; do
-		[[ -f $file ]] && log_must $RM -f $file
+		[[ -f $file ]] && log_must rm -f $file
 	done
 }
 
@@ -58,23 +62,23 @@ snap1=$fs@snap1
 snap2=$fs@snap2
 ibackup=/var/tmp/ibackup.$$
 
-datasetexists $fs || log_must $ZFS create $fs
+datasetexists $fs || log_must zfs create $fs
 
 mntpnt=$(get_prop mountpoint $fs) || log_fail "get_prop mountpoint $fs"
-log_must $MKFILE 10m $mntpnt/file1
-log_must $ZFS snapshot $snap1
-log_must $MKFILE 10m $mntpnt/file2
-log_must $ZFS snapshot $snap2
+log_must mkfile 10m $mntpnt/file1
+log_must zfs snapshot $snap1
+log_must mkfile 10m $mntpnt/file2
+log_must zfs snapshot $snap2
 
-log_must eval "$ZFS send -i $snap1 $snap2 > $ibackup"
+log_must eval "zfs send -i $snap1 $snap2 > $ibackup"
 
-log_must $ZFS destroy $snap1
-log_must $ZFS destroy $snap2
-log_mustnot eval "$ZFS receive -F $fs < $ibackup"
+log_must zfs destroy $snap1
+log_must zfs destroy $snap2
+log_mustnot eval "zfs receive -F $fs < $ibackup"
 
-log_must $MKFILE 20m $mntpnt/file1
-log_must $RM -rf $mntpnt/file2
-log_must $ZFS snapshot $snap1
-log_mustnot eval "$ZFS receive -F $snap2 < $ibackup"
+log_must mkfile 20m $mntpnt/file1
+log_must rm -rf $mntpnt/file2
+log_must zfs snapshot $snap1
+log_mustnot eval "zfs receive -F $snap2 < $ibackup"
 
 log_pass "'zfs recv -F' should fail if the incremental stream does not match"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_008_pos.ksh
index 6d9081e9f9..82fceeab22 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_008_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
 
 #
@@ -44,20 +48,20 @@ function cleanup
 {
 	for dset in $rst_snap $rst_fs $orig_snap; do
 		if datasetexists $dset; then
-			log_must $ZFS destroy -fr $dset
+			log_must zfs destroy -fr $dset
 		fi
 	done
 
 	for file in $fbackup $mnt_file $tmp_out; do
 		if [[ -f $file ]]; then
-			log_must $RM -f $file
+			log_must rm -f $file
 		fi
 	done
 
 	if datasetexists $TESTPOOL/$TESTFS; then
-		log_must $ZFS destroy -Rf $TESTPOOL/$TESTFS
-		log_must $ZFS create $TESTPOOL/$TESTFS
-		log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+		log_must zfs destroy -Rf $TESTPOOL/$TESTFS
+		log_must zfs create $TESTPOOL/$TESTFS
+		log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 	fi
 }
 
@@ -79,7 +83,7 @@ for orig_fs in $datasets ; do
 	typeset dryrun_msg="would receive full stream of ${orig_snap} into ${rst_snap}"
 
 	if ! datasetexists $orig_fs; then
-		log_must $ZFS create $orig_fs
+		log_must zfs create $orig_fs
 	fi
 
 	typeset mntpnt
@@ -90,24 +94,24 @@ for orig_fs in $datasets ; do
 
 	typeset mnt_file=$mntpnt/file1
 
-	log_must $MKFILE 100m $mnt_file
-	log_must $ZFS snapshot $orig_snap
-	log_must eval "$ZFS send $orig_snap > $fbackup"
+	log_must mkfile 100m $mnt_file
+	log_must zfs snapshot $orig_snap
+	log_must eval "zfs send $orig_snap > $fbackup"
 
 	for opt in "-v"  "-vn"; do
 		if datasetexists $rst_fs; then
-			log_must $ZFS destroy -fr $rst_fs
+			log_must zfs destroy -fr $rst_fs
 		fi
 		log_note "Check ZFS receive $opt [<filesystem|snapshot>]"
-		log_must eval "$ZFS receive $opt $rst_fs < $fbackup > $tmp_out 2>&1"
+		log_must eval "zfs receive $opt $rst_fs < $fbackup > $tmp_out 2>&1"
 		if [[ $opt == "-v" ]]; then
-			log_must eval "$GREP \"$verb_msg\" $tmp_out >/dev/null 2>&1"
+			log_must eval "grep \"$verb_msg\" $tmp_out >/dev/null 2>&1"
 			if ! datasetexists $rst_snap; then
 				log_fail "dataset was not received, even though the"\
 					" -v flag was used."
 			fi
 		else
-			log_must eval "$GREP \"$dryrun_msg\" $tmp_out >/dev/null 2>&1"
+			log_must eval "grep \"$dryrun_msg\" $tmp_out >/dev/null 2>&1"
 			if datasetexists $rst_snap; then
 				log_fail "dataset was received, even though the -nv"\
 					" flag was used."
@@ -117,9 +121,9 @@ for orig_fs in $datasets ; do
 
 	log_note "Check ZFS receive -vn -d <filesystem>"
 	if ! datasetexists $rst_fs; then
-		log_must $ZFS create $rst_fs
+		log_must zfs create $rst_fs
 	fi
-	log_must eval "$ZFS receive -vn -d -F $rst_fs <$fbackup >$tmp_out 2>&1"
+	log_must eval "zfs receive -vn -d -F $rst_fs <$fbackup >$tmp_out 2>&1"
 	typeset relative_path=""
 	if [[ ${orig_fs} == *"/"* ]]; then
 		relative_path=${orig_fs#*/}
@@ -130,12 +134,12 @@ for orig_fs in $datasets ; do
 	rst_snap=${leaf_fs}@snap
 	dryrun_msg="would receive full stream of ${orig_snap} into ${rst_snap}"
 
-	log_must eval "$GREP \"$dryrun_msg\" $tmp_out > /dev/null 2>&1"
+	log_must eval "grep \"$dryrun_msg\" $tmp_out > /dev/null 2>&1"
 
 	if datasetexists $rst_snap; then
 		log_fail "dataset $rst_snap should not existed."
 	fi
-	log_must $ZFS destroy -Rf $rst_fs
+	log_must zfs destroy -Rf $rst_fs
 
 	cleanup
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_009_neg.ksh
index 8d4b89b484..d028acafad 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_009_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
 
 #
@@ -45,15 +49,15 @@ function cleanup
 	typeset ds
 
 	if snapexists $snap; then
-		log_must $ZFS destroy $snap
+		log_must zfs destroy $snap
 	fi
 	for ds in $ctr1 $ctr2 $fs1; do
 		if datasetexists $ds; then
-			log_must $ZFS destroy -rf $ds
+			log_must zfs destroy -rf $ds
 		fi
 	done
 	if [[ -d $TESTDIR2 ]]; then
-		$RM -rf $TESTDIR2
+		rm -rf $TESTDIR2
 	fi
 }
 
@@ -74,28 +78,28 @@ bkup=$TESTDIR2/bkup.$$
 
 # Preparations for negative testing
 for ctr in $ctr1 $ctr2; do
-	log_must $ZFS create $ctr
+	log_must zfs create $ctr
 done
 if [[ -d $TESTDIR2 ]]; then
-	$RM -rf $TESTDIR2
+	rm -rf $TESTDIR2
 fi
-log_must $ZFS create -o mountpoint=$TESTDIR2 $fs1
-log_must $ZFS snapshot $snap
-log_must eval "$ZFS send $snap > $bkup"
+log_must zfs create -o mountpoint=$TESTDIR2 $fs1
+log_must zfs snapshot $snap
+log_must eval "zfs send $snap > $bkup"
 
 #Testing zfs receive fails with input from terminal
-log_mustnot eval "$ZFS recv $fs3 </dev/console"
+log_mustnot eval "zfs recv $fs3 </dev/console"
 
 # Testing with missing argument and too many arguments
 typeset -i i=0
 while (( i < ${#validopts[*]} )); do
-	log_mustnot eval "$ZFS recv < $bkup"
+	log_mustnot eval "zfs recv < $bkup"
 
-	$ECHO ${validopts[i]} | $GREP "d" >/dev/null 2>&1
+	echo ${validopts[i]} | grep "d" >/dev/null 2>&1
 	if (( $? != 0 )); then
-		log_mustnot eval "$ZFS recv ${validopts[i]} $fs2 $fs3 < $bkup"
+		log_mustnot eval "zfs recv ${validopts[i]} $fs2 $fs3 < $bkup"
 	else
-		log_mustnot eval "$ZFS recv ${validopts[i]} $ctr1 $ctr2 < $bkup"
+		log_mustnot eval "zfs recv ${validopts[i]} $ctr1 $ctr2 < $bkup"
 	fi
 
 	(( i += 1 ))
@@ -105,8 +109,8 @@ done
 i=0
 while (( i < ${#badopts[*]} ))
 do
-	log_mustnot eval "$ZFS recv ${badopts[i]} $ctr1 < $bkup"
-	log_mustnot eval "$ZFS recv ${badopts[i]} $fs2 < $bkup"
+	log_mustnot eval "zfs recv ${badopts[i]} $ctr1 < $bkup"
+	log_mustnot eval "zfs recv ${badopts[i]} $fs2 < $bkup"
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_010_pos.ksh
index 511463f331..1be4799d94 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_010_pos.ksh
@@ -51,15 +51,15 @@ function make_object
 	local mntpnt=$2
 	local type=$3
 	if [[ $type == "file" ]]; then
-		$DD if=/dev/urandom of=${mntpnt}/f$objnum bs=512 count=16
+		dd if=/dev/urandom of=${mntpnt}/f$objnum bs=512 count=16
 	elif [[ $type == "hole1" ]]; then
-		$DD if=/dev/urandom of=${mntpnt}/fh$objnum bs=512 count=5 stride=4
+		dd if=/dev/urandom of=${mntpnt}/fh$objnum bs=512 count=5 stride=4
 	elif [[ $type == "hole2" ]]; then
-		$DD if=/dev/urandom of=${mntpnt}/fh$objnum bs=512 count=4 stride=5
+		dd if=/dev/urandom of=${mntpnt}/fh$objnum bs=512 count=4 stride=5
 	elif [[ $type == "directory" ]]; then
-		$MKDIR ${mntpnt}/d$objnum
+		mkdir ${mntpnt}/d$objnum
 	elif [[ $type == "missing" ]]; then
-		$TOUCH ${mntpnt}/h$objnum
+		touch ${mntpnt}/h$objnum
 	fi
 }
 
@@ -76,17 +76,17 @@ function create_pair
 
 function cleanup
 {
-	$ZFS destroy -Rf $TESTPOOL/$TESTFS/base
+	zfs destroy -Rf $TESTPOOL/$TESTFS/base
 	rm /tmp/zr010p*
 }
 
 log_assert "zfs receive of full send as clone should work"
 log_onexit cleanup
-log_must $ZFS create -o checksum=sha256 -o compression=gzip -o recordsize=512 \
+log_must zfs create -o checksum=sha256 -o compression=gzip -o recordsize=512 \
 	$TESTPOOL/$TESTFS/base
 
-log_must $ZFS create $fs
-log_must $ZFS create $fs2
+log_must zfs create $fs
+log_must zfs create $fs2
 mntpnt=$(get_prop mountpoint $fs)
 mntpnt2=$(get_prop mountpoint $fs2)
 
@@ -129,49 +129,49 @@ create_pair 16 $mntpnt $mntpnt2 "directory" "missing"
 create_pair 17 $mntpnt $mntpnt2 "missing" "missing"
 
 # Receive a file with a different record size onto a file (and vice versa).
-log_must $ZFS set recordsize=128k $fs
-$DD if=/dev/urandom of=$mntpnt/f18 bs=128k count=64
-$TOUCH $mntpnt2/f18
+log_must zfs set recordsize=128k $fs
+dd if=/dev/urandom of=$mntpnt/f18 bs=128k count=64
+touch $mntpnt2/f18
 
 # Remove objects that are intended to be missing.
-$RM $mntpnt/h17
-$RM $mntpnt2/h*
+rm $mntpnt/h17
+rm $mntpnt2/h*
 
 # Add empty objects to $fs to exercise dmu_traverse code
 for i in {1..100}; do
 	log_must touch $mntpnt/uf$i
 done
 
-log_must $ZFS snapshot $fs@s1
-log_must $ZFS snapshot $fs2@s1
+log_must zfs snapshot $fs@s1
+log_must zfs snapshot $fs2@s1
 
-log_must $ZFS send $fs@s1 > /tmp/zr010p
-log_must $ZFS send $fs2@s1 > /tmp/zr010p2
+log_must zfs send $fs@s1 > /tmp/zr010p
+log_must zfs send $fs2@s1 > /tmp/zr010p2
 
 
 #
 # Test that, when we receive a full send as a clone of itself,
 # nop-write saves us all the space used by data blocks.
 #
-cat /tmp/zr010p | log_must $ZFS receive -o origin=$fs@s1 $rfs
+cat /tmp/zr010p | log_must zfs receive -o origin=$fs@s1 $rfs
 size=$(get_prop used $rfs)
 size2=$(get_prop used $fs)
 if [[ $size -ge $(($size2 / 10)) ]] then
         log_fail "nop-write failure; expected usage less than "\
 		"$(($size2 / 10)), but is using $size"
 fi
-log_must $ZFS destroy -fr $rfs
+log_must zfs destroy -fr $rfs
 
 # Correctness testing: receive each full send as a clone of the other fiesystem.
-cat /tmp/zr010p | log_must $ZFS receive -o origin=$fs2@s1 $rfs
+cat /tmp/zr010p | log_must zfs receive -o origin=$fs2@s1 $rfs
 mntpnt_old=$(get_prop mountpoint $fs)
 mntpnt_new=$(get_prop mountpoint $rfs)
-log_must $DIFF -r $mntpnt_old $mntpnt_new
-log_must $ZFS destroy -r $rfs
+log_must diff -r $mntpnt_old $mntpnt_new
+log_must zfs destroy -r $rfs
 
-cat /tmp/zr010p2 | log_must $ZFS receive -o origin=$fs@s1 $rfs
+cat /tmp/zr010p2 | log_must zfs receive -o origin=$fs@s1 $rfs
 mntpnt_old=$(get_prop mountpoint $fs2)
 mntpnt_new=$(get_prop mountpoint $rfs)
-log_must $DIFF -r $mntpnt_old $mntpnt_new
+log_must diff -r $mntpnt_old $mntpnt_new
 
 log_pass "zfs receive of full send as clone works"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_011_pos.ksh
index b905a87c64..6e312d8ea9 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_011_pos.ksh
@@ -18,6 +18,10 @@
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,9 +47,9 @@ typeset streamfile=/var/tmp/streamfile.$$
 
 function cleanup
 {
-	log_must $RM $streamfile
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS1
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS2
+	log_must rm $streamfile
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS1
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS2
 }
 
 log_assert "refquota is properly sent-and-received, regardless of any " \
@@ -55,30 +59,30 @@ log_onexit cleanup
 orig=$TESTPOOL/$TESTFS1
 dest=$TESTPOOL/$TESTFS2
 #	1. Create a filesystem.
-log_must $ZFS create $orig
+log_must zfs create $orig
 origdir=$(get_prop mountpoint $orig)
 
 #	2. Create two equal-sized large files.
-log_must $MKFILE 5M $origdir/file1
-log_must $MKFILE 5M $origdir/file2
-log_must $SYNC
+log_must mkfile 5M $origdir/file1
+log_must mkfile 5M $origdir/file2
+log_must sync
 
 #	3. Snapshot the filesystem.
-log_must $ZFS snapshot $orig@1
+log_must zfs snapshot $orig@1
 
 #	4. Remove one of the two large files.
-log_must $RM $origdir/file2
-log_must $SYNC
+log_must rm $origdir/file2
+log_must sync
 
 #	5. Create a refquota larger than one file, but smaller than both.
-log_must $ZFS set refquota=8M $orig
+log_must zfs set refquota=8M $orig
 
 #	6. Snapshot the filesystem again.
-log_must $ZFS snapshot $orig@2
+log_must zfs snapshot $orig@2
 
 #	7. Send a replication stream of the second snapshot to a new filesystem.
-log_must eval "$ZFS send -R $orig@2 > $streamfile"
-log_must eval "$ZFS recv $dest < $streamfile"
+log_must eval "zfs send -R $orig@2 > $streamfile"
+log_must eval "zfs recv $dest < $streamfile"
 
 log_pass "refquota is properly sent-and-received, regardless of any " \
 	"intermediate snapshots sent by a replication stream."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_012_pos.ksh
index af9f91e61c..70afe419fc 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_012_pos.ksh
@@ -44,9 +44,9 @@ typeset streamfile=/var/tmp/streamfile.$$
 
 function cleanup
 {
-	log_must $RM $streamfile
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS1
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS2
+	log_must rm $streamfile
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS1
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS2
 }
 
 log_assert "The allowable slight refquota overage is properly sent-and-" \
@@ -57,27 +57,27 @@ orig=$TESTPOOL/$TESTFS1
 dest=$TESTPOOL/$TESTFS2
 
 #	1. Create a filesystem.
-log_must $ZFS create $orig
+log_must zfs create $orig
 origdir=$(get_prop mountpoint $orig)
 
 #	2. Set a refquota.
-log_must $ZFS set refquota=50M $orig
+log_must zfs set refquota=50M $orig
 
 #	3. Snapshot the filesystem.
-log_must $ZFS snapshot $orig@1
+log_must zfs snapshot $orig@1
 
 #	4. Send a replication stream to a new filesystem.
-log_must eval "$ZFS send -R $orig@1 > $streamfile"
-log_must eval "$ZFS recv $dest < $streamfile"
+log_must eval "zfs send -R $orig@1 > $streamfile"
+log_must eval "zfs recv $dest < $streamfile"
 
 #	5. On the original filesystem, fill it up to its quota.
 cat < /dev/urandom > $origdir/fill-it-up
 
 #	6. Snapshot the original filesystem again.
-log_must $ZFS snapshot $orig@2
+log_must zfs snapshot $orig@2
 
 #	7. Send an incremental stream to the same new filesystem.
-log_must eval "$ZFS send -I 1 -R $orig@2 > $streamfile"
-log_must eval "$ZFS recv $dest < $streamfile"
+log_must eval "zfs send -I 1 -R $orig@2 > $streamfile"
+log_must eval "zfs recv $dest < $streamfile"
 
 log_pass "Verified receiving a slightly-over-refquota stream succeeds."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_013_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_013_pos.ksh
index 145ff68702..9879282ea2 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_013_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_013_pos.ksh
@@ -15,7 +15,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
@@ -39,11 +39,11 @@ tpoolfile=/temptank.$$
 function cleanup
 {
     for fs in $src_fs $dst_fs; do
-        datasetexists $fs && log_must $ZFS destroy -rf $fs
+        datasetexists $fs && log_must zfs destroy -rf $fs
     done
     zpool destroy $temppool
-    [[ -f $streamfile ]] && log_must $RM -f $streamfile
-    [[ -f $tpoolfile ]] && log_must $RM -f $tpoolfile
+    [[ -f $streamfile ]] && log_must rm -f $streamfile
+    [[ -f $tpoolfile ]] && log_must rm -f $tpoolfile
 }
 
 log_assert "Verifying 'zfs receive' works correctly on deduplicated streams"
@@ -51,22 +51,22 @@ log_onexit cleanup
 
 truncate -s 100M $tpoolfile
 log_must zpool create $temppool $tpoolfile
-log_must $ZFS create $src_fs
+log_must zfs create $src_fs
 src_mnt=$(get_prop mountpoint $src_fs) || log_fail "get_prop mountpoint $src_fs"
 
 echo blah > $src_mnt/blah
-$ZFS snapshot $src_fs@base
+zfs snapshot $src_fs@base
 
 echo grumble > $src_mnt/grumble
 echo blah > $src_mnt/blah2
-$ZFS snapshot $src_fs@snap2
+zfs snapshot $src_fs@snap2
 
 echo grumble > $src_mnt/mumble
 echo blah > $src_mnt/blah3
-$ZFS snapshot $src_fs@snap3
+zfs snapshot $src_fs@snap3
 
-log_must eval "$ZFS send -D -R $src_fs@snap3 > $streamfile"
-log_must eval "$ZFS receive -v $dst_fs < $streamfile"
+log_must eval "zfs send -D -R $src_fs@snap3 > $streamfile"
+log_must eval "zfs receive -v $dst_fs < $streamfile"
 
 cleanup
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/cleanup.ksh
index 544d79a664..e845bf62db 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/cleanup.ksh
@@ -25,12 +25,16 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 default_cleanup_noexit
 
 if [[ -d $TESTDIR2 ]]; then
-        $RM -rf $TESTDIR2
+        rm -rf $TESTDIR2
         if (( $? != 0 )); then
                 log_unresolved Could not remove $TESTDIR2
         fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh
index 3e8e010940..271149e5d2 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -37,13 +37,13 @@ DISK=${DISKS%% *}
 default_setup_noexit "$DISK" "true" "true"
 
 if [[ -d $TESTDIR2 ]]; then
-	$RM -rf $TESTDIR2
+	rm -rf $TESTDIR2
 	if (( $? != 0 )); then
 		log_unresolved Could not remove $TESTDIR2
 	fi
 fi
-log_must $ZFS create $TESTPOOL/$DATAFS
-log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL/$DATAFS
-log_must eval "$DD if=$IF of=$OF bs=$BS count=$CNT >/dev/null 2>&1"
+log_must zfs create $TESTPOOL/$DATAFS
+log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL/$DATAFS
+log_must eval "dd if=$IF of=$OF bs=$BS count=$CNT >/dev/null 2>&1"
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
index e363607eb8..bb40bc1989 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_rename/zfs_rename.cfg
@@ -33,34 +33,34 @@
 function additional_setup
 {
 	# Create testfile
-	log_must $CP $DATA $TESTDIR/$TESTFILE0
-	log_must $CP $DATA $TESTDIR1/$TESTFILE0
+	log_must cp $DATA $TESTDIR/$TESTFILE0
+	log_must cp $DATA $TESTDIR1/$TESTFILE0
 
 	# Create snapshot
 	if ! snapexists $TESTPOOL/$TESTFS@snapshot; then
-		log_must $ZFS snapshot $TESTPOOL/$TESTFS@snapshot
-		log_must $ZFS clone $TESTPOOL/$TESTFS@snapshot \
+		log_must zfs snapshot $TESTPOOL/$TESTFS@snapshot
+		log_must zfs clone $TESTPOOL/$TESTFS@snapshot \
 		    $TESTPOOL/$TESTFS-clone
 	fi
 
 	# Create file system
 	datasetexists $TESTPOOL/$TESTFS1 || \
-		log_must $ZFS create $TESTPOOL/$TESTFS1
+		log_must zfs create $TESTPOOL/$TESTFS1
 
 	# Create testfile
-	log_must $CP $DATA $(get_prop mountpoint $TESTPOOL/$TESTFS1)/$TESTFILE0
+	log_must cp $DATA $(get_prop mountpoint $TESTPOOL/$TESTFS1)/$TESTFILE0
 
 	# Create container
 	datasetexists $TESTPOOL/$TESTCTR1 || \
-		log_must $ZFS create $TESTPOOL/$TESTCTR1
-	log_must $CP $DATA $(get_prop mountpoint $TESTPOOL/$TESTCTR1)/$TESTFILE0
+		log_must zfs create $TESTPOOL/$TESTCTR1
+	log_must cp $DATA $(get_prop mountpoint $TESTPOOL/$TESTCTR1)/$TESTFILE0
 
 	# Create data in zvol
 	if is_global_zone; then
-		log_must eval "$DD if=$DATA of=$VOL_R_PATH bs=$BS count=$CNT \
+		log_must eval "dd if=$DATA of=$VOL_R_PATH bs=$BS count=$CNT \
 				>/dev/null 2>&1"
 	else
-		log_must $CP $DATA $(get_prop mountpoint $TESTPOOL/$TESTVOL)/$TESTFILE0
+		log_must cp $DATA $(get_prop mountpoint $TESTPOOL/$TESTVOL)/$TESTFILE0
 	fi
 
 }
@@ -70,7 +70,7 @@ function rename_dataset # src dest
 	typeset src=$1
 	typeset dest=$2
 
-	log_must $ZFS rename $src $dest
+	log_must zfs rename $src $dest
 
 	#
 	# Verify src name no longer in use
@@ -89,24 +89,24 @@ function cleanup
 		fi
 
                 if [[ ${dataset[i]}-new != *@* ]] ; then
-                        $ZFS rename ${dataset[i]}-new ${dataset[i]}
+                        zfs rename ${dataset[i]}-new ${dataset[i]}
                         if [[ $? -ne 0 ]]; then
                                 typeset newfs=${dataset[i]}-new
                                 typeset oldfs=${dataset[i]}
                                 typeset mntp=$(get_prop mountpoint  $newfs)
-                                log_must $ZFS destroy -f $newfs
-                                log_must $ZFS create -p $oldfs
-                                log_must $ZFS set mountpoint=$mntp $oldfs
+                                log_must zfs destroy -f $newfs
+                                log_must zfs create -p $oldfs
+                                log_must zfs set mountpoint=$mntp $oldfs
                         fi
                 else
-                        log_must $ZFS destroy -fR ${dataset[i]}-new
+                        log_must zfs destroy -fR ${dataset[i]}-new
                 fi
 
                 ((i = i + 1))
 	done
 
 	if snapexists $TESTPOOL/$TESTFS@snapshot; then
-		log_must $ZFS destroy -fR $TESTPOOL/$TESTFS@snapshot
+		log_must zfs destroy -fR $TESTPOOL/$TESTFS@snapshot
 	fi
 
 }
@@ -116,7 +116,7 @@ function cmp_data #<$1 src data, $2 tgt data>
         typeset src=$1
         typeset tgt=$2
 
-        $CMP $src $tgt >/dev/null 2>&1
+        cmp $src $tgt >/dev/null 2>&1
 
         return $?
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_001_pos.ksh
index dc178c4200..c76b5a2fe5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
 
@@ -86,7 +91,7 @@ done
 
 #verify the data integrity in zvol
 if is_global_zone; then
-	log_must eval "$DD if=${VOL_R_PATH}-new of=$VOLDATA bs=$BS count=$CNT >/dev/null 2>&1"
+	log_must eval "dd if=${VOL_R_PATH}-new of=$VOLDATA bs=$BS count=$CNT >/dev/null 2>&1"
 	if ! cmp_data $VOLDATA $DATA ; then
 		log_fail "$VOLDATA gets corrupted after rename operation."
 	fi
@@ -96,7 +101,7 @@ fi
 typeset -i i=0
 while ((i < ${#dataset[*]} )); do
 	if datasetexists ${dataset[i]}-new ; then
-                log_must $ZFS rename ${dataset[i]}-new ${dataset[i]}
+                log_must zfs rename ${dataset[i]}-new ${dataset[i]}
 	fi
         ((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_002_pos.ksh
index 6646df5aa6..6d51f612b3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_002_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
 
@@ -71,7 +76,7 @@ while ((i < ${#dataset[*]} )); do
 	if [[ ${dataset[i]} == *@* ]]; then
 		data=$(snapshot_mountpoint ${dataset[i]})/$TESTFILE0
 	elif [[ ${dataset[i]} == "$TESTPOOL/$TESTVOL" ]] && is_global_zone; then
-		log_must eval "$DD if=$VOL_R_PATH of=$VOLDATA bs=$BS count=$CNT >/dev/null 2>&1"
+		log_must eval "dd if=$VOL_R_PATH of=$VOLDATA bs=$BS count=$CNT >/dev/null 2>&1"
 		data=$VOLDATA
 	else
 		data=$(get_prop mountpoint ${dataset[i]})/$TESTFILE0
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_003_pos.ksh
index 9660641048..56c06cfe85 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -40,7 +44,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	datasetexists $snap && log_must $ZFS destroy $snap
+	datasetexists $snap && log_must zfs destroy $snap
 }
 
 log_assert "'zfs rename' can address the abbreviated snapshot name."
@@ -49,14 +53,14 @@ log_onexit cleanup
 fs=$TESTPOOL/$TESTFS; snap=$fs@snap
 set -A newname "$fs@new-snap" "@new-snap" "new-snap"
 
-log_must $ZFS snapshot $snap
+log_must zfs snapshot $snap
 log_must datasetexists $snap
 
 typeset -i i=0
 while ((i < ${#newname[*]} )); do
-        log_must $ZFS rename $snap ${newname[$i]}
+        log_must zfs rename $snap ${newname[$i]}
 	log_must datasetexists ${snap%%@*}@${newname[$i]##*@}
-	log_must $ZFS rename ${snap%%@*}@${newname[$i]##*@} $snap
+	log_must zfs rename ${snap%%@*}@${newname[$i]##*@} $snap
 
 	((i += 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_004_neg.ksh
index 19f8a80adc..cafa74366d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_004_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
 
@@ -86,10 +91,10 @@ additional_setup
 
 typeset -i i=0
 while ((i < ${#bad_dataset[*]} )); do
-        log_mustnot $ZFS rename ${bad_dataset[i]} ${bad_dataset[((i + 1))]}
+        log_mustnot zfs rename ${bad_dataset[i]} ${bad_dataset[((i + 1))]}
         log_must datasetexists ${bad_dataset[i]}
 
-        log_mustnot $ZFS rename -p ${bad_dataset[i]} ${bad_dataset[((i + 1))]}
+        log_mustnot zfs rename -p ${bad_dataset[i]} ${bad_dataset[((i + 1))]}
         log_must datasetexists ${bad_dataset[i]}
 
 	((i = i + 2))
@@ -97,10 +102,10 @@ done
 
 #verify 'rename -p' can not work with snapshots
 
-log_mustnot $ZFS rename -p $TESTPOOL/$TESTFS@snapshot \
+log_mustnot zfs rename -p $TESTPOOL/$TESTFS@snapshot \
 		$TESTPOOL/$TESTFS@snapshot2
 log_must datasetexists $TESTPOOL/$TESTFS@snapshot
-log_mustnot $ZFS rename -p $TESTPOOL/$TESTFS@snapshot \
+log_mustnot zfs rename -p $TESTPOOL/$TESTFS@snapshot \
 		$TESTPOOL/$TESTFS/$TESTFS@snapshot2
 log_must datasetexists $TESTPOOL/$TESTFS@snapshot
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_005_neg.ksh
index b3f1b39671..5ef77de0c7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function my_cleanup
 	poolexists $TESTPOOL1 && \
 		destroy_pool $TESTPOOL1
 	[[ -e $TESTDIR/$TESTFILE1 ]] && \
-		log_must $RM -f $TESTDIR/$TESTFILE1
+		log_must rm -f $TESTDIR/$TESTFILE1
 	cleanup
 }
 
@@ -68,7 +68,7 @@ log_assert "'zfs rename' should fail while datasets are within different pool."
 
 additional_setup
 
-log_must $MKFILE $MINVDEVSIZE $TESTDIR/$TESTFILE1
+log_must mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1
 create_pool $TESTPOOL1 $TESTDIR/$TESTFILE1
 
 for src in ${src_dataset[@]} ; do
@@ -79,8 +79,8 @@ for src in ${src_dataset[@]} ; do
 	else
 		dest=${TESTPOOL1}/$dest
 	fi
-	log_mustnot $ZFS rename $src $dest
-	log_mustnot $ZFS rename -p $src $dest
+	log_mustnot zfs rename $src $dest
+	log_mustnot zfs rename -p $src $dest
 
 	#
 	# Verify original dataset name still in use
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_006_pos.ksh
index 25fb7330a8..34dd3a19a8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
@@ -57,9 +57,9 @@ log_assert "'zfs rename' can successfully rename a volume snapshot."
 vol=$TESTPOOL/$TESTVOL
 snap=$TESTSNAP
 
-log_must eval "$DD if=$DATA of=$VOL_R_PATH bs=$BS count=$CNT >/dev/null 2>&1"
+log_must eval "dd if=$DATA of=$VOL_R_PATH bs=$BS count=$CNT >/dev/null 2>&1"
 if ! snapexists $vol@$snap; then
-	log_must $ZFS snapshot $vol@$snap
+	log_must zfs snapshot $vol@$snap
 fi
 
 rename_dataset $vol@$snap $vol@${snap}-new
@@ -72,13 +72,13 @@ create_clone $vol@$snap $clone
 
 #verify data integrity
 for input in $VOL_R_PATH /dev/zvol/rdsk/$clone; do
-	log_must eval "$DD if=$input of=$VOLDATA bs=$BS count=$CNT >/dev/null 2>&1"
+	log_must eval "dd if=$input of=$VOLDATA bs=$BS count=$CNT >/dev/null 2>&1"
 	if ! cmp_data $VOLDATA $DATA ; then
 		log_fail "$input gets corrupted after rename operation."
 	fi
 done
 
 destroy_clone $clone
-log_must $ZFS destroy $vol@$snap
+log_must zfs destroy $vol@$snap
 
 log_pass "'zfs rename' can rename volume snapshot as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_007_pos.ksh
index cc685525ed..e39f29263d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,12 +47,12 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTFS ; then
-		log_must $ZFS destroy -Rf $TESTPOOL/$TESTFS
+		log_must zfs destroy -Rf $TESTPOOL/$TESTFS
 	fi
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
-	$RM -f $SRC_FILE $DST_FILE
+	rm -f $SRC_FILE $DST_FILE
 }
 
 function target_obj
@@ -78,74 +78,74 @@ log_onexit cleanup
 BS=512 ; CNT=2048
 SRC_FILE=/tmp/srcfile.$$
 DST_FILE=/tmp/dstfile.$$
-log_must $DD if=/dev/random of=$SRC_FILE bs=$BS count=$CNT
+log_must dd if=/dev/random of=$SRC_FILE bs=$BS count=$CNT
 
 fs=$TESTPOOL/$TESTFS/fs.$$
 fsclone=$TESTPOOL/$TESTFS/fsclone.$$
-log_must $ZFS create $fs
+log_must zfs create $fs
 
 obj=$(target_obj $fs)
-log_must $CP $SRC_FILE $obj
+log_must cp $SRC_FILE $obj
 
 snap=${fs}@snap.$$
-log_must $ZFS snapshot $snap
-log_must $ZFS clone $snap $fsclone
+log_must zfs snapshot $snap
+log_must zfs clone $snap $fsclone
 
 # Rename dataset & clone
 #
-log_must $ZFS rename $fs ${fs}-new
-log_must $ZFS rename $fsclone ${fsclone}-new
+log_must zfs rename $fs ${fs}-new
+log_must zfs rename $fsclone ${fsclone}-new
 
 # Compare source file and target file
 #
 obj=$(target_obj ${fs}-new)
-log_must $DIFF $SRC_FILE $obj
+log_must diff $SRC_FILE $obj
 obj=$(target_obj ${fsclone}-new)
-log_must $DIFF $SRC_FILE $obj
+log_must diff $SRC_FILE $obj
 
 # Rename snapshot and re-clone dataset
 #
-log_must $ZFS rename ${fs}-new $fs
-log_must $ZFS rename $snap ${snap}-new
-log_must $ZFS clone ${snap}-new $fsclone
+log_must zfs rename ${fs}-new $fs
+log_must zfs rename $snap ${snap}-new
+log_must zfs clone ${snap}-new $fsclone
 
 # Compare source file and target file
 #
 obj=$(target_obj $fsclone)
-log_must $DIFF $SRC_FILE $obj
+log_must diff $SRC_FILE $obj
 
 if is_global_zone; then
 	vol=$TESTPOOL/$TESTFS/vol.$$ ;	volclone=$TESTPOOL/$TESTFS/volclone.$$
-	log_must $ZFS create -V 100M $vol
+	log_must zfs create -V 100M $vol
 
 	obj=$(target_obj $vol)
-	log_must $DD if=$SRC_FILE of=$obj bs=$BS count=$CNT
+	log_must dd if=$SRC_FILE of=$obj bs=$BS count=$CNT
 
 	snap=${vol}@snap.$$
-	log_must $ZFS snapshot $snap
-	log_must $ZFS clone $snap $volclone
+	log_must zfs snapshot $snap
+	log_must zfs clone $snap $volclone
 
 	# Rename dataset & clone
-	log_must $ZFS rename $vol ${vol}-new
-	log_must $ZFS rename $volclone ${volclone}-new
+	log_must zfs rename $vol ${vol}-new
+	log_must zfs rename $volclone ${volclone}-new
 
 	# Compare source file and target file
 	obj=$(target_obj ${vol}-new)
-	log_must $DD if=$obj of=$DST_FILE bs=$BS count=$CNT
-	log_must $DIFF $SRC_FILE $DST_FILE
+	log_must dd if=$obj of=$DST_FILE bs=$BS count=$CNT
+	log_must diff $SRC_FILE $DST_FILE
 	obj=$(target_obj ${volclone}-new)
-	log_must $DD if=$obj of=$DST_FILE bs=$BS count=$CNT
-	log_must $DIFF $SRC_FILE $DST_FILE
+	log_must dd if=$obj of=$DST_FILE bs=$BS count=$CNT
+	log_must diff $SRC_FILE $DST_FILE
 
 	# Rename snapshot and re-clone dataset
-	log_must $ZFS rename ${vol}-new $vol
-	log_must $ZFS rename $snap ${snap}-new
-	log_must $ZFS clone ${snap}-new $volclone
+	log_must zfs rename ${vol}-new $vol
+	log_must zfs rename $snap ${snap}-new
+	log_must zfs clone ${snap}-new $volclone
 
 	# Compare source file and target file
 	obj=$(target_obj $volclone)
-	log_must $DD if=$obj of=$DST_FILE bs=$BS count=$CNT
-	log_must $DIFF $SRC_FILE $DST_FILE
+	log_must dd if=$obj of=$DST_FILE bs=$BS count=$CNT
+	log_must diff $SRC_FILE $DST_FILE
 fi
 
 log_pass "Rename dataset, the data haven't changed passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_008_pos.ksh
index 2552acce3c..3fc099d79f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,10 +48,10 @@ function cleanup
 	typeset -i i=0
 	while ((i < ${#datasets[@]})); do
 		if datasetexists ${datasets[$i]}@snap ; then
-			log_must $ZFS destroy ${datasets[$i]}@snap
+			log_must zfs destroy ${datasets[$i]}@snap
 		fi
 		if datasetexists ${datasets[$i]}@snap-new ; then
-			log_must $ZFS destroy ${datasets[$i]}@snap-new
+			log_must zfs destroy ${datasets[$i]}@snap-new
 		fi
 
 		((i += 1))
@@ -67,7 +67,7 @@ if is_global_zone; then
 	datasets[${#datasets[@]}]=$TESTPOOL/$TESTVOL
 fi
 
-log_must $ZFS snapshot -r ${TESTPOOL}@snap
+log_must zfs snapshot -r ${TESTPOOL}@snap
 typeset -i i=0
 while ((i < ${#datasets[@]})); do
 	log_must datasetexists ${datasets[$i]}@snap
@@ -75,7 +75,7 @@ while ((i < ${#datasets[@]})); do
 	((i += 1))
 done
 
-log_must $ZFS rename -r ${TESTPOOL}@snap ${TESTPOOL}@snap-new
+log_must zfs rename -r ${TESTPOOL}@snap ${TESTPOOL}@snap-new
 i=0
 while ((i < ${#datasets[@]})); do
 	log_must datasetexists ${datasets[$i]}@snap-new
@@ -83,6 +83,6 @@ while ((i < ${#datasets[@]})); do
 	((i += 1))
 done
 
-log_must $ZFS destroy -rf ${TESTPOOL}@snap-new
+log_must zfs destroy -rf ${TESTPOOL}@snap-new
 
 log_pass "Verify zfs rename -r passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_009_neg.ksh
index 16d306dd38..d19c9485e6 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,24 +47,24 @@ verify_runnable "both"
 
 function cleanup
 {
-	typeset snaps=$($ZFS list -H -t snapshot -o name)
+	typeset snaps=$(zfs list -H -t snapshot -o name)
 	typeset exclude
 	typeset snap
 	typeset pool_name
 
 	if [[ -n $KEEP ]]; then
-		exclude=`eval $ECHO \"'(${KEEP})'\"`
+		exclude=`eval echo \"'(${KEEP})'\"`
 	fi
 
 	for snap in $snaps; do
-		pool_name=$($ECHO "$snap" | $AWK -F/ '{print $1}')
+		pool_name=$(echo "$snap" | awk -F/ '{print $1}')
 		if [[ -n $exclude ]]; then
-			$ECHO "$pool_name" | $EGREP -v "$exclude" > /dev/null 2>&1
+			echo "$pool_name" | egrep -v "$exclude" > /dev/null 2>&1
 			if [[ $? -eq 0 ]]; then
-				log_must $ZFS destroy $snap
+				log_must zfs destroy $snap
 			fi
 		else
-			log_must $ZFS destroy $snap
+			log_must zfs destroy $snap
 		fi
 	done
 }
@@ -78,13 +78,13 @@ if is_global_zone; then
 	datasets[${#datasets[@]}]=$TESTPOOL/$TESTVOL
 fi
 
-log_must $ZFS snapshot -r ${TESTPOOL}@snap
+log_must zfs snapshot -r ${TESTPOOL}@snap
 typeset -i i=0
 while ((i < ${#datasets[@]})); do
 	# Create one more snapshot
-	log_must $ZFS snapshot ${datasets[$i]}@snap2
-	log_mustnot $ZFS rename -r ${TESTPOOL}@snap ${TESTPOOL}@snap2
-	log_must $ZFS destroy ${datasets[$i]}@snap2
+	log_must zfs snapshot ${datasets[$i]}@snap2
+	log_mustnot zfs rename -r ${TESTPOOL}@snap ${TESTPOOL}@snap2
+	log_must zfs destroy ${datasets[$i]}@snap2
 
 	# Check datasets, make sure none of them was renamed.
 	typeset -i j=0
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_010_neg.ksh
index 2b96662ebc..171770fa32 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_010_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,7 +54,7 @@ fi
 for opts in "-r" "-r -p"; do
 	typeset -i i=0
 	while ((i < ${#datasets[@]})); do
-		log_mustnot $ZFS rename $opts ${datasets[$i]} \
+		log_mustnot zfs rename $opts ${datasets[$i]} \
 			${datasets[$i]}-new
 
 		# Check datasets, make sure none of them was renamed.
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_011_pos.ksh
index e453e83865..2d1220e334 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_011_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
 
@@ -42,19 +47,19 @@ verify_runnable "both"
 function additional_cleanup
 {
 	if datasetexists $TESTPOOL/notexist ; then
-		log_must $ZFS destroy -Rf $TESTPOOL/notexist
+		log_must zfs destroy -Rf $TESTPOOL/notexist
 	fi
 
 	if datasetexists $TESTPOOL/$TESTFS ; then
-		log_must $ZFS destroy -Rf $TESTPOOL/$TESTFS
+		log_must zfs destroy -Rf $TESTPOOL/$TESTFS
 	fi
-	log_must $ZFS create $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
 
 	if is_global_zone ; then
 		if datasetexists $TESTPOOL/$TESTVOL ; then
-			log_must $ZFS destroy -Rf $TESTPOOL/$TESTVOL
+			log_must zfs destroy -Rf $TESTPOOL/$TESTVOL
 		fi
-		log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
+		log_must zfs create -V $VOLSIZE $TESTPOOL/$TESTVOL
 	fi
 }
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_012_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_012_neg.ksh
index 495f663ef7..6daf001797 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_012_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_012_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,14 +54,14 @@ datasets=("$TESTPOOL" "$TESTPOOL/$TESTFS" "$TESTPOOL/$TESTFS@$TESTSNAP"
 
 longname="$(gen_dataset_name 260 abcdefg)"
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
 for ds in ${datasets[@]}; do
 	for opt in ${badopts[@]}; do
-		log_mustnot $ZFS rename $opt $ds ${ds}-new
+		log_mustnot zfs rename $opt $ds ${ds}-new
 	done
-	log_mustnot $ZFS rename $ds
-	log_mustnot $ZFS rename $ds ${ds}-new ${ds}-new1
-	log_mustnot $ZFS rename $ds ${ds}.$longname
+	log_mustnot zfs rename $ds
+	log_mustnot zfs rename $ds ${ds}-new ${ds}-new1
+	log_mustnot zfs rename $ds ${ds}.$longname
 done
 
 log_pass "'zfs rename' fails with illegal scenarios as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_013_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_013_pos.ksh
index 3189be5fd0..b2e01006fd 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_013_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_013_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,19 +47,19 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$TESTCTR@snap-new ; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTCTR@snap-new
+		log_must zfs destroy -f $TESTPOOL/$TESTCTR@snap-new
 	fi
 
 	if datasetexists $TESTPOOL/$TESTCTR@snap ; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTCTR@snap
+		log_must zfs destroy -f $TESTPOOL/$TESTCTR@snap
 	fi
 
 	if datasetexists $TESTPOOL@snap-new ; then
-		log_must $ZFS destroy -f $TESTPOOL@snap-new
+		log_must zfs destroy -f $TESTPOOL@snap-new
 	fi
 
 	if datasetexists $TESTPOOL@snap ; then
-		log_must $ZFS destroy -f $TESTPOOL@snap
+		log_must zfs destroy -f $TESTPOOL@snap
 	fi
 }
 
@@ -68,17 +68,17 @@ log_assert "zfs rename -r can rename snapshot when child datasets" \
 
 log_onexit cleanup
 
-log_must $ZFS snapshot $TESTPOOL/$TESTCTR@snap
-log_must $ZFS rename -r $TESTPOOL/$TESTCTR@snap $TESTPOOL/$TESTCTR@snap-new
+log_must zfs snapshot $TESTPOOL/$TESTCTR@snap
+log_must zfs rename -r $TESTPOOL/$TESTCTR@snap $TESTPOOL/$TESTCTR@snap-new
 log_must datasetexists $TESTPOOL/$TESTCTR@snap-new
 
-log_must $ZFS snapshot $TESTPOOL@snap
-log_must $ZFS rename -r $TESTPOOL@snap $TESTPOOL@snap-new
+log_must zfs snapshot $TESTPOOL@snap
+log_must zfs rename -r $TESTPOOL@snap $TESTPOOL@snap-new
 log_must datasetexists $TESTPOOL/$TESTCTR@snap-new
 log_must datasetexists $TESTPOOL@snap-new
 
-log_must $ZFS destroy -f $TESTPOOL/$TESTCTR@snap-new
-log_must $ZFS destroy -f $TESTPOOL@snap-new
+log_must zfs destroy -f $TESTPOOL/$TESTCTR@snap-new
+log_must zfs destroy -f $TESTPOOL@snap-new
 
 log_pass "Verify zfs rename -r passed when child datasets" \
 	"don't have a snapshot of the given name."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_001_pos.ksh
index d3a6a00ec6..7ec55ce0f3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,8 +48,8 @@ RESERVATION="reserve"
 function cleanup
 {
 	if datasetexists $TESTPOOL/$RESERVATION ; then
-		log_must $ZFS unmount $TESTPOOL/$RESERVATION
-		log_must $ZFS destroy $TESTPOOL/$RESERVATION
+		log_must zfs unmount $TESTPOOL/$RESERVATION
+		log_must zfs destroy $TESTPOOL/$RESERVATION
 	fi
 }
 
@@ -52,8 +57,8 @@ log_onexit cleanup
 
 log_assert "Verify that a reservation > 2^64 -1 fails."
 
-log_must $ZFS create $TESTPOOL/$RESERVATION
+log_must zfs create $TESTPOOL/$RESERVATION
 
-log_mustnot $ZFS set reservation=18446744073709551615 $TESTPOOL/$RESERVATION
+log_mustnot zfs set reservation=18446744073709551615 $TESTPOOL/$RESERVATION
 
 log_pass "Unable to set a reservation > 2^64 - 1"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_002_pos.ksh
index d308f75df6..c482f9c3c7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_reservation/zfs_reservation_002_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -50,8 +55,8 @@ function cleanup
 	for FS in $TESTPOOL/$RESERVATION $TESTPOOL/$RESERVATION2
 	do
 		if datasetexists $FS ; then
-			log_must $ZFS unmount $FS
-			log_must $ZFS destroy $FS
+			log_must zfs unmount $FS
+			log_must zfs destroy $FS
 		fi
 	done
 }
@@ -60,21 +65,21 @@ log_onexit cleanup
 
 log_assert "Ensure a reservation of 0 or 'none' is allowed."
 
-log_must $ZFS create $TESTPOOL/$RESERVATION
-log_must $ZFS create $TESTPOOL/$RESERVATION2
+log_must zfs create $TESTPOOL/$RESERVATION
+log_must zfs create $TESTPOOL/$RESERVATION2
 
-log_must $ZFS set reservation=0 $TESTPOOL/$RESERVATION
-log_must $ZFS set reservation=none $TESTPOOL/$RESERVATION2
+log_must zfs set reservation=0 $TESTPOOL/$RESERVATION
+log_must zfs set reservation=none $TESTPOOL/$RESERVATION2
 
 for FS in $TESTPOOL/$RESERVATION $TESTPOOL/$RESERVATION2
 do
 
-	reserve=`$ZFS get -pH reservation $FS | $AWK '{print $3}'`
+	reserve=`zfs get -pH reservation $FS | awk '{print $3}'`
 	if [[ $reserve -ne 0 ]]; then
 		log_fail "ZFS get -p reservation did not return 0"
 	fi
 
-	reserve=`$ZFS get -H reservation $FS | $AWK '{print $3}'`
+	reserve=`zfs get -H reservation $FS | awk '{print $3}'`
 	if [[ $reserve != "none" ]]; then
 		log_fail "ZFS get reservation did not return 'none'"
 	fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_001_pos.ksh
index 02874b33c1..19b3843e8b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
 
@@ -68,12 +72,12 @@ function test_n_check #opt num_snap_clone num_rollback
 		log_fail "Unsupported testing condition."
 
 	# Clean up the test environment
-	datasetexists $FS && log_must $ZFS destroy -Rf $FS
+	datasetexists $FS && log_must zfs destroy -Rf $FS
 	if datasetexists $VOL; then
-		$DF -lhF ufs "/dev/zvol/dsk/$VOL" > /dev/null 2>&1
-		(( $? == 0 )) && log_must $UMOUNT -f $TESTDIR1
+		df -lhF ufs "/dev/zvol/dsk/$VOL" > /dev/null 2>&1
+		(( $? == 0 )) && log_must umount -f $TESTDIR1
 
-		log_must $ZFS destroy -Rf $VOL
+		log_must zfs destroy -Rf $VOL
 	fi
 
 	# Create specified test environment
@@ -113,12 +117,12 @@ function test_n_check #opt num_snap_clone num_rollback
 		fi
 
 		if [[ $dtst == $VOL ]]; then
-			log_must $UMOUNT -f $TESTDIR1
-			log_must $ZFS rollback $opt $dtst@$snap_point
-			log_must $MOUNT \
+			log_must umount -f $TESTDIR1
+			log_must zfs rollback $opt $dtst@$snap_point
+			log_must mount \
 				/dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR1
 		else
-			log_must $ZFS rollback $opt $dtst@$snap_point
+			log_must zfs rollback $opt $dtst@$snap_point
 		fi
 
 		for snap in $all_snap; do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_002_pos.ksh
index 8da658934e..659660dc0f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
 
@@ -53,11 +57,11 @@ setup_snap_env 1
 #
 write_mountpoint_dir ${FSSNAP0%%@*}
 
-log_must $ZFS rollback $FSSNAP0
-log_must $ZFS rollback -f $FSSNAP0
+log_must zfs rollback $FSSNAP0
+log_must zfs rollback -f $FSSNAP0
 log_must datasetexists $FSSNAP0
 
-$PKILL ${DD##*/}
+pkill ${DD##*/}
 
 check_files $FSSNAP0
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh
index 1115ea630b..1e4dda3783 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
 
@@ -45,10 +49,10 @@ verify_runnable "both"
 
 function cleanup
 {
-	$PKILL ${DD##*/}
+	pkill ${DD##*/}
 	for snap in $FSSNAP0 $FSSNAP1 $FSSNAP2; do
 		if snapexists $snap; then
-			log_must $ZFS destroy -Rf $snap
+			log_must zfs destroy -Rf $snap
 		fi
 	done
 }
@@ -64,8 +68,8 @@ create_snapshot $TESTPOOL/$TESTFS $TESTSNAP1
 
 # Run 'zfs rollback ""|-f <snap>' and it should fail.
 #
-log_mustnot $ZFS rollback $TESTPOOL/$TESTFS@$TESTSNAP
-log_mustnot $ZFS rollback -f $TESTPOOL/$TESTFS@$TESTSNAP
+log_mustnot zfs rollback $TESTPOOL/$TESTFS@$TESTSNAP
+log_mustnot zfs rollback -f $TESTPOOL/$TESTFS@$TESTSNAP
 
 # Create 'clone1' based on 'snap1'.
 #
@@ -73,8 +77,8 @@ create_clone $TESTPOOL/$TESTFS@$TESTSNAP1 $TESTPOOL/$TESTCLONE1
 
 # Run 'zfs rollback -r|-rf <snap>' and it should fail.
 #
-log_mustnot $ZFS rollback -r $TESTPOOL/$TESTFS@$TESTSNAP
-log_mustnot $ZFS rollback -rf $TESTPOOL/$TESTFS@$TESTSNAP
+log_mustnot zfs rollback -r $TESTPOOL/$TESTFS@$TESTSNAP
+log_mustnot zfs rollback -rf $TESTPOOL/$TESTFS@$TESTSNAP
 
 log_pass "zfs rollback ''|-f|-r|-rf will fail in different conditions " \
 	"passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_004_neg.ksh
index a0aab07899..0c1bb730e7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_004_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
 
@@ -48,7 +52,7 @@ function cleanup
 
 	for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL; do
 		if snapexists ${ds}@$TESTSNAP; then
-			log_must $ZFS destroy ${ds}@$TESTSNAP
+			log_must zfs destroy ${ds}@$TESTSNAP
 		fi
 	done
 }
@@ -60,21 +64,21 @@ log_onexit cleanup
 set -A badopts "r" "R" "f" "-F" "-rF" "-RF" "-fF" "-?" "-*" "-blah" "-1" "-2"
 
 for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL; do
-	log_must $ZFS snapshot ${ds}@$TESTSNAP
+	log_must zfs snapshot ${ds}@$TESTSNAP
 done
 
 for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL; do
 	for opt in "" "-r" "-R" "-f" "-rR" "-rf" "-rRf"; do
-		log_mustnot eval "$ZFS rollback $opt $ds >/dev/null 2>&1"
-		log_mustnot eval "$ZFS rollback $opt ${ds}@$TESTSNAP \
+		log_mustnot eval "zfs rollback $opt $ds >/dev/null 2>&1"
+		log_mustnot eval "zfs rollback $opt ${ds}@$TESTSNAP \
 			${ds}@$TESTSNAP >/dev/null 2>&1"
-		log_mustnot eval "$ZFS rollback $opt >/dev/null 2>&1"
+		log_mustnot eval "zfs rollback $opt >/dev/null 2>&1"
 		# zfs rollback should fail with non-existen snapshot
-		log_mustnot eval "$ZFS rollback $opt ${ds}@nosnap >/dev/null 2>&1"
+		log_mustnot eval "zfs rollback $opt ${ds}@nosnap >/dev/null 2>&1"
 	done
 
 	for badopt in ${badopts[@]}; do
-		log_mustnot eval "$ZFS rollback $badopt ${ds}@$TESTSNAP \
+		log_mustnot eval "zfs rollback $badopt ${ds}@$TESTSNAP \
 				>/dev/null 2>&1"
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
index 63b998a374..f08ae1abdd 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -38,7 +38,7 @@ function getsum #fname
 {
 	(( ${#1} == 0 )) && \
 		log_fail "Need give file name."
-	return $($SUM $1 | $AWK '{print $1}')
+	return $(sum $1 | awk '{print $1}')
 }
 
 # Define global variable checksum, get the original file sum.
@@ -58,12 +58,12 @@ function setup_snap_env
 	typeset createclone=${2:-"false"}
 
 	if datasetnonexists $FS; then
-		log_must $ZFS create $FS
-		log_must $ZFS set mountpoint=$TESTDIR $FS
+		log_must zfs create $FS
+		log_must zfs set mountpoint=$TESTDIR $FS
 	fi
 	# Volume can't be created in Local Zone.
 	if datasetnonexists $VOL && is_global_zone; then
-		log_must $ZFS create -V $VOLSIZE $VOL
+		log_must zfs create -V $VOLSIZE $VOL
 	fi
 
 	# Make sure $VOL is volume
@@ -75,16 +75,16 @@ function setup_snap_env
 		# mount it. Otherwise, only check if this ufs file system
 		# was mounted.
 		#
-		log_must eval "$ECHO "y" | \
-			$NEWFS -v /dev/zvol/dsk/$VOL > /dev/null 2>&1"
+		log_must eval "echo "y" | \
+			newfs -v /dev/zvol/dsk/$VOL > /dev/null 2>&1"
 
-		[[ ! -d $TESTDIR1 ]] && log_must $MKDIR $TESTDIR1
+		[[ ! -d $TESTDIR1 ]] && log_must mkdir $TESTDIR1
 
 		# Make sure the ufs filesystem hasn't been mounted,
 		# then mount the new ufs filesystem.
-		$DF -lhF ufs "/dev/zvol/dsk/$VOL" > /dev/null 2>&1
+		df -lhF ufs "/dev/zvol/dsk/$VOL" > /dev/null 2>&1
 		if (( $? != 0 )); then
-			log_must $MOUNT \
+			log_must mount \
 				/dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR1
 		fi
 	fi
@@ -116,7 +116,7 @@ function setup_snap_env
 			esac
 
 			if datasetnonexists $snap; then
-				log_must $CP /etc/passwd $fname
+				log_must cp /etc/passwd $fname
 				#
 				# using 'lockfs -f' to flush the writes to disk
 				# before taking a snapshot.
@@ -124,11 +124,11 @@ function setup_snap_env
 				if [[ $dtst == $VOL ]]; then
 					log_must /usr/sbin/lockfs -f $TESTDIR1
 				fi
-				log_must $ZFS snapshot $snap
+				log_must zfs snapshot $snap
 			fi
 			if [[ $createclone == "true" ]]; then
 				if datasetnonexists $clone; then
-					log_must $ZFS clone $snap $clone
+					log_must zfs clone $snap $clone
 				fi
 			fi
 			(( ind += 1 ))
@@ -153,33 +153,33 @@ function cleanup_env
 	typeset dtst
 	typeset snap
 
-	$PKILL ${DD##*/}
+	pkill ${DD##*/}
 
-	$DF -lhF ufs "/dev/zvol/dsk/$VOL" > /dev/null 2>&1
+	df -lhF ufs "/dev/zvol/dsk/$VOL" > /dev/null 2>&1
 	if (( $? == 0 )); then
-		log_must $UMOUNT -f $TESTDIR1
+		log_must umount -f $TESTDIR1
 	fi
 
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
-	[[ -d $TESTDIR1 ]] && log_must $RM -rf $TESTDIR1/*
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR/*
+	[[ -d $TESTDIR1 ]] && log_must rm -rf $TESTDIR1/*
 
 	for dtst in $FS $VOL; do
 		for snap in $TESTSNAP $TESTSNAP1 $TESTSNAP2; do
 			if snapexists $dtst@$snap; then
-				 log_must $ZFS destroy -Rf $dtst@$snap
+				 log_must zfs destroy -Rf $dtst@$snap
 			fi
 		done
 	done
 
 	# Restore original test environment
 	if datasetnonexists $FS ; then
-		log_must $ZFS create $FS
+		log_must zfs create $FS
 	fi
 	if datasetnonexists $VOL ; then
 		if is_global_zone ; then
-			log_must $ZFS create -V $VOLSIZE $VOL
+			log_must zfs create -V $VOLSIZE $VOL
 		else
-			log_must $ZFS create $VOL
+			log_must zfs create $VOL
 		fi
 	fi
 }
@@ -300,6 +300,6 @@ function write_mountpoint_dir
 		dir=$TESTDIR1
 		log_must ismounted $dir "ufs"
 	fi
-	$DD if=/dev/urandom of=$dir/$TESTFILE1 &
-	log_must $SLEEP 3
+	dd if=/dev/urandom of=$dir/$TESTFILE1 &
+	log_must sleep 3
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_001_pos.ksh
index 0f3ae6143f..f28ce06fd7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
@@ -51,21 +51,21 @@ function cleanup
 {
 	for snap in $init_snap $inc_snap $rst_snap $rst_inc_snap; do
                 snapexists $snap && \
-                        log_must $ZFS destroy -f $snap
+                        log_must zfs destroy -f $snap
         done
 
 	datasetexists $rst_root && \
-		log_must $ZFS destroy -Rf $rst_root
+		log_must zfs destroy -Rf $rst_root
 
 	for file in $full_bkup $inc_bkup \
 			$init_data $inc_data
 	do
 		[[ -e $file ]] && \
-			log_must $RM -f $file
+			log_must rm -f $file
 	done
 
 	[[ -d $TESTDIR1 ]] && \
-		log_must $RM -rf $TESTDIR1
+		log_must rm -rf $TESTDIR1
 
 }
 
@@ -90,37 +90,37 @@ rst_inc_data=$TESTDIR1/$TESTFS/$TESTFILE2
 log_note "Verify 'zfs send' can create full send stream."
 
 #Pre-paration
-log_must $ZFS create $rst_root
+log_must zfs create $rst_root
 [[ ! -d $TESTDIR1 ]] && \
-	log_must $MKDIR -p $TESTDIR1
-log_must $ZFS set mountpoint=$TESTDIR1 $rst_root
+	log_must mkdir -p $TESTDIR1
+log_must zfs set mountpoint=$TESTDIR1 $rst_root
 
-$FILE_WRITE -o create -f $init_data -b $BLOCK_SIZE -c $WRITE_COUNT
+file_write -o create -f $init_data -b $BLOCK_SIZE -c $WRITE_COUNT
 
-log_must $ZFS snapshot $init_snap
-$ZFS send $init_snap > $full_bkup
+log_must zfs snapshot $init_snap
+zfs send $init_snap > $full_bkup
 (( $? != 0 )) && \
-	log_fail "'$ZFS send' fails to create full send"
+	log_fail "'zfs send' fails to create full send"
 
 log_note "Verify the send stream is valid to receive."
 
-log_must $ZFS receive $rst_snap <$full_bkup
+log_must zfs receive $rst_snap <$full_bkup
 receive_check $rst_snap ${rst_snap%%@*}
 compare_cksum $init_data $rst_data
 
 log_note "Verify 'zfs send -i' can create incremental send stream."
 
-$FILE_WRITE -o create -f $inc_data -b $BLOCK_SIZE -c $WRITE_COUNT -d 0
+file_write -o create -f $inc_data -b $BLOCK_SIZE -c $WRITE_COUNT -d 0
 
-log_must $ZFS snapshot $inc_snap
-$ZFS send -i $init_snap $inc_snap > $inc_bkup
+log_must zfs snapshot $inc_snap
+zfs send -i $init_snap $inc_snap > $inc_bkup
 (( $? != 0 )) && \
-	log_fail "'$ZFS send -i' fails to create incremental send"
+	log_fail "'zfs send -i' fails to create incremental send"
 
 log_note "Verify the incremental send stream is valid to receive."
 
-log_must $ZFS rollback $rst_snap
-log_must $ZFS receive $rst_inc_snap <$inc_bkup
+log_must zfs rollback $rst_snap
+log_must zfs receive $rst_inc_snap <$inc_bkup
 receive_check $rst_inc_snap
 compare_cksum $inc_data $rst_inc_data
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_002_pos.ksh
index b542bf9dac..0c21e4175f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
@@ -49,16 +49,16 @@ verify_runnable "both"
 function cleanup
 {
 	snapexists $snap && \
-		log_must $ZFS destroy $snap
+		log_must zfs destroy $snap
 
 	datasetexists $ctr && \
-		log_must $ZFS destroy -r $ctr
+		log_must zfs destroy -r $ctr
 
 	[[ -e $origfile ]] && \
-		log_must $RM -f $origfile
+		log_must rm -f $origfile
 
 	[[ -e $stream ]] && \
-		log_must $RM -f $stream
+		log_must rm -f $stream
 }
 
 function do_testing # <prop> <prop_value>
@@ -66,21 +66,21 @@ function do_testing # <prop> <prop_value>
 	typeset property=$1
 	typeset prop_val=$2
 
-	log_must $ZFS set $property=$prop_val $fs
-	$FILE_WRITE -o create -f $origfile -b $BLOCK_SIZE -c $WRITE_COUNT
-	log_must $ZFS snapshot $snap
-	$ZFS send $snap > $stream
+	log_must zfs set $property=$prop_val $fs
+	file_write -o create -f $origfile -b $BLOCK_SIZE -c $WRITE_COUNT
+	log_must zfs snapshot $snap
+	zfs send $snap > $stream
 	(( $? != 0 )) && \
-		log_fail "'$ZFS send' fails to create send streams."
-	$ZFS receive -d $ctr <$stream
+		log_fail "'zfs send' fails to create send streams."
+	zfs receive -d $ctr <$stream
 	(( $? != 0 )) && \
-		log_fail "'$ZFS receive' fails to receive send streams."
+		log_fail "'zfs receive' fails to receive send streams."
 
 	#verify receive result
 	! datasetexists $rstfs && \
-		log_fail "'$ZFS receive' fails to restore $rstfs"
+		log_fail "'zfs receive' fails to restore $rstfs"
 	! snapexists $rstfssnap && \
-		log_fail "'$ZFS receive' fails to restore $rstfssnap"
+		log_fail "'zfs receive' fails to restore $rstfssnap"
 	if [[ ! -e $rstfile ]] || [[ ! -e $rstsnapfile ]]; then
 		log_fail " Data lost after receiving stream"
 	fi
@@ -89,13 +89,13 @@ function do_testing # <prop> <prop_value>
 	compare_cksum $origsnapfile $rstsnapfile
 
 	#Destroy datasets and stream for next testing
-	log_must $ZFS destroy $snap
+	log_must zfs destroy $snap
 	if is_global_zone ; then
-		log_must $ZFS destroy -r $rstfs
+		log_must zfs destroy -r $rstfs
 	else
-		log_must $ZFS destroy -r $ds_path
+		log_must zfs destroy -r $ds_path
 	fi
-	log_must $RM -f $stream
+	log_must rm -f $stream
 }
 
 log_assert "Verify 'zfs send' generates valid streams with a property setup"
@@ -123,7 +123,7 @@ set -A propval "on lzjb" "on fletcher2 fletcher4 sha256" \
 	"512 1k 4k 8k 16k 32k 64k 128k"
 
 #Create a dataset to receive the send stream
-log_must $ZFS create $ctr
+log_must zfs create $ctr
 
 typeset -i i=0
 while (( i < ${#props[*]} ))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_003_pos.ksh
index 749f0740f1..825a10d0f8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -40,8 +44,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	datasetexists $snap1 && log_must $ZFS destroy $snap1
-	datasetexists $snap2 && log_must $ZFS destroy $snap2
+	datasetexists $snap1 && log_must zfs destroy $snap1
+	datasetexists $snap2 && log_must zfs destroy $snap2
 }
 
 log_assert "'zfs send -i' can deal with abbreviated snapshot name."
@@ -52,12 +56,12 @@ snap1=$TESTPOOL/$TESTFS@snap1; snap2=$TESTPOOL/$TESTFS@snap2
 set -A args "$snap1 $snap2" \
 	"${snap1##*@} $snap2" "@${snap1##*@} $snap2"
 
-log_must $ZFS snapshot $snap1
-log_must $ZFS snapshot $snap2
+log_must zfs snapshot $snap1
+log_must zfs snapshot $snap2
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_must eval "$ZFS send -i ${args[i]} > /dev/null"
+	log_must eval "zfs send -i ${args[i]} > /dev/null"
 
 	(( i += 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh
index 4f0bf2b5c3..da14fa2fa6 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/cli_common.kshlib
 
 #
@@ -45,12 +49,12 @@ function cleanup
 
 	for snap in $snap1 $snap2 $snap3; do
 		snapexists $snap && \
-			log_must $ZFS destroy -f $snap
+			log_must zfs destroy -f $snap
 	done
 
 	for f in $tmpfile1 $tmpfile2; do
 		if [[ -e $f ]]; then
-			$RM -f $f
+			rm -f $f
 		fi
 	done
 }
@@ -81,25 +85,25 @@ set -A badargs \
 log_assert "Verify that invalid parameters to 'zfs send' are caught."
 log_onexit cleanup
 
-log_must $ZFS snapshot $snap1
+log_must zfs snapshot $snap1
 tmpfile1=$TESTDIR/testfile1.$$
-log_must $TOUCH $tmpfile1
-log_must $ZFS snapshot $snap2
+log_must touch $tmpfile1
+log_must zfs snapshot $snap2
 tmpfile2=$TESTDIR/testfile2.$$
-log_must $TOUCH $tmpfile2
-log_must $ZFS snapshot $snap3
+log_must touch $tmpfile2
+log_must zfs snapshot $snap3
 
 typeset -i i=0
 while (( i < ${#badargs[*]} ))
 do
-	log_mustnot eval "$ZFS send ${badargs[i]} >/dev/null"
+	log_mustnot eval "zfs send ${badargs[i]} >/dev/null"
 
 	(( i = i + 1 ))
 done
 
 #Testing zfs send fails by send backup stream to terminal
 for arg in "$snap1" "-i $snap1 $snap2"; do
-	log_mustnot eval "$ZFS send $arg >/dev/console"
+	log_mustnot eval "zfs send $arg >/dev/console"
 done
 
 log_pass "Invalid parameters to 'zfs send' are caught as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_005_pos.ksh
index ffabfe1800..f24ce7f922 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,21 +46,21 @@ verify_runnable "both"
 
 function cleanup
 {
-	poolexists $TESTPOOL && log_must $ZPOOL export $TESTPOOL
-	log_must $ZPOOL import $TESTPOOL
+	poolexists $TESTPOOL && log_must zpool export $TESTPOOL
+	log_must zpool import $TESTPOOL
 
 	datasetexists $TESTPOOL@snap && \
-	    log_must $ZFS destroy -r $TESTPOOL@snap
+	    log_must zfs destroy -r $TESTPOOL@snap
 }
 
 log_assert "'zfs send -R' can send from read-only pools"
 log_onexit cleanup
 
-log_must $ZFS snapshot -r $TESTPOOL@snap
+log_must zfs snapshot -r $TESTPOOL@snap
 
-log_must $ZPOOL export $TESTPOOL
-log_must $ZPOOL import -o readonly=on $TESTPOOL
+log_must zpool export $TESTPOOL
+log_must zpool import -o readonly=on $TESTPOOL
 
-log_must eval "$ZFS send -R $TESTPOOL@snap >/dev/null"
+log_must eval "zfs send -R $TESTPOOL@snap >/dev/null"
 
 log_pass "'zfs send -R' can send from read-only pools"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_006_pos.ksh
index 7580c6d6f4..801633e1fe 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_006_pos.ksh
@@ -15,7 +15,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -37,15 +37,15 @@ verify_runnable "both"
 function cleanup
 {
 	for ds in $datasets; do
-                datasetexists $ds && $ZFS destroy -rf $ds
+                datasetexists $ds && zfs destroy -rf $ds
 	done
 }
 
 function cal_percentage
 {
 	typeset value=$1
-	return=$($ECHO "$PERCENT * $value" | bc)
-	return=$($ECHO "$return / 100" | bc)
+	return=$(echo "$PERCENT * $value" | bc)
+	return=$(echo "$return / 100" | bc)
 	echo $return
 }
 
@@ -55,19 +55,19 @@ function get_estimate_size
 	typeset option=$2
 	typeset base_snapshot=${3:-""}
 	if [[ -z $3 ]];then
-		typeset total_size=$($ZFS send $option $snapshot 2>&1 | $TAIL -1)
+		typeset total_size=$(zfs send $option $snapshot 2>&1 | tail -1)
 	else
-		typeset total_size=$($ZFS send $option $base_snapshot $snapshot \
-		     2>&1 | $TAIL -1)
+		typeset total_size=$(zfs send $option $base_snapshot $snapshot \
+		     2>&1 | tail -1)
 	fi
 	if [[ $options == *"P"* ]]; then
-		total_size=$($ECHO "$total_size" | $AWK '{print $2}')
+		total_size=$(echo "$total_size" | awk '{print $2}')
 	else
-		total_size=$($ECHO "$total_size" | $AWK '{print $5}')
+		total_size=$(echo "$total_size" | awk '{print $5}')
 		total_size=${total_size%M}
-		total_size=$($ECHO "$total_size * $block_count" | bc)
+		total_size=$(echo "$total_size * $block_count" | bc)
 	fi
-	$ECHO $total_size
+	echo $total_size
 
 }
 
@@ -75,12 +75,12 @@ function verify_size_estimates
 {
 	typeset options=$1
 	typeset file_size=$2
-	typeset refer_diff=$($ECHO "$refer_size - $estimate_size" | bc)
-	refer_diff=$($ECHO "$refer_diff / 1" | bc)
-	refer_diff=$($ECHO "$refer_diff" | $NAWK '{print ($1 < 0) ? ($1 * -1): $1'})
-	typeset file_diff=$($ECHO "$file_size - $estimate_size" | bc)
-	file_diff=$($ECHO "$file_diff / 1" | bc)
-	file_diff=$($ECHO "$file_diff" | $NAWK '{print ($1 < 0) ? ($1 * -1):$1'})
+	typeset refer_diff=$(echo "$refer_size - $estimate_size" | bc)
+	refer_diff=$(echo "$refer_diff / 1" | bc)
+	refer_diff=$(echo "$refer_diff" | nawk '{print ($1 < 0) ? ($1 * -1): $1'})
+	typeset file_diff=$(echo "$file_size - $estimate_size" | bc)
+	file_diff=$(echo "$file_diff / 1" | bc)
+	file_diff=$(echo "$file_diff" | nawk '{print ($1 < 0) ? ($1 * -1):$1'})
 	typeset expected_diff=$(cal_percentage $refer_size)
 
 	[[ -z $refer_diff && -z $file_diff && -z $expected_diff ]] && \
@@ -99,21 +99,21 @@ typeset -i PERCENT=1
 ((block_count=1024*1024))
 
 # create dataset
-log_must $ZFS create $TESTPOOL/$TESTFS1
+log_must zfs create $TESTPOOL/$TESTFS1
 
 # create multiple snapshot for the dataset with data
 for block_size in 64 128 256; do
-	log_must $DD if=/dev/urandom of=/$TESTPOOL/$TESTFS1/file$block_size \
+	log_must dd if=/dev/urandom of=/$TESTPOOL/$TESTFS1/file$block_size \
 	    bs=1M count=$block_size
-	log_must $ZFS snapshot $TESTPOOL/$TESTFS1@snap$block_size
+	log_must zfs snapshot $TESTPOOL/$TESTFS1@snap$block_size
 done
 
 full_snapshot="$TESTPOOL/$TESTFS1@snap64"
 increamental_snapshot="$TESTPOOL/$TESTFS1@snap256"
 
-full_size=$($ZFS send $full_snapshot 2>&1 | wc -c)
-increamental_size=$($ZFS send $increamental_snapshot 2>&1 | wc -c)
-increamental_send=$($ZFS send -i $full_snapshot $increamental_snapshot 2>&1 | wc -c)
+full_size=$(zfs send $full_snapshot 2>&1 | wc -c)
+increamental_size=$(zfs send $increamental_snapshot 2>&1 | wc -c)
+increamental_send=$(zfs send -i $full_snapshot $increamental_snapshot 2>&1 | wc -c)
 
 log_note "verify zfs send -nv"
 options="-nv"
@@ -144,7 +144,7 @@ log_note "verify zfs send -inv for increamental send"
 options="-nvi"
 refer_size=$(get_prop refer $increamental_snapshot)
 deduct_size=$(get_prop refer $full_snapshot)
-refer_size=$($ECHO "$refer_size - $deduct_size" | bc)
+refer_size=$(echo "$refer_size - $deduct_size" | bc)
 
 estimate_size=$(get_estimate_size $increamental_snapshot $options $full_snapshot)
 log_must verify_size_estimates $options $increamental_send
@@ -155,33 +155,33 @@ options="-vPni"
 estimate_size=$(get_estimate_size $increamental_snapshot $options $full_snapshot)
 log_must verify_size_estimates $options $increamental_send
 
-log_must $ZFS destroy -r $TESTPOOL/$TESTFS1
+log_must zfs destroy -r $TESTPOOL/$TESTFS1
 
 #setup_recursive_send
 datasets="$TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS1/$TESTFS2
     $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3"
 # create nested datasets
-log_must $ZFS create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
+log_must zfs create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3
 
 # verify dataset creation
 for ds in $datasets; do
         datasetexists $ds || log_fail "Create $ds dataset fail."
 done
 for ds in $datasets; do
-	log_must $DD if=/dev/urandom of=/$ds/file64 \
+	log_must dd if=/dev/urandom of=/$ds/file64 \
 	    bs=1M count=64
 done
 
 # create recursive nested snapshot
-log_must $ZFS snapshot -r $TESTPOOL/$TESTFS1@snap64
+log_must zfs snapshot -r $TESTPOOL/$TESTFS1@snap64
 for ds in $datasets; do
         datasetexists $ds@snap64 || log_fail "Create $ds@snap64 snapshot fail."
 done
-recursive_size=$($ZFS send -R $full_snapshot 2>&1 | wc -c)
+recursive_size=$(zfs send -R $full_snapshot 2>&1 | wc -c)
 log_note "verify zfs send -Rnv for recursive send"
 options="-Rnv"
 refer_size=$(get_prop refer $full_snapshot)
-refer_size=$($ECHO "$refer_size * 3" | bc)
+refer_size=$(echo "$refer_size * 3" | bc)
 
 estimate_size=$(get_estimate_size $full_snapshot $options)
 log_must verify_size_estimates $options $recursive_size
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh
index 13ae4f0248..2b99089e09 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_007_pos.ksh
@@ -38,11 +38,11 @@ verify_runnable "both"
 
 function cleanup
 {
-	$ZFS destroy -rf $TESTPOOL/fs
-	$ZFS destroy -rf $TESTPOOL/recvfs
-	$RM $streamfile
-	$RM $vdev
-	$ZPOOL destroy testpool
+	zfs destroy -rf $TESTPOOL/fs
+	zfs destroy -rf $TESTPOOL/recvfs
+	rm $streamfile
+	rm $vdev
+	zpool destroy tmp_pool
 }
 
 
@@ -55,45 +55,44 @@ vdev=$(mktemp /var/tmp/file.XXXXXX)
 test_pool ()
 {
 	POOL=$1
-	log_must $ZFS create -o recordsize=512 $POOL/fs
+	log_must zfs create -o recordsize=512 $POOL/fs
 	mntpnt=$(get_prop mountpoint "$POOL/fs")
-	log_must $DD if=/dev/urandom of=${mntpnt}/file bs=512 count=1 2>/dev/null
+	log_must dd if=/dev/urandom of=${mntpnt}/file bs=512 count=1 2>/dev/null
 	first_object=$(ls -i $mntpnt | awk '{print $1}')
-	log_must $ZFS snapshot $POOL/fs@a
+	log_must zfs snapshot $POOL/fs@a
 	while true; do
-		log_must $FIND $mntpnt -delete
+		log_must find $mntpnt -delete
 		sync
-		log_must $MKFILES "$mntpnt/" 4000
+		log_must mkfiles "$mntpnt/" 4000
 		FILE=$(ls -i $mntpnt | awk \
 			'{if ($1 == '$first_object') {print $2}}')
 		if [[ -n "$FILE" ]]; then
 			break
 		fi
 	done
-	$DD if=/dev/urandom of=${mntpnt}/$FILE bs=512 count=1 seek=1 2>/dev/null
+	dd if=/dev/urandom of=${mntpnt}/$FILE bs=512 count=1 seek=1 2>/dev/null
 
-	log_must $ZFS snapshot $POOL/fs@b
+	log_must zfs snapshot $POOL/fs@b
 
-	log_must eval "$ZFS send $POOL/fs@a > $streamfile"
-	$CAT $streamfile | log_must $ZFS receive $POOL/recvfs
+	log_must eval "zfs send $POOL/fs@a > $streamfile"
+	cat $streamfile | log_must zfs receive $POOL/recvfs
 
-	log_must eval "$ZFS send -i @a $POOL/fs@b > $streamfile"
-	$CAT $streamfile | log_must $ZFS receive $POOL/recvfs
+	log_must eval "zfs send -i @a $POOL/fs@b > $streamfile"
+	cat $streamfile | log_must zfs receive $POOL/recvfs
 
 	recv_mntpnt=$(get_prop mountpoint "$POOL/recvfs")
-	log_must $DIFF -r $mntpnt $recv_mntpnt
-	log_must $ZFS destroy -rf $POOL/fs
-	log_must $ZFS destroy -rf $POOL/recvfs
+	log_must diff -r $mntpnt $recv_mntpnt
+	log_must zfs destroy -rf $POOL/fs
+	log_must zfs destroy -rf $POOL/recvfs
 }
 
 test_pool $TESTPOOL
-log_must $TRUNCATE --size=1G $vdev
-log_must $ZPOOL create -o version=1 testpool $vdev
-test_pool testpool
-log_must $ZPOOL destroy testpool
-log_must $ZPOOL create -d testpool $vdev
-test_pool testpool
-log_must $ZPOOL destroy testpool
-
+log_must truncate --size=1G $vdev
+log_must zpool create -o version=1 tmp_pool $vdev
+test_pool tmp_pool
+log_must zpool destroy tmp_pool
+log_must zpool create -d tmp_pool $vdev
+test_pool tmp_pool
+log_must zpool destroy tmp_pool
 
 log_pass "'zfs send' drills appropriate holes"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh
index 653f31acd0..5fbc8bf716 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
@@ -53,7 +57,7 @@ do
 	while (( i < ${#dataset[@]} )); do
 		j=0
 		while (( j < ${#values[@]} )); do
-			log_mustnot $ZFS set $propname=${values[j]} ${dataset[i]}
+			log_mustnot zfs set $propname=${values[j]} ${dataset[i]}
 			(( j += 1 ))
 		done
 		(( i += 1 ))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_001_pos.ksh
index de219c4f18..dd3397f015 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
@@ -60,19 +64,19 @@ set -A values "on" "off"
 function cleanup
 {
 	if snapexists $TESTPOOL/$TESTFS@$TESTSNAP ; then
-		log_must $ZFS destroy -R $TESTPOOL/$TESTFS@$TESTSNAP
+		log_must zfs destroy -R $TESTPOOL/$TESTFS@$TESTSNAP
 	fi
 	if snapexists $TESTPOOL/$TESTVOL@$TESTSNAP ; then
-		log_must $ZFS destroy -R $TESTPOOL/$TESTVOL@$TESTSNAP
+		log_must zfs destroy -R $TESTPOOL/$TESTVOL@$TESTSNAP
 	fi
 
 	[[ -n $old_ctr_canmount ]] && \
-		log_must $ZFS set canmount=$old_ctr_canmount $TESTPOOL/$TESTCTR
+		log_must zfs set canmount=$old_ctr_canmount $TESTPOOL/$TESTCTR
 	[[ -n $old_fs_canmount ]] && \
-		log_must $ZFS set canmount=$old_fs_canmount $TESTPOOL/$TESTFS
+		log_must zfs set canmount=$old_fs_canmount $TESTPOOL/$TESTFS
 
-	$ZFS unmount -a > /dev/null 2>&1
-	log_must $ZFS mount -a
+	zfs unmount -a > /dev/null 2>&1
+	log_must zfs mount -a
 }
 
 log_assert "Setting a valid property of canmount to file system, it must be successful."
@@ -87,21 +91,21 @@ old_ctr_canmount=$(get_prop canmount $TESTPOOL/$TESTCTR)
 [[ $? != 0 ]] && \
 	log_fail "Get the $TESTPOOL/$TESTCTR canmount error."
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
-log_must $ZFS snapshot $TESTPOOL/$TESTVOL@$TESTSNAP
-log_must $ZFS clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
-log_must $ZFS clone $TESTPOOL/$TESTVOL@$TESTSNAP $TESTPOOL/$TESTCLONE1
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_must zfs snapshot $TESTPOOL/$TESTVOL@$TESTSNAP
+log_must zfs clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
+log_must zfs clone $TESTPOOL/$TESTVOL@$TESTSNAP $TESTPOOL/$TESTCLONE1
 
 for dataset in "${dataset_pos[@]}" ; do
 	for value in "${values[@]}" ; do
 		set_n_check_prop "$value" "canmount" "$dataset"
 		if [[ $value == "off" ]]; then
 			log_mustnot ismounted $dataset
-			log_mustnot $ZFS mount $dataset
+			log_mustnot zfs mount $dataset
 			log_mustnot ismounted $dataset
 		else
 			if ! ismounted $dataset ; then
-				log_must $ZFS mount $dataset
+				log_must zfs mount $dataset
 			fi
 			log_must ismounted $dataset
 		fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh
index 447a9e8034..7cbcf7903e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -65,8 +65,8 @@ function cleanup
 	while (( i < ${#dataset_pos[*]} )); do
 		ds=${dataset_pos[i]}
 		if datasetexists $ds; then
-			log_must $ZFS set mountpoint=${old_mnt[i]} $ds
-			log_must $ZFS set canmount=${old_canmount[i]} $ds
+			log_must zfs set mountpoint=${old_mnt[i]} $ds
+			log_must zfs set canmount=${old_canmount[i]} $ds
 		fi
 		(( i = i + 1 ))
 	done
@@ -74,24 +74,24 @@ function cleanup
 	ds=$TESTPOOL/$TESTCLONE
 	if datasetexists $ds; then
 		mntp=$(get_prop mountpoint $ds)
-		log_must $ZFS destroy $ds
+		log_must zfs destroy $ds
 		if [[ -d $mntp ]]; then
-			$RM -fr $mntp
+			rm -fr $mntp
 		fi
 	fi
 
 	if snapexists $TESTPOOL/$TESTFS@$TESTSNAP ; then
-		log_must $ZFS destroy -R $TESTPOOL/$TESTFS@$TESTSNAP
+		log_must zfs destroy -R $TESTPOOL/$TESTFS@$TESTSNAP
 	fi
 	if snapexists $TESTPOOL/$TESTVOL@$TESTSNAP ; then
-		log_must $ZFS destroy -R $TESTPOOL/$TESTVOL@$TESTSNAP
+		log_must zfs destroy -R $TESTPOOL/$TESTVOL@$TESTSNAP
 	fi
 
-	$ZFS unmount -a > /dev/null 2>&1
-	log_must $ZFS mount -a
+	zfs unmount -a > /dev/null 2>&1
+	log_must zfs mount -a
 
 	if [[ -d $tmpmnt ]]; then
-		$RM -fr $tmpmnt
+		rm -fr $tmpmnt
 	fi
 }
 
@@ -103,10 +103,10 @@ set -A old_canmount
 typeset tmpmnt=/tmpmount$$
 typeset ds
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
-log_must $ZFS snapshot $TESTPOOL/$TESTVOL@$TESTSNAP
-log_must $ZFS clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
-log_must $ZFS clone $TESTPOOL/$TESTVOL@$TESTSNAP $TESTPOOL/$TESTCLONE1
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_must zfs snapshot $TESTPOOL/$TESTVOL@$TESTSNAP
+log_must zfs clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
+log_must zfs clone $TESTPOOL/$TESTVOL@$TESTSNAP $TESTPOOL/$TESTCLONE1
 
 typeset -i i=0
 while (( i < ${#dataset_pos[*]} )); do
@@ -120,25 +120,25 @@ i=0
 while (( i < ${#dataset_pos[*]} )) ; do
 	dataset=${dataset_pos[i]}
 	set_n_check_prop "noauto" "canmount" "$dataset"
-	log_must $ZFS set mountpoint=$tmpmnt $dataset
+	log_must zfs set mountpoint=$tmpmnt $dataset
 	if  ismounted $dataset; then
-		$ZFS unmount -a > /dev/null 2>&1
+		zfs unmount -a > /dev/null 2>&1
 		log_must mounted $dataset
-		log_must $ZFS unmount $dataset
+		log_must zfs unmount $dataset
 		log_must unmounted $dataset
-		log_must $ZFS mount -a
+		log_must zfs mount -a
 		log_must unmounted $dataset
 	else
-		log_must $ZFS mount -a
+		log_must zfs mount -a
 		log_must unmounted $dataset
-		$ZFS unmount -a > /dev/null 2>&1
+		zfs unmount -a > /dev/null 2>&1
 		log_must unmounted $dataset
 	fi
 
-	log_must $ZFS mount $dataset
+	log_must zfs mount $dataset
 	log_must mounted $dataset
-	log_must $ZFS set canmount="${old_canmount[i]}" $dataset
-	log_must $ZFS set mountpoint="${old_mnt[i]}" $dataset
+	log_must zfs set canmount="${old_canmount[i]}" $dataset
+	log_must zfs set mountpoint="${old_mnt[i]}" $dataset
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_003_pos.ksh
index 886b120f2f..a11cfb4088 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,8 +54,8 @@ function cleanup
 	while (( i < ${#dataset_pos[*]} )); do
 		ds=${dataset_pos[i]}
 		if datasetexists $ds; then
-			log_must $ZFS set mountpoint=${old_mnt[i]} $ds
-			log_must $ZFS set canmount=${old_canmount[i]} $ds
+			log_must zfs set mountpoint=${old_mnt[i]} $ds
+			log_must zfs set canmount=${old_canmount[i]} $ds
 		fi
 		(( i = i + 1 ))
 	done
@@ -63,18 +63,18 @@ function cleanup
 	ds=$TESTPOOL/$TESTCLONE
 	if datasetexists $ds; then
 		mntp=$(get_prop mountpoint $ds)
-		log_must $ZFS destroy $ds
+		log_must zfs destroy $ds
 		if [[ -d $mntp ]]; then
-			log_must $RM -fr $mntp
+			log_must rm -fr $mntp
 		fi
 	fi
 
 	if snapexists $TESTPOOL/$TESTFS@$TESTSNAP ; then
-		log_must $ZFS destroy -R $TESTPOOL/$TESTFS@$TESTSNAP
+		log_must zfs destroy -R $TESTPOOL/$TESTFS@$TESTSNAP
 	fi
 
-	$ZFS unmount -a > /dev/null 2>&1
-	log_must $ZFS mount -a
+	zfs unmount -a > /dev/null 2>&1
+	log_must zfs mount -a
 }
 
 log_assert "While canmount=noauto and  the dataset is mounted,"\
@@ -86,8 +86,8 @@ set -A old_canmount
 typeset ds
 typeset pwd=$PWD
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
-log_must $ZFS clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_must zfs clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
 
 typeset -i i=0
 while (( i < ${#dataset_pos[*]} )); do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_004_pos.ksh
index bc8e279045..11be1af3cf 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/canmount_004_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,7 +49,7 @@ set -A sharesmb_prop "off" "on"
 
 function cleanup
 {
-	log_must $ZFS destroy -rR $CS_FS
+	log_must zfs destroy -rR $CS_FS
 }
 
 function assert_unmounted
@@ -68,21 +72,21 @@ CS_FS=$TESTPOOL/$TESTFS/cs_fs.$$
 oldmpt=$TESTDIR/old_cs_fs.$$
 newmpt=$TESTDIR/new_cs_fs.$$
 
-log_must $ZFS create -o canmount=noauto -o mountpoint=$oldmpt $CS_FS
+log_must zfs create -o canmount=noauto -o mountpoint=$oldmpt $CS_FS
 assert_unmounted
 
 for n in ${sharenfs_prop[@]}; do
-	log_must $ZFS set sharenfs="$n" $CS_FS
+	log_must zfs set sharenfs="$n" $CS_FS
 	assert_unmounted
 	for s in ${sharesmb_prop[@]}; do
-		log_must $ZFS set sharesmb="$s" $CS_FS
+		log_must zfs set sharesmb="$s" $CS_FS
 		assert_unmounted
 
 		mntpt=$(get_prop mountpoint $CS_FS)
 		if [[ "$mntpt" == "$oldmpt" ]]; then
-			log_must $ZFS set mountpoint="$newmpt" $CS_FS
+			log_must zfs set mountpoint="$newmpt" $CS_FS
 		else
-			log_must $ZFS set mountpoint="$oldmpt" $CS_FS
+			log_must zfs set mountpoint="$oldmpt" $CS_FS
 		fi
 		assert_unmounted
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_001_pos.ksh
index eaf9a629e5..1255ae5f56 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -59,10 +59,10 @@ set -A values "$TESTDIR2" "legacy" "none" "$TESTDIR_NOTEXISTING"
 
 function cleanup
 {
-	log_must $ZFS set mountpoint=$old_ctr_mpt $TESTPOOL/$TESTCTR
-	log_must $ZFS set mountpoint=$old_fs_mpt $TESTPOOL/$TESTFS
-	[[ -d $TESTDIR2 ]] && log_must $RM -r $TESTDIR2
-	[[ -d $TESTDIR_NOTEXISTING ]] && log_must $RM -r $TESTDIR_NOTEXISTING
+	log_must zfs set mountpoint=$old_ctr_mpt $TESTPOOL/$TESTCTR
+	log_must zfs set mountpoint=$old_fs_mpt $TESTPOOL/$TESTFS
+	[[ -d $TESTDIR2 ]] && log_must rm -r $TESTDIR2
+	[[ -d $TESTDIR_NOTEXISTING ]] && log_must rm -r $TESTDIR_NOTEXISTING
 }
 
 log_assert "Setting a valid mountpoint to file system, it must be successful."
@@ -76,7 +76,7 @@ old_ctr_mpt=$(get_prop mountpoint $TESTPOOL/$TESTCTR)
 	log_fail "Get the $TESTPOOL/$TESTCTR mountpoint error."
 
 if [[ ! -d $TESTDIR2 ]]; then
-	log_must $MKDIR $TESTDIR2
+	log_must mkdir $TESTDIR2
 fi
 
 typeset -i i=0
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh
index d827fbe82f..ad33e18fbb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,11 +54,11 @@ set -A values "$TESTDIR2" "$TESTDIR_NOTEXISTING"
 
 function cleanup
 {
-	log_must $ZFS set mountpoint=$old_ctr_mpt $TESTPOOL/$TESTCTR
-	log_must $ZFS set mountpoint=$old_fs_mpt $TESTPOOL/$TESTFS
-	log_must $ZFS mount -a
-	[[ -d $TESTDIR2 ]] && log_must $RM -r $TESTDIR2
-	[[ -d $TESTDIR_NOTEXISTING ]] && log_must $RM -r $TESTDIR_NOTEXISTING
+	log_must zfs set mountpoint=$old_ctr_mpt $TESTPOOL/$TESTCTR
+	log_must zfs set mountpoint=$old_fs_mpt $TESTPOOL/$TESTFS
+	log_must zfs mount -a
+	[[ -d $TESTDIR2 ]] && log_must rm -r $TESTDIR2
+	[[ -d $TESTDIR_NOTEXISTING ]] && log_must rm -r $TESTDIR_NOTEXISTING
 }
 
 log_assert "Setting a valid mountpoint for an unmounted file system, \
@@ -73,7 +73,7 @@ old_ctr_mpt=$(get_prop mountpoint $TESTPOOL/$TESTCTR)
 	log_fail "Unable to get the mountpoint property for $TESTPOOL/$TESTCTR"
 
 if [[ ! -d $TESTDIR2 ]]; then
-	log_must $MKDIR $TESTDIR2
+	log_must mkdir $TESTDIR2
 fi
 
 typeset -i i=0
@@ -81,7 +81,7 @@ typeset -i j=0
 while (( i < ${#dataset[@]} )); do
 	j=0
 	if ismounted ${dataset[i]} ; then
-		log_must $ZFS unmount ${dataset[i]}
+		log_must zfs unmount ${dataset[i]}
 	fi
 	log_mustnot ismounted ${dataset[i]}
 	while (( j < ${#values[@]} )); do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_003_pos.ksh
index 507e167fbb..939860b060 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,10 +47,10 @@ verify_runnable "both"
 
 function cleanup
 {
-	ismounted $tmpmnt && log_must $UMOUNT $tmpmnt
-	[[ -d $tmpmnt ]] && log_must $RM -rf $tmpmnt
-	[[ -n $oldmpt ]] && log_must $ZFS set mountpoint=$oldmpt $testfs
-	! ismounted $oldmpt && log_must $ZFS mount $testfs
+	ismounted $tmpmnt && log_must umount $tmpmnt
+	[[ -d $tmpmnt ]] && log_must rm -rf $tmpmnt
+	[[ -n $oldmpt ]] && log_must zfs set mountpoint=$oldmpt $testfs
+	! ismounted $oldmpt && log_must zfs mount $testfs
 }
 
 log_assert "With legacy mount, FSType-specific option works well."
@@ -69,29 +73,29 @@ set -A args \
 	"atime"		"/atime/"	"noatime"	"/noatime/"
 
 tmpmnt=/tmpmnt.$$
-[[ -d $tmpmnt ]] && $RM -rf $tmpmnt
+[[ -d $tmpmnt ]] && rm -rf $tmpmnt
 testfs=$TESTPOOL/$TESTFS
-log_must $MKDIR $tmpmnt
+log_must mkdir $tmpmnt
 oldmpt=$(get_prop mountpoint $testfs)
-log_must $ZFS set mountpoint=legacy $testfs
+log_must zfs set mountpoint=legacy $testfs
 
 typeset i=0
 while ((i < ${#args[@]})); do
-	log_must $MOUNT -F zfs -o ${args[$i]} $testfs $tmpmnt
-	msg=$($MOUNT | $GREP "^$tmpmnt ")
+	log_must mount -F zfs -o ${args[$i]} $testfs $tmpmnt
+	msg=$(mount | grep "^$tmpmnt ")
 
 	# In LZ, a user with all zone privileges can never with "devices"
 	if ! is_global_zone && [[ ${args[$i]} == devices ]] ; then
 		args[((i+1))]="/nodevices/"
 	fi
 
-	$ECHO $msg | $GREP "${args[((i+1))]}" > /dev/null 2>&1
+	echo $msg | grep "${args[((i+1))]}" > /dev/null 2>&1
 	if (($? != 0)) ; then
 		log_fail "Expected option: ${args[((i+1))]} \n" \
 			 "Real option: $msg"
 	fi
 
-	log_must $UMOUNT $tmpmnt
+	log_must umount $tmpmnt
 	((i += 2))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/onoffs_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/onoffs_001_pos.ksh
index 41ff4b7eaa..498567fdd3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/onoffs_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/onoffs_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
@@ -42,7 +46,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS mount -a
+	log_must zfs mount -a
 }
 
 log_onexit cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/property_alias_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/property_alias_001_pos.ksh
index d2f8cee928..cb53f38db8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/property_alias_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/property_alias_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
@@ -48,7 +52,7 @@ function set_and_check #<dataset><set_prop_name><set_value><check_prop_name>
 	typeset chkprop=$4
 	typeset getval
 
-	log_must $ZFS set $setprop=$setval $ds
+	log_must zfs set $setprop=$setval $ds
 	if [[ $setval == "gzip-6" ]]; then
 		setval="gzip"
 	fi
@@ -89,7 +93,7 @@ typeset -i i=0
 
 for ds in $pool $fs $vol; do
 	for propname in ${ro_prop[*]}; do
-		$ZFS get -pH -o value $propname $ds >/dev/null 2>&1
+		zfs get -pH -o value $propname $ds >/dev/null 2>&1
 		(( $? != 0 )) && \
 			log_fail "Get the property $proname of $ds failed."
 	done
@@ -118,7 +122,7 @@ for ds in $pool $fs $vol; do
 	done
 	if [[ $ds == $vol ]]; then
 		for propname in "volblocksize" "volblock" ; do
-			$ZFS get -pH -o value $propname $ds >/dev/null 2>&1
+			zfs get -pH -o value $propname $ds >/dev/null 2>&1
 			(( $? != 0 )) && \
 				log_fail "Get the property $propname of $ds failed."
 		done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/readonly_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/readonly_001_pos.ksh
index fd8a9e4daf..a80738da4f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/readonly_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/readonly_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
@@ -48,7 +48,7 @@ function cleanup
 {
 	for dataset in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL ; do
 		snapexists ${dataset}@$TESTSNAP && \
-			log_must $ZFS destroy -R ${dataset}@$TESTSNAP
+			log_must zfs destroy -R ${dataset}@$TESTSNAP
 	done
 }
 
@@ -60,8 +60,8 @@ function initial_dataset # $1 dataset
 
 	if [[ $fstype == "filesystem" ]] ; then
 		typeset mtpt=$(get_prop mountpoint $dataset)
-		log_must $TOUCH $mtpt/$TESTFILE0
-		log_must $MKDIR -p $mtpt/$TESTDIR0
+		log_must touch $mtpt/$TESTFILE0
+		log_must mkdir -p $mtpt/$TESTDIR0
 	fi
 }
 
@@ -74,8 +74,8 @@ function cleanup_dataset # $1 dataset
 
 	if [[ $fstype == "filesystem" ]] ; then
 		typeset mtpt=$(get_prop mountpoint $dataset)
-		log_must $RM -f $mtpt/$TESTFILE0
-		log_must $RM -rf $mtpt/$TESTDIR0
+		log_must rm -f $mtpt/$TESTFILE0
+		log_must rm -rf $mtpt/$TESTDIR0
 	fi
 }
 
@@ -100,20 +100,20 @@ function verify_readonly # $1 dataset, $2 on|off
 	case $fstype in
 		filesystem)
 			typeset mtpt=$(get_prop mountpoint $dataset)
-			$expect $TOUCH $mtpt/$TESTFILE1
-			$expect $MKDIR -p $mtpt/$TESTDIR1
-			$expect eval "$ECHO 'y' | $RM $mtpt/$TESTFILE0"
-			$expect $RMDIR $mtpt/$TESTDIR0
+			$expect touch $mtpt/$TESTFILE1
+			$expect mkdir -p $mtpt/$TESTDIR1
+			$expect eval "echo 'y' | rm $mtpt/$TESTFILE0"
+			$expect rmdir $mtpt/$TESTDIR0
 
 			if [[ $expect == "log_must" ]] ; then
-				log_must eval "$ECHO 'y' | $RM $mtpt/$TESTFILE1"
-				log_must $RMDIR $mtpt/$TESTDIR1
-				log_must $TOUCH $mtpt/$TESTFILE0
-				log_must $MKDIR -p $mtpt/$TESTDIR0
+				log_must eval "echo 'y' | rm $mtpt/$TESTFILE1"
+				log_must rmdir $mtpt/$TESTDIR1
+				log_must touch $mtpt/$TESTFILE0
+				log_must mkdir -p $mtpt/$TESTDIR0
 			fi
 			;;
 		volume)
-			$expect eval "$ECHO 'y' | $NEWFS \
+			$expect eval "echo 'y' | newfs \
 			    /dev/zvol/dsk/$dataset > /dev/null 2>&1"
 			;;
 		*)
@@ -129,14 +129,14 @@ log_assert "Setting a valid readonly property on a dataset succeeds."
 
 typeset all_datasets
 
-log_must $ZFS mount -a
+log_must zfs mount -a
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
-log_must $ZFS clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
+log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+log_must zfs clone $TESTPOOL/$TESTFS@$TESTSNAP $TESTPOOL/$TESTCLONE
 
 if is_global_zone ; then
-	log_must $ZFS snapshot $TESTPOOL/$TESTVOL@$TESTSNAP
-	log_must $ZFS clone $TESTPOOL/$TESTVOL@$TESTSNAP $TESTPOOL/$TESTCLONE1
+	log_must zfs snapshot $TESTPOOL/$TESTVOL@$TESTSNAP
+	log_must zfs clone $TESTPOOL/$TESTVOL@$TESTSNAP $TESTPOOL/$TESTCLONE1
 	all_datasets="$TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL "
 	all_datasets+="$TESTPOOL/$TESTCLONE $TESTPOOL/$TESTCLONE1"
 else
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/reservation_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/reservation_001_neg.ksh
index 511a506ab9..de6d83d227 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/reservation_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/reservation_001_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -66,12 +70,12 @@ function set_n_check # data-set
 		j=0
 		while (( $j < ${#suffix[*]} )); do
 
-			$ZFS set \
+			zfs set \
 				reservation=${values[$i]}${suffix[$j]} $obj \
 				> /dev/null 2>&1
 			if [ $? -eq 0 ]
 			then
-				log_note "$ZFS set \
+				log_note "zfs set \
 				reservation=${values[$i]}${suffix[$j]} $obj"
 				log_fail "The above reservation set returned 0!"
 			fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh
index 83ec0d8b0f..0c4124a831 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/ro_props_001_pos.ksh
@@ -57,7 +57,7 @@ typeset snap_ro_props="volsize recordsize recsize quota reservation reserv mount
 	sharenfs checksum compression compress atime devices exec readonly rdonly \
 	setuid zoned"
 
-$ZFS upgrade -v > /dev/null 2>&1
+zfs upgrade -v > /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
 	snap_ro_props="$snap_ro_props version"
 fi
@@ -102,7 +102,7 @@ while (( i < ${#dataset[@]} )); do
 			# equal to values[j].
 			#
 			if [[ $cur_value == ${values[j]} ]]; then
-				log_mustnot $ZFS set $prop=${values[j]} \
+				log_mustnot zfs set $prop=${values[j]} \
 					${dataset[i]}
 			else
 				set_n_check_prop ${values[j]} $prop \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/share_mount_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/share_mount_001_neg.ksh
index 05c8b637e5..fa32c2774f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/share_mount_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/share_mount_001_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -41,7 +45,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS set mountpoint=$oldmpt $fs
+	log_must zfs set mountpoint=$oldmpt $fs
 }
 
 log_assert "Verify that we cannot share or mount legacy filesystems."
@@ -51,10 +55,10 @@ fs=$TESTPOOL/$TESTFS
 oldmpt=$(get_prop mountpoint $fs)
 
 for propval in "legacy" "none"; do
-	log_must $ZFS set mountpoint=$propval $fs
+	log_must zfs set mountpoint=$propval $fs
 
-	log_mustnot $ZFS mount $fs
-	log_mustnot $ZFS share $fs
+	log_mustnot zfs mount $fs
+	log_mustnot zfs share $fs
 done
 
 log_pass "We cannot share or mount legacy filesystems as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/snapdir_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/snapdir_001_pos.ksh
index 9abd0ec8e8..079fc770a6 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/snapdir_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/snapdir_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -45,7 +49,7 @@ function cleanup
 {
 	for dataset in $all_datasets; do
 		snapexists ${dataset}@snap && \
-			log_must $ZFS destroy ${dataset}@snap
+			log_must zfs destroy ${dataset}@snap
 	done
 }
 
@@ -56,7 +60,7 @@ function verify_snapdir_visible # $1 dataset, $2 hidden|visible
 	typeset mtpt=$(get_prop mountpoint $dataset)
 	typeset name
 
-	for name in `$LS -a $mtpt`; do
+	for name in `ls -a $mtpt`; do
 		if [[ $name == ".zfs" ]]; then
 			if [[ $value == "visible" ]]; then
 				return 0
@@ -85,7 +89,7 @@ fi
 log_onexit cleanup
 
 for dataset in $all_datasets; do
-	log_must $ZFS snapshot ${dataset}@snap
+	log_must zfs snapshot ${dataset}@snap
 done
 
 log_assert "Setting a valid snapdir property on a dataset succeeds."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_001_pos.ksh
index be8c88c0ca..fb03d7c971 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -55,7 +59,7 @@ while ((i < 10)); do
 	typeset value=$(user_property_value $len)
 
 	for dtst in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL; do
-		log_must eval "$ZFS set $user_prop='$value' $dtst"
+		log_must eval "zfs set $user_prop='$value' $dtst"
 		log_must eval "check_user_prop $dtst $user_prop '$value'"
 	done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh
index 24fecfba1f..310d1540a0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -44,13 +48,13 @@ verify_runnable "both"
 
 function cleanup
 {
-	datasetexists $new_vol && log_must $ZFS rename $new_vol $vol
+	datasetexists $new_vol && log_must zfs rename $new_vol $vol
 
 	typeset dtst
 	for dtst in $new_fsclone $new_volclone $fsclone $volclone \
 	    $fssnap $volsnap; do
 		if datasetexists $dtst; then
-			log_must $ZFS destroy -f $dtst
+			log_must zfs destroy -f $dtst
 		fi
 	done
 
@@ -92,26 +96,26 @@ log_onexit cleanup
 
 pool=$TESTPOOL; fs=$pool/$TESTFS; vol=$pool/$TESTVOL
 fssnap=$fs@snap; volsnap=$vol@snap;
-log_must $ZFS snapshot $fssnap
-log_must $ZFS snapshot $volsnap
+log_must zfs snapshot $fssnap
+log_must zfs snapshot $volsnap
 fsclone=$pool/fsclone; volclone=$pool/volclone
-log_must $ZFS clone $fssnap $fsclone
-log_must $ZFS clone $volsnap $volclone
+log_must zfs clone $fssnap $fsclone
+log_must zfs clone $volsnap $volclone
 
 prop_name=$(valid_user_property 10)
 value=$(user_property_value 16)
-log_must eval "$ZFS set $prop_name='$value' $pool"
+log_must eval "zfs set $prop_name='$value' $pool"
 log_must eval "check_user_prop $pool $prop_name '$value'"
 log_must inherit_check $prop_name $pool $fs $vol $fsclone $volclone
 
 new_fsclone=$fs/fsclone; new_volclone=$fs/volclone
-log_must $ZFS rename $fsclone $new_fsclone
-log_must $ZFS rename $volclone $new_volclone
+log_must zfs rename $fsclone $new_fsclone
+log_must zfs rename $volclone $new_volclone
 log_must inherit_check $prop_name $pool $fs $new_fsclone $new_volclone
 
 log_note "Set intermediate dataset will change the inherited relationship."
 new_value=$(user_property_value 16)
-log_must eval "$ZFS set $prop_name='$new_value' $fs"
+log_must eval "zfs set $prop_name='$new_value' $fs"
 log_must eval "check_user_prop $fs $prop_name '$new_value'"
 log_must inherit_check $prop_name $fs $new_fsclone $new_volclone
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_003_neg.ksh
index 4c1c1bca82..6a90665f4b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_003_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -53,7 +57,7 @@ while ((i < 10)); do
 	typeset value=$(user_property_value $len)
 
 	for dtst in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL ; do
-		log_mustnot $ZFS set $user_prop=$value $dtst
+		log_mustnot zfs set $user_prop=$value $dtst
 		log_mustnot check_user_prop $dtst \"$user_prop\" \"$value\"
 	done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_004_pos.ksh
index 1bce7a75c9..1d197fa25f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/user_property_004_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -43,7 +47,7 @@ function cleanup
 	for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL ; do
 		typeset fssnap=$fs@snap
 		if datasetexists $fssnap ; then
-			log_must $ZFS destroy -f $fssnap
+			log_must zfs destroy -f $fssnap
 		fi
 	done
 	cleanup_user_prop $TESTPOOL
@@ -68,7 +72,7 @@ log_onexit cleanup
 
 typeset snap_property=
 
-$ZPOOL upgrade -v | $GREP "Snapshot properties" > /dev/null 2>&1
+zpool upgrade -v | grep "Snapshot properties" > /dev/null 2>&1
 if (( $? == 0 )) ; then
 	snap_property="true"
 fi
@@ -77,19 +81,19 @@ for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL ; do
 	typeset fssnap=$fs@snap
 	prop_name=$(valid_user_property 10)
 	value=$(user_property_value 16)
-	log_must eval "$ZFS set $prop_name='$value' $fs"
+	log_must eval "zfs set $prop_name='$value' $fs"
 	log_must eval "check_user_prop $fs $prop_name '$value'"
 
-	log_must $ZFS snapshot $fssnap
+	log_must zfs snapshot $fssnap
 
 	if [[ -n $snap_property ]] ; then
 		log_mustnot nonexist_user_prop $prop_name $fssnap
 
-		log_must eval "$ZFS set $prop_name='$value' $fssnap"
+		log_must eval "zfs set $prop_name='$value' $fssnap"
 		log_mustnot nonexist_user_prop $prop_name $fssnap
 	else
 		log_must nonexist_user_prop $prop_name $fssnap
-		log_mustnot eval "$ZFS set $prop_name='$value' $fssnap"
+		log_mustnot eval "zfs set $prop_name='$value' $fssnap"
 		log_must nonexist_user_prop $prop_name $fssnap
 	fi
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/version_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/version_001_neg.ksh
index 40a541a9e8..cf5ef5116e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/version_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/version_001_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -62,9 +66,9 @@ function set_n_check # data-set
 	orig_val=$(get_prop version $obj)
 
 	while (($i < ${#values[*]})); do
-		$ZFS set version=${values[$i]} $obj  > /dev/null 2>&1
+		zfs set version=${values[$i]} $obj  > /dev/null 2>&1
 		if [[ $? -eq 0 ]]; then
-			log_note "$ZFS set version=${values[$i]} $obj"
+			log_note "zfs set version=${values[$i]} $obj"
 			log_fail "The above version set returned 0!"
 		fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_002_neg.ksh
index 619a1ee011..b9044041cb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2011 by Delphix. All rights reserved.
+# Copyright (c) 2011, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
@@ -54,7 +54,7 @@ for ds in $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \
 	$TESTPOOL/$TESTFS@$TESTSNAP; do
 	for badarg in "" "-" "-?"; do
 		for prop in ${editable_props[@]}; do
-			log_mustnot eval "$ZFS set $badarg $prop= $ds >/dev/null 2>&1"
+			log_mustnot eval "zfs set $badarg $prop= $ds >/dev/null 2>&1"
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_003_neg.ksh
index 13260f1623..16bb38802c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_003_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -42,10 +46,10 @@ verify_runnable "both"
 function cleanup
 {
 	if [ -e $badpath ]; then
-		$RM -f $badpath
+		rm -f $badpath
 	fi
 	if datasetexists $TESTPOOL/foo; then
-		log_must $ZFS destroy $TESTPOOL/foo
+		log_must zfs destroy $TESTPOOL/foo
 	fi
 }
 
@@ -53,21 +57,21 @@ log_assert "'zfs set mountpoint/sharenfs' fails with invalid scenarios"
 log_onexit cleanup
 
 badpath=/tmp/foo1.$$
-$TOUCH $badpath
+touch $badpath
 longpath=$(gen_dataset_name 1030 "abcdefg")
 
-log_must $ZFS create -o mountpoint=legacy $TESTPOOL/foo
+log_must zfs create -o mountpoint=legacy $TESTPOOL/foo
 
 # Do the negative testing about "property may be set but unable to remount filesystem"
-log_mustnot eval "$ZFS set mountpoint=$badpath $TESTPOOL/foo >/dev/null 2>&1"
+log_mustnot eval "zfs set mountpoint=$badpath $TESTPOOL/foo >/dev/null 2>&1"
 
 # Do the negative testing about "property may be set but unable to reshare filesystem"
-log_mustnot eval "$ZFS set sharenfs=on $TESTPOOL/foo >/dev/null 2>&1"
+log_mustnot eval "zfs set sharenfs=on $TESTPOOL/foo >/dev/null 2>&1"
 
 # Do the negative testing about "sharenfs property can not be set to null"
-log_mustnot eval "$ZFS set sharenfs= $TESTPOOL/foo >/dev/null 2>&1"
+log_mustnot eval "zfs set sharenfs= $TESTPOOL/foo >/dev/null 2>&1"
 
 # Do the too long pathname testing (>1024)
-log_mustnot eval "$ZFS set mountpoint=/$longpath $TESTPOOL/foo >/dev/null 2>&1"
+log_mustnot eval "zfs set mountpoint=/$longpath $TESTPOOL/foo >/dev/null 2>&1"
 
 log_pass "'zfs set mountpoint/sharenfs' fails with invalid scenarios as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
index 5c4363b19e..a5aafd46cb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -62,7 +62,7 @@ function set_n_check_prop
 		[[ -z $prop || -z $dataset ]] && \
 			log_fail "property or dataset isn't defined."
 
-		log_must $ZFS set $prop=$expect_value $dataset
+		log_must zfs set $prop=$expect_value $dataset
 		if [[ $expect_value == "gzip-6" ]]; then
 			expect_value="gzip"
 		fi
@@ -89,7 +89,7 @@ function set_n_check_prop
 		esac
 
 	else
-		log_mustnot $ZFS set $prop=$expect_value $dataset
+		log_mustnot zfs set $prop=$expect_value $dataset
 
 		[[ -n $prop ]] && cur_value=$(get_prop $prop $dataset)
 
@@ -109,16 +109,16 @@ function set_n_check_prop
 function cleanup_user_prop
 {
 	typeset pool=$1
-	typeset dtst=$($ZFS list -H -r -o name -t filesystem,volume $pool)
+	typeset dtst=$(zfs list -H -r -o name -t filesystem,volume $pool)
 
 	typeset user_prop
 	for dt in $dtst; do
-		user_prop=$($ZFS get -H -o property all $dtst | grep ":")
+		user_prop=$(zfs get -H -o property all $dtst | grep ":")
 
 		typeset prop
 		for prop in $user_prop; do
-			$ZFS inherit $prop $dt
-			(($? != 0)) && log_must $ZFS inherit $prop $dt
+			zfs inherit $prop $dt
+			(($? != 0)) && log_must zfs inherit $prop $dt
 		done
 	done
 }
@@ -150,7 +150,7 @@ function random_string
 		((i += 1))
 	done
 
-	$ECHO "$str"
+	echo "$str"
 }
 
 #
@@ -183,7 +183,7 @@ function valid_user_property
 		break
 	done
 
-	$ECHO "${part1}:${part2}"
+	echo "${part1}:${part2}"
 }
 
 #
@@ -211,7 +211,7 @@ function invalid_user_property
 		break
 	done
 
-	$ECHO "${part1}${part2}"
+	echo "${part1}${part2}"
 }
 
 #
@@ -225,7 +225,7 @@ function user_property_value
 
 	typeset value=$(random_string ALL_CHAR $len)
 
-	$ECHO "$value"
+	echo "$value"
 }
 
 #
@@ -240,7 +240,7 @@ function check_user_prop
 	typeset dtst=$1
 	typeset user_prop="$2"
 	typeset expect_value="$3"
-	typeset value=$($ZFS get -p -H -o value "$user_prop" $dtst 2>&1)
+	typeset value=$(zfs get -p -H -o value "$user_prop" $dtst 2>&1)
 
 	if [[ "$expect_value" == "$value" ]]; then
 		return 0
@@ -258,10 +258,10 @@ function get_source
 	typeset dataset=$2
 	typeset source
 
-	source=$($ZFS get -H -o source $prop $dataset)
+	source=$(zfs get -H -o source $prop $dataset)
         if (($? != 0)); then
                 log_fail "Unable to get $prop source for dataset $dataset"
         fi
 
-	$ECHO "$source"
+	echo "$source"
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_001_pos.ksh
index 084b18d1f1..7638660e3d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -51,21 +55,21 @@ function cleanup
 {
 	typeset -i i=0
 	while (( i < ${#fs[*]} )); do
-		log_must $ZFS set sharenfs=off ${fs[((i+1))]}
+		log_must zfs set sharenfs=off ${fs[((i+1))]}
 		unshare_fs ${fs[i]}
 
 		((i = i + 2))
 	done
 
 	if mounted $TESTPOOL/$TESTFS-clone; then
-		log_must $ZFS unmount $TESTDIR2
+		log_must zfs unmount $TESTDIR2
 	fi
 
 	datasetexists $TESTPOOL/$TESTFS-clone && \
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS-clone
+		log_must zfs destroy -f $TESTPOOL/$TESTFS-clone
 
 	if snapexists "$TESTPOOL/$TESTFS@snapshot"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS@snapshot
+		log_must zfs destroy -f $TESTPOOL/$TESTFS@snapshot
 	fi
 }
 
@@ -84,31 +88,31 @@ function test_share # mntp filesystem
 	not_shared $mntp || \
 	    log_fail "File system $filesystem is already shared."
 
-	log_must $ZFS set sharenfs=on $filesystem
+	log_must zfs set sharenfs=on $filesystem
 	is_shared $mntp || \
 	    log_fail "File system $filesystem is not shared (set sharenfs)."
 
 	#
 	# Verify 'zfs share' works as well.
 	#
-	log_must $ZFS unshare $filesystem
+	log_must zfs unshare $filesystem
 	is_shared $mntp && \
 	    log_fail "File system $filesystem is still shared."
 
-	log_must $ZFS share $filesystem
+	log_must zfs share $filesystem
 	is_shared $mntp || \
 	    log_fail "file system $filesystem is not shared (zfs share)."
 
 	log_note "Sharing a shared file system fails."
-	log_mustnot $ZFS share $filesystem
+	log_mustnot zfs share $filesystem
 }
 
 log_assert "Verify that 'zfs share' succeeds as root."
 log_onexit cleanup
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snapshot
-log_must $ZFS clone $TESTPOOL/$TESTFS@snapshot $TESTPOOL/$TESTFS-clone
-log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL/$TESTFS-clone
+log_must zfs snapshot $TESTPOOL/$TESTFS@snapshot
+log_must zfs clone $TESTPOOL/$TESTFS@snapshot $TESTPOOL/$TESTFS-clone
+log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL/$TESTFS-clone
 
 typeset -i i=0
 while (( i < ${#fs[*]} )); do
@@ -132,7 +136,7 @@ done
 #
 # Try a zfs share -a and verify all file systems are shared.
 #
-log_must $ZFS share -a
+log_must zfs share -a
 
 i=0
 while (( i < ${#fs[*]} )); do
@@ -142,4 +146,4 @@ while (( i < ${#fs[*]} )); do
 	((i = i + 2))
 done
 
-log_pass "'$ZFS share [ -a ] <filesystem>' succeeds as root."
+log_pass "'zfs share [ -a ] <filesystem>' succeeds as root."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_002_pos.ksh
index 4005bf056c..588a30f46d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,16 +58,16 @@ log_assert "Verify that "zfs share" with a non-existent file system fails."
 
 log_onexit cleanup
 
-log_mustnot $ZFS list $TESTPOOL/$NONEXISTFSNAME
+log_mustnot zfs list $TESTPOOL/$NONEXISTFSNAME
 
-$ZFS share $TESTPOOL/$NONEXISTFSNAME
+zfs share $TESTPOOL/$NONEXISTFSNAME
 ret=$?
 (( ret == 1)) || \
-	log_fail "'$ZFS share $TESTPOOL/$NONEXISTFSNAME' " \
+	log_fail "'zfs share $TESTPOOL/$NONEXISTFSNAME' " \
 		"failed with an unexpected return code of $ret."
 
 log_note "Make sure the file system $TESTPOOL/$NONEXISTFSNAME is unshared"
 not_shared $TESTPOOL/$NONEXISTFSNAME || \
 	log_fail "File system $TESTPOOL/$NONEXISTFSNAME is unexpectedly shared."
 
-log_pass "'$ZFS share' with a non-existent file system fails."
+log_pass "'zfs share' with a non-existent file system fails."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_003_pos.ksh
index e4ab8c6f5b..b99c72ca14 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -51,7 +55,7 @@ function cleanup
 {
 	typeset -i i=0
 	while (( i < ${#fs[*]} )); do
-		log_must $ZFS inherit -r sharenfs ${fs[((i + 1))]}
+		log_must zfs inherit -r sharenfs ${fs[((i + 1))]}
 		log_must unshare_fs ${fs[i]}
 
 		((i = i + 2))
@@ -75,22 +79,22 @@ function test_legacy_share # mntp filesystem
 	    log_fail "File system $filesystem is already shared."
 
 	if is_global_zone ; then
-		log_must $ZFS set sharenfs=off $filesystem
+		log_must zfs set sharenfs=off $filesystem
 		not_shared $mntp || \
 		    log_fail "File system $filesystem is still shared (set sharenfs)."
 	fi
 
-	$ZFS share $filesystem
+	zfs share $filesystem
 	ret=$?
 	(( ret == 1)) || \
-	    log_fail "'$ZFS share $filesystem' " \
+	    log_fail "'zfs share $filesystem' " \
 		"unexpected return code of $ret."
 
 	not_shared $mntp || \
 	    log_fail "file system $filesystem is shared (zfs share)."
 }
 
-log_assert "Verify that '$ZFS share' with a file system " \
+log_assert "Verify that 'zfs share' with a file system " \
         "whose sharenfs property is 'off'  " \
         "will fail with return code 1."
 log_onexit cleanup
@@ -102,5 +106,5 @@ while (( i < ${#fs[*]} )); do
 	((i = i + 2))
 done
 
-log_pass "Verify that '$ZFS share' with a file system " \
+log_pass "Verify that 'zfs share' with a file system " \
         "whose sharenfs property is 'off' fails."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_004_pos.ksh
index 04cf72efcd..baa5f4e416 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,10 +48,10 @@ verify_runnable "global"
 function cleanup
 {
 	if snapexists $TESTPOOL/$TESTFS@snapshot; then
-		log_must $ZFS destroy $TESTPOOL/$TESTFS@snapshot
+		log_must zfs destroy $TESTPOOL/$TESTFS@snapshot
 	fi
 
-	log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
 	log_must unshare_fs $TESTPOOL/$TESTFS
 }
 
@@ -70,27 +70,27 @@ function test_snap_share # mntp filesystem
         not_shared $mntp || \
             log_fail "File system $filesystem is already shared."
 
-        log_must $ZFS set sharenfs=on $filesystem
+        log_must zfs set sharenfs=on $filesystem
         is_shared $mntp || \
             log_fail "File system $filesystem is not shared (set sharenfs)."
 
-	log_must $LS -l  $mntp/$SNAPROOT/snapshot
+	log_must ls -l  $mntp/$SNAPROOT/snapshot
         #
         # Verify 'zfs share' works as well.
         #
-        log_must $ZFS unshare $filesystem
-        log_must $ZFS share $filesystem
+        log_must zfs unshare $filesystem
+        log_must zfs share $filesystem
 
         is_shared $mntp || \
             log_fail "file system $filesystem is not shared (zfs share)."
 
-	log_must $LS -l  $mntp/$SNAPROOT/snapshot
+	log_must ls -l  $mntp/$SNAPROOT/snapshot
 }
 
 log_assert "Verify that a file system and its snapshot are shared."
 log_onexit cleanup
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snapshot
+log_must zfs snapshot $TESTPOOL/$TESTFS@snapshot
 test_snap_share $TESTDIR $TESTPOOL/$TESTFS
 
 log_pass "A file system and its snapshot are both shared as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_005_pos.ksh
index eed0eaad4d..8c541f0485 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_005_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -41,7 +45,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
 	is_shared $TESTPOOL/$TESTFS && \
 		log_must unshare_fs $TESTPOOL/$TESTFS
 }
@@ -61,14 +65,14 @@ cleanup
 typeset -i i=0
 while (( i < ${#shareopts[*]} ))
 do
-	log_must $ZFS set sharenfs="${shareopts[i]}" $TESTPOOL/$TESTFS
+	log_must zfs set sharenfs="${shareopts[i]}" $TESTPOOL/$TESTFS
 
 	option=`get_prop sharenfs $TESTPOOL/$TESTFS`
 	if [[ $option != ${shareopts[i]} ]]; then
 		log_fail "get sharenfs failed. ($option != ${shareopts[i]})"
 	fi
 
-	$SHARE | $GREP $option > /dev/null 2>&1
+	share | grep $option > /dev/null 2>&1
 	if (( $? != 0 )); then
 		log_fail "The '$option' option was not found in share output."
 	fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_006_pos.ksh
index 20884899bc..6b06589b69 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_006_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -43,13 +47,13 @@ verify_runnable "global"
 
 function cleanup
 {
-	log_must $ZFS set sharenfs=off $TESTPOOL/$TESTCTR
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTCTR
 	if mounted $TESTDIR2; then
-		log_must $ZFS unmount $TESTDIR2
+		log_must zfs unmount $TESTDIR2
 	fi
 
 	datasetexists $TESTPOOL/$TESTCTR/$TESTFS2 && \
-		log_must $ZFS destroy $TESTPOOL/$TESTCTR/$TESTFS2
+		log_must zfs destroy $TESTPOOL/$TESTCTR/$TESTFS2
 
 	typeset fs=""
 	for fs in $mntp $TESTDIR1 $TESTDIR2
@@ -74,7 +78,7 @@ function test_ctr_share # mntp ctr
 	not_shared $mntp || \
 	    log_fail "Mountpoint: $mntp is already shared."
 
-	log_must $ZFS set sharenfs=on $ctr
+	log_must zfs set sharenfs=on $ctr
 
 	not_shared $mntp || \
 		log_fail "File system $mntp is shared (set sharenfs)."
@@ -83,8 +87,8 @@ function test_ctr_share # mntp ctr
 	# Add a new file system to the dataset and verify it is shared.
 	#
 	typeset mntp2=$TESTDIR2
-	log_must $ZFS create $ctr/$TESTFS2
-	log_must $ZFS set mountpoint=$mntp2 $ctr/$TESTFS2
+	log_must zfs create $ctr/$TESTFS2
+	log_must zfs set mountpoint=$mntp2 $ctr/$TESTFS2
 
 	is_shared $mntp2 || \
 	    log_fail "File system $mntp2 was not shared (set sharenfs)."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_007_neg.ksh
index ace4e439b9..1a9244db15 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_007_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -41,7 +45,7 @@ verify_runnable "both"
 
 function cleanup {
 	if is_global_zone; then
-		log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS
+		log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
 	fi
 }
 
@@ -57,9 +61,9 @@ typeset -i i=0
 while (( i < ${#badopts[*]} ))
 do
 	log_note "Setting sharenfs=${badopts[i]} $i "
-	log_mustnot $ZFS set sharenfs="${badopts[i]}" $TESTPOOL/$TESTFS
+	log_mustnot zfs set sharenfs="${badopts[i]}" $TESTPOOL/$TESTFS
 
-	$SHARE | $GREP $option > /dev/null 2>&1
+	share | grep $option > /dev/null 2>&1
 	if (( $? == 0 )); then
 		log_fail "An invalid setting '$option' was propagated."
 	fi
@@ -72,7 +76,7 @@ do
 	#
 	if is_global_zone; then
 		log_note "Resetting sharenfs option"
-		log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS
+		log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
 	fi
 
 	((i = i + 1))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_008_neg.ksh
index a945ddd2cf..34fbd38994 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_008_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -49,7 +53,7 @@ log_assert "Verify that sharing a dataset other than filesystem fails."
 typeset -i i=0
 while (( i < ${#datasets[*]} ))
 do
-	log_mustnot $ZFS set sharenfs=on ${datasets[i]}
+	log_mustnot zfs set sharenfs=on ${datasets[i]}
 
 	option=`get_prop sharenfs ${datasets[i]}`
 	if [[ $option == ${datasets[i]} ]]; then
@@ -59,7 +63,7 @@ do
 	not_shared ${datasets[i]} || \
 	    log_fail "An invalid setting '$option' was propagated."
 
-	log_mustnot $ZFS share ${datasets[i]}
+	log_mustnot zfs share ${datasets[i]}
 
 	not_shared ${datasets[i]} || \
 	    log_fail "An invalid dataset '${datasets[i]}' was shared."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_009_neg.ksh
index 6b4f3037d9..7a9377bcd8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_009_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,7 +49,7 @@ function cleanup
 
 	val=$(get_prop sharenfs $fs)
 	if [[ $val == on ]]; then
-		log_must $ZFS set sharenfs=off $fs
+		log_must zfs set sharenfs=off $fs
 	fi
 }
 
@@ -56,14 +60,14 @@ fs=$TESTPOOL/$TESTFS
 sharenfs_val=$(get_prop sharenfs $fs)
 mpt=$(get_prop mountpoint $fs)
 if [[ $sharenfs_val == off ]]; then
-	log_must $ZFS set sharenfs=on $fs
+	log_must zfs set sharenfs=on $fs
 fi
 
-$SHARE | $GREP $mpt >/dev/null 2>&1
+share | grep $mpt >/dev/null 2>&1
 if (( $? != 0 )); then
-	log_must $ZFS share $fs
+	log_must zfs share $fs
 fi
 
-log_mustnot $ZFS share $fs
+log_mustnot zfs share $fs
 
 log_pass "zfs share fails with shared filesystem as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_010_neg.ksh
index a56761e82c..238a586292 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_010_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,12 +49,12 @@ fs=$TESTPOOL/$TESTFS
 set -A badargs "A" "-A" "-" "-x" "-?" "=" "-a *" "-a"
 
 for arg in "${badargs[@]}"; do
-	log_mustnot eval "$ZFS share $arg $fs >/dev/null 2>&1"
+	log_mustnot eval "zfs share $arg $fs >/dev/null 2>&1"
 done
 
 #zfs share failed when missing arguments or invalid datasetname
 for obj in "" "/$fs"; do
-	log_mustnot eval "$ZFS share $obj >/dev/null 2>&1"
+	log_mustnot eval "zfs share $obj >/dev/null 2>&1"
 done
 
 log_pass "zfs share fails with bad parameters as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_011_pos.ksh
index 8f519b3808..f75877ee89 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_011_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -44,15 +48,15 @@ function cleanup
 {
 	log_must cd $origdir
 
-	log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
 	unshare_fs $TESTPOOL/$TESTFS
 
 	if snapexists "$TESTPOOL/$TESTFS@snapshot"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS@snapshot
+		log_must zfs destroy -f $TESTPOOL/$TESTFS@snapshot
 	fi
 
 	if datasetexists $TESTPOOL/$TESTFS/fs2 ; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS/fs2
+		log_must zfs destroy -f $TESTPOOL/$TESTFS/fs2
 	fi
 }
 
@@ -63,19 +67,19 @@ log_onexit cleanup
 typeset origdir=$PWD
 
 # unmount fails will not unshare the shared filesystem
-log_must $ZFS set sharenfs=on $TESTPOOL/$TESTFS
+log_must zfs set sharenfs=on $TESTPOOL/$TESTFS
 log_must is_shared $TESTDIR
 if cd $TESTDIR ; then
-	log_mustnot $ZFS umount $TESTPOOL/$TESTFS
+	log_mustnot zfs umount $TESTPOOL/$TESTFS
 else
 	log_fail "cd $TESTDIR fails"
 fi
 log_must is_shared $TESTDIR
 
 # destroy fails will not unshare the shared filesystem
-log_must $ZFS create $TESTPOOL/$TESTFS/fs2
+log_must zfs create $TESTPOOL/$TESTFS/fs2
 if cd $TESTDIR/fs2 ; then
-	log_mustnot $ZFS destroy $TESTPOOL/$TESTFS/fs2
+	log_mustnot zfs destroy $TESTPOOL/$TESTFS/fs2
 else
 	log_fail "cd $TESTDIR/fs2 fails"
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_001_neg.ksh
index 860dd6ca43..8708d8b624 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -76,7 +76,7 @@ function setup_all
 
 	for snap in $SNAPFS $SNAPFS1; do
 		if ! snapexists $snap; then
-			log_must $ZFS snapshot $snap
+			log_must zfs snapshot $snap
 		fi
 	done
 
@@ -89,13 +89,13 @@ function cleanup_all
 
 	while (( i < ${#args[*]} )); do
 		for snap in ${args[i]}; do
-			snapexists $snap && log_must $ZFS destroy -f $snap
+			snapexists $snap && log_must zfs destroy -f $snap
 		done
 		(( i = i + 1 ))
 	done
 
 	for mtpt in $SNAPDIR $SNAPDIR1; do
-		[[ -d $mtpt ]] && log_must $RM -rf $mtpt
+		[[ -d $mtpt ]] && log_must rm -rf $mtpt
 	done
 
 	return 0
@@ -109,7 +109,7 @@ setup_all
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZFS snapshot ${args[i]}
+	log_mustnot zfs snapshot ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh
index 907d0dd12a..2efcf1cceb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -49,11 +54,11 @@ function cleanup
 		$TESTPOOL/$TESTCTR/$TESTVOL@$TESTSNAP;
 	do
 		snapexists $snap && \
-			log_must $ZFS destroy $snap
+			log_must zfs destroy $snap
 	done
 
 	datasetexists $TESTPOOL/$TESTCTR/$TESTVOL && \
-		log_must $ZFS destroy -rf $TESTPOOL/$TESTCTR/$TESTVOL
+		log_must zfs destroy -rf $TESTPOOL/$TESTCTR/$TESTVOL
 
 }
 
@@ -67,12 +72,12 @@ set -A args "" \
     "$TESTPOOL/$TESTCTR@$TESTSNAP@$TESTSNAP"
 
 # setup preparations
-log_must $ZFS snapshot $TESTPOOL/$TESTCTR/$TESTFS1@$TESTSNAP
+log_must zfs snapshot $TESTPOOL/$TESTCTR/$TESTFS1@$TESTSNAP
 
 # testing
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZFS snapshot -r ${args[i]}
+	log_mustnot zfs snapshot -r ${args[i]}
 
 	((i = i + 1))
 done
@@ -80,14 +85,14 @@ done
 # Testing the invalid senario: the child volume already has an
 # identical name snapshot, zfs snapshot -r should fail when
 # creating snapshot with -r for the parent
-log_must $ZFS destroy $TESTPOOL/$TESTCTR/$TESTFS1@$TESTSNAP
+log_must zfs destroy $TESTPOOL/$TESTCTR/$TESTFS1@$TESTSNAP
 if is_global_zone; then
-	log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTCTR/$TESTVOL
+	log_must zfs create -V $VOLSIZE $TESTPOOL/$TESTCTR/$TESTVOL
 else
-	log_must $ZFS create $TESTPOOL/$TESTCTR/$TESTVOL
+	log_must zfs create $TESTPOOL/$TESTCTR/$TESTVOL
 fi
-log_must $ZFS snapshot $TESTPOOL/$TESTCTR/$TESTVOL@$TESTSNAP
+log_must zfs snapshot $TESTPOOL/$TESTCTR/$TESTVOL@$TESTSNAP
 
-log_mustnot $ZFS snapshot -r $TESTPOOL/$TESTCTR@$TESTSNAP
+log_mustnot zfs snapshot -r $TESTPOOL/$TESTCTR@$TESTSNAP
 
 log_pass "'zfs snapshot -r' fails with invalid arguments or scenarios as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_003_neg.ksh
index e424b9b811..ca8ff8ca43 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_003_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -48,14 +53,14 @@ l_name="$(gen_dataset_name 260 abcdefg)"
 
 for ds in $TESTPOOL/$TESTFS $TESTPOOL/$TESTCTR $TESTPOOL/$TESTVOL; do
 	for opt in ${badopts[@]}; do
-		log_mustnot $ZFS snapshot $opt $ds@$TESTSNAP
+		log_mustnot zfs snapshot $opt $ds@$TESTSNAP
 	done
 
-	log_mustnot $ZFS snapshot $ds@snap $ds@snap1
-	log_mustnot $ZFS snapshot -r $ds@snap $ds@snap1
+	log_mustnot zfs snapshot $ds@snap $ds@snap1
+	log_mustnot zfs snapshot -r $ds@snap $ds@snap1
 
-	log_mustnot $ZFS snapshot $ds@$l_name
-	log_mustnot $ZFS snapshot -r $ds@$l_name
+	log_mustnot zfs snapshot $ds@$l_name
+	log_mustnot zfs snapshot -r $ds@$l_name
 done
 
 log_pass "'zfs snapshot' fails with bad options or too many arguments as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh
index 319e5c44c5..96121f1c13 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -41,7 +45,7 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $initfs ; then
-		log_must $ZFS destroy -rf $initfs
+		log_must zfs destroy -rf $initfs
 	fi
 }
 
@@ -52,12 +56,12 @@ initfs=$TESTPOOL/$TESTFS/$TESTFS
 basefs=$initfs
 typeset -i ret=0 len snaplen
 while ((ret == 0)); do
-	$ZFS create $basefs
-	$ZFS snapshot $basefs@snap1
+	zfs create $basefs
+	zfs snapshot $basefs@snap1
 	ret=$?
 
 	if ((ret != 0)); then
-		len=$($ECHO $basefs| $WC -c)
+		len=$(echo $basefs| wc -c)
 		log_note "The deeply-nested filesystem len: $len"
 
 		#
@@ -67,10 +71,10 @@ while ((ret == 0)); do
 		#
 		if ((len >= 255)); then
 			if datasetexists $basefs; then
-				log_must $ZFS destroy -r $basefs
+				log_must zfs destroy -r $basefs
 			fi
 			basefs=${basefs%/*}
-			len=$($ECHO $basefs| $WC -c)
+			len=$(echo $basefs| wc -c)
 		fi
 		break
 	fi
@@ -81,7 +85,7 @@ done
 # Make snapshot name is longer than the max length
 ((snaplen = 256 - len + 10))
 snap=$(gen_dataset_name $snaplen "s")
-log_mustnot $ZFS snapshot -r $TESTPOOL@$snap
+log_mustnot zfs snapshot -r $TESTPOOL@$snap
 
 log_must datasetnonexists $TESTPOOL@$snap
 while [[ $basefs != $TESTPOOL ]]; do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh
index 8794cba84f..d97dc0f822 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -42,7 +46,7 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $initfs ; then
-		log_must $ZFS destroy -rf $initfs
+		log_must zfs destroy -rf $initfs
 	fi
 }
 
@@ -53,12 +57,12 @@ initfs=$TESTPOOL/$TESTFS/$TESTFS
 basefs=$initfs
 typeset -i ret=0 len snaplen
 while ((ret == 0)); do
-	$ZFS create $basefs
-	$ZFS snapshot $basefs@snap1
+	zfs create $basefs
+	zfs snapshot $basefs@snap1
 	ret=$?
 
 	if ((ret != 0)); then
-		len=$($ECHO $basefs | $WC -c)
+		len=$(echo $basefs | wc -c)
 		log_note "The deeply-nested filesystem len: $len"
 
 		#
@@ -68,10 +72,10 @@ while ((ret == 0)); do
 		#
 		if ((len >= 255)); then
 			if datasetexists $basefs; then
-				log_must $ZFS destroy -r $basefs
+				log_must zfs destroy -r $basefs
 			fi
 			basefs=${basefs%/*}
-			len=$($ECHO $basefs| $WC -c)
+			len=$(echo $basefs| wc -c)
 		fi
 		break
 	fi
@@ -82,11 +86,11 @@ done
 # Make snapshot name length match the longest one
 ((snaplen = 256 - len - 1)) # 1: @
 snap=$(gen_dataset_name $snaplen "s")
-log_must $ZFS snapshot $basefs@$snap
+log_must zfs snapshot $basefs@$snap
 
-log_mustnot $ZFS rename $basefs ${basefs}a
-log_mustnot $ZFS rename $basefs ${basefs}-new
-log_mustnot $ZFS rename $initfs ${initfs}-new
-log_mustnot $ZFS rename $TESTPOOL/$TESTFS $TESTPOOL/$TESTFS-new
+log_mustnot zfs rename $basefs ${basefs}a
+log_mustnot zfs rename $basefs ${basefs}-new
+log_mustnot zfs rename $initfs ${initfs}-new
+log_mustnot zfs rename $TESTPOOL/$TESTFS $TESTPOOL/$TESTFS-new
 
 log_pass "Verify long name filesystem with snapshot should not break ZFS."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_006_pos.ksh
index 6d5f03cb85..089ebdb979 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
@@ -47,7 +47,7 @@ function cleanup
 	for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL ; do
 		typeset fssnap=$fs@snap
 		if datasetexists $fssnap ; then
-			log_must $ZFS destroy -rf $fssnap
+			log_must zfs destroy -rf $fssnap
 		fi
 	done
 	cleanup_user_prop $TESTPOOL
@@ -77,16 +77,16 @@ for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL ; do
 	prop_name=$(valid_user_property 10)
 	value=$(user_property_value 16)
 
-	log_must eval "$ZFS snapshot -o $prop_name='$value' $fssnap"
+	log_must eval "zfs snapshot -o $prop_name='$value' $fssnap"
 	log_must snapexists $fssnap
 	log_mustnot nonexist_user_prop $prop_name $fssnap
 
-	log_must $ZFS destroy -f $fssnap
+	log_must zfs destroy -f $fssnap
 
 	prop_name2=$(valid_user_property 10)
 	value2=$(user_property_value 16)
 
-	log_must eval "$ZFS snapshot -o $prop_name='$value' -o $prop_name2='$value2' $fssnap"
+	log_must eval "zfs snapshot -o $prop_name='$value' -o $prop_name2='$value2' $fssnap"
 	log_must snapexists $fssnap
 	log_mustnot nonexist_user_prop $prop_name $fssnap
 	log_mustnot nonexist_user_prop $prop_name2 $fssnap
@@ -97,13 +97,13 @@ cleanup
 prop_name=$(valid_user_property 10)
 value=$(user_property_value 16)
 
-log_must eval "$ZFS snapshot -r -o $prop_name='$value' $TESTPOOL@snap"
+log_must eval "zfs snapshot -r -o $prop_name='$value' $TESTPOOL@snap"
 for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL ; do
 	typeset fssnap=$fs@snap
 	log_must snapexists $fssnap
 	log_mustnot nonexist_user_prop $prop_name $fssnap
 
-	log_must $ZFS destroy -rf $fssnap
+	log_must zfs destroy -rf $fssnap
 done
 
 cleanup
@@ -111,14 +111,14 @@ cleanup
 prop_name2=$(valid_user_property 10)
 value2=$(user_property_value 16)
 
-log_must eval "$ZFS snapshot -r -o $prop_name='$value' -o $prop_name2='$value2' $TESTPOOL@snap"
+log_must eval "zfs snapshot -r -o $prop_name='$value' -o $prop_name2='$value2' $TESTPOOL@snap"
 for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL ; do
 	typeset fssnap=$fs@snap
 	log_must snapexists $fssnap
 	log_mustnot nonexist_user_prop $prop_name $fssnap
 	log_mustnot nonexist_user_prop $prop_name2 $fssnap
 
-	log_must $ZFS destroy -rf $fssnap
+	log_must zfs destroy -rf $fssnap
 done
 
 log_pass "User property could be set upon snapshot via 'zfs snapshot -o'."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh
index 1a80e4f58b..590d56ec80 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
 
 #
@@ -43,7 +47,7 @@ function cleanup
 	for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL/$TESTCTR $TESTPOOL ; do
 		typeset fssnap=$fs@snap
 		if datasetexists $fssnap ; then
-			log_must $ZFS destroy -rf $fssnap
+			log_must zfs destroy -rf $fssnap
 		fi
 	done
 	cleanup_user_prop $TESTPOOL
@@ -72,7 +76,7 @@ typeset snap_ro_props="volsize recordsize recsize quota reservation reserv mount
 	sharenfs checksum compression compress atime devices exec readonly rdonly \
 	setuid zoned"
 
-$ZFS upgrade -v > /dev/null 2>&1
+zfs upgrade -v > /dev/null 2>&1
 if [[ $? -eq 0 ]]; then
 	snap_ro_props="$snap_ro_props version"
 fi
@@ -83,21 +87,21 @@ for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL/$TESTCTR $TESTPOOL ; do
 	prop_name=$(valid_user_property 10)
 	value=$(user_property_value 16)
 
-	log_must eval "$ZFS snapshot -o $prop_name='$value' $fssnap"
+	log_must eval "zfs snapshot -o $prop_name='$value' $fssnap"
 	log_must snapexists $fssnap
 	log_mustnot nonexist_user_prop $prop_name $fssnap
 
-	log_must $ZFS destroy -f $fssnap
+	log_must zfs destroy -f $fssnap
 
 	prop_name2=$(valid_user_property 10)
 	value2=$(user_property_value 16)
 
-	log_must eval "$ZFS snapshot -o $prop_name='$value' -o $prop_name2='$value2' $fssnap"
+	log_must eval "zfs snapshot -o $prop_name='$value' -o $prop_name2='$value2' $fssnap"
 	log_must snapexists $fssnap
 	log_mustnot nonexist_user_prop $prop_name $fssnap
 	log_mustnot nonexist_user_prop $prop_name2 $fssnap
 
-	log_must $ZFS destroy -f $fssnap
+	log_must zfs destroy -f $fssnap
 done
 
 cleanup
@@ -105,7 +109,7 @@ cleanup
 prop_name=$(valid_user_property 10)
 value=$(user_property_value 16)
 
-log_must eval "$ZFS snapshot -r -o $prop_name='$value' $TESTPOOL@snap"
+log_must eval "zfs snapshot -r -o $prop_name='$value' $TESTPOOL@snap"
 for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL/$TESTCTR $TESTPOOL ; do
 	typeset fssnap=$fs@snap
 	log_must snapexists $fssnap
@@ -117,7 +121,7 @@ cleanup
 prop_name2=$(valid_user_property 10)
 value2=$(user_property_value 16)
 
-log_must eval "$ZFS snapshot -r -o $prop_name='$value' -o $prop_name2='$value2' $TESTPOOL@snap"
+log_must eval "zfs snapshot -r -o $prop_name='$value' -o $prop_name2='$value2' $TESTPOOL@snap"
 for fs in $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL $TESTPOOL/$TESTCTR $TESTPOOL ; do
 	typeset fssnap=$fs@snap
 	log_must snapexists $fssnap
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh
index 20fbdd863b..a801c79ce9 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_snapshot/zfs_snapshot.cfg
@@ -43,7 +43,7 @@ function cleanup
 {
 	for pool in $SNAPPOOL1 $SNAPPOOL2 ; do
 		if poolexists $pool ; then
-			log_must $ZPOOL destroy -f $pool
+			log_must zpool destroy -f $pool
 		fi
 	done
 
@@ -57,12 +57,12 @@ function cleanup
 log_assert "'zfs snapshot pool1@snap1 pool2@snap2' should fail since snapshots are in different pools."
 log_onexit cleanup
 
-log_must $MKFILE $MINVDEVSIZE $SNAPDEV1
-log_must $MKFILE $MINVDEVSIZE $SNAPDEV2
+log_must mkfile $MINVDEVSIZE $SNAPDEV1
+log_must mkfile $MINVDEVSIZE $SNAPDEV2
 
-log_must $ZPOOL create $SNAPPOOL1 $SNAPDEV1
-log_must $ZPOOL create $SNAPPOOL2 $SNAPDEV2
+log_must zpool create $SNAPPOOL1 $SNAPDEV1
+log_must zpool create $SNAPPOOL2 $SNAPDEV2
 
-log_mustnot $ZFS snapshot $SNAPPOOL1@snap1 $SNAPPOOL2@snap2
+log_mustnot zfs snapshot $SNAPPOOL1@snap1 $SNAPPOOL2@snap2
 
 log_pass "'zfs snapshot pool1@snap1 pool2@snap2' should fail since snapshots are in different pools."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
index 00734eb34c..688153a172 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -31,9 +31,9 @@ ZFS_MAX_DATASET_NAME_LEN=256
 function cleanup
 {
 	for ds in $datasets; do
-		datasetexists $ds && log_must $ZFS destroy -r $ds
+		datasetexists $ds && log_must zfs destroy -r $ds
 	done
-	$ZFS destroy -r $TESTPOOL/TESTFS4
+	zfs destroy -r $TESTPOOL/TESTFS4
 }
 datasets="$TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS2
     $TESTPOOL/$TESTFS3"
@@ -59,38 +59,38 @@ test_data=$STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles
 
 log_note "destroy a list of valid snapshots"
 for ds in $datasets; do
-	log_must $ZFS create $ds
-	log_must $CP -r $test_data /$ds
+	log_must zfs create $ds
+	log_must cp -r $test_data /$ds
 done
 i=0
 while (( i < ${#valid_args[*]} )); do
-	log_must $ZFS snapshot ${valid_args[i]}
+	log_must zfs snapshot ${valid_args[i]}
 	for token in ${valid_args[i]}; do
 		log_must snapexists $token && \
-		    log_must $ZFS destroy $token
+		    log_must zfs destroy $token
 	done
 	((i = i + 1))
 done
 log_note "destroy a list of invalid snapshots"
 i=0
 while (( i < ${#invalid_args[*]} )); do
-	log_mustnot $ZFS snapshot ${invalid_args[i]}
+	log_mustnot zfs snapshot ${invalid_args[i]}
 	for token in ${invalid_args[i]}; do
 		log_mustnot snapexists $token
 	done
 	((i = i + 1))
 done
 log_note "verify multiple snapshot transaction group"
-txg_group=$($ZDB -Pd $TESTPOOL | $GREP snap | $AWK '{print $7}')
+txg_group=$(zdb -Pd $TESTPOOL | grep snap | awk '{print $7}')
 for i in 1 2 3; do
-	txg_tag=$($ECHO "$txg_group" | $NAWK -v j=$i 'FNR == j {print}')
-	[[ $txg_tag != $($ECHO "$txg_group" | \
-	    $NAWK -v j=$i 'FNR == j {print}') ]] \
+	txg_tag=$(echo "$txg_group" | nawk -v j=$i 'FNR == j {print}')
+	[[ $txg_tag != $(echo "$txg_group" | \
+	    nawk -v j=$i 'FNR == j {print}') ]] \
 	    && log_fail "snapshots belong to differnt transaction groups"
 done
 log_note "verify snapshot contents"
 for ds in $datasets; do
-	status=$($DIRCMP /$ds /$ds/.zfs/snapshot/snap | $GREP "different")
+	status=$(dircmp /$ds /$ds/.zfs/snapshot/snap | grep "different")
 	[[ -z $status ]] || log_fail "snapshot contents are different from" \
 	    "the filesystem"
 done
@@ -101,13 +101,13 @@ DATASET_XXX=$(printf 'x%.0s' \
     {1..$(($ZFS_MAX_DATASET_NAME_LEN - ${#TESTPOOL} - ${#TESTFS3} - 18))})
 
 log_note "verify multiple snapshot with -r option"
-log_must $ZFS create $TESTPOOL/TESTFS4
-log_must $ZFS create -p $TESTPOOL/$TESTFS3/TESTFSA$DATASET_XXX/TESTFSB
-log_mustnot $ZFS snapshot -r $TESTPOOL/$TESTFS1@snap1 $TESTPOOL/$TESTFS2@snap1 \
+log_must zfs create $TESTPOOL/TESTFS4
+log_must zfs create -p $TESTPOOL/$TESTFS3/TESTFSA$DATASET_XXX/TESTFSB
+log_mustnot zfs snapshot -r $TESTPOOL/$TESTFS1@snap1 $TESTPOOL/$TESTFS2@snap1 \
         $TESTPOOL/$TESTFS3@snap1 $TESTPOOL/TESTFS4@snap1
-log_must $ZFS rename $TESTPOOL/$TESTFS3/TESTFSA$DATASET_XXX \
+log_must zfs rename $TESTPOOL/$TESTFS3/TESTFSA$DATASET_XXX \
     $TESTPOOL/$TESTFS3/TESTFSA
-log_must $ZFS snapshot -r $TESTPOOL/$TESTFS1@snap1 $TESTPOOL/$TESTFS2@snap1 \
+log_must zfs snapshot -r $TESTPOOL/$TESTFS1@snap1 $TESTPOOL/$TESTFS2@snap1 \
         $TESTPOOL/$TESTFS3@snap1 $TESTPOOL/TESTFS4@snap1
 
 log_pass "zfs multiple snapshot verified correctly"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
index 9c9cb71ba9..525dfd1629 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_unmount/zfs_unmount.cfg
@@ -42,19 +42,19 @@ function do_unmount #cmd #opt #mnt #expect
 	mounted $mnt || wasmounted=0
 
 	if (( expect == 0 )) ; then
-		log_must $ZFS $cmd $opt $mnt
+		log_must zfs $cmd $opt $mnt
 
 		log_must unmounted $mnt
 
-		log_note "Successfully $ZFS $cmd $opt $mnt"
+		log_note "Successfully zfs $cmd $opt $mnt"
 
 	else
-		log_note "$ZFS $cmd $opt $mnt"
+		log_note "zfs $cmd $opt $mnt"
 
-		$ZFS $cmd $opt $mnt
+		zfs $cmd $opt $mnt
 		ret=$?
 		if (( ret != expect)); then
-			log_fail "'$ZFS $cmd $opt $mnt' " \
+			log_fail "'zfs $cmd $opt $mnt' " \
 				"unexpected return code of $ret."
 		fi
 
@@ -71,7 +71,7 @@ function cleanup
 {
 	[[ -n $cwd ]] && cd $cwd
 
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 	mounted $TESTPOOL/$TESTFS || \
-		log_must $ZFS $mountcmd $TESTPOOL/$TESTFS
+		log_must zfs $mountcmd $TESTPOOL/$TESTFS
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_001_pos.ksh
index 924e6ac179..fb4d1d9378 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -47,13 +52,13 @@ verify_runnable "both"
 function cleanup
 {
 	mounted $TESTDIR2 && \
-		log_must $ZFS umount -f $TESTDIR2
+		log_must zfs umount -f $TESTDIR2
 
 	datasetexists $TESTPOOL/$TESTFS2 && \
-		log_must $ZFS destroy $TESTPOOL/$TESTFS2
+		log_must zfs destroy $TESTPOOL/$TESTFS2
 
 	[[ -d $TESTDIR2 ]] && \
-		log_must $RM -rf $TESTDIR2
+		log_must rm -rf $TESTDIR2
 }
 function do_unmount
 {
@@ -62,18 +67,18 @@ function do_unmount
 	typeset mnt=$3
 
 	[[ ! -d $TESTDIR2 ]] && \
-	    log_must $MKDIR $TESTDIR2
+	    log_must mkdir $TESTDIR2
 
 	if ! datasetexists $TESTPOOL/$TESTFS2 ; then
-		log_must $ZFS create $TESTPOOL/$TESTFS2
-		log_must $ZFS set mountpoint=$TESTDIR2 \
+		log_must zfs create $TESTPOOL/$TESTFS2
+		log_must zfs set mountpoint=$TESTDIR2 \
 		    $TESTPOOL/$TESTFS2
 	fi
 
 	unmounted $TESTPOOL/$TESTFS2 && \
-		log_must $ZFS mount $TESTPOOL/$TESTFS2
+		log_must zfs mount $TESTPOOL/$TESTFS2
 
-	log_must $ZFS $cmd $options $mnt
+	log_must zfs $cmd $options $mnt
 
 	unmounted "$mnt" || \
 		log_fail "Unable to unmount $options $mnt"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_002_pos.ksh
index 1b0e621345..b8a5078586 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
 
@@ -66,7 +70,7 @@ function do_unmount_multiple #options #expect
 		j=0
 		while (( j < ${#dev[*]} )); do
 			log_note "Make sure ${dev[j]} is not in 'zfs list'"
-			log_mustnot $ZFS list ${dev[j]}
+			log_mustnot zfs list ${dev[j]}
 
 			do_unmount "${cmd[i]}" "$opt" \
 				"${dev[j]}" $expect
@@ -78,7 +82,7 @@ function do_unmount_multiple #options #expect
 	done
 }
 
-log_assert "Verify that '$ZFS $unmountcmd [-f] <filesystem|mountpoint>' " \
+log_assert "Verify that 'zfs $unmountcmd [-f] <filesystem|mountpoint>' " \
 	"whose name is not in 'zfs list' will fail with return code 1."
 
 log_onexit cleanup
@@ -90,5 +94,5 @@ while (( i <  ${#options[*]} )); do
 	((i = i + 1))
 done
 
-log_pass "'$ZFS $unmountcmd [-f] <filesystem|mountpoint>' " \
+log_pass "'zfs $unmountcmd [-f] <filesystem|mountpoint>' " \
 	"whose name is not in 'zfs list' failed with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_003_pos.ksh
index 8f1b9497e8..985c3d2b1f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
 
@@ -68,7 +72,7 @@ function do_unmount_multiple #options #expect #mountpoint
 		j=0
 		while (( j < ${#dev[*]} )); do
 			[[ -n $mopt ]] && \
-				log_must $ZFS set mountpoint=$mopt ${dev[0]}
+				log_must zfs set mountpoint=$mopt ${dev[0]}
 
 			do_unmount "${cmd[i]}" "$opt" \
 				"${dev[j]}" $expect
@@ -82,7 +86,7 @@ function do_unmount_multiple #options #expect #mountpoint
 	done
 }
 
-log_assert "Verify that '$ZFS $unmountcmd [-f] <filesystem|mountpoint>' " \
+log_assert "Verify that 'zfs $unmountcmd [-f] <filesystem|mountpoint>' " \
 	"whose mountpoint property is 'legacy' or 'none' " \
 	"will fail with return code 1."
 
@@ -100,6 +104,6 @@ while (( i < ${#mopts[*]} )); do
 	((i = i + 1))
 done
 
-log_pass "'$ZFS $unmountcmd [-f] <filesystem|mountpoint>' " \
+log_pass "'zfs $unmountcmd [-f] <filesystem|mountpoint>' " \
 	"whose mountpoint property is 'legacy' or 'none' " \
 	"will fail with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_004_pos.ksh
index 8f3def6e5a..bcc25ccd0f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_004_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
 
@@ -67,7 +71,7 @@ function do_unmount_multiple #options #expect
 		j=0
 		while (( j < ${#dev[*]} )); do
 			unmounted ${dev[j]} || \
-				log_must $ZFS $unmountforce ${dev[j]}
+				log_must zfs $unmountforce ${dev[j]}
 
 			do_unmount "${cmd[i]}" "$opt" \
 				"${dev[j]}" $expect
@@ -79,7 +83,7 @@ function do_unmount_multiple #options #expect
 	done
 }
 
-log_assert "Verify that '$ZFS $unmountcmd [-f] <filesystem|mountpoint>' " \
+log_assert "Verify that 'zfs $unmountcmd [-f] <filesystem|mountpoint>' " \
 	"with an unmounted filesystem will fail with return code 1."
 
 log_onexit cleanup
@@ -91,5 +95,5 @@ while (( i <  ${#options[*]} )); do
 	((i = i + 1))
 done
 
-log_pass "'$ZFS $unmountcmd [-f] <filesystem|mountpoint>' " \
+log_pass "'zfs $unmountcmd [-f] <filesystem|mountpoint>' " \
 	"with an unmounted filesystem failed with return code 1."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_005_pos.ksh
index ac2de65ae7..e21a2954d0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_005_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
 
@@ -68,7 +72,7 @@ function do_unmount_multiple #options #expect
 		j=0
 		while (( j < ${#dev[*]} )); do
 			mounted ${dev[j]} || \
-				log_must $ZFS $mountcmd ${dev[0]}
+				log_must zfs $mountcmd ${dev[0]}
 
 			cd $TESTDIR || \
 				log_unresolved "Unable change dir to $TESTDIR"
@@ -85,7 +89,7 @@ function do_unmount_multiple #options #expect
 	done
 }
 
-log_assert "Verify that '$ZFS $unmountcmd <filesystem|mountpoint>' " \
+log_assert "Verify that 'zfs $unmountcmd <filesystem|mountpoint>' " \
 	"with a filesystem which mountpoint is currently in use " \
 	"will fail with return code 1, and forcefully will succeeds as root."
 
@@ -104,6 +108,6 @@ while (( i <  ${#options[*]} )); do
         ((i = i + 1))
 done
 
-log_pass "'$ZFS $unmountcmd <filesystem|mountpoint>' " \
+log_pass "'zfs $unmountcmd <filesystem|mountpoint>' " \
 	"with a filesystem which mountpoint is currently in use " \
 	"will fail with return code 1, and forcefully will succeeds as root."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_006_pos.ksh
index 3e2ac07b2d..8b70e8868a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_006_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -42,7 +46,7 @@ verify_runnable "both"
 function cleanup
 {
 	if ! ismounted $TESTPOOL/$TESTFS ; then
-		log_must $ZFS mount $TESTPOOL/$TESTFS
+		log_must zfs mount $TESTPOOL/$TESTFS
 	fi
 }
 
@@ -56,12 +60,12 @@ mntpnt=$(get_prop mountpoint $TESTPOOL/$TESTFS)
 
 typeset -i i=0
 while (( i < 10000 )); do
-	$CP $STF_SUITE/include/libtest.shlib $mntpnt
+	cp $STF_SUITE/include/libtest.shlib $mntpnt
 
 	(( i += 1 ))
 done
 log_note "Recreating zfs files for 10000 times."
 
-log_must $ZFS unmount $TESTPOOL/$TESTFS
+log_must zfs unmount $TESTPOOL/$TESTFS
 
 log_pass "Re-creating zfs files, 'zfs unmount' passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_007_neg.ksh
index c1000e85ec..cdf4a5a266 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_007_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
 
@@ -70,10 +74,10 @@ function cleanup_all
 	typeset fs
 
 	cleanup_filesystem "$TESTPOOL" "$TESTFS1"
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
 	[[ -d ${TEST_BASE_DIR%%/}/testroot$$ ]] && \
-		$RM -rf ${TEST_BASE_DIR%%/}/testroot$$
+		rm -rf ${TEST_BASE_DIR%%/}/testroot$$
 
 	return 0
 }
@@ -96,7 +100,7 @@ log_must setup_all
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZFS ${args[i]}
+	log_mustnot zfs ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_008_neg.ksh
index e274e66690..ecc13de87b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_008_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -50,19 +54,19 @@ function cleanup
 {
 	for ds in $vol $fs1; do
 		if datasetexists $ds; then
-			log_must $ZFS destroy -f $ds
+			log_must zfs destroy -f $ds
 		fi
 	done
 
 	if snapexists $snap; then
-		log_must $ZFS destroy $snap
+		log_must zfs destroy $snap
 	fi
 
 	if [[ -e /tmp/$file ]]; then
-		$RM -f /tmp/$file
+		rm -f /tmp/$file
 	fi
 	if [[ -d /tmp/$dir ]]; then
-		$RM -rf /tmp/$dir
+		rm -rf /tmp/$dir
 	fi
 
 }
@@ -76,26 +80,26 @@ snap=$TESTPOOL/$TESTFS@snap.$$
 set -A badargs "A" "-A" "F" "-F" "-" "-x" "-?"
 
 if ! ismounted $fs; then
-	log_must $ZFS mount $fs
+	log_must zfs mount $fs
 fi
 
-log_must $ZFS snapshot $snap
+log_must zfs snapshot $snap
 if is_global_zone; then
-	log_must $ZFS create -V 10m $vol
+	log_must zfs create -V 10m $vol
 else
 	vol=""
 fi
 
 # Testing bad options
 for arg in ${badargs[@]}; do
-	log_mustnot eval "$ZFS unmount $arg $fs >/dev/null 2>&1"
+	log_mustnot eval "zfs unmount $arg $fs >/dev/null 2>&1"
 done
 
 
 #Testing invalid datasets
 for ds in $snap $vol "blah"; do
 	for opt in "" "-f"; do
-		log_mustnot eval "$ZFS unmount $opt $ds >/dev/null 2>&1"
+		log_mustnot eval "zfs unmount $opt $ds >/dev/null 2>&1"
 	done
 done
 
@@ -103,37 +107,37 @@ done
 dir=foodir.$$
 file=foo.$$
 fs1=$TESTPOOL/fs.$$
-$MKDIR /tmp/$dir
-$TOUCH /tmp/$file
-log_must $ZFS create -o mountpoint=/tmp/$dir $fs1
-curpath=`$DIRNAME $0`
+mkdir /tmp/$dir
+touch /tmp/$file
+log_must zfs create -o mountpoint=/tmp/$dir $fs1
+curpath=`dirname $0`
 cd /tmp
 for mpt in "./$dir" "./$file" "/tmp"; do
 	for opt in "" "-f"; do
-		log_mustnot eval "$ZFS unmount $opt $mpt >/dev/null 2>&1"
+		log_mustnot eval "zfs unmount $opt $mpt >/dev/null 2>&1"
 	done
 done
 cd $curpath
 
 #Testing null argument and too many arguments
 for opt in "" "-f"; do
-	log_mustnot eval "$ZFS unmount $opt >/dev/null 2>&1"
-	log_mustnot eval "$ZFS unmount $opt $fs $fs1 >/dev/null 2>&1"
+	log_mustnot eval "zfs unmount $opt >/dev/null 2>&1"
+	log_mustnot eval "zfs unmount $opt $fs $fs1 >/dev/null 2>&1"
 done
 
 #Testing already unmounted filesystem
-log_must $ZFS unmount $fs1
+log_must zfs unmount $fs1
 for opt in "" "-f"; do
-	log_mustnot eval "$ZFS unmount $opt $fs1 >/dev/null 2>&1"
-	log_mustnot eval "$ZFS unmount /tmp/$dir >/dev/null 2>&1"
+	log_mustnot eval "zfs unmount $opt $fs1 >/dev/null 2>&1"
+	log_mustnot eval "zfs unmount /tmp/$dir >/dev/null 2>&1"
 done
 
 #Testing legacy mounted filesystem
-log_must $ZFS set mountpoint=legacy $fs1
-log_must $MOUNT -F zfs $fs1 /tmp/$dir
+log_must zfs set mountpoint=legacy $fs1
+log_must mount -F zfs $fs1 /tmp/$dir
 for opt in "" "-f"; do
-	log_mustnot eval "$ZFS unmount $opt $fs1 >/dev/null 2>&1"
+	log_mustnot eval "zfs unmount $opt $fs1 >/dev/null 2>&1"
 done
-$UMOUNT /tmp/$dir
+umount /tmp/$dir
 
 log_pass "zfs unmount fails with bad parameters or scenarios as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh
index 79c6fdabf0..b1d98e68bc 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -52,28 +56,28 @@ function cleanup
 	for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do
 		typeset snap=$fs@$TESTSNAP
 		if snapexists $snap; then
-			log_must $ZFS destroy $snap
+			log_must zfs destroy $snap
 		fi
 	done
 
 	if ! poolexists $TESTPOOL && is_global_zone; then
-		log_must $ZPOOL create $TESTPOOL $DISK
+		log_must zpool create $TESTPOOL $DISK
 	fi
 
 	if ! datasetexists $TESTPOOL/$TESTFS; then
-		log_must $ZFS create $TESTPOOL/$TESTFS
-		log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+		log_must zfs create $TESTPOOL/$TESTFS
+		log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 	fi
 }
 
 function restore_dataset
 {
 	if ! datasetexists $TESTPOOL/$TESTFS ; then
-		log_must $ZFS create $TESTPOOL/$TESTFS
-		log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+		log_must zfs create $TESTPOOL/$TESTFS
+		log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 		log_must cd $TESTDIR
-		$ECHO hello > world
-		log_must $ZFS snapshot $TESTPOOL/$TESTFS@$TESTSNAP
+		echo hello > world
+		log_must zfs snapshot $TESTPOOL/$TESTFS@$TESTSNAP
 		log_must cd .zfs/snapshot/$TESTSNAP
 	fi
 }
@@ -87,22 +91,22 @@ for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do
 	typeset mtpt=$(get_prop mountpoint $fs)
 
 	log_must cd $mtpt
-	$ECHO hello > world
-	log_must $ZFS snapshot $snap
+	echo hello > world
+	log_must zfs snapshot $snap
 	log_must cd .zfs/snapshot/$TESTSNAP
 
-	log_mustnot $ZFS unmount -a
-	log_must $ZFS unmount -fa
-	log_mustnot $LS
+	log_mustnot zfs unmount -a
+	log_must zfs unmount -fa
+	log_mustnot ls
 	log_must cd /
 
-	log_must $ZFS mount -a
+	log_must zfs mount -a
 	log_must cd $mtpt
 	log_must cd .zfs/snapshot/$TESTSNAP
 
 	if is_global_zone || [[ $fs != $TESTPOOL ]] ; then
-		log_must $ZFS destroy -rf $fs
-		log_mustnot $LS
+		log_must zfs destroy -rf $fs
+		log_mustnot ls
 		log_must cd /
 	fi
 
@@ -110,14 +114,14 @@ for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do
 done
 
 if is_global_zone ; then
-	log_must $ZPOOL destroy -f $TESTPOOL
-	log_mustnot $LS
+	log_must zpool destroy -f $TESTPOOL
+	log_mustnot ls
 	log_must cd /
 fi
 
-log_must eval $ZFS list > /dev/null 2>&1
-log_must eval $ZPOOL list > /dev/null 2>&1
-log_must eval $ZPOOL status > /dev/null 2>&1
-$ZPOOL iostat > /dev/null 2>&1
+log_must eval zfs list > /dev/null 2>&1
+log_must eval zpool list > /dev/null 2>&1
+log_must eval zpool status > /dev/null 2>&1
+zpool iostat > /dev/null 2>&1
 
 log_pass "zfs fource unmount and destroy in snapshot directory will not cause error."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh
index 454293f01a..b1be2093ed 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_all_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
 . $STF_SUITE/tests/functional/cli_root/zfs_unmount/zfs_unmount.kshlib
 
@@ -119,7 +123,7 @@ function cleanup_all
 	done
 
 	[[ -d ${TEST_BASE_DIR%%/}/testroot$$ ]] && \
-		$RM -rf ${TEST_BASE_DIR%%/}/testroot$$
+		rm -rf ${TEST_BASE_DIR%%/}/testroot$$
 }
 
 function verify_all
@@ -167,17 +171,17 @@ log_must setup_all
 typeset opt
 for opt in "-a" "-fa"; do
 	export __ZFS_POOL_RESTRICT="$TESTPOOL"
-	log_must $ZFS $mountall
+	log_must zfs $mountall
 	unset __ZFS_POOL_RESTRICT
 
 	if [[ $opt == "-fa" ]]; then
 		mntpnt=$(get_prop mountpoint ${TESTPOOL}/${TESTCTR}/${TESTFS})
 		cd $mntpnt
-		log_mustnot $ZFS unmount -a
+		log_mustnot zfs unmount -a
 	fi
 
 	export __ZFS_POOL_RESTRICT="$TESTPOOL"
-	log_must $ZFS unmount $opt
+	log_must zfs unmount $opt
 	unset __ZFS_POOL_RESTRICT
 
 	if [[ $opt == "-fa" ]]; then
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh
index 033865b51a..7e9725f9c8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -46,28 +50,28 @@ function cleanup
 {
 	typeset -i i=0
 	while (( i < ${#mntp_fs[*]} )); do
-		log_must $ZFS set sharenfs=off ${mntp_fs[((i+1))]}
+		log_must zfs set sharenfs=off ${mntp_fs[((i+1))]}
 
 		((i = i + 2))
 	done
 
 	if mounted $TESTPOOL/$TESTCLONE; then
-		log_must $ZFS unmount $TESTDIR2
+		log_must zfs unmount $TESTDIR2
 	fi
 
 	[[ -d $TESTDIR2 ]] && \
-		log_must $RM -rf $TESTDIR2
+		log_must rm -rf $TESTDIR2
 
 	if datasetexists "$TESTPOOL/$TESTCLONE"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTCLONE
+		log_must zfs destroy -f $TESTPOOL/$TESTCLONE
 	fi
 
 	if snapexists "$TESTPOOL/$TESTFS2@snapshot"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS2@snapshot
+		log_must zfs destroy -f $TESTPOOL/$TESTFS2@snapshot
 	fi
 
 	if datasetexists "$TESTPOOL/$TESTFS2"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS2
+		log_must zfs destroy -f $TESTPOOL/$TESTFS2
 	fi
 }
 
@@ -88,29 +92,29 @@ function test_unshare # <mntp> <filesystem>
 
 	if [[ $prop_value == "off" ]]; then
 		not_shared $mntp ||
-			log_must $UNSHARE -F nfs $mntp
-		log_must $ZFS set sharenfs=on $filesystem
+			log_must unshare -F nfs $mntp
+		log_must zfs set sharenfs=on $filesystem
 		is_shared $mntp || \
-			log_fail "'$ZFS set sharenfs=on' fails to make" \
+			log_fail "'zfs set sharenfs=on' fails to make" \
 				"file system $filesystem shared."
 	fi
 
-	is_shared $mntp || log_must $ZFS share $filesystem
+	is_shared $mntp || log_must zfs share $filesystem
 
         #
 	# Verify 'zfs unshare <filesystem>' works as well.
 	#
-	log_must $ZFS unshare $filesystem
+	log_must zfs unshare $filesystem
 	not_shared $mntp || log_fail "'zfs unshare <filesystem>' fails"
 
-	log_must $ZFS share $filesystem
+	log_must zfs share $filesystem
 
-	log_must $ZFS unshare $mntp
+	log_must zfs unshare $mntp
 	not_shared $mntp || log_fail "'zfs unshare <mountpoint>' fails"
 
         log_note "Unsharing an unshared file system fails."
-        log_mustnot $ZFS unshare $filesystem
-	log_mustnot $ZFS unshare $mntp
+        log_mustnot zfs unshare $filesystem
+	log_mustnot zfs unshare $mntp
 }
 
 set -A mntp_fs \
@@ -121,10 +125,10 @@ set -A mntp_fs \
 log_assert "Verify that 'zfs unshare [-a] <filesystem|mountpoint>' succeeds as root."
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS2
-log_must $ZFS snapshot $TESTPOOL/$TESTFS2@snapshot
-log_must $ZFS clone $TESTPOOL/$TESTFS2@snapshot $TESTPOOL/$TESTCLONE
-log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL/$TESTCLONE
+log_must zfs create $TESTPOOL/$TESTFS2
+log_must zfs snapshot $TESTPOOL/$TESTFS2@snapshot
+log_must zfs clone $TESTPOOL/$TESTFS2@snapshot $TESTPOOL/$TESTCLONE
+log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL/$TESTCLONE
 
 #
 # Invoke 'test_unshare' routine to test 'zfs unshare <filesystem|mountpoint>'.
@@ -136,7 +140,7 @@ while (( i < ${#mntp_fs[*]} )); do
 	((i = i + 2))
 done
 
-log_note "Verify '$ZFS unshare -a' succeds as root."
+log_note "Verify 'zfs unshare -a' succeds as root."
 
 i=0
 typeset sharenfs_val
@@ -144,11 +148,11 @@ while (( i < ${#mntp_fs[*]} )); do
 	sharenfs_val=$(get_prop "sharenfs" ${mntp_fs[((i+1))]})
 	if [[ $sharenfs_val == "on" ]]; then
 		not_shared ${mntp_fs[i]} && \
-			log_must $ZFS share ${mntp_fs[((i+1))]}
+			log_must zfs share ${mntp_fs[((i+1))]}
 	else
-		log_must $ZFS set sharenfs=on ${mntp_fs[((i+1))]}
+		log_must zfs set sharenfs=on ${mntp_fs[((i+1))]}
 		is_shared ${mntp_fs[i]} || \
-			log_fail "'$ZFS set sharenfs=on' fails to share filesystem."
+			log_fail "'zfs set sharenfs=on' fails to share filesystem."
 	fi
 
         ((i = i + 2))
@@ -157,7 +161,7 @@ done
 #
 # test 'zfs unshare -a '
 #
-log_must $ZFS unshare -a
+log_must zfs unshare -a
 
 #
 # verify all shared filesystems become unshared
@@ -165,9 +169,9 @@ log_must $ZFS unshare -a
 i=0
 while (( i < ${#mntp_fs[*]} )); do
         not_shared ${mntp_fs[i]} || \
-                log_fail "'$ZFS unshare -a' fails to unshare all shared zfs filesystems."
+                log_fail "'zfs unshare -a' fails to unshare all shared zfs filesystems."
 
         ((i = i + 2))
 done
 
-log_pass "'$ZFS unshare [-a] <filesystem|mountpoint>' succeeds as root."
+log_pass "'zfs unshare [-a] <filesystem|mountpoint>' succeeds as root."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_002_pos.ksh
index ea1d079df4..269264b32c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,28 +49,28 @@ function cleanup
 	typeset -i i=0
 	while (( i < ${#mntp_fs[*]} )); do
 		is_shared ${mntp_fs[i]} && \
-			log_must $UNSHARE -F nfs ${mntp_fs[i]}
+			log_must unshare -F nfs ${mntp_fs[i]}
 
 		((i = i + 2))
 	done
 
 	if mounted $TESTPOOL/$TESTCLONE; then
-		log_must $ZFS unmount $TESTDIR2
+		log_must zfs unmount $TESTDIR2
 	fi
 
 	[[ -d $TESTDIR2 ]] && \
-		log_must $RM -rf $TESTDIR2
+		log_must rm -rf $TESTDIR2
 
 	if datasetexists "$TESTPOOL/$TESTCLONE"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTCLONE
+		log_must zfs destroy -f $TESTPOOL/$TESTCLONE
 	fi
 
 	if snapexists "$TESTPOOL/$TESTFS2@snapshot"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS2@snapshot
+		log_must zfs destroy -f $TESTPOOL/$TESTFS2@snapshot
 	fi
 
 	if datasetexists "$TESTPOOL/$TESTFS2"; then
-		log_must $ZFS destroy -f $TESTPOOL/$TESTFS2
+		log_must zfs destroy -f $TESTPOOL/$TESTFS2
 	fi
 }
 
@@ -81,18 +85,18 @@ function test_legacy_unshare # <mntp> <filesystem>
         typeset mntp=$1
         typeset filesystem=$2
 
-	log_must $ZFS set sharenfs=off $filesystem
+	log_must zfs set sharenfs=off $filesystem
 	not_shared $mntp || \
 	    log_fail "'zfs set sharenfs=off' fails to make ZFS " \
 	    "filesystem $filesystem unshared."
 
-	log_must $SHARE -F nfs $mntp
+	log_must share -F nfs $mntp
 	is_shared $mntp || \
 	    log_fail "'share' command fails to share ZFS file system."
 	#
 	# Verify 'zfs unshare <filesystem>' is aware of legacy share.
 	#
-	log_mustnot $ZFS unshare $filesystem
+	log_mustnot zfs unshare $filesystem
 	is_shared $mntp || \
 	    log_fail "'zfs unshare <filesystem>' fails to be aware" \
 	    "of legacy share."
@@ -100,7 +104,7 @@ function test_legacy_unshare # <mntp> <filesystem>
 	#
 	# Verify 'zfs unshare <filesystem>' is aware of legacy share.
 	#
-	log_mustnot $ZFS unshare $mntp
+	log_mustnot zfs unshare $mntp
 	is_shared $mntp || \
 	    log_fail "'zfs unshare <mountpoint>' fails to be aware" \
 	    "of legacy share."
@@ -115,10 +119,10 @@ set -A mntp_fs \
 log_assert "Verify that 'zfs unshare [-a]' is aware of legacy share."
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS2
-log_must $ZFS snapshot $TESTPOOL/$TESTFS2@snapshot
-log_must $ZFS clone $TESTPOOL/$TESTFS2@snapshot $TESTPOOL/$TESTCLONE
-log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL/$TESTCLONE
+log_must zfs create $TESTPOOL/$TESTFS2
+log_must zfs snapshot $TESTPOOL/$TESTFS2@snapshot
+log_must zfs clone $TESTPOOL/$TESTFS2@snapshot $TESTPOOL/$TESTCLONE
+log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL/$TESTCLONE
 
 #
 # Invoke 'test_legacy_unshare' routine to verify.
@@ -131,16 +135,16 @@ while (( i < ${#mntp_fs[*]} )); do
 done
 
 
-log_note "Verify '$ZFS unshare -a' is aware of legacy share."
+log_note "Verify 'zfs unshare -a' is aware of legacy share."
 
 #
 # set the 'sharenfs' property to 'off' for each filesystem
 #
 i=0
 while (( i < ${#mntp_fs[*]} )); do
-        log_must $ZFS set sharenfs=off ${mntp_fs[((i + 1))]}
+        log_must zfs set sharenfs=off ${mntp_fs[((i + 1))]}
         not_shared ${mntp_fs[i]} || \
-                log_fail "'$ZFS set sharenfs=off' unshares file system failed."
+                log_fail "'zfs set sharenfs=off' unshares file system failed."
 
         ((i = i + 2))
 done
@@ -150,9 +154,9 @@ done
 #
 i=0
 while (( i < ${#mntp_fs[*]} )); do
-        $SHARE -F nfs ${mntp_fs[i]}
+        share -F nfs ${mntp_fs[i]}
         is_shared ${mntp_fs[i]} || \
-                log_fail "'$SHARE' shares ZFS filesystem failed."
+                log_fail "'share' shares ZFS filesystem failed."
 
         ((i = i + 2))
 done
@@ -160,7 +164,7 @@ done
 #
 # Verify that 'zfs unshare -a' is aware of legacy share
 #
-log_must $ZFS unshare -a
+log_must zfs unshare -a
 
 #
 # verify ZFS filesystems are still shared
@@ -168,10 +172,10 @@ log_must $ZFS unshare -a
 i=0
 while (( i < ${#mntp_fs[*]} )); do
         is_shared ${mntp_fs[i]} || \
-            log_fail "'$ZFS  unshare -a' fails to be aware of legacy share."
+            log_fail "'zfs  unshare -a' fails to be aware of legacy share."
 
         ((i = i + 2))
 done
 
-log_pass "'$ZFS unshare [-a]' succeeds to be aware of legacy share."
+log_pass "'zfs unshare [-a]' succeeds to be aware of legacy share."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_003_pos.ksh
index 74cc41dbc7..a16a58f813 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -46,10 +50,10 @@ verify_runnable "global"
 function cleanup
 {
 	if snapexists $TESTPOOL/$TESTFS@snapshot; then
-		log_must $ZFS destroy $TESTPOOL/$TESTFS@snapshot
+		log_must zfs destroy $TESTPOOL/$TESTFS@snapshot
 	fi
 
-	log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
 }
 
 #
@@ -68,11 +72,11 @@ function test_snap_unshare # <mntp> <filesystem>
 	prop_value=$(get_prop "sharenfs" $filesystem)
 
 	if [[ $prop_value == "off" ]]; then
-		is_shared $mntp || $UNSHARE -F nfs $mntp
-		log_must $ZFS set sharenfs=on $filesystem
+		is_shared $mntp || unshare -F nfs $mntp
+		log_must zfs set sharenfs=on $filesystem
 	fi
 
-	log_must $ZFS set sharenfs=off $filesystem
+	log_must zfs set sharenfs=off $filesystem
 
 	not_shared $mntp || \
 		log_fail "File system $filesystem is shared (set sharenfs)."
@@ -84,7 +88,7 @@ function test_snap_unshare # <mntp> <filesystem>
 log_assert "Verify that a file system and its dependant are unshared."
 log_onexit cleanup
 
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snapshot
+log_must zfs snapshot $TESTPOOL/$TESTFS@snapshot
 test_snap_unshare $TESTDIR $TESTPOOL/$TESTFS
 
 log_pass "A file system and its dependant are both unshared as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh
index 29c5fb9395..e92581c7c9 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,33 +52,33 @@ set -A opts "" "$TESTPOOL/$NONEXISTFSNAME" "$NONEEXISTMOUNTPOINT" "-?" "-1" \
 		"$TESTPOOL/$TESTFS $TESTDIR" "-f $TESTPOOL/$TESTFS $TESTDIR" \
 		"${TESTDIR#/}" "-f ${TESTDIR#/}"
 
-log_assert "Verify that '$ZFS unshare' issue error message with badly formed parameter."
+log_assert "Verify that 'zfs unshare' issue error message with badly formed parameter."
 
 shareval=$(get_prop sharenfs $TESTPOOL/$TESTFS)
 if [[ $shareval == off ]]; then
-	log_must $ZFS set sharenfs=on $TESTPOOL/$TESTFS
+	log_must zfs set sharenfs=on $TESTPOOL/$TESTFS
 fi
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-        log_mustnot $ZFS unshare ${args[i]}
+        log_mustnot zfs unshare ${args[i]}
 
         ((i = i + 1))
 done
 
 #Testing that unsharing unshared filesystem fails.
 mpt=$(get_prop mountpoint $TESTPOOL/$TESTFS)
-log_must $ZFS unshare $TESTPOOL/$TESTFS
+log_must zfs unshare $TESTPOOL/$TESTFS
 for opt in "" "-f"; do
-	log_mustnot eval "$ZFS unshare $opt $TESTPOOL/$TESTFS >/dev/null 2>&1"
-	log_mustnot eval "$ZFS unshare $opt $mpt >/dev/null 2>&1"
+	log_mustnot eval "zfs unshare $opt $TESTPOOL/$TESTFS >/dev/null 2>&1"
+	log_mustnot eval "zfs unshare $opt $mpt >/dev/null 2>&1"
 done
 
 #Testing zfs unshare fails with legacy share set
-log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS
+log_must zfs set sharenfs=off $TESTPOOL/$TESTFS
 for opt in "" "-f"; do
-	log_mustnot eval "$ZFS unshare $opt $TESTPOOL/$TESTFS >/dev/null 2>&1"
-	log_mustnot eval "$ZFS unshare $opt $mpt >/dev/null 2>&1"
+	log_mustnot eval "zfs unshare $opt $TESTPOOL/$TESTFS >/dev/null 2>&1"
+	log_mustnot eval "zfs unshare $opt $mpt >/dev/null 2>&1"
 done
 
-log_pass "'$ZFS unshare' fails as expected with badly-formed parameters."
+log_pass "'zfs unshare' fails as expected with badly-formed parameters."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_005_neg.ksh
index d6fd5d0b8c..c1f5bc907e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_005_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -48,7 +52,7 @@ log_assert "Verify that unsharing a dataset other than filesystem fails."
 typeset -i i=0
 while (( i < ${#datasets[*]} ))
 do
-	log_mustnot $ZFS unshare ${datasets[i]}
+	log_mustnot zfs unshare ${datasets[i]}
 
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
index b622c94e4e..b74811b7f7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
@@ -24,6 +24,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -66,12 +70,12 @@ function default_setup_datasets #rootfs
 			(( m+=1 ))
 		done
 		if (( spa_version != 0 )) && (( vp < spa_version )); then
-			log_mustnot $ZFS create -o version=${version} ${current_fs}
+			log_mustnot zfs create -o version=${version} ${current_fs}
 			continue
 		fi
-		log_must $ZFS create -o version=${version} ${current_fs}
-		log_must $ZFS snapshot ${current_snap}
-		log_must $ZFS clone ${current_snap} ${current_clone}
+		log_must zfs create -o version=${version} ${current_fs}
+		log_must zfs snapshot ${current_snap}
+		log_must zfs clone ${current_snap} ${current_clone}
 
 		for subversion in $ZFS_ALL_VERSIONS ; do
 			typeset subverfs
@@ -88,10 +92,10 @@ function default_setup_datasets #rootfs
 				(( m+=1 ))
 			done
 			if (( spa_version != 0 )) && (( vp < spa_version )); then
-				log_mustnot $ZFS create -o \
+				log_mustnot zfs create -o \
 				version=${subversion} ${current_fs}/$subverfs
 			else
-				log_must $ZFS create -o \
+				log_must zfs create -o \
 				version=${subversion} ${current_fs}/$subverfs
 			fi
 		done
@@ -103,11 +107,11 @@ function default_cleanup_datasets #rootfs
 	typeset rootfs=$1
 
 	if datasetexists $rootfs ; then
-		log_must $ZFS destroy -Rf $rootfs
+		log_must zfs destroy -Rf $rootfs
 	fi
 
 	if datasetnonexists $rootfs ; then
-		log_must $ZFS create $rootfs
+		log_must zfs create $rootfs
 	fi
 }
 
@@ -122,7 +126,7 @@ function default_check_zfs_upgrade #rootfs
 	typeset newv
 	typeset -i df_ret
 
-	$DF -F zfs / > /dev/null 2>&1
+	df -F zfs / > /dev/null 2>&1
 	df_ret=$?
 
 	for newv in "" $ZFS_VERSION; do
@@ -146,14 +150,14 @@ function default_check_zfs_upgrade #rootfs
 
 		if (( df_ret != 0 )); then
 			if (( spa_version != 0 )) && (( vp < spa_version )); then
-				log_mustnot eval '$ZFS upgrade $opt -a > /dev/null 2>&1'
-				log_must eval '$ZPOOL upgrade $pool > /dev/null 2>&1'
+				log_mustnot eval 'zfs upgrade $opt -a > /dev/null 2>&1'
+				log_must eval 'zpool upgrade $pool > /dev/null 2>&1'
 				vp=$(get_pool_prop version $pool)
 			fi
 
-			log_must eval '$ZFS upgrade $opt -a > /dev/null 2>&1'
+			log_must eval 'zfs upgrade $opt -a > /dev/null 2>&1'
 
-			for fs in $($ZFS list -rH -t filesystem -o name $rootfs) ; do
+			for fs in $(zfs list -rH -t filesystem -o name $rootfs) ; do
 				log_must check_fs_version $fs $newv
 			done
 		fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh
index 0a4c76b254..a72a577f59 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh
@@ -23,8 +23,11 @@
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+
 #
+# Copyright (c) 2016 by Delphix. All rights reserved.
 #
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -48,13 +51,13 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $rootfs ; then
-		log_must $ZFS destroy -Rf $rootfs
+		log_must zfs destroy -Rf $rootfs
 	fi
-	log_must $ZFS create $rootfs
+	log_must zfs create $rootfs
 
 	for file in $output $oldoutput ; do
 		if [[ -f $file ]]; then
-			log_must $RM -f $file
+			log_must rm -f $file
 		fi
 	done
 }
@@ -70,8 +73,8 @@ typeset expect_str2="All filesystems are formatted with the current version"
 typeset expect_str3="The following filesystems are out of date, and can be upgraded"
 typeset -i COUNT OLDCOUNT
 
-$ZFS upgrade | $NAWK '$1 ~ "^[0-9]+$" {print $2}'> $oldoutput
-OLDCOUNT=$( $WC -l $oldoutput | $AWK '{print $1}' )
+zfs upgrade | nawk '$1 ~ "^[0-9]+$" {print $2}'> $oldoutput
+OLDCOUNT=$( wc -l $oldoutput | awk '{print $1}' )
 
 old_datasets=""
 for version in $ZFS_ALL_VERSIONS ; do
@@ -80,9 +83,9 @@ for version in $ZFS_ALL_VERSIONS ; do
 	typeset current_fs=$rootfs/$verfs
 	typeset current_snap=${current_fs}@snap
 	typeset current_clone=$rootfs/clone$verfs
-	log_must $ZFS create -o version=${version} ${current_fs}
-	log_must $ZFS snapshot ${current_snap}
-	log_must $ZFS clone ${current_snap} ${current_clone}
+	log_must zfs create -o version=${version} ${current_fs}
+	log_must zfs snapshot ${current_snap}
+	log_must zfs clone ${current_snap} ${current_clone}
 
 	if (( version != $ZFS_VERSION )); then
 		old_datasets="$old_datasets ${current_fs} ${current_clone}"
@@ -90,46 +93,46 @@ for version in $ZFS_ALL_VERSIONS ; do
 done
 
 if is_global_zone; then
-	log_must $ZFS create -V 100m $rootfs/$TESTVOL
+	log_must zfs create -V 100m $rootfs/$TESTVOL
 fi
 
-log_must eval '$ZFS upgrade > $output 2>&1'
+log_must eval 'zfs upgrade > $output 2>&1'
 
 # we also check that the usage message contains at least a description
 # of the current ZFS version.
-log_must eval '$GREP "${expect_str1} $ZFS_VERSION" $output > /dev/null 2>&1'
-$ZFS upgrade | $NAWK '$1 ~ "^[0-9]+$" {print $2}'> $output
-COUNT=$( $WC -l $output | $AWK '{print $1}' )
+log_must eval 'grep "${expect_str1} $ZFS_VERSION" $output > /dev/null 2>&1'
+zfs upgrade | nawk '$1 ~ "^[0-9]+$" {print $2}'> $output
+COUNT=$( wc -l $output | awk '{print $1}' )
 
 typeset -i i=0
 for fs in ${old_datasets}; do
-	log_must $GREP "^$fs$" $output
+	log_must grep "^$fs$" $output
 	(( i = i + 1 ))
 done
 
 if (( i != COUNT - OLDCOUNT )); then
-	$CAT $output
+	cat $output
 	log_fail "More old-version filesystems print out than expect."
 fi
 
 for fs in $old_datasets ; do
 	if datasetexists $fs ; then
-		log_must $ZFS destroy -Rf $fs
+		log_must zfs destroy -Rf $fs
 	fi
 done
 
-log_must eval '$ZFS upgrade > $output 2>&1'
-log_must eval '$GREP "${expect_str1} $ZFS_VERSION" $output > /dev/null 2>&1'
+log_must eval 'zfs upgrade > $output 2>&1'
+log_must eval 'grep "${expect_str1} $ZFS_VERSION" $output > /dev/null 2>&1'
 if (( OLDCOUNT == 0 )); then
-	log_must eval '$GREP "${expect_str2}" $output > /dev/null 2>&1'
+	log_must eval 'grep "${expect_str2}" $output > /dev/null 2>&1'
 else
-	log_must eval '$GREP "${expect_str3}" $output > /dev/null 2>&1'
+	log_must eval 'grep "${expect_str3}" $output > /dev/null 2>&1'
 fi
-$ZFS upgrade | $NAWK '$1 ~ "^[0-9]+$" {print $2}'> $output
-COUNT=$( $WC -l $output | $AWK '{print $1}' )
+zfs upgrade | nawk '$1 ~ "^[0-9]+$" {print $2}'> $output
+COUNT=$( wc -l $output | awk '{print $1}' )
 
 if (( COUNT != OLDCOUNT )); then
-	$CAT $output
+	cat $output
 	log_fail "Unexpect old-version filesystems print out."
 fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_002_pos.ksh
index 2b7fd3999e..5cbe955d32 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_002_pos.ksh
@@ -24,7 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
 #
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -43,7 +47,7 @@ verify_runnable "both"
 function cleanup
 {
 	if [[ -f $output ]]; then
-		log_must $RM -f $output
+		log_must rm -f $output
 	fi
 }
 
@@ -54,10 +58,10 @@ typeset output=/tmp/zfs-versions.$$
 typeset expect_str1="Initial ZFS filesystem version"
 typeset expect_str2="Enhanced directory entries"
 
-log_must eval '$ZFS upgrade -v > /dev/null 2>&1'
+log_must eval 'zfs upgrade -v > /dev/null 2>&1'
 
-$ZFS upgrade -v | $NAWK '$1 ~ "^[0-9]+$" {print $0}'> $output
-log_must eval '$GREP "${expect_str1}" $output > /dev/null 2>&1'
-log_must eval '$GREP "${expect_str2}" $output > /dev/null 2>&1'
+zfs upgrade -v | nawk '$1 ~ "^[0-9]+$" {print $0}'> $output
+log_must eval 'grep "${expect_str1}" $output > /dev/null 2>&1'
+log_must eval 'grep "${expect_str2}" $output > /dev/null 2>&1'
 
 log_pass "Executing 'zfs upgrade -v' command succeeds."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_003_pos.ksh
index 95b05b20f9..2f3394856d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_003_pos.ksh
@@ -24,7 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
 #
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -44,9 +48,9 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $rootfs ; then
-		log_must $ZFS destroy -Rf $rootfs
+		log_must zfs destroy -Rf $rootfs
 	fi
-	log_must $ZFS create $rootfs
+	log_must zfs create $rootfs
 }
 
 function setup_datasets
@@ -58,9 +62,9 @@ function setup_datasets
 		typeset current_fs=$rootfs/$verfs
 		typeset current_snap=${current_fs}@snap
 		typeset current_clone=$rootfs/clone$verfs
-		log_must $ZFS create -o version=${version} ${current_fs}
-		log_must $ZFS snapshot ${current_snap}
-		log_must $ZFS clone ${current_snap} ${current_clone}
+		log_must zfs create -o version=${version} ${current_fs}
+		log_must zfs snapshot ${current_snap}
+		log_must zfs clone ${current_snap} ${current_clone}
 		datasets="$datasets ${current_fs} ${current_clone}"
 	done
 }
@@ -87,10 +91,10 @@ for newv in "" "current" $ZFS_ALL_VERSIONS; do
 		fi
 
 		if (( newv >= oldv )); then
-			log_must eval '$ZFS upgrade $opt $fs > /dev/null 2>&1'
+			log_must eval 'zfs upgrade $opt $fs > /dev/null 2>&1'
 			log_must check_fs_version $fs $newv
 		else
-			log_mustnot eval '$ZFS upgrade $opt $fs > /dev/null 2>&1'
+			log_mustnot eval 'zfs upgrade $opt $fs > /dev/null 2>&1'
 			log_must check_fs_version $fs $oldv
 		fi
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_004_pos.ksh
index 67f441928a..d9119ca1d4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_004_pos.ksh
@@ -24,7 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
 #
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -44,9 +48,9 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $rootfs ; then
-		log_must $ZFS destroy -Rf $rootfs
+		log_must zfs destroy -Rf $rootfs
 	fi
-	log_must $ZFS create $rootfs
+	log_must zfs create $rootfs
 }
 
 function setup_datasets
@@ -58,14 +62,14 @@ function setup_datasets
 		typeset current_fs=$rootfs/$verfs
 		typeset current_snap=${current_fs}@snap
 		typeset current_clone=$rootfs/clone$verfs
-		log_must $ZFS create -o version=${version} ${current_fs}
-		log_must $ZFS snapshot ${current_snap}
-		log_must $ZFS clone ${current_snap} ${current_clone}
+		log_must zfs create -o version=${version} ${current_fs}
+		log_must zfs snapshot ${current_snap}
+		log_must zfs clone ${current_snap} ${current_clone}
 
 		for subversion in $ZFS_ALL_VERSIONS ; do
 			typeset subverfs
 			eval subverfs=\$ZFS_VERSION_$subversion
-			log_must $ZFS create -o version=${subversion} \
+			log_must zfs create -o version=${subversion} \
 				${current_fs}/$subverfs
 		done
 		datasets="$datasets ${current_fs}"
@@ -92,9 +96,9 @@ for newv in "" "current" $ZFS_VERSION; do
 			newv=$ZFS_VERSION
 		fi
 
-		log_must eval '$ZFS upgrade -r $opt $topfs > /dev/null 2>&1'
+		log_must eval 'zfs upgrade -r $opt $topfs > /dev/null 2>&1'
 
-		for fs in $($ZFS list -rH -t filesystem -o name $topfs) ; do
+		for fs in $(zfs list -rH -t filesystem -o name $topfs) ; do
 			log_must check_fs_version $fs $newv
 		done
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh
index 7612071905..a4983c75b6 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh
@@ -24,7 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
 #
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -44,9 +48,9 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $rootfs ; then
-		log_must $ZFS destroy -Rf $rootfs
+		log_must zfs destroy -Rf $rootfs
 	fi
-	log_must $ZFS create $rootfs
+	log_must zfs create $rootfs
 }
 
 function setup_datasets
@@ -58,14 +62,14 @@ function setup_datasets
 		typeset current_fs=$rootfs/$verfs
 		typeset current_snap=${current_fs}@snap
 		typeset current_clone=$rootfs/clone$verfs
-		log_must $ZFS create -o version=${version} ${current_fs}
-		log_must $ZFS snapshot ${current_snap}
-		log_must $ZFS clone ${current_snap} ${current_clone}
+		log_must zfs create -o version=${version} ${current_fs}
+		log_must zfs snapshot ${current_snap}
+		log_must zfs clone ${current_snap} ${current_clone}
 
 		for subversion in $ZFS_ALL_VERSIONS ; do
 			typeset subverfs
 			eval subverfs=\$ZFS_VERSION_$subversion
-			log_must $ZFS create -o version=${subversion} \
+			log_must zfs create -o version=${subversion} \
 				${current_fs}/$subverfs
 		done
 		datasets="$datasets ${current_fs}"
@@ -92,10 +96,10 @@ for newv in "" "current" $ZFS_VERSION; do
 	fi
 
 	export __ZFS_POOL_RESTRICT="$TESTPOOL"
-	log_must $ZFS upgrade $opt -a
+	log_must zfs upgrade $opt -a
 	unset __ZFS_POOL_RESTRICT
 
-	for fs in $($ZFS list -rH -t filesystem -o name $rootfs) ; do
+	for fs in $(zfs list -rH -t filesystem -o name $rootfs) ; do
 		log_must check_fs_version $fs $newv
 	done
 	cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_006_neg.ksh
index 6cd3bb4536..f5eef31933 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_006_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -47,7 +51,7 @@ log_assert "Badly-formed 'zfs upgrade' should return an error."
 
 typeset -i i=1
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZFS upgrade ${args[i]}
+	log_mustnot zfs upgrade ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_007_neg.ksh
index cdc7e4140e..6c6f94754d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_007_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zfs_upgrade/zfs_upgrade.kshlib
 
@@ -48,7 +52,7 @@ log_assert "Set invalid value or non-digit version should fail as expected."
 typeset -i i=0
 while (( i < ${#args[*]} ))
 do
-	log_mustnot $ZFS upgrade -V ${args[i]} $TESTPOOL/$TESTFS
+	log_mustnot zfs upgrade -V ${args[i]} $TESTPOOL/$TESTFS
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
index 7b37644265..a3158bd578 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -57,7 +62,7 @@ log_assert "Execute zpool sub-command without proper parameters."
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL ${args[i]}
+	log_mustnot zpool ${args[i]}
 
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh
index f3fc2ecb7b..76579e35ab 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,10 +48,10 @@ function cleanup
 	unset ZFS_ABORT
 
 	if [[ -d $corepath ]]; then
-		$RM -rf $corepath
+		rm -rf $corepath
 	fi
 	if poolexists $pool; then
-		log_must $ZPOOL destroy -f $pool
+		log_must zpool destroy -f $pool
 	fi
 }
 
@@ -61,16 +61,16 @@ log_onexit cleanup
 #preparation work for testing
 corepath=$TESTDIR/core
 if [[ -d $corepath ]]; then
-	$RM -rf $corepath
+	rm -rf $corepath
 fi
-$MKDIR $corepath
+mkdir $corepath
 
 pool=pool.$$
 vdev1=$TESTDIR/file1
 vdev2=$TESTDIR/file2
 vdev3=$TESTDIR/file3
 for vdev in $vdev1 $vdev2 $vdev3; do
-	$MKFILE $MINVDEVSIZE $vdev
+	mkfile $MINVDEVSIZE $vdev
 done
 
 set -A cmds "create $pool mirror $vdev1 $vdev2" "list $pool" "iostat $pool" \
@@ -84,16 +84,16 @@ set -A badparams "" "create" "destroy" "add" "remove" "list *" "iostat" "status"
 		"online" "offline" "clear" "attach" "detach" "replace" "scrub" \
 		"import" "export" "upgrade" "history -?" "get" "set"
 
-$COREADM -p ${corepath}/core.%f
+coreadm -p ${corepath}/core.%f
 export ZFS_ABORT=yes
 
 for subcmd in "${cmds[@]}" "${badparams[@]}"; do
-	$ZPOOL $subcmd >/dev/null 2>&1
+	zpool $subcmd >/dev/null 2>&1
 	corefile=${corepath}/core.zpool
 	if [[ ! -e $corefile ]]; then
-		log_fail "$ZPOOL $subcmd cannot generate core file  with ZFS_ABORT set."
+		log_fail "zpool $subcmd cannot generate core file  with ZFS_ABORT set."
 	fi
-	$RM -f $corefile
+	rm -f $corefile
 done
 
 log_pass "With ZFS_ABORT set, zpool command can abort and generate core file as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh
index dc6b6b287b..fce361de86 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,25 +46,25 @@ verify_runnable "both"
 
 log_assert "Debugging features of zpool should succeed."
 
-log_must $ZPOOL -? > /dev/null 2>&1
+log_must zpool -? > /dev/null 2>&1
 
 if is_global_zone ; then
-	log_must $ZPOOL freeze $TESTPOOL
+	log_must zpool freeze $TESTPOOL
 else
-	log_mustnot $ZPOOL freeze $TESTPOOL
-	log_mustnot $ZPOOL freeze ${TESTPOOL%%/*}
+	log_mustnot zpool freeze $TESTPOOL
+	log_mustnot zpool freeze ${TESTPOOL%%/*}
 fi
 
-log_mustnot $ZPOOL freeze fakepool
+log_mustnot zpool freeze fakepool
 
 # Remove corefile possibly left by previous failing run of this test.
 [[ -f core ]] && log_must rm -f core
 
 ZFS_ABORT=1; export ZFS_ABORT
-$ZPOOL > /dev/null 2>&1
+zpool > /dev/null 2>&1
 unset ZFS_ABORT
 
-[[ -f core ]] || log_fail "$ZPOOL did not dump core by request."
+[[ -f core ]] || log_fail "zpool did not dump core by request."
 [[ -f core ]] && log_must rm -f core
 
 log_pass "Debugging features of zpool succeed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/setup.ksh
index 4457e2a0a1..16584d106d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ if [[ -n $DISK ]]; then
 
         partition_disk $SIZE $DISK 7
 else
-	for disk in `$ECHO $DISKSARRAY`; do
+	for disk in `echo $DISKSARRAY`; do
 		cleanup_devices $disk
 		partition_disk $SIZE $disk 7
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
index 2ea78fde6d..09fecc3cd0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -42,16 +42,16 @@ function find_vfstab_dev
 	typeset vfstabdevs=""
 	typeset line
 
-	$CAT $vfstab | $GREP "^/dev/dsk" >$tmpfile
+	cat $vfstab | grep "^/dev/dsk" >$tmpfile
 	while read -r line
 	do
-		vfstabdev=`$ECHO "$line" | $AWK '{print $1}'`
+		vfstabdev=`echo "$line" | awk '{print $1}'`
 		vfstabdev=${vfstabdev%%:}
 		vfstabdevs="$vfstabdev $vfstabdevs"
 	done <$tmpfile
 
-	$RM -f $tmpfile
-	$ECHO $vfstabdevs
+	rm -f $tmpfile
+	echo $vfstabdevs
 }
 
 #
@@ -65,16 +65,16 @@ function find_mnttab_dev
 	typeset mnttabdevs=""
 	typeset line
 
-	$CAT $mnttab | $GREP "^/dev/dsk" >$tmpfile
+	cat $mnttab | grep "^/dev/dsk" >$tmpfile
 	while read -r line
 	do
-		mnttabdev=`$ECHO "$line" | $AWK '{print $1}'`
+		mnttabdev=`echo "$line" | awk '{print $1}'`
 		mnttabdev=${mnttabdev%%:}
 		mnttabdevs="$mnttabdev $mnttabdevs"
 	done <$tmpfile
 
-	$RM -f $tmpfile
-	$ECHO $mnttabdevs
+	rm -f $tmpfile
+	echo $mnttabdevs
 }
 
 #
@@ -86,9 +86,9 @@ function save_dump_dev
 	typeset dumpdev
 	typeset fnd="Dump device"
 
-	dumpdev=`$DUMPADM | $GREP "$fnd" | $CUT -f2 -d : | \
-		$AWK '{print $1}'`
-	$ECHO $dumpdev
+	dumpdev=`dumpadm | grep "$fnd" | cut -f2 -d : | \
+		awk '{print $1}'`
+	echo $dumpdev
 }
 
 #
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_001_pos.ksh
index f57eb348bf..721ffcfb6c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -92,7 +92,7 @@ while (( $i < ${#keywords[*]} )); do
 		for vdev in "${poolarray[@]}"; do
 			create_pool "$TESTPOOL" "${disk}s${SLICE6}"
 			log_must poolexists "$TESTPOOL"
-			log_must $ZPOOL add -f "$TESTPOOL" ${keywords[i]} $vdev
+			log_must zpool add -f "$TESTPOOL" ${keywords[i]} $vdev
 			log_must vdevs_in_pool "$TESTPOOL" "$vdev"
 			destroy_pool "$TESTPOOL"
 		done
@@ -103,7 +103,7 @@ while (( $i < ${#keywords[*]} )); do
 			create_pool "$TESTPOOL" "${keywords[i]}" \
 				"${disk}s${SLICE4}" "${disk}s${SLICE5}"
 			log_must poolexists "$TESTPOOL"
-			log_must $ZPOOL add "$TESTPOOL" ${keywords[i]} $vdev
+			log_must zpool add "$TESTPOOL" ${keywords[i]} $vdev
 			log_must vdevs_in_pool "$TESTPOOL" "$vdev"
 			destroy_pool "$TESTPOOL"
 		done
@@ -114,7 +114,7 @@ while (( $i < ${#keywords[*]} )); do
 			create_pool "$TESTPOOL" "${keywords[i]}" \
 				"${disk}s${SLICE4}" "${disk}s${SLICE5}"
 			log_must poolexists "$TESTPOOL"
-			log_must $ZPOOL add "$TESTPOOL" ${keywords[i]} $vdev
+			log_must zpool add "$TESTPOOL" ${keywords[i]} $vdev
 			log_must vdevs_in_pool "$TESTPOOL" "$vdev"
 			destroy_pool "$TESTPOOL"
 		done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_002_pos.ksh
index 8008669bf8..33a5eb07d8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
@@ -62,10 +62,10 @@ log_onexit cleanup
 create_pool "$TESTPOOL" mirror "${disk}s${SLICE0}" "${disk}s${SLICE1}"
 log_must poolexists "$TESTPOOL"
 
-log_mustnot $ZPOOL add "$TESTPOOL" ${disk}s${SLICE3}
+log_mustnot zpool add "$TESTPOOL" ${disk}s${SLICE3}
 log_mustnot vdevs_in_pool "$TESTPOOL" "${disk}s${SLICE3}"
 
-log_must $ZPOOL add -f "$TESTPOOL" ${disk}s${SLICE3}
+log_must zpool add -f "$TESTPOOL" ${disk}s${SLICE3}
 log_must vdevs_in_pool "$TESTPOOL" "${disk}s${SLICE3}"
 
 log_pass "'zpool add -f <pool> <vdev> ...' executes successfully."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_003_pos.ksh
index a0ef7e5e12..edafedee35 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,7 +53,7 @@ function cleanup
 	partition_cleanup
 
 	[[ -e $tmpfile ]] && \
-		log_must $RM -f $tmpfile
+		log_must rm -f $tmpfile
 }
 
 log_assert "'zpool add -n <pool> <vdev> ...' can display the configuration" \
@@ -66,12 +66,12 @@ tmpfile="/var/tmp/zpool_add_003.tmp$$"
 create_pool "$TESTPOOL" "${disk}s${SLICE0}"
 log_must poolexists "$TESTPOOL"
 
-$ZPOOL add -n "$TESTPOOL" ${disk}s${SLICE1} > $tmpfile
+zpool add -n "$TESTPOOL" ${disk}s${SLICE1} > $tmpfile
 
 log_mustnot vdevs_in_pool "$TESTPOOL" "${disk}s${SLICE1}"
 
 str="would update '$TESTPOOL' to the following configuration:"
-$CAT $tmpfile | $GREP "$str" >/dev/null 2>&1
+cat $tmpfile | grep "$str" >/dev/null 2>&1
 (( $? != 0 )) && \
 	 log_fail "'zpool add -n <pool> <vdev> ...' is executed as unexpected"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_004_pos.ksh
index ced64a4260..742f34b8ab 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,7 +51,7 @@ function cleanup
 		destroy_pool "$TESTPOOL"
 
 	datasetexists $TESTPOOL1/$TESTVOL && \
-		log_must $ZFS destroy -f $TESTPOOL1/$TESTVOL
+		log_must zfs destroy -f $TESTPOOL1/$TESTVOL
 	poolexists $TESTPOOL1 && \
 		destroy_pool "$TESTPOOL1"
 
@@ -68,9 +68,9 @@ log_must poolexists "$TESTPOOL"
 
 create_pool "$TESTPOOL1" "${disk}s${SLICE1}"
 log_must poolexists "$TESTPOOL1"
-log_must $ZFS create -V $VOLSIZE $TESTPOOL1/$TESTVOL
+log_must zfs create -V $VOLSIZE $TESTPOOL1/$TESTVOL
 
-log_must $ZPOOL add "$TESTPOOL" /dev/zvol/dsk/$TESTPOOL1/$TESTVOL
+log_must zpool add "$TESTPOOL" /dev/zvol/dsk/$TESTPOOL1/$TESTVOL
 
 log_must vdevs_in_pool "$TESTPOOL" "/dev/zvol/dsk/$TESTPOOL1/$TESTVOL"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh
index 2ff349184d..ce3935683d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,7 +56,7 @@ function cleanup
 		destroy_pool "$TESTPOOL1"
 
 	if [[ -n $saved_dump_dev ]]; then
-		log_must eval "$DUMPADM -u -d $saved_dump_dev > /dev/null"
+		log_must eval "dumpadm -u -d $saved_dump_dev > /dev/null"
 	fi
 
 	partition_cleanup
@@ -78,12 +78,12 @@ create_pool "$TESTPOOL1" "${disk}s${SLICE1}"
 log_must poolexists "$TESTPOOL1"
 
 unset NOINUSE_CHECK
-log_mustnot $ZPOOL add -f "$TESTPOOL" ${disk}s${SLICE1}
-log_mustnot $ZPOOL add -f "$TESTPOOL" $mnttab_dev
-log_mustnot $ZPOOL add -f "$TESTPOOL" $vfstab_dev
+log_mustnot zpool add -f "$TESTPOOL" ${disk}s${SLICE1}
+log_mustnot zpool add -f "$TESTPOOL" $mnttab_dev
+log_mustnot zpool add -f "$TESTPOOL" $vfstab_dev
 
-log_must $ECHO "y" | $NEWFS /dev/dsk/$dump_dev > /dev/null 2>&1
-log_must $DUMPADM -u -d /dev/dsk/$dump_dev > /dev/null
-log_mustnot $ZPOOL add -f "$TESTPOOL" $dump_dev
+log_must echo "y" | newfs /dev/dsk/$dump_dev > /dev/null 2>&1
+log_must dumpadm -u -d /dev/dsk/$dump_dev > /dev/null
+log_mustnot zpool add -f "$TESTPOOL" $dump_dev
 
 log_pass "'zpool add' should fail with inapplicable scenarios."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_006_pos.ksh
index ad2aa685b5..dcc117e279 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,7 +52,7 @@ function cleanup
 	poolexists $TESTPOOL && \
 		destroy_pool $TESTPOOL
 
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR
 	partition_cleanup
 }
 
@@ -60,19 +60,19 @@ log_assert "Adding a large number of file based vdevs to a zpool works."
 log_onexit cleanup
 
 create_pool $TESTPOOL ${DISKS%% *}
-log_must $ZFS create -o mountpoint=$TESTDIR $TESTPOOL/$TESTFS
-log_must $MKFILE $MINVDEVSIZE $TESTDIR/file.00
+log_must zfs create -o mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+log_must mkfile $MINVDEVSIZE $TESTDIR/file.00
 create_pool "$TESTPOOL1" "$TESTDIR/file.00"
 
-vdevs_list=$($ECHO $TESTDIR/file.{01..16})
-log_must $MKFILE $MINVDEVSIZE $vdevs_list
+vdevs_list=$(echo $TESTDIR/file.{01..16})
+log_must mkfile $MINVDEVSIZE $vdevs_list
 
-log_must $ZPOOL add -f "$TESTPOOL1" $vdevs_list
+log_must zpool add -f "$TESTPOOL1" $vdevs_list
 log_must vdevs_in_pool "$TESTPOOL1" "$vdevs_list"
 
 # Attempt to add a file based vdev that's too small.
-log_must $MKFILE 32m $TESTDIR/broken_file
-log_mustnot $ZPOOL add -f "$TESTPOOL1" ${TESTDIR}/broken_file
+log_must mkfile 32m $TESTDIR/broken_file
+log_mustnot zpool add -f "$TESTPOOL1" ${TESTDIR}/broken_file
 log_mustnot vdevs_in_pool "$TESTPOOL1" "${TESTDIR}/broken_file"
 
 log_pass "Adding a large number of file based vdevs to a zpool works."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_007_neg.ksh
index 15e7c087c9..de8ff61a5b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_007_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
 
@@ -59,7 +64,7 @@ log_must poolexists "$TESTPOOL"
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZPOOL add ${args[i]}
+	log_mustnot zpool add ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_008_neg.ksh
index e764aa6f35..3ed89b7353 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_008_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
 
@@ -60,7 +65,7 @@ log_must poolexists "$TESTPOOL"
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZPOOL add ${args[i]}
+	log_mustnot zpool add ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_009_neg.ksh
index fab56cf8b7..f24969b598 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_009_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
 
@@ -58,8 +63,8 @@ log_onexit cleanup
 create_pool "$TESTPOOL" "${disk}s${SLICE0}"
 log_must poolexists "$TESTPOOL"
 
-log_mustnot $ZPOOL add -f "$TESTPOOL" ${disk}s${SLICE1} ${disk}s${SLICE1}
-log_mustnot $ZPOOL add -f "$TESTPOOL" ${disk}s${SLICE0}
+log_mustnot zpool add -f "$TESTPOOL" ${disk}s${SLICE1} ${disk}s${SLICE1}
+log_mustnot zpool add -f "$TESTPOOL" ${disk}s${SLICE0}
 
 log_pass "'zpool add' get fail as expected if vdevs are the same or vdev is " \
 	"contained in the given pool."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/zpool_attach_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/zpool_attach_001_neg.ksh
index df53b1214f..01b8e41ee4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/zpool_attach_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_attach/zpool_attach_001_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -70,7 +75,7 @@ typeset -i i=0
 
 while [[ $i -lt ${#args[*]} ]]; do
 
-	log_mustnot $ZPOOL attach ${args[$i]}
+	log_mustnot zpool attach ${args[$i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh
index b2a2ed5e4d..ae588e0ffb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,10 +48,10 @@ verify_runnable "global"
 function cleanup
 {
         poolexists $TESTPOOL1 && \
-                log_must $ZPOOL destroy -f $TESTPOOL1
+                log_must zpool destroy -f $TESTPOOL1
 
-        for file in `$LS $TESTDIR/file.*`; do
-		log_must $RM -f $file
+        for file in `ls $TESTDIR/file.*`; do
+		log_must rm -f $file
         done
 }
 
@@ -62,7 +62,7 @@ log_onexit cleanup
 #make raw files to create various configuration pools
 typeset -i i=0
 while (( i < 3 )); do
-	log_must $MKFILE $FILESIZE $TESTDIR/file.$i
+	log_must mkfile $FILESIZE $TESTDIR/file.$i
 
 	(( i = i + 1 ))
 done
@@ -87,28 +87,28 @@ function check_err # <pool> [<vdev>]
 	typeset c_cksum=0
 	typeset tmpfile=/var/tmp/file.$$
 	typeset healthstr="pool '$pool' is healthy"
-	typeset output="`$ZPOOL status -x $pool`"
+	typeset output="`zpool status -x $pool`"
 
 	[[ "$output" ==  "$healthstr" ]] && return $errnum
 
-	$ZPOOL status -x $pool | $GREP -v "^$" | $GREP -v "pool:" \
-			| $GREP -v "state:" | $GREP -v "config:" \
-			| $GREP -v "errors:" > $tmpfile
+	zpool status -x $pool | grep -v "^$" | grep -v "pool:" \
+			| grep -v "state:" | grep -v "config:" \
+			| grep -v "errors:" > $tmpfile
 	typeset line
 	typeset -i fetchbegin=1
 	while read line; do
 		if (( $fetchbegin != 0 )); then
-                        $ECHO $line | $GREP "NAME" >/dev/null 2>&1
+                        echo $line | grep "NAME" >/dev/null 2>&1
                         (( $? == 0 )) && (( fetchbegin = 0 ))
                          continue
                 fi
 
 		if [[ -n $checkvdev ]]; then
-			$ECHO $line | $GREP $checkvdev >/dev/null 2>&1
+			echo $line | grep $checkvdev >/dev/null 2>&1
 			(( $? != 0 )) && continue
-			c_read=`$ECHO $line | $AWK '{print $3}'`
-			c_write=`$ECHO $line | $AWK '{print $4}'`
-			c_cksum=`$ECHO $line | $AWK '{print $5}'`
+			c_read=`echo $line | awk '{print $3}'`
+			c_write=`echo $line | awk '{print $4}'`
+			c_cksum=`echo $line | awk '{print $5}'`
 			if [ $c_read != 0 ] || [ $c_write != 0 ] || \
 			    [ $c_cksum != 0 ]
 			then
@@ -117,9 +117,9 @@ function check_err # <pool> [<vdev>]
 			break
 		fi
 
-		c_read=`$ECHO $line | $AWK '{print $3}'`
-		c_write=`$ECHO $line | $AWK '{print $4}'`
-		c_cksum=`$ECHO $line | $AWK '{print $5}'`
+		c_read=`echo $line | awk '{print $3}'`
+		c_write=`echo $line | awk '{print $4}'`
+		c_cksum=`echo $line | awk '{print $5}'`
 		if [ $c_read != 0 ] || [ $c_write != 0 ] || \
 		    [ $c_cksum != 0 ]
 		then
@@ -138,21 +138,21 @@ function do_testing #<clear type> <vdevs>
 	shift
 	typeset vdev="$@"
 
-	log_must $ZPOOL create -f $TESTPOOL1 $vdev
-	log_must $ZFS create $FS
+	log_must zpool create -f $TESTPOOL1 $vdev
+	log_must zfs create $FS
 	#
 	# Fully fill up the zfs filesystem in order to make data block errors
 	# zfs filesystem
 	#
 	typeset -i ret=0
 	typeset -i i=0
-	while $TRUE ; do
-		$FILE_WRITE -o create -f $file.$i -b $BLOCKSZ -c $NUM_WRITES
+	while true ; do
+		file_write -o create -f $file.$i -b $BLOCKSZ -c $NUM_WRITES
 		ret=$?
 		(( $ret != 0 )) && break
 		(( i = i + 1 ))
 	done
-	(( $ret != 28 )) && log_fail "$FILE_WRITE fails to fully fill up the $FS."
+	(( $ret != 28 )) && log_fail "file_write fails to fully fill up the $FS."
 
 	#
 	#Make errors to the testing pool by overwrite the vdev device with
@@ -179,30 +179,30 @@ function do_testing #<clear type> <vdevs>
 			(( wcount = FILESIZE/1024 - 512 ))
 			;;
 	esac
-	$DD if=/dev/zero of=$fbase.$i seek=512 bs=1024 count=$wcount conv=notrunc \
+	dd if=/dev/zero of=$fbase.$i seek=512 bs=1024 count=$wcount conv=notrunc \
 			> /dev/null 2>&1
-	log_must $SYNC
-	log_must $ZPOOL scrub $TESTPOOL1
+	log_must sync
+	log_must zpool scrub $TESTPOOL1
 	# Wait for the completion of scrub operation
 	while is_pool_scrubbing $TESTPOOL1; do
-		$SLEEP 1
+		sleep 1
 	done
 
 	check_err $TESTPOOL1 && \
 		log_fail "No error generated."
 	if [[ $type == "device" ]]; then
-		log_must $ZPOOL clear $TESTPOOL1 $fbase.$i
+		log_must zpool clear $TESTPOOL1 $fbase.$i
 		! check_err $TESTPOOL1 $fbase.$i && \
 		    log_fail "'zpool clear' fails to clear error for $fbase.$i device."
 	fi
 
 	if [[ $type == "pool" ]]; then
-		log_must $ZPOOL clear $TESTPOOL1
+		log_must zpool clear $TESTPOOL1
 		! check_err $TESTPOOL1 && \
 		    log_fail "'zpool clear' fails to clear error for pool $TESTPOOL1."
 	fi
 
-	log_must $ZPOOL destroy $TESTPOOL1
+	log_must zpool destroy $TESTPOOL1
 }
 
 log_note "'zpool clear' clears leaf-device error."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_002_neg.ksh
index 35c2b643dc..91a637b337 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,9 +48,9 @@ verify_runnable "global"
 function cleanup
 {
 	poolexists $TESTPOOL1 && \
-		log_must $ZPOOL destroy -f $TESTPOOL1
+		log_must zpool destroy -f $TESTPOOL1
 	[[ -e $file ]] && \
-		log_must $RM -f $file
+		log_must rm -f $file
 }
 
 log_assert "Execute 'zpool clear' using invalid parameters."
@@ -59,8 +59,8 @@ log_onexit cleanup
 # Create another pool for negative testing, which clears pool error
 # with vdev device not in the pool vdev devices.
 file=$TESTDIR/file.$$
-log_must $MKFILE $FILESIZE $file
-log_must $ZPOOL create $TESTPOOL1 $file
+log_must mkfile $FILESIZE $file
+log_must zpool create $TESTPOOL1 $file
 
 set -A args "" "-?" "--%" "-1234567" "0.0001" "0.7644" "-0.7644" \
 		"blah" "blah $DISK" "$TESTPOOL c0txdx" "$TESTPOOL $file" \
@@ -68,7 +68,7 @@ set -A args "" "-?" "--%" "-1234567" "0.0001" "0.7644" "-0.7644" \
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZPOOL clear ${args[i]}
+	log_mustnot zpool clear ${args[i]}
 
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_003_neg.ksh
index 241ac035e5..637fdd8428 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,10 +47,10 @@ verify_runnable "global"
 function cleanup
 {
         poolexists $TESTPOOL1 && \
-                log_must $ZPOOL destroy -f $TESTPOOL1
+                log_must zpool destroy -f $TESTPOOL1
 
-        for file in `$LS $TESTDIR/file.*`; do
-		log_must $RM -f $file
+        for file in `ls $TESTDIR/file.*`; do
+		log_must rm -f $file
         done
 }
 
@@ -61,13 +61,13 @@ log_onexit cleanup
 #make raw files to create a spare pool
 typeset -i i=0
 while (( i < 5 )); do
-	log_must $MKFILE $FILESIZE $TESTDIR/file.$i
+	log_must mkfile $FILESIZE $TESTDIR/file.$i
 
 	(( i = i + 1 ))
 done
-log_must $ZPOOL create $TESTPOOL1 raidz $TESTDIR/file.1 $TESTDIR/file.2 \
+log_must zpool create $TESTPOOL1 raidz $TESTDIR/file.1 $TESTDIR/file.2 \
 	$TESTDIR/file.3 spare $TESTDIR/file.4
 
-log_mustnot $ZPOOL clear $TESTPOOL1 $TESTDIR/file.4
+log_mustnot zpool clear $TESTPOOL1 $TESTDIR/file.4
 
 log_pass "'zpool clear' works on spare device failed as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/setup.ksh
index 06420b362a..7d144e79cd 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ if [[ -n $DISK ]]; then
 
         partition_disk $((($MINVDEVSIZE / (1024 * 1024)) * 3))m $DISK 7
 else
-	for disk in `$ECHO $DISKSARRAY`; do
+	for disk in `echo $DISKSARRAY`; do
 		cleanup_devices $disk
 
 		partition_disk $((($MINVDEVSIZE / (1024 * 1024)) * 3))m $disk 7
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
index 853b618564..3bd3bc1f60 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -64,22 +64,22 @@ function create_blockfile
 	typeset size=$1
 	typeset file=$2
 	typeset disk=$3
-	typeset dir=`$DIRNAME $file`
+	typeset dir=`dirname $file`
 
 	if [[ -d $dir ]]; then
 		ismounted $dir ufs
 		(( $? == 0 )) && \
-			log_must $UMOUNT -f $dir
+			log_must umount -f $dir
 	else
-		log_must $MKDIR -p $dir
+		log_must mkdir -p $dir
 	fi
 
-	$ECHO "y" | $NEWFS /dev/rdsk/$disk >/dev/null 2>&1
+	echo "y" | newfs /dev/rdsk/$disk >/dev/null 2>&1
 	(( $? != 0 )) &&
 		log_fail "Create ufs file system fail."
 
-        log_must $MOUNT /dev/dsk/$disk $dir
-        log_must $MKFILE $size $file
+        log_must mount /dev/dsk/$disk $dir
+        log_must mkfile $size $file
 }
 
 #
@@ -93,13 +93,13 @@ function clean_blockfile
 	for dir in $dirs; do
 		if [[ -d $dir ]]; then
 			if ismounted $dir ufs; then
-				typeset dev=$($DF -lhF ufs | $GREP "$dir" | \
-					$AWK '{print $1}')
-				log_must $UMOUNT -f $dir
+				typeset dev=$(df -lhF ufs | grep "$dir" | \
+					awk '{print $1}')
+				log_must umount -f $dir
 				create_pool ${TESTPOOL}.tmp $dev
 				destroy_pool ${TESTPOOL}.tmp
 			fi
-			log_must $RM -rf $dir
+			log_must rm -rf $dir
 		fi
 	done
 }
@@ -115,16 +115,16 @@ function find_vfstab_dev
 	typeset vfstabdevs=""
 	typeset line
 
-	$CAT $vfstab | $GREP "^/dev/dsk" >$tmpfile
+	cat $vfstab | grep "^/dev/dsk" >$tmpfile
 	while read -r line
 	do
-		vfstabdev=`$ECHO "$line" | $AWK '{print $1}'`
+		vfstabdev=`echo "$line" | awk '{print $1}'`
 		vfstabdev=${vfstabdev%%:}
 		vfstabdevs="$vfstabdev $vfstabdevs"
 	done <$tmpfile
 
-	$RM -f $tmpfile
-	$ECHO $vfstabdevs
+	rm -f $tmpfile
+	echo $vfstabdevs
 }
 
 #
@@ -136,7 +136,7 @@ function save_dump_dev
 	typeset dumpdev
 	typeset fnd="Dump device"
 
-	dumpdev=`$DUMPADM | $GREP "$fnd" | $CUT -f2 -d : | \
-		$AWK '{print $1}'`
-	$ECHO $dumpdev
+	dumpdev=`dumpadm | grep "$fnd" | cut -f2 -d : | \
+		awk '{print $1}'`
+	echo $dumpdev
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh
index 4c581a7ba3..ae168fd4e7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,7 +58,7 @@ function cleanup
 	for file in /var/tmp/$FILEDISK0 /var/tmp/$FILEDISK1 /var/tmp/$FILEDISK2
 	do
 		if [[ -e $file ]]; then
-			$RM -rf $file
+			rm -rf $file
 		fi
 	done
 
@@ -76,36 +76,36 @@ else
 	disk=$DISK0
 fi
 create_pool "$TESTPOOL" "${disk}s${SLICE0}"
-log_must $ECHO "y" | $NEWFS /dev/rdsk/${disk}s${SLICE1} >/dev/null 2>&1
+log_must echo "y" | newfs /dev/rdsk/${disk}s${SLICE1} >/dev/null 2>&1
 create_blockfile $FILESIZE $TESTDIR0/$FILEDISK0 ${disk}s${SLICE4}
 create_blockfile $FILESIZE1 $TESTDIR1/$FILEDISK1 ${disk}s${SLICE5}
-log_must $MKFILE $SIZE /var/tmp/$FILEDISK0
-log_must $MKFILE $SIZE /var/tmp/$FILEDISK1
-log_must $MKFILE $SIZE /var/tmp/$FILEDISK2
+log_must mkfile $SIZE /var/tmp/$FILEDISK0
+log_must mkfile $SIZE /var/tmp/$FILEDISK1
+log_must mkfile $SIZE /var/tmp/$FILEDISK2
 
 unset NOINUSE_CHECK
-log_must $ZPOOL export $TESTPOOL
+log_must zpool export $TESTPOOL
 log_note "'zpool create' without '-f' will fail " \
 	"while device is belong to an exported pool."
-log_mustnot $ZPOOL create "$TESTPOOL1" "${disk}s${SLICE0}"
+log_mustnot zpool create "$TESTPOOL1" "${disk}s${SLICE0}"
 create_pool "$TESTPOOL1" "${disk}s${SLICE0}"
 log_must poolexists $TESTPOOL1
 
 log_note "'zpool create' without '-f' will fail " \
 	"while device is using by an ufs filesystem."
-log_mustnot $ZPOOL create "$TESTPOOL2" "${disk}s${SLICE1}"
+log_mustnot zpool create "$TESTPOOL2" "${disk}s${SLICE1}"
 create_pool "$TESTPOOL2" "${disk}s${SLICE1}"
 log_must poolexists $TESTPOOL2
 
 log_note "'zpool create' mirror without '-f' will fail " \
 	"while devices have different size."
-log_mustnot $ZPOOL create "$TESTPOOL3" "mirror" $TESTDIR0/$FILEDISK0 $TESTDIR1/$FILEDISK1
+log_mustnot zpool create "$TESTPOOL3" "mirror" $TESTDIR0/$FILEDISK0 $TESTDIR1/$FILEDISK1
 create_pool "$TESTPOOL3" "mirror" $TESTDIR0/$FILEDISK0 $TESTDIR1/$FILEDISK1
 log_must poolexists $TESTPOOL3
 
 log_note "'zpool create' mirror without '-f' will fail " \
 	"while devices are of different types."
-log_mustnot $ZPOOL create "$TESTPOOL4" "mirror" /var/tmp/$FILEDISK0 \
+log_mustnot zpool create "$TESTPOOL4" "mirror" /var/tmp/$FILEDISK0 \
 	${disk}s${SLICE3}
 create_pool "$TESTPOOL4" "mirror" /var/tmp/$FILEDISK0 ${disk}s${SLICE3}
 log_must poolexists $TESTPOOL4
@@ -114,9 +114,9 @@ log_note "'zpool create' without '-f' will fail " \
 	"while device is part of potentially active pool."
 create_pool "$TESTPOOL5"  "mirror" /var/tmp/$FILEDISK1 \
 	/var/tmp/$FILEDISK2
-log_must $ZPOOL offline $TESTPOOL5 /var/tmp/$FILEDISK2
-log_must $ZPOOL export $TESTPOOL5
-log_mustnot $ZPOOL create "$TESTPOOL6" /var/tmp/$FILEDISK2
+log_must zpool offline $TESTPOOL5 /var/tmp/$FILEDISK2
+log_must zpool export $TESTPOOL5
+log_mustnot zpool create "$TESTPOOL6" /var/tmp/$FILEDISK2
 create_pool $TESTPOOL6 /var/tmp/$FILEDISK2
 log_must poolexists $TESTPOOL6
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_003_pos.ksh
index 303c72afbc..ae2a12f40d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	[[ -e $tmpfile ]] && log_must $RM -f $tmpfile
+	[[ -e $tmpfile ]] && log_must rm -f $tmpfile
 }
 
 tmpfile="/var/tmp/zpool_create_003.tmp$$"
@@ -68,13 +68,13 @@ fi
 create_pool $TESTPOOL ${disk}s${SLICE0} > $tmpfile
 destroy_pool $TESTPOOL
 
-$ZPOOL create -n  $TESTPOOL ${disk}s${SLICE0} > $tmpfile
+zpool create -n  $TESTPOOL ${disk}s${SLICE0} > $tmpfile
 
 poolexists $TESTPOOL && \
         log_fail "'zpool create -n <pool> <vspec> ...' fail."
 
 str="would create '$TESTPOOL' with the following layout:"
-$CAT $tmpfile | $GREP "$str" >/dev/null 2>&1
+cat $tmpfile | grep "$str" >/dev/null 2>&1
 (( $? != 0 )) && \
         log_fail "'zpool create -n <pool> <vspec>...' is executed as unexpected."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_004_pos.ksh
index 1ba6408222..9773286ff4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zpool_create/zpool_create.shlib
@@ -50,7 +50,7 @@ function cleanup
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 	poolexists $TESTPOOL && destroy_pool $TESTPOOL
 
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR
 	partition_disk $SIZE $disk 6
 }
 
@@ -59,10 +59,10 @@ log_onexit cleanup
 
 disk=${DISKS%% *}
 create_pool $TESTPOOL $disk
-log_must $ZFS create -o mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+log_must zfs create -o mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
-vdevs_list=$($ECHO $TESTDIR/file.{01..16})
-log_must $MKFILE $MINVDEVSIZE $vdevs_list
+vdevs_list=$(echo $TESTDIR/file.{01..16})
+log_must mkfile $MINVDEVSIZE $vdevs_list
 
 create_pool "$TESTPOOL1" $vdevs_list
 log_must vdevs_in_pool "$TESTPOOL1" "$vdevs_list"
@@ -73,8 +73,8 @@ else
 	log_fail "Creating pool with large numbers of file-vdevs failed."
 fi
 
-log_must $MKFILE 32m $TESTDIR/broken_file
+log_must mkfile 32m $TESTDIR/broken_file
 vdevs_list="$vdevs_list $TESTDIR/broken_file"
-log_mustnot $ZPOOL create -f $TESTPOOL1 $vdevs_list
+log_mustnot zpool create -f $TESTPOOL1 $vdevs_list
 
 log_pass "Storage pools with many file based vdevs can be created."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh
index c2f3789891..2afbec37dc 100755
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,10 +47,10 @@ verify_runnable "global"
 function cleanup
 {
 	poolexists $TESTPOOL && \
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 
 	for dir in $TESTDIR $TESTDIR1; do
-		[[ -d $dir ]] && $RM -rf $dir
+		[[ -d $dir ]] && rm -rf $dir
 	done
 }
 
@@ -70,17 +70,17 @@ for pool in $TESTPOOL2 $TESTPOOL1 $TESTPOOL; do
 done
 
 #prepare raw file for file disk
-[[ -d $TESTDIR ]] && $RM -rf $TESTDIR
-log_must $MKDIR -p $TESTDIR
+[[ -d $TESTDIR ]] && rm -rf $TESTDIR
+log_must mkdir -p $TESTDIR
 typeset -i i=1
 while (( i < 4 )); do
-	log_must $MKFILE $FILESIZE $TESTDIR/file.$i
+	log_must mkfile $FILESIZE $TESTDIR/file.$i
 
 	(( i = i + 1 ))
 done
 
 #Remove the directory with name as pool name if it exists
-[[ -d /$TESTPOOL ]] && $RM -rf /$TESTPOOL
+[[ -d /$TESTPOOL ]] && rm -rf /$TESTPOOL
 file=$TESTDIR/file
 
 for opt in "-R $TESTDIR1" "-m $TESTDIR1" \
@@ -90,13 +90,13 @@ do
 	while (( i < ${#pooltype[*]} )); do
 		#Remove the testing pool and its mount directory
 		poolexists $TESTPOOL && \
-			log_must $ZPOOL destroy -f $TESTPOOL
-		[[ -d $TESTDIR1 ]] && $RM -rf $TESTDIR1
-		log_must $ZPOOL create $opt $TESTPOOL ${pooltype[i]} \
+			log_must zpool destroy -f $TESTPOOL
+		[[ -d $TESTDIR1 ]] && rm -rf $TESTDIR1
+		log_must zpool create $opt $TESTPOOL ${pooltype[i]} \
 			$file.1 $file.2 $file.3
 		! poolexists $TESTPOOL && \
 			log_fail "Createing pool with $opt fails."
-		mpt=`$ZFS mount | $EGREP "^$TESTPOOL[^/]" | $AWK '{print $2}'`
+		mpt=`zfs mount | egrep "^$TESTPOOL[^/]" | awk '{print $2}'`
 		(( ${#mpt} == 0 )) && \
 			log_fail "$TESTPOOL created with $opt is not mounted."
 		mpt_val=$(get_prop "mountpoint" $TESTPOOL)
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_006_pos.ksh
index 6b3a183f5f..ab2ae5a8a3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,7 +58,7 @@ mntpnt=$(get_prop mountpoint $TESTPOOL)
 
 typeset -i i=0
 while ((i < 10)); do
-	log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev$i
+	log_must mkfile $MINVDEVSIZE $mntpnt/vdev$i
 
 	eval vdev$i=$mntpnt/vdev$i
 	((i += 1))
@@ -107,19 +107,19 @@ set -A forced_args \
 
 i=0
 while ((i < ${#valid_args[@]})); do
-	log_must $ZPOOL create $TESTPOOL1 ${valid_args[$i]}
-	$SYNC; $SYNC
-	log_must $ZPOOL destroy -f $TESTPOOL1
+	log_must zpool create $TESTPOOL1 ${valid_args[$i]}
+	sync; sync
+	log_must zpool destroy -f $TESTPOOL1
 
 	((i += 1))
 done
 
 i=0
 while ((i < ${#forced_args[@]})); do
-	log_mustnot $ZPOOL create $TESTPOOL1 ${forced_args[$i]}
-	log_must $ZPOOL create -f $TESTPOOL1 ${forced_args[$i]}
-	$SYNC; $SYNC
-	log_must $ZPOOL destroy -f $TESTPOOL1
+	log_mustnot zpool create $TESTPOOL1 ${forced_args[$i]}
+	log_must zpool create -f $TESTPOOL1 ${forced_args[$i]}
+	sync; sync
+	log_must zpool destroy -f $TESTPOOL1
 
 	((i += 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_007_neg.ksh
index 6327e5a66d..301d9aa8b0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_007_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -78,7 +78,7 @@ log_onexit default_cleanup_noexit
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL create ${args[i]}
+	log_mustnot zpool create ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh
index 5cd46af9e7..f03440f809 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,9 +48,9 @@ function cleanup
 {
 	if [[ $exported_pool == true ]]; then
 		if [[ $force_pool == true ]]; then
-			log_must $ZPOOL create -f $TESTPOOL ${disk}s${SLICE0}
+			log_must zpool create -f $TESTPOOL ${disk}s${SLICE0}
 		else
-			log_must $ZPOOL import $TESTPOOL
+			log_must zpool import $TESTPOOL
 		fi
 	fi
 
@@ -79,25 +79,25 @@ function create_overlap_slice
         typeset format_file=/var/tmp/format_overlap.$$
         typeset disk=$1
 
-        $ECHO "partition" >$format_file
-        $ECHO "0" >> $format_file
-        $ECHO "" >> $format_file
-        $ECHO "" >> $format_file
-        $ECHO "0" >> $format_file
-        $ECHO "200m" >> $format_file
-        $ECHO "1" >> $format_file
-        $ECHO "" >> $format_file
-        $ECHO "" >> $format_file
-        $ECHO "0" >> $format_file
-        $ECHO "400m" >> $format_file
-        $ECHO "label" >> $format_file
-        $ECHO "" >> $format_file
-        $ECHO "q" >> $format_file
-        $ECHO "q" >> $format_file
-
-        $FORMAT -e -s -d $disk -f $format_file
+        echo "partition" >$format_file
+        echo "0" >> $format_file
+        echo "" >> $format_file
+        echo "" >> $format_file
+        echo "0" >> $format_file
+        echo "200m" >> $format_file
+        echo "1" >> $format_file
+        echo "" >> $format_file
+        echo "" >> $format_file
+        echo "0" >> $format_file
+        echo "400m" >> $format_file
+        echo "label" >> $format_file
+        echo "" >> $format_file
+        echo "q" >> $format_file
+        echo "q" >> $format_file
+
+        format -e -s -d $disk -f $format_file
 	typeset -i ret=$?
-        $RM -fr $format_file
+        rm -fr $format_file
 
 	if (( ret != 0 )); then
                 log_fail "unable to create overlap slice."
@@ -129,19 +129,19 @@ log_must labelvtoc $disk
 log_must create_overlap_slice $disk
 
 unset NOINUSE_CHECK
-log_mustnot $ZPOOL create $TESTPOOL ${disk}s${SLICE0}
-log_must $ZPOOL create -f $TESTPOOL ${disk}s${SLICE0}
+log_mustnot zpool create $TESTPOOL ${disk}s${SLICE0}
+log_must zpool create -f $TESTPOOL ${disk}s${SLICE0}
 destroy_pool $TESTPOOL
 
 # exported device to be as spare vdev need -f to create pool
 
-log_must $ZPOOL create -f $TESTPOOL $disk
+log_must zpool create -f $TESTPOOL $disk
 destroy_pool $TESTPOOL
 log_must partition_disk $SIZE $disk 6
 create_pool $TESTPOOL ${disk}s${SLICE0} ${disk}s${SLICE1}
-log_must $ZPOOL export $TESTPOOL
+log_must zpool export $TESTPOOL
 exported_pool=true
-log_mustnot $ZPOOL create $TESTPOOL1 ${disk}s${SLICE3} spare ${disk}s${SLICE1}
+log_mustnot zpool create $TESTPOOL1 ${disk}s${SLICE3} spare ${disk}s${SLICE1}
 create_pool $TESTPOOL1 ${disk}s${SLICE3} spare ${disk}s${SLICE1}
 force_pool=true
 destroy_pool $TESTPOOL1
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_009_neg.ksh
index 09159c3933..0b1b18aebb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -79,16 +79,16 @@ for opt in "" "mirror" "raidz" "raidz1"; do
 
 	# Create two pools but using the same disks.
 	create_pool $TESTPOOL $opt $disk
-	log_mustnot $ZPOOL create -f $TESTPOOL1 $opt $disk
+	log_mustnot zpool create -f $TESTPOOL1 $opt $disk
 	destroy_pool $TESTPOOL
 
 	# Create two pools and part of the devices were overlapped
 	create_pool $TESTPOOL $opt $disk
-	log_mustnot $ZPOOL create -f $TESTPOOL1 $opt ${DISKS% *}
+	log_mustnot zpool create -f $TESTPOOL1 $opt ${DISKS% *}
 	destroy_pool $TESTPOOL
 
 	# Create one pool but using the same disks twice.
-	log_mustnot $ZPOOL create -f $TESTPOOL $opt $disk $disk
+	log_mustnot zpool create -f $TESTPOOL $opt $disk $disk
 done
 
 log_pass "Using overlapping or in-use disks to create a new pool fails as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_010_neg.ksh
index 694397ff14..165939786d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_010_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,7 +53,7 @@ function cleanup
 
         poolexists $TESTPOOL && destroy_pool $TESTPOOL
 
-	[[ -d $TESTDIR ]] && $RM -rf $TESTDIR
+	[[ -d $TESTDIR ]] && rm -rf $TESTDIR
 
 	partition_disk $SIZE $disk 6
 }
@@ -66,13 +66,13 @@ else
 fi
 
 create_pool $TESTPOOL $disk
-log_must $ZFS create $TESTPOOL/$TESTFS
-log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+log_must zfs create $TESTPOOL/$TESTFS
+log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
 typeset -l devsize=$(($SPA_MINDEVSIZE - 1024 * 1024))
 for files in $TESTDIR/file1 $TESTDIR/file2
 do
-	log_must $MKFILE $devsize $files
+	log_must mkfile $devsize $files
 done
 
 set -A args \
@@ -82,7 +82,7 @@ set -A args \
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL create ${args[i]}
+	log_mustnot zpool create ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_011_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_011_neg.ksh
index 4c902ae29c..80214f3d37 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_011_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_011_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,7 +55,7 @@ function cleanup
         done
 
 	if [[ -n $saved_dump_dev ]]; then
-		log_must $DUMPADM -u -d $saved_dump_dev
+		log_must dumpadm -u -d $saved_dump_dev
 	fi
 
         partition_disk $SIZE $disk 6
@@ -108,23 +108,23 @@ set -A arg "$TESTPOOL $pooldev2" \
 unset NOINUSE_CHECK
 typeset -i i=0
 while (( i < ${#arg[*]} )); do
-        log_mustnot $ZPOOL create ${arg[i]}
+        log_mustnot zpool create ${arg[i]}
         (( i = i+1 ))
 done
 
 # now destroy the pool to be polite
-log_must $ZPOOL destroy -f $TESTPOOL
+log_must zpool destroy -f $TESTPOOL
 
 # create/destroy a pool as a simple way to set the partitioning
 # back to something normal so we can use this $disk as a dump device
-log_must $ZPOOL create -f $TESTPOOL3 $disk
-log_must $ZPOOL destroy -f $TESTPOOL3
+log_must zpool create -f $TESTPOOL3 $disk
+log_must zpool destroy -f $TESTPOOL3
 
-log_must $DUMPADM -d /dev/dsk/$specified_dump_dev
-log_mustnot $ZPOOL create -f $TESTPOOL1 "$specified_dump_dev"
+log_must dumpadm -d /dev/dsk/$specified_dump_dev
+log_mustnot zpool create -f $TESTPOOL1 "$specified_dump_dev"
 
 # Also check to see that in-use checking prevents us from creating
 # a zpool from just the first slice on the disk.
-log_mustnot $ZPOOL create -f $TESTPOOL1 ${specified_dump_dev}s0
+log_mustnot zpool create -f $TESTPOOL1 ${specified_dump_dev}s0
 
 log_pass "'zpool create' is failed as expected with inapplicable scenarios."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_012_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_012_neg.ksh
index f3e438f2c2..062a2d63a8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_012_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_012_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -48,15 +52,15 @@ function cleanup
 	fi
 
 }
-typeset swap_disks=`$SWAP -l | $GREP "c[0-9].*d[0-9].*s[0-9]" | \
-            $AWK '{print $1}'`
+typeset swap_disks=`swap -l | grep "c[0-9].*d[0-9].*s[0-9]" | \
+            awk '{print $1}'`
 
 log_assert "'zpool create' should fail with disk slice in swap."
 log_onexit cleanup
 
 for sdisk in $swap_disks; do
 	for opt in "-n" "" "-f"; do
-		log_mustnot $ZPOOL create $opt $TESTPOOL $sdisk
+		log_mustnot zpool create $opt $TESTPOOL $sdisk
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_014_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_014_neg.ksh
index 678e2b0707..f538148adb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_014_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_014_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,13 +48,13 @@ verify_runnable "global"
 function cleanup
 {
 	if datasetexists $vol_name; then
-		$SWAP -l | $GREP $TMP_FILE > /dev/null 2>&1
+		swap -l | grep $TMP_FILE > /dev/null 2>&1
 		if [[ $? -eq 0 ]]; then
-			log_must $SWAP -d $TMP_FILE
+			log_must swap -d $TMP_FILE
 		fi
-		$RM -f $TMP_FILE
-		log_must $UMOUNT $mntp
-		$ZFS destroy $vol_name
+		rm -f $TMP_FILE
+		log_must umount $mntp
+		zfs destroy $vol_name
 	fi
 
 	if poolexists $TESTPOOL; then
@@ -77,15 +77,15 @@ typeset mntp=/mnt
 typeset TMP_FILE=$mntp/tmpfile.$$
 
 create_pool $TESTPOOL $pool_dev
-log_must $ZFS create -V 100m $vol_name
-log_must $ECHO "y" | $NEWFS /dev/zvol/dsk/$vol_name > /dev/null 2>&1
-log_must $MOUNT /dev/zvol/dsk/$vol_name $mntp
+log_must zfs create -V 100m $vol_name
+log_must echo "y" | newfs /dev/zvol/dsk/$vol_name > /dev/null 2>&1
+log_must mount /dev/zvol/dsk/$vol_name $mntp
 
-log_must $MKFILE 50m $TMP_FILE
-log_must $SWAP -a $TMP_FILE
+log_must mkfile 50m $TMP_FILE
+log_must swap -a $TMP_FILE
 
 for opt in "-n" "" "-f"; do
-	log_mustnot $ZPOOL create $opt $TESTPOOL $TMP_FILE
+	log_mustnot zpool create $opt $TESTPOOL $TMP_FILE
 done
 
 log_pass "'zpool create' passed as expected with inapplicable scenario."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_015_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_015_neg.ksh
index 9949fd8fba..7c9beeab2f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_015_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_015_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,9 +52,9 @@ function cleanup
 {
 	# cleanup zfs pool and dataset
 	if datasetexists $vol_name; then
-		$SWAP -l | $GREP /dev/zvol/dsk/$vol_name > /dev/null 2>&1
+		swap -l | grep /dev/zvol/dsk/$vol_name > /dev/null 2>&1
 		if [[ $? -eq 0 ]]; then
-			$SWAP -d /dev/zvol/dsk/${vol_name}
+			swap -d /dev/zvol/dsk/${vol_name}
 		fi
 	fi
 
@@ -82,15 +82,15 @@ log_onexit cleanup
 # use zfs vol device in swap to create pool which should fail.
 #
 create_pool $TESTPOOL $pool_dev
-log_must $ZFS create -V 100m $vol_name
-log_must $SWAP -a /dev/zvol/dsk/$vol_name
+log_must zfs create -V 100m $vol_name
+log_must swap -a /dev/zvol/dsk/$vol_name
 for opt in "-n" "" "-f"; do
-	log_mustnot $ZPOOL create $opt $TESTPOOL1 /dev/zvol/dsk/${vol_name}
+	log_mustnot zpool create $opt $TESTPOOL1 /dev/zvol/dsk/${vol_name}
 done
 
 # cleanup
-log_must $SWAP -d /dev/zvol/dsk/${vol_name}
-log_must $ZFS destroy $vol_name
-log_must $ZPOOL destroy $TESTPOOL
+log_must swap -d /dev/zvol/dsk/${vol_name}
+log_must zfs destroy $vol_name
+log_must zpool destroy $TESTPOOL
 
 log_pass "'zpool create' passed as expected with inapplicable scenario."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh
index f13637e41e..8b03f6d03c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,18 +54,18 @@ function cleanup
 
 	#recover swap devices
 	FSTAB=/tmp/fstab_$$
-	$RM -f $FSTAB
+	rm -f $FSTAB
 	for sdisk in $swap_disks; do
-		$ECHO "$sdisk	-	-	swap	-	no	-" >> $FSTAB
+		echo "$sdisk	-	-	swap	-	no	-" >> $FSTAB
 	done
 	if [ -e $FSTAB ]
 	then
-		log_must $SWAPADD $FSTAB
+		log_must swapadd $FSTAB
 	fi
-	$RM -f $FSTAB
+	rm -f $FSTAB
 	if [ $dump_device != "none" ]
 	then
-		log_must $DUMPADM -u -d $dump_device
+		log_must dumpadm -u -d $dump_device
 	fi
 }
 
@@ -75,22 +75,22 @@ else
 	disk=$DISK0
 fi
 typeset pool_dev=${disk}s${SLICE0}
-typeset swap_disks=$($SWAP -l | $GREP -v "swapfile" | $AWK '{print $1}')
-typeset dump_device=$($DUMPADM | $GREP "Dump device" | $AWK '{print $3}')
+typeset swap_disks=$(swap -l | grep -v "swapfile" | awk '{print $1}')
+typeset dump_device=$(dumpadm | grep "Dump device" | awk '{print $3}')
 
 log_assert "'zpool create' should success with no device in swap."
 log_onexit cleanup
 
 for sdisk in $swap_disks; do
 	log_note "Executing: swap -d $sdisk"
-	$SWAP -d $sdisk >/dev/null 2>&1;
+	swap -d $sdisk >/dev/null 2>&1;
 	if [[ $? != 0 ]]; then
 		log_untested "Unable to delete swap device $sdisk because of" \
 				"insufficient RAM"
 	fi
 done
 
-log_must $ZPOOL create $TESTPOOL $pool_dev
-log_must $ZPOOL destroy $TESTPOOL
+log_must zpool create $TESTPOOL $pool_dev
+log_must zpool destroy $TESTPOOL
 
 log_pass "'zpool create' passed as expected with applicable scenario."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_017_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_017_neg.ksh
index 1584d2f04b..54b3fabfe7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_017_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_017_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,7 +52,7 @@ function cleanup
 	fi
 
 	if [[ -d $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR
+		log_must rm -rf $TESTDIR
 	fi
 }
 
@@ -68,20 +68,20 @@ log_assert "'zpool create' should fail with mountpoint exists and not empty."
 log_onexit cleanup
 
 if [[ ! -d $TESTDIR ]]; then
-	log_must $MKDIR -p $TESTDIR
+	log_must mkdir -p $TESTDIR
 fi
 
 typeset -i i=0
 
 while (( i < 2 )); do
-	log_must $RM -rf $TESTDIR/*
+	log_must rm -rf $TESTDIR/*
 	if (( i == 0 )); then
-		log_must $MKDIR $TESTDIR/testdir
+		log_must mkdir $TESTDIR/testdir
 	else
-		log_must $TOUCH $TESTDIR/testfile
+		log_must touch $TESTDIR/testfile
 	fi
 
-	log_mustnot $ZPOOL create -m $TESTDIR -f $TESTPOOL $pool_dev
+	log_mustnot zpool create -m $TESTDIR -f $TESTPOOL $pool_dev
 	log_mustnot poolexists $TESTPOOL
 
 	(( i = i + 1 ))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_018_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_018_pos.ksh
index d3969c7d3b..f0f98eac93 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_018_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_018_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@
 function cleanup
 {
 	poolexists $TESTPOOL && destroy_pool $TESTPOOL
-	[[ -f $CPATH ]] && log_must $RM $CPATH
+	[[ -f $CPATH ]] && log_must rm $CPATH
 }
 
 log_onexit cleanup
@@ -70,15 +70,15 @@ typeset vals=("off" "off" "$CPATH" "3" "on")
 typeset -i i=0;
 while [ $i -lt "${#props[@]}" ]
 do
-	log_must $ZPOOL create -o ${props[$i]}=${vals[$i]} $TESTPOOL $disk
+	log_must zpool create -o ${props[$i]}=${vals[$i]} $TESTPOOL $disk
 	RESULT=$(get_pool_prop ${props[$i]} $TESTPOOL)
 	if [[ $RESULT != ${vals[$i]} ]]
 	then
-		$ZPOOL get all $TESTPOOL
+		zpool get all $TESTPOOL
 		log_fail "Pool was created without setting the ${props[$i]} " \
 		    "property"
 	fi
-	log_must $ZPOOL destroy $TESTPOOL
+	log_must zpool destroy $TESTPOOL
 	((i = i + 1))
 done
 
@@ -86,18 +86,18 @@ done
 poolexists $TESTPOOL && destroy_pool $TESTPOOL
 
 # pick two properties, and verify we can create with those as well
-log_must $ZPOOL create -o delegation=off -o cachefile=$CPATH $TESTPOOL $disk
+log_must zpool create -o delegation=off -o cachefile=$CPATH $TESTPOOL $disk
 RESULT=$(get_pool_prop delegation $TESTPOOL)
 if [[ $RESULT != off ]]
 then
-	$ZPOOL get all $TESTPOOL
+	zpool get all $TESTPOOL
 	log_fail "Pool created without the delegation prop."
 fi
 
 RESULT=$(get_pool_prop cachefile $TESTPOOL)
 if [[ $RESULT != $CPATH ]]
 then
-	$ZPOOL get all $TESTPOOL
+	zpool get all $TESTPOOL
 	log_fail "Pool created without the cachefile prop."
 fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_019_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_019_pos.ksh
index 74f73671ec..43c02a6c2c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_019_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_019_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -61,7 +65,7 @@ typeset -i i=0;
 while [ $i -lt "${#props[@]}" ]
 do
         # try to set each property in the prop list with it's corresponding val
-        log_mustnot $ZPOOL create -o ${props[$i]}=${vals[$i]} $TESTPOOL $disk
+        log_mustnot zpool create -o ${props[$i]}=${vals[$i]} $TESTPOOL $disk
 	if poolexists $TESTPOOL
 	then
 		log_fail "$TESTPOOL was created when setting ${props[$i]}!"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_020_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_020_pos.ksh
index 53c3a64ca5..44fa04f25a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_020_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_020_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,7 +51,7 @@ function cleanup
         fi
 	if [ -d ${TESTPOOL}.root ]
 	then
-		log_must $RMDIR ${TESTPOOL}.root
+		log_must rmdir ${TESTPOOL}.root
 	fi
 }
 
@@ -65,44 +65,44 @@ else
 	disk=$DISK0
 fi
 
-log_must $MKDIR /${TESTPOOL}.root
-log_must $ZPOOL create -R /${TESTPOOL}.root $TESTPOOL $disk
+log_must mkdir /${TESTPOOL}.root
+log_must zpool create -R /${TESTPOOL}.root $TESTPOOL $disk
 if [ ! -d /${TESTPOOL}.root ]
 then
 	log_fail "Mountpoint was not create when using zpool with -R flag!"
 fi
 
-FS=$($ZFS list $TESTPOOL)
+FS=$(zfs list $TESTPOOL)
 if [ -z "$FS" ]
 then
 	log_fail "Mounted filesystem at /${TESTPOOL}.root isn't ZFS!"
 fi
 
-log_must $ZPOOL get all $TESTPOOL
-$ZPOOL get all $TESTPOOL > /tmp/values.$$
+log_must zpool get all $TESTPOOL
+zpool get all $TESTPOOL > /tmp/values.$$
 
 # check for the cachefile property, verifying that it's set to 'none'
-$GREP "$TESTPOOL[ ]*cachefile[ ]*none" /tmp/values.$$ > /dev/null 2>&1
+grep "$TESTPOOL[ ]*cachefile[ ]*none" /tmp/values.$$ > /dev/null 2>&1
 if [ $? -ne 0 ]
 then
 	log_fail "zpool property \'cachefile\' was not set to \'none\'."
 fi
 
 # check that the root = /mountpoint property is set correctly
-$GREP "$TESTPOOL[ ]*altroot[ ]*/${TESTPOOL}.root" /tmp/values.$$ > /dev/null 2>&1
+grep "$TESTPOOL[ ]*altroot[ ]*/${TESTPOOL}.root" /tmp/values.$$ > /dev/null 2>&1
 if [ $? -ne 0 ]
 then
 	log_fail "zpool property root was not found in pool output."
 fi
 
-$RM /tmp/values.$$
+rm /tmp/values.$$
 
 # finally, check that the pool has no reference in /etc/zfs/zpool.cache
 if [[ -f /etc/zfs/zpool.cache ]] ; then
-	REF=$($STRINGS /etc/zfs/zpool.cache | $GREP ${TESTPOOL})
+	REF=$(strings /etc/zfs/zpool.cache | grep ${TESTPOOL})
 	if [ ! -z "$REF" ]
 	then
-		$STRINGS /etc/zfs/zpool.cache
+		strings /etc/zfs/zpool.cache
 		log_fail "/etc/zfs/zpool.cache appears to have a reference to $TESTPOOL"
 	fi
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_021_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_021_pos.ksh
index ab3ea8fa10..dc00a65007 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_021_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_021_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -75,12 +75,12 @@ set -A RW_FS_PROP "quota=512M" \
 
 typeset -i i=0
 while (( $i < ${#RW_FS_PROP[*]} )); do
-	log_must $ZPOOL create -O ${RW_FS_PROP[$i]} -f $TESTPOOL $DISKS
+	log_must zpool create -O ${RW_FS_PROP[$i]} -f $TESTPOOL $DISKS
 	datasetexists $TESTPOOL || \
 		log_fail "zpool create $TESTPOOL fail."
 	propertycheck $TESTPOOL ${RW_FS_PROP[i]} || \
 		log_fail "${RW_FS_PROP[i]} is failed to set."
-	log_must $ZPOOL destroy $TESTPOOL
+	log_must zpool destroy $TESTPOOL
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_022_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_022_pos.ksh
index 03bd672253..9a657e03de 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_022_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_022_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	datasetexists $TESTPOOL && log_must $ZPOOL destroy $TESTPOOL
+	datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
 }
 
 log_onexit cleanup
@@ -80,7 +80,7 @@ while (( $i < ${#RW_FS_PROP[*]} )); do
 	(( i = i + 1 ))
 done
 
-log_must $ZPOOL create $opts -f $TESTPOOL $DISKS
+log_must zpool create $opts -f $TESTPOOL $DISKS
 datasetexists $TESTPOOL || log_fail "zpool create $TESTPOOL fail."
 
 i=0
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_023_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_023_neg.ksh
index 6a13796b57..5626ed2518 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_023_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_023_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,7 +45,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	datasetexists $TESTPOOL && log_must $ZPOOL destroy $TESTPOOL
+	datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
 }
 
 log_onexit cleanup
@@ -77,7 +77,7 @@ log_assert "'zpool create -O' should return an error with badly formed parameter
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZPOOL create -O ${args[i]} -f $TESTPOOL $DISKS
+	log_mustnot zpool create -O ${args[i]} -f $TESTPOOL $DISKS
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_001_pos.ksh
index 296a7b47fb..b90460c51f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_001_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -43,13 +43,13 @@ verify_runnable "global"
 
 function cleanup
 {
-	datasetexists $TESTPOOL && log_must $ZPOOL destroy $TESTPOOL
+	datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
 }
 
 function check_features
 {
-	for state in $($ZPOOL get all $TESTPOOL | \
-	    $AWK '$2 ~ /feature@/ { print $3 }'); do
+	for state in $(zpool get all $TESTPOOL | \
+	    awk '$2 ~ /feature@/ { print $3 }'); do
 		if [[ "$state" != "enabled" && "$state" != "active" ]]; then
 			log_fail "some features are not enabled on new pool"
 	        fi
@@ -60,11 +60,11 @@ log_onexit cleanup
 
 log_assert "'zpool create' creates pools with all features enabled"
 
-log_must $ZPOOL create -f $TESTPOOL $DISKS
+log_must zpool create -f $TESTPOOL $DISKS
 check_features
-log_must $ZPOOL destroy -f $TESTPOOL
+log_must zpool destroy -f $TESTPOOL
 
-log_must $ZPOOL create -f -o feature@async_destroy=enabled $TESTPOOL $DISKS
+log_must zpool create -f -o feature@async_destroy=enabled $TESTPOOL $DISKS
 check_features
 
 log_pass "'zpool create' creates pools with all features enabled"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_002_pos.ksh
index ce24b38dd8..9ac4fa0d49 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_002_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -42,13 +42,13 @@ verify_runnable "global"
 
 function cleanup
 {
-	datasetexists $TESTPOOL && log_must $ZPOOL destroy $TESTPOOL
+	datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
 }
 
 function check_features
 {
-	for prop in $($ZPOOL get all $TESTPOOL | $AWK '$2 ~ /feature@/ { print $2 }'); do
-		state=$($ZPOOL list -Ho "$prop" $TESTPOOL)
+	for prop in $(zpool get all $TESTPOOL | awk '$2 ~ /feature@/ { print $2 }'); do
+		state=$(zpool list -Ho "$prop" $TESTPOOL)
                 if [[ "$state" != "disabled" ]]; then
 			log_fail "$prop is enabled on new pool"
 	        fi
@@ -59,11 +59,11 @@ log_onexit cleanup
 
 log_assert "'zpool create -d' creates pools with all features disabled"
 
-log_must $ZPOOL create -f -d $TESTPOOL $DISKS
+log_must zpool create -f -d $TESTPOOL $DISKS
 check_features
-log_must $ZPOOL destroy -f $TESTPOOL
+log_must zpool destroy -f $TESTPOOL
 
-log_must $ZPOOL create -f -o version=28 $TESTPOOL $DISKS
+log_must zpool create -f -o version=28 $TESTPOOL $DISKS
 check_features
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_003_pos.ksh
index 936a1cd571..cabd0ad010 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_003_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -43,7 +43,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	datasetexists $TESTPOOL && log_must $ZPOOL destroy $TESTPOOL
+	datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
 }
 
 log_onexit cleanup
@@ -51,15 +51,15 @@ log_onexit cleanup
 log_assert "'zpool create -d -o feature@async_destroy=enabled' only " \
     "enables async_destroy"
 
-log_must $ZPOOL create -f -d -o feature@async_destroy=enabled $TESTPOOL $DISKS
+log_must zpool create -f -d -o feature@async_destroy=enabled $TESTPOOL $DISKS
 
-state=$($ZPOOL list -Ho feature@async_destroy $TESTPOOL)
+state=$(zpool list -Ho feature@async_destroy $TESTPOOL)
 if [[ "$state" != "enabled" ]]; then
 	log_fail "async_destroy has state $state"
 fi
 
-for prop in $($ZPOOL get all $TESTPOOL | $AWK '$2 ~ /feature@/ { print $2 }'); do
-	state=$($ZPOOL list -Ho "$prop" $TESTPOOL)
+for prop in $(zpool get all $TESTPOOL | awk '$2 ~ /feature@/ { print $2 }'); do
+	state=$(zpool list -Ho "$prop" $TESTPOOL)
 	if [[ "$prop" != "feature@async_destroy" \
 	    && "$state" != "disabled" ]]; then
 		log_fail "$prop is enabled on new pool"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_004_neg.ksh
index 2d3ffc8b8f..83886533c4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_004_neg.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,14 +47,14 @@ unsupported@some_feature=readonly \
 
 function cleanup
 {
-	datasetexists $TESTPOOL && log_must $ZPOOL destroy $TESTPOOL
+	datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
 }
 
 log_assert "'zpool create' with invalid feature names/states fails"
 log_onexit cleanup
 
 for prop in $properties; do
-	log_mustnot $ZPOOL create -f -o "$prop" $TESTPOOL $DISKS
+	log_mustnot zpool create -f -o "$prop" $TESTPOOL $DISKS
 	log_mustnot datasetexists $TESTPOOL
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
index e7a820b99d..3036e9606b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ function cleanup
 {
 	poolexists $TESTPOOL2 && destroy_pool $TESTPOOL2
 	datasetexists $TESTPOOL1/$TESTVOL && \
-		log_must $ZFS destroy -f $TESTPOOL1/$TESTVOL
+		log_must zfs destroy -f $TESTPOOL1/$TESTVOL
 
 	typeset pool
 	for pool in $TESTPOOL1 $TESTPOOL; do
@@ -73,13 +73,13 @@ partition_disk $SLICE_SIZE $DISK 2
 
 create_pool "$TESTPOOL" "${DISK}s${SLICE0}"
 create_pool "$TESTPOOL1" "${DISK}s${SLICE1}"
-log_must $ZFS create -s -V $VOLSIZE $TESTPOOL1/$TESTVOL
+log_must zfs create -s -V $VOLSIZE $TESTPOOL1/$TESTVOL
 create_pool "$TESTPOOL2" "/dev/zvol/dsk/$TESTPOOL1/$TESTVOL"
 
 typeset -i i=0
 while (( i < ${#datasets[*]} )); do
 	log_must poolexists "${datasets[i]}"
-	log_must $ZPOOL destroy "${datasets[i]}"
+	log_must zpool destroy "${datasets[i]}"
 	log_mustnot poolexists "${datasets[i]}"
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_002_pos.ksh
index 682e9c0882..d05493df2f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,13 +55,13 @@ function cleanup
 		ismounted $TESTDIR
 		((  $? == 0 )) && \
 			log_must $UNMOUNT $TESTDIR
-		log_must $RM -rf $TESTDIR
+		log_must rm -rf $TESTDIR
 	fi
 
 	typeset -i i=0
 	while (( $i < ${#datasets[*]} )); do
 		datasetexists ${datasets[i]} && \
-			log_must $ZFS destroy ${datasets[i]}
+			log_must zfs destroy ${datasets[i]}
 		(( i = i + 1 ))
 	done
 
@@ -78,12 +78,12 @@ log_onexit cleanup
 typeset cwd=""
 
 create_pool "$TESTPOOL" "$DISK"
-log_must $ZFS create $TESTPOOL/$TESTFS
-log_must $MKDIR -p $TESTDIR
-log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
-log_must $ZFS create $TESTPOOL/$TESTCTR
-log_must $ZFS create $TESTPOOL/$TESTCTR/$TESTFS1
-log_must $ZFS create -V $VOLSIZE $TESTPOOL/$TESTVOL
+log_must zfs create $TESTPOOL/$TESTFS
+log_must mkdir -p $TESTDIR
+log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+log_must zfs create $TESTPOOL/$TESTCTR
+log_must zfs create $TESTPOOL/$TESTCTR/$TESTFS1
+log_must zfs create -V $VOLSIZE $TESTPOOL/$TESTVOL
 
 typeset -i i=0
 while (( $i < ${#datasets[*]} )); do
@@ -98,10 +98,10 @@ log_note "'zpool destroy' without '-f' will fail " \
 
 for dir in $TESTDIR /$TESTPOOL/$TESTCTR /$TESTPOOL/$TESTCTR/$TESTFS1 ; do
 	log_must cd $dir
-	log_mustnot $ZPOOL destroy $TESTPOOL
+	log_mustnot zpool destroy $TESTPOOL
 
 	# Need mount here, otherwise some dataset may be unmounted.
-	log_must $ZFS mount -a
+	log_must zfs mount -a
 
 	i=0
 	while (( i < ${#datasets[*]} )); do
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_003_neg.ksh
index fb104f1f34..75b77b4bde 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_003_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,7 +50,7 @@ log_assert "'zpool destroy' should return an error with badly-formed parameters.
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZPOOL destroy ${args[i]}
+	log_mustnot zpool destroy ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/zpool_detach_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/zpool_detach_001_neg.ksh
index 848ce8c827..74f8e1e664 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/zpool_detach_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_detach/zpool_detach_001_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -57,7 +62,7 @@ typeset -i i=0
 
 while [[ $i -lt ${#args[*]} ]]; do
 
-	log_mustnot $ZPOOL detach ${args[$i]}
+	log_mustnot zpool detach ${args[$i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh
index 85c887a174..5d3243fa4b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,12 +51,12 @@ verify_runnable "global"
 function cleanup
 {
 	if poolexists $TESTPOOL1; then
-		log_must $ZPOOL destroy $TESTPOOL1
+		log_must zpool destroy $TESTPOOL1
 	fi
 
 	for i in 1 2 3; do
 		if datasetexists $VFS/vol$i; then
-			log_must $ZFS destroy $VFS/vol$i
+			log_must zfs destroy $VFS/vol$i
 		fi
 	done
 }
@@ -66,12 +66,12 @@ log_onexit cleanup
 log_assert "zpool can be autoexpanded after set autoexpand=on on LUN expansion"
 
 for i in 1 2 3; do
-	log_must $ZFS create -V $org_size $VFS/vol$i
+	log_must zfs create -V $org_size $VFS/vol$i
 done
 
 for type in " " mirror raidz raidz2; do
 
-	log_must $ZPOOL create -o autoexpand=on $TESTPOOL1 $type \
+	log_must zpool create -o autoexpand=on $TESTPOOL1 $type \
 	    /dev/zvol/dsk/$VFS/vol1  /dev/zvol/dsk/$VFS/vol2 \
 	    /dev/zvol/dsk/$VFS/vol3
 
@@ -81,20 +81,20 @@ for type in " " mirror raidz raidz2; do
 	fi
 
 	typeset prev_size=$(get_pool_prop size $TESTPOOL1)
-	typeset zfs_prev_size=$($ZFS get -p avail $TESTPOOL1 | $TAIL -1 | \
-	    $AWK '{print $3}')
+	typeset zfs_prev_size=$(zfs get -p avail $TESTPOOL1 | tail -1 | \
+	    awk '{print $3}')
 
 	for i in 1 2 3; do
-		log_must $ZFS set volsize=$exp_size $VFS/vol$i
+		log_must zfs set volsize=$exp_size $VFS/vol$i
 	done
 
-	$SYNC
-	$SLEEP 10
-	$SYNC
+	sync
+	sleep 10
+	sync
 
 	typeset expand_size=$(get_pool_prop size $TESTPOOL1)
-	typeset zfs_expand_size=$($ZFS get -p avail $TESTPOOL1 | $TAIL -1 | \
-	    $AWK '{print $3}')
+	typeset zfs_expand_size=$(zfs get -p avail $TESTPOOL1 | tail -1 | \
+	    awk '{print $3}')
 
 	log_note "$TESTPOOL1 $type has previous size: $prev_size and " \
 	    "expanded size: $expand_size"
@@ -102,30 +102,30 @@ for type in " " mirror raidz raidz2; do
 	if [[ $zfs_expand_size > $zfs_prev_size ]]; then
 	# check for zpool history for the pool size expansion
 		if [[ $type == " " ]]; then
-			typeset	size_addition=$($ZPOOL history -il $TESTPOOL1 |\
-			    $GREP "pool '$TESTPOOL1' size:" | \
-			    $GREP "vdev online" | \
-			    $GREP "(+${EX_1GB}" | wc -l)
+			typeset	size_addition=$(zpool history -il $TESTPOOL1 |\
+			    grep "pool '$TESTPOOL1' size:" | \
+			    grep "vdev online" | \
+			    grep "(+${EX_1GB}" | wc -l)
 
 			if [[ $size_addition -ne $i ]]; then
 				log_fail "pool $TESTPOOL1 is not autoexpand " \
 				    "after LUN expansion"
 			fi
 		elif [[ $type == "mirror" ]]; then
-			$ZPOOL history -il $TESTPOOL1 | \
-			    $GREP "pool '$TESTPOOL1' size:" | \
-			    $GREP "vdev online" | \
-			    $GREP "(+${EX_1GB})" >/dev/null 2>&1
+			zpool history -il $TESTPOOL1 | \
+			    grep "pool '$TESTPOOL1' size:" | \
+			    grep "vdev online" | \
+			    grep "(+${EX_1GB})" >/dev/null 2>&1
 
 			if [[ $? -ne 0 ]] ; then
 				log_fail "pool $TESTPOOL1 is not autoexpand " \
 				    "after LUN expansion"
 			fi
 		else
-			$ZPOOL history -il $TESTPOOL1 | \
-			    $GREP "pool '$TESTPOOL1' size:" | \
-			    $GREP "vdev online" | \
-			    $GREP "(+${EX_3GB})" >/dev/null 2>&1
+			zpool history -il $TESTPOOL1 | \
+			    grep "pool '$TESTPOOL1' size:" | \
+			    grep "vdev online" | \
+			    grep "(+${EX_3GB})" >/dev/null 2>&1
 
 			if [[ $? -ne 0 ]]; then
 				log_fail "pool $TESTPOOL is not autoexpand " \
@@ -137,9 +137,9 @@ for type in " " mirror raidz raidz2; do
 		    "expansion"
 	fi
 
-	log_must $ZPOOL destroy $TESTPOOL1
+	log_must zpool destroy $TESTPOOL1
 	for i in 1 2 3; do
-		log_must $ZFS set volsize=$org_size $VFS/vol$i
+		log_must zfs set volsize=$org_size $VFS/vol$i
 	done
 
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_002_pos.ksh
index 2ce6508174..09847dc4f5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,12 +52,12 @@ verify_runnable "global"
 function cleanup
 {
         if poolexists $TESTPOOL1; then
-                log_must $ZPOOL destroy $TESTPOOL1
+                log_must zpool destroy $TESTPOOL1
         fi
 
 	for i in 1 2 3; do
 		if datasetexists $VFS/vol$i; then
-			log_must $ZFS destroy $VFS/vol$i
+			log_must zfs destroy $VFS/vol$i
 		fi
 	done
 }
@@ -67,11 +67,11 @@ log_onexit cleanup
 log_assert "zpool can expand after zpool online -e zvol vdevs on LUN expansion"
 
 for i in 1 2 3; do
-	log_must $ZFS create -V $org_size $VFS/vol$i
+	log_must zfs create -V $org_size $VFS/vol$i
 done
 
 for type in " " mirror raidz raidz2; do
-	log_must $ZPOOL create $TESTPOOL1 $type /dev/zvol/dsk/$VFS/vol1 \
+	log_must zpool create $TESTPOOL1 $type /dev/zvol/dsk/$VFS/vol1 \
 	    /dev/zvol/dsk/$VFS/vol2 /dev/zvol/dsk/$VFS/vol3
 
 	typeset autoexp=$(get_pool_prop autoexpand $TESTPOOL1)
@@ -81,24 +81,24 @@ for type in " " mirror raidz raidz2; do
 		    "$autoexp"
 	fi
 	typeset prev_size=$(get_pool_prop size $TESTPOOL1)
-	typeset zfs_prev_size=$($ZFS get -p avail $TESTPOOL1 | $TAIL -1 | \
-	    $AWK '{print $3}')
+	typeset zfs_prev_size=$(zfs get -p avail $TESTPOOL1 | tail -1 | \
+	    awk '{print $3}')
 
 	for i in 1 2 3; do
-		log_must $ZFS set volsize=$exp_size $VFS/vol$i
+		log_must zfs set volsize=$exp_size $VFS/vol$i
 	done
 
 	for i in 1 2 3; do
-		log_must $ZPOOL online -e $TESTPOOL1 /dev/zvol/dsk/$VFS/vol$i
+		log_must zpool online -e $TESTPOOL1 /dev/zvol/dsk/$VFS/vol$i
 	done
 
-	$SYNC
-	$SLEEP 10
-	$SYNC
+	sync
+	sleep 10
+	sync
 
 	typeset expand_size=$(get_pool_prop size $TESTPOOL1)
-	typeset zfs_expand_size=$($ZFS get -p avail $TESTPOOL1 | $TAIL -1 | \
-	    $AWK '{print $3}')
+	typeset zfs_expand_size=$(zfs get -p avail $TESTPOOL1 | tail -1 | \
+	    awk '{print $3}')
 	log_note "$TESTPOOL1 $type has previous size: $prev_size and " \
 	    "expanded size: $expand_size"
 
@@ -106,30 +106,30 @@ for type in " " mirror raidz raidz2; do
 	if [[ $zfs_expand_size -gt $zfs_prev_size ]]; then
 	# check for zpool history for the pool size expansion
 		if [[ $type == " " ]]; then
-			typeset	size_addition=$($ZPOOL history -il $TESTPOOL1 \
-			    | $GREP "pool '$TESTPOOL1' size:" | \
-			    $GREP "vdev online" | \
-			    $GREP "(+${EX_1GB}" | wc -l)
+			typeset	size_addition=$(zpool history -il $TESTPOOL1 \
+			    | grep "pool '$TESTPOOL1' size:" | \
+			    grep "vdev online" | \
+			    grep "(+${EX_1GB}" | wc -l)
 
 			if [[ $size_addition -ne $i ]]; then
 				log_fail "pool $TESTPOOL1 is not autoexpand " \
 				    "after LUN expansion"
 			fi
 		elif [[ $type == "mirror" ]]; then
-			$ZPOOL history -il $TESTPOOL1 | \
-			    $GREP "pool '$TESTPOOL1' size:" | \
-			    $GREP "vdev online" | \
-			    $GREP "(+${EX_1GB})" >/dev/null 2>&1
+			zpool history -il $TESTPOOL1 | \
+			    grep "pool '$TESTPOOL1' size:" | \
+			    grep "vdev online" | \
+			    grep "(+${EX_1GB})" >/dev/null 2>&1
 
 			if [[ $? -ne 0 ]]; then
 				log_fail "pool $TESTPOOL1 is not autoexpand " \
 				    "after LUN expansion"
 			fi
 		else
-			$ZPOOL history -il $TESTPOOL1 | \
-			    $GREP "pool '$TESTPOOL1' size:" | \
-			    $GREP "vdev online" | \
-			    $GREP "(+${EX_3GB})" >/dev/null 2>&1
+			zpool history -il $TESTPOOL1 | \
+			    grep "pool '$TESTPOOL1' size:" | \
+			    grep "vdev online" | \
+			    grep "(+${EX_3GB})" >/dev/null 2>&1
 
 			if [[ $? -ne 0 ]] ; then
 				log_fail "pool $TESTPOOL1 is not autoexpand " \
@@ -140,9 +140,9 @@ for type in " " mirror raidz raidz2; do
 		log_fail "pool $TESTPOOL1 is not autoexpanded after LUN " \
 		    "expansion"
 	fi
-	log_must $ZPOOL destroy $TESTPOOL1
+	log_must zpool destroy $TESTPOOL1
 	for i in 1 2 3; do
-		log_must $ZFS set volsize=$org_size $VFS/vol$i
+		log_must zfs set volsize=$org_size $VFS/vol$i
 	done
 done
 log_pass "zpool can expand after zpool online -e zvol vdevs on LUN expansion"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_003_neg.ksh
index c686afe3d5..7f0d6f0d0d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,12 +51,12 @@ verify_runnable "global"
 function cleanup
 {
         if poolexists $TESTPOOL1; then
-                log_must $ZPOOL destroy $TESTPOOL1
+                log_must zpool destroy $TESTPOOL1
         fi
 
 	for i in 1 2 3; do
 		if datasetexists $VFS/vol$i; then
-			log_must $ZFS destroy $VFS/vol$i
+			log_must zfs destroy $VFS/vol$i
 		fi
 	done
 }
@@ -66,11 +66,11 @@ log_onexit cleanup
 log_assert "zpool can not expand if set autoexpand=off after LUN expansion"
 
 for i  in 1 2 3; do
-	log_must $ZFS create -V $org_size $VFS/vol$i
+	log_must zfs create -V $org_size $VFS/vol$i
 done
 
 for type in " " mirror raidz raidz2; do
-	log_must $ZPOOL create $TESTPOOL1 $type /dev/zvol/dsk/$VFS/vol1 \
+	log_must zpool create $TESTPOOL1 $type /dev/zvol/dsk/$VFS/vol1 \
 	    /dev/zvol/dsk/$VFS/vol2 /dev/zvol/dsk/$VFS/vol3
 
 	typeset autoexp=$(get_pool_prop autoexpand $TESTPOOL1)
@@ -82,16 +82,16 @@ for type in " " mirror raidz raidz2; do
 	typeset prev_size=$(get_pool_prop size $TESTPOOL1)
 
 	for i in 1 2 3; do
-		log_must $ZFS set volsize=$exp_size $VFS/vol$i
+		log_must zfs set volsize=$exp_size $VFS/vol$i
 	done
 
-	$SYNC
-	$SLEEP 10
-	$SYNC
+	sync
+	sleep 10
+	sync
 
 	# check for zpool history for the pool size expansion
-	$ZPOOL history -il $TESTPOOL1 | $GREP "pool '$TESTPOOL1' size:" | \
-	    $GREP "vdev online" >/dev/null 2>&1
+	zpool history -il $TESTPOOL1 | grep "pool '$TESTPOOL1' size:" | \
+	    grep "vdev online" >/dev/null 2>&1
 
 	if [[ $? -eq 0 ]]; then
 		log_fail "pool $TESTPOOL1 is not autoexpand after LUN " \
@@ -104,10 +104,10 @@ for type in " " mirror raidz raidz2; do
 		log_fail "pool $TESTPOOL1 size changed after LUN expansion"
 	fi
 
-	log_must $ZPOOL destroy $TESTPOOL1
+	log_must zpool destroy $TESTPOOL1
 
 	for i in 1 2 3; do
-		log_must $ZFS set volsize=$org_size $VFS/vol$i
+		log_must zfs set volsize=$org_size $VFS/vol$i
 	done
 
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_001_pos.ksh
index 6f404ce128..47dd16c712 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,19 +50,19 @@ function cleanup
 	typeset dir=$(get_device_dir $DISKS)
 
 	datasetexists "$TESTPOOL/$TESTFS" || \
-		log_must $ZPOOL import -d $dir $TESTPOOL
+		log_must zpool import -d $dir $TESTPOOL
 
 	ismounted "$TESTPOOL/$TESTFS"
 	(( $? != 0 )) && \
-	    log_must $ZFS mount $TESTPOOL/$TESTFS
+	    log_must zfs mount $TESTPOOL/$TESTFS
 }
 
 log_onexit cleanup
 
 log_assert "Verify a pool can be exported."
 
-log_must $ZFS umount $TESTDIR
-log_must $ZPOOL export $TESTPOOL
+log_must zfs umount $TESTDIR
+log_must zpool export $TESTPOOL
 
 poolexists $TESTPOOL && \
         log_fail "$TESTPOOL unexpectedly found in 'zpool list' output."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_002_pos.ksh
index ee1895eaa4..81473d903a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_002_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -45,14 +50,14 @@ function cleanup
 	    log_fail "Couldn't cd back to $olddir"
 
 	datasetexists "$TESTPOOL/$TESTFS" || \
-	    log_must $ZPOOL import -d $dir $TESTPOOL
+	    log_must zpool import -d $dir $TESTPOOL
 
 	ismounted "$TESTPOOL/$TESTFS"
 	(( $? != 0 )) && \
-	    log_must $ZFS mount $TESTPOOL/$TESTFS
+	    log_must zfs mount $TESTPOOL/$TESTFS
 
 	[[ -e $TESTDIR/$TESTFILE0 ]] && \
-	    log_must $RM -rf $TESTDIR/$TESTFILE0
+	    log_must rm -rf $TESTDIR/$TESTFILE0
 }
 
 olddir=$PWD
@@ -68,7 +73,7 @@ ismounted "$TESTPOOL/$TESTFS"
 cd $TESTDIR || \
     log_fail "Couldn't cd to $TESTDIR"
 
-log_mustnot $ZPOOL export $TESTPOOL
+log_mustnot zpool export $TESTPOOL
 
 poolexists $TESTPOOL || \
 	log_fail "$TESTPOOL not found in 'zpool list' output."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_003_neg.ksh
index c3d6c632ac..b188f9c330 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_003_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -42,11 +47,11 @@ function cleanup
 {
 	typeset dir=$(get_device_dir $DISKS)
 	datasetexists "$TESTPOOL/$TESTFS" || \
-		log_must $ZPOOL import -d $dir $TESTPOOL
+		log_must zpool import -d $dir $TESTPOOL
 
 	ismounted "$TESTPOOL/$TESTFS"
 	(( $? != 0 )) && \
-	    log_must $ZFS mount $TESTPOOL/$TESTFS
+	    log_must zfs mount $TESTPOOL/$TESTFS
 }
 
 log_onexit cleanup
@@ -57,7 +62,7 @@ log_assert "'zpool export' should return an error with badly-formed parameters."
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZPOOL export ${args[i]}
+	log_mustnot zpool export ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_004_pos.ksh
index 14b9f21982..7be92850c2 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,13 +53,13 @@ verify_runnable "global"
 function cleanup
 {
 	mntpnt=$(get_prop mountpoint $TESTPOOL)
-        datasetexists $TESTPOOL1 || log_must $ZPOOL import -d $mntpnt $TESTPOOL1
+        datasetexists $TESTPOOL1 || log_must zpool import -d $mntpnt $TESTPOOL1
 	datasetexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 	datasetexists $TESTPOOL2 && destroy_pool $TESTPOOL2
 	typeset -i i=0
 	while ((i < 5)); do
 		if [[ -e $mntpnt/vdev$i ]]; then
-			log_must $RM -f $mntpnt/vdev$i
+			log_must rm -f $mntpnt/vdev$i
 		fi
 		((i += 1))
 	done
@@ -73,27 +73,27 @@ mntpnt=$(get_prop mountpoint $TESTPOOL)
 
 typeset -i i=0
 while ((i < 5)); do
-	log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev$i
+	log_must mkfile $MINVDEVSIZE $mntpnt/vdev$i
 	eval vdev$i=$mntpnt/vdev$i
 	((i += 1))
 done
 
-log_must $ZPOOL create $TESTPOOL1 mirror $vdev0 $vdev1 spare $vdev4
-log_must $ZPOOL create $TESTPOOL2 mirror $vdev2 $vdev3 spare $vdev4
+log_must zpool create $TESTPOOL1 mirror $vdev0 $vdev1 spare $vdev4
+log_must zpool create $TESTPOOL2 mirror $vdev2 $vdev3 spare $vdev4
 
-log_must $ZPOOL export $TESTPOOL1
-log_must $ZPOOL import -d $mntpnt $TESTPOOL1
+log_must zpool export $TESTPOOL1
+log_must zpool import -d $mntpnt $TESTPOOL1
 
-log_must $ZPOOL replace $TESTPOOL1 $vdev0 $vdev4
-log_must $ZPOOL detach $TESTPOOL1 $vdev4
-log_must $ZPOOL export $TESTPOOL1
-log_must $ZPOOL import -d $mntpnt $TESTPOOL1
+log_must zpool replace $TESTPOOL1 $vdev0 $vdev4
+log_must zpool detach $TESTPOOL1 $vdev4
+log_must zpool export $TESTPOOL1
+log_must zpool import -d $mntpnt $TESTPOOL1
 
-log_must $ZPOOL replace $TESTPOOL1 $vdev0 $vdev4
-log_mustnot $ZPOOL export $TESTPOOL1
+log_must zpool replace $TESTPOOL1 $vdev0 $vdev4
+log_mustnot zpool export $TESTPOOL1
 
-log_must $ZPOOL export -f $TESTPOOL1
-log_must $ZPOOL import -d $mntpnt  $TESTPOOL1
+log_must zpool export -f $TESTPOOL1
+log_must zpool import -d $mntpnt  $TESTPOOL1
 
 log_pass "Verify zpool export succeed or fail with spare."
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_001_pos.ksh
index f1f300ce3f..172b27e820 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -40,14 +44,14 @@
 
 log_assert "Zpool get usage message is displayed when called with no arguments."
 
-$ZPOOL get > /dev/null 2>&1
+zpool get > /dev/null 2>&1
 RET=$?
 if [ $RET != 2 ]
 then
 	log_fail "\"zpool get\" exit status $RET should be equal to 2."
 fi
 
-OUTPUT=$($ZPOOL get 2>&1 | $GREP -i usage)
+OUTPUT=$(zpool get 2>&1 | grep -i usage)
 RET=$?
 if [ $RET != 0 ]
 then
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_002_pos.ksh
index c6d046cfd0..ed01a48a14 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,11 +56,11 @@ if ! is_global_zone ; then
 	TESTPOOL=${TESTPOOL%%/*}
 fi
 
-log_must $ZPOOL get all $TESTPOOL
-$ZPOOL get all $TESTPOOL > /tmp/values.$$
+log_must zpool get all $TESTPOOL
+zpool get all $TESTPOOL > /tmp/values.$$
 
 log_note "Checking zpool get all output for a header."
-$GREP ^"NAME " /tmp/values.$$ > /dev/null 2>&1
+grep ^"NAME " /tmp/values.$$ > /dev/null 2>&1
 if [ $? -ne 0 ]
 then
 	log_fail "The header was not printed from zpool get all"
@@ -70,7 +70,7 @@ fi
 while [ $i -lt "${#properties[@]}" ]
 do
 	log_note "Checking for ${properties[$i]} property"
-	$GREP "$TESTPOOL *${properties[$i]}" /tmp/values.$$ > /dev/null 2>&1
+	grep "$TESTPOOL *${properties[$i]}" /tmp/values.$$ > /dev/null 2>&1
 	if [ $? -ne 0 ]
 	then
 		log_fail "zpool property ${properties[$i]} was not found\
@@ -82,7 +82,7 @@ done
 # increment the counter to include the header line
 i=$(( $i + 1 ))
 
-COUNT=$($WC /tmp/values.$$ | $AWK '{print $1}')
+COUNT=$(wc /tmp/values.$$ | awk '{print $1}')
 if [ $i -ne $COUNT ]
 then
 	log_fail "Found zpool features not in the zpool_get test config."
@@ -90,5 +90,5 @@ fi
 
 
 
-$RM /tmp/values.$$
+rm /tmp/values.$$
 log_pass "Zpool get all works as expected"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_003_pos.ksh
index d9cde6f7c2..6696c197c8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/cli_root/zpool_get/zpool_get.cfg
 
@@ -48,13 +52,13 @@ typeset -i i=0;
 while [ $i -lt "${#properties[@]}" ]
 do
 	log_note "Checking for ${properties[$i]} property"
-	log_must eval "$ZPOOL get ${properties[$i]} $TESTPOOL > /tmp/value.$$"
-	$GREP "${properties[$i]}" /tmp/value.$$ > /dev/null 2>&1
+	log_must eval "zpool get ${properties[$i]} $TESTPOOL > /tmp/value.$$"
+	grep "${properties[$i]}" /tmp/value.$$ > /dev/null 2>&1
 	if [ $? -ne 0 ]
 	then
 		log_fail "${properties[$i]} not seen in output"
 	fi
-	$GREP "^NAME " /tmp/value.$$ > /dev/null 2>&1
+	grep "^NAME " /tmp/value.$$ > /dev/null 2>&1
 	# only need to check this once.
 	if [ $i -eq 0 ] && [ $? -ne 0 ]
 	then
@@ -63,5 +67,5 @@ do
 	i=$(( $i + 1 ))
 done
 
-$RM /tmp/value.$$
+rm /tmp/value.$$
 log_pass "Zpool get returns values for all known properties"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_004_neg.ksh
index d688c8dd98..dc04f3a33c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_004_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -51,7 +55,7 @@ set -A arguments "$TESTPOOL $TESTPOOL" "$TESTPOOL rubbish" "-v $TESTPOOL" \
 
 for arg in $arguments
 do
-	log_mustnot $ZPOOL get $arg
+	log_mustnot zpool get $arg
 done
 
 log_pass "Malformed zpool get commands are rejected"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh
index a722fe7cad..dd1be14a06 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -47,19 +51,19 @@ set -A neg_opt "$TESTPOOL/$TESTCTR" "$TESTPOOL/$TESTVOL" "-t $TESTPOOL" \
 
 function cleanup
 {
-	datasetexists $clone && log_must $ZFS destroy $clone
-	datasetexists $snap && log_must $ZFS destroy $snap
+	datasetexists $clone && log_must zfs destroy $clone
+	datasetexists $snap && log_must zfs destroy $snap
 }
 
 log_assert "Verify 'zpool history' can deal with non-existent pools and " \
 	"garbage to the command."
 log_onexit cleanup
 
-log_must $ZFS snapshot $snap
-log_must $ZFS clone $snap $clone
+log_must zfs snapshot $snap
+log_must zfs clone $snap $clone
 
 for opt in "${neg_opt[@]}"; do
-	log_mustnot eval "$ZPOOL history $opt > /dev/null"
+	log_mustnot eval "zpool history $opt > /dev/null"
 done
 
 log_pass "'zpool history' command line negation test passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_002_pos.ksh
index bd5bf19034..0146aa5bc1 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ log_assert "Verify zpool history can handle options [-il] correctly."
 options="-i -l -il -li -lil -ili -lli -iill -liil"
 
 for opt in $options; do
-	log_must eval "$ZPOOL history $opt $TESTPOOL > /dev/null 2>&1"
+	log_must eval "zpool history $opt $TESTPOOL > /dev/null 2>&1"
 done
 
 log_pass "Verify zpool history can handle options [-il] passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh
index 8e28f23da7..c4569fc2af 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -36,16 +36,16 @@ verify_runnable "global"
 
 for pool in "$TESTPOOL" "$TESTPOOL1"; do
 	datasetexists $pool/$TESTFS && \
-		log_must $ZFS destroy -Rf $pool/$TESTFS
+		log_must zfs destroy -Rf $pool/$TESTFS
 	destroy_pool "$pool"
 done
 
 ismounted $DEVICE_DIR ufs
-(( $? == 0 )) && log_must $UMOUNT -f $DEVICE_DIR
+(( $? == 0 )) && log_must umount -f $DEVICE_DIR
 
 for dir in "$TESTDIR" "$TESTDIR1" "$DEVICE_DIR" ; do
 	[[ -d $dir ]] && \
-		log_must $RM -rf $dir
+		log_must rm -rf $dir
 done
 
 # recreate and destroy a zpool over the disks to restore the partitions to
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh
index d59cfc3886..d84f01abc2 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,25 +55,25 @@ done
 create_pool "$TESTPOOL" "$ZFSSIDE_DISK1"
 
 if [[ -d $TESTDIR ]]; then
-	$RM -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
-	$MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR
+	rm -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
+	mkdir -p $TESTDIR || log_unresolved Could not create $TESTDIR
 fi
 
-log_must $ZFS create $TESTPOOL/$TESTFS
-log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+log_must zfs create $TESTPOOL/$TESTFS
+log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
-$ECHO "y" | $NEWFS -v /dev/rdsk/$ZFSSIDE_DISK2 >/dev/null 2>&1
+echo "y" | newfs -v /dev/rdsk/$ZFSSIDE_DISK2 >/dev/null 2>&1
 (( $? != 0 )) &&
 	log_untested "Unable to setup a UFS file system"
 
 [[ ! -d $DEVICE_DIR ]] && \
-	log_must $MKDIR -p $DEVICE_DIR
+	log_must mkdir -p $DEVICE_DIR
 
-log_must $MOUNT /dev/dsk/$ZFSSIDE_DISK2 $DEVICE_DIR
+log_must mount /dev/dsk/$ZFSSIDE_DISK2 $DEVICE_DIR
 
 i=0
 while (( i < $MAX_NUM )); do
-	log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+	log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh
index 3562b045b5..ead7773a58 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -63,16 +63,16 @@ function cleanup
 
 	while (( i < ${#pools[*]} )); do
 		poolexists ${pools[i]} && \
-			log_must $ZPOOL export ${pools[i]}
+			log_must zpool export ${pools[i]}
 
 		datasetexists "${pools[i]}/$TESTFS" || \
-			log_must $ZPOOL import ${devs[i]} ${pools[i]}
+			log_must zpool import ${devs[i]} ${pools[i]}
 
 		ismounted "${pools[i]}/$TESTFS" || \
-			log_must $ZFS mount ${pools[i]}/$TESTFS
+			log_must zfs mount ${pools[i]}/$TESTFS
 
 		[[ -e ${mtpts[i]}/$TESTFILE0 ]] && \
-			log_must $RM -rf ${mtpts[i]}/$TESTFILE0
+			log_must rm -rf ${mtpts[i]}/$TESTFILE0
 
 		((i = i + 1))
 	done
@@ -82,7 +82,7 @@ function cleanup
         destroy_pool $TESTPOOL1
 
 	[[ -d $ALTER_ROOT ]] && \
-		log_must $RM -rf $ALTER_ROOT
+		log_must rm -rf $ALTER_ROOT
 }
 
 log_onexit cleanup
@@ -91,7 +91,7 @@ log_assert "Verify that an exported pool can be imported."
 
 setup_filesystem "$DEVICE_FILES" $TESTPOOL1 $TESTFS $TESTDIR1
 
-checksum1=$($SUM $MYTESTFILE | $AWK '{print $1}')
+checksum1=$(sum $MYTESTFILE | awk '{print $1}')
 
 typeset -i i=0
 typeset -i j=0
@@ -99,20 +99,20 @@ typeset basedir
 
 while (( i < ${#pools[*]} )); do
 	guid=$(get_config ${pools[i]} pool_guid)
-	log_must $CP $MYTESTFILE ${mtpts[i]}/$TESTFILE0
+	log_must cp $MYTESTFILE ${mtpts[i]}/$TESTFILE0
 
-	log_must $ZFS umount ${mtpts[i]}
+	log_must zfs umount ${mtpts[i]}
 
 	j=0
 	while (( j <  ${#options[*]} )); do
-		log_must $ZPOOL export ${pools[i]}
+		log_must zpool export ${pools[i]}
 
 		typeset target=${pools[i]}
 		if (( RANDOM % 2 == 0 )) ; then
 			target=$guid
 			log_note "Import by guid."
 		fi
-		log_must $ZPOOL import ${devs[i]} ${options[j]} $target
+		log_must zpool import ${devs[i]} ${options[j]} $target
 
 		log_must poolexists ${pools[i]}
 
@@ -125,7 +125,7 @@ while (( i < ${#pools[*]} )); do
 		[[ ! -e $basedir/$TESTFILE0 ]] && \
 			log_fail "$basedir/$TESTFILE0 missing after import."
 
-		checksum2=$($SUM $basedir/$TESTFILE0 | $AWK '{print $1}')
+		checksum2=$(sum $basedir/$TESTFILE0 | awk '{print $1}')
 		[[ "$checksum1" != "$checksum2" ]] && \
 			log_fail "Checksums differ ($checksum1 != $checksum2)"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_002_pos.ksh
index 73f24a4a6a..898f93cc90 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -62,16 +62,16 @@ function cleanup
 	typeset -i i=0
 	while (( i < ${#pools[*]} )); do
 		poolexists ${pools[i]} && \
-			log_must $ZPOOL export ${pools[i]}
+			log_must zpool export ${pools[i]}
 
 		datasetexists "${pools[i]}/$TESTFS" || \
-			log_must $ZPOOL import ${devs[i]} ${pools[i]}
+			log_must zpool import ${devs[i]} ${pools[i]}
 
 		ismounted "${pools[i]}/$TESTFS" || \
-			log_must $ZFS mount ${pools[i]}/$TESTFS
+			log_must zfs mount ${pools[i]}/$TESTFS
 
 		[[ -e ${mtpts[i]}/$TESTFILE0 ]] && \
-			log_must $RM -rf ${mtpts[i]}/$TESTFILE0
+			log_must rm -rf ${mtpts[i]}/$TESTFILE0
 
 		((i = i + 1))
 	done
@@ -81,7 +81,7 @@ function cleanup
 	destroy_pool $TESTPOOL1
 
 	[[ -d $ALTER_ROOT ]] && \
-		log_must $RM -rf $ALTER_ROOT
+		log_must rm -rf $ALTER_ROOT
 }
 
 log_onexit cleanup
@@ -90,7 +90,7 @@ log_assert "Verify that an exported pool cannot be imported more than once."
 
 setup_filesystem "$DEVICE_FILES" $TESTPOOL1 $TESTFS $TESTDIR1
 
-checksum1=$($SUM $MYTESTFILE | $AWK '{print $1}')
+checksum1=$(sum $MYTESTFILE | awk '{print $1}')
 
 typeset -i i=0
 typeset -i j=0
@@ -99,13 +99,13 @@ typeset basedir
 while (( i < ${#pools[*]} )); do
 	guid=$(get_config ${pools[i]} pool_guid)
 
-	log_must $CP $MYTESTFILE ${mtpts[i]}/$TESTFILE0
+	log_must cp $MYTESTFILE ${mtpts[i]}/$TESTFILE0
 
-	log_must $ZFS umount ${mtpts[i]}
+	log_must zfs umount ${mtpts[i]}
 
 	j=0
 	while (( j <  ${#options[*]} )); do
-		log_must $ZPOOL export ${pools[i]}
+		log_must zpool export ${pools[i]}
 
 		typeset target=${pools[i]}
 		if (( RANDOM % 2 == 0 )) ; then
@@ -113,7 +113,7 @@ while (( i < ${#pools[*]} )); do
 			log_note "Import by guid."
 		fi
 
-		log_must $ZPOOL import ${devs[i]} ${options[j]} $target
+		log_must zpool import ${devs[i]} ${options[j]} $target
 
 		log_must poolexists ${pools[i]}
 
@@ -126,11 +126,11 @@ while (( i < ${#pools[*]} )); do
 		[[ ! -e $basedir/$TESTFILE0 ]] && \
 			log_fail "$basedir/$TESTFILE0 missing after import."
 
-		checksum2=$($SUM $basedir/$TESTFILE0 | $AWK '{print $1}')
+		checksum2=$(sum $basedir/$TESTFILE0 | awk '{print $1}')
 		[[ "$checksum1" != "$checksum2" ]] && \
 			log_fail "Checksums differ ($checksum1 != $checksum2)"
 
-		log_mustnot $ZPOOL import ${devs[i]} $target
+		log_mustnot zpool import ${devs[i]} $target
 
 		((j = j + 1))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_003_pos.ksh
index 26ed492095..dfda989dea 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,20 +48,20 @@ function cleanup
 {
 	destroy_pool $TESTPOOL1
 
-	log_must $RM $VDEV0 $VDEV1
-	log_must $MKFILE $FILE_SIZE $VDEV0 $VDEV1
+	log_must rm $VDEV0 $VDEV1
+	log_must mkfile $FILE_SIZE $VDEV0 $VDEV1
 }
 
 log_assert "Destroyed pools are not listed unless with -D option is specified."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 $VDEV0 $VDEV1
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool create $TESTPOOL1 $VDEV0 $VDEV1
+log_must zpool destroy $TESTPOOL1
 
 #
 # 'pool:' is the keywords of 'zpool import -D' output.
 #
-log_mustnot eval "$ZPOOL import -d $DEVICE_DIR | $GREP pool:"
-log_must eval "$ZPOOL import -d $DEVICE_DIR -D | $GREP pool:"
+log_mustnot eval "zpool import -d $DEVICE_DIR | grep pool:"
+log_must eval "zpool import -d $DEVICE_DIR -D | grep pool:"
 
 log_pass "Destroyed pool only can be listed with -D option."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_004_pos.ksh
index f584200628..657e28be25 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,10 +50,10 @@ function cleanup
 {
 	destroy_pool $TESTPOOL1
 
-	log_must $RM -rf $DEVICE_DIR/*
+	log_must rm -rf $DEVICE_DIR/*
 	typeset i=0
 	while (( i < $MAX_NUM )); do
-		log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+		log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 		((i += 1))
 	done
 }
@@ -62,27 +62,27 @@ log_assert "Destroyed pools devices was moved to another directory," \
 	"it still can be imported correctly."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 $VDEV0 $VDEV1 $VDEV2
+log_must zpool create $TESTPOOL1 $VDEV0 $VDEV1 $VDEV2
 typeset guid=$(get_config $TESTPOOL1 pool_guid)
 typeset target=$TESTPOOL1
 if (( RANDOM % 2 == 0 )) ; then
 	target=$guid
 	log_note "Import by guid."
 fi
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL1
 
 log_note "Devices was moved to different directories."
-log_must $MKDIR $DEVICE_DIR/newdir1 $DEVICE_DIR/newdir2
-log_must $MV $VDEV1 $DEVICE_DIR/newdir1
-log_must $MV $VDEV2 $DEVICE_DIR/newdir2
-log_must $ZPOOL import -d $DEVICE_DIR/newdir1 -d $DEVICE_DIR/newdir2 \
+log_must mkdir $DEVICE_DIR/newdir1 $DEVICE_DIR/newdir2
+log_must mv $VDEV1 $DEVICE_DIR/newdir1
+log_must mv $VDEV2 $DEVICE_DIR/newdir2
+log_must zpool import -d $DEVICE_DIR/newdir1 -d $DEVICE_DIR/newdir2 \
 	-d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy -f $TESTPOOL1
+log_must zpool destroy -f $TESTPOOL1
 
 log_note "Devices was moved to same directory."
-log_must $MV $VDEV0 $DEVICE_DIR/newdir2
-log_must $MV $DEVICE_DIR/newdir1/* $DEVICE_DIR/newdir2
-log_must $ZPOOL import -d $DEVICE_DIR/newdir2 -D -f $target
-log_must $ZPOOL destroy -f $TESTPOOL1
+log_must mv $VDEV0 $DEVICE_DIR/newdir2
+log_must mv $DEVICE_DIR/newdir1/* $DEVICE_DIR/newdir2
+log_must zpool import -d $DEVICE_DIR/newdir2 -D -f $target
+log_must zpool destroy -f $TESTPOOL1
 
 log_pass "Destroyed pools devices was moved, 'zpool import -D' passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_005_pos.ksh
index 12bd14d33c..79f026ede5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,10 +48,10 @@ function cleanup
 {
 	destroy_pool $TESTPOOL1
 
-	log_must $RM -rf $DEVICE_DIR/*
+	log_must rm -rf $DEVICE_DIR/*
 	typeset i=0
 	while (( i < $MAX_NUM )); do
-		log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+		log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 		((i += 1))
 	done
 }
@@ -60,26 +60,26 @@ log_assert "Destroyed pools devices was renamed, it still can be imported " \
 	"correctly."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 $VDEV0 $VDEV1 $VDEV2
+log_must zpool create $TESTPOOL1 $VDEV0 $VDEV1 $VDEV2
 typeset guid=$(get_config $TESTPOOL1 pool_guid)
 typeset target=$TESTPOOL1
 if (( RANDOM % 2 == 0 )) ; then
 	target=$guid
 	log_note "Import by guid."
 fi
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL1
 
 log_note "Part of devices was renamed in the same directory."
-log_must $MV $VDEV0 $DEVICE_DIR/vdev0-new
-log_must $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy -f $TESTPOOL1
+log_must mv $VDEV0 $DEVICE_DIR/vdev0-new
+log_must zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy -f $TESTPOOL1
 
 log_note "All of devices was rename to different directories."
-log_must $MKDIR $DEVICE_DIR/newdir1 $DEVICE_DIR/newdir2
-log_must $MV $VDEV1 $DEVICE_DIR/newdir1/vdev1-new
-log_must $MV $VDEV2 $DEVICE_DIR/newdir2/vdev2-new
-log_must $ZPOOL import -d $DEVICE_DIR/newdir1 -d $DEVICE_DIR/newdir2 \
+log_must mkdir $DEVICE_DIR/newdir1 $DEVICE_DIR/newdir2
+log_must mv $VDEV1 $DEVICE_DIR/newdir1/vdev1-new
+log_must mv $VDEV2 $DEVICE_DIR/newdir2/vdev2-new
+log_must zpool import -d $DEVICE_DIR/newdir1 -d $DEVICE_DIR/newdir2 \
 	-d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy -f $TESTPOOL1
+log_must zpool destroy -f $TESTPOOL1
 
 log_pass "Destroyed pools devices was renamed, 'zpool import -D' passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_006_pos.ksh
index b35e3ccff6..2353bb07d0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,10 +51,10 @@ function cleanup
 	destroy_pool $TESTPOOL2
 	destroy_pool $TESTPOOL1
 
-	log_must $RM -rf $DEVICE_DIR/*
+	log_must rm -rf $DEVICE_DIR/*
 	typeset i=0
 	while (( i < $MAX_NUM )); do
-		log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+		log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 		((i += 1))
 	done
 }
@@ -63,21 +63,21 @@ log_assert "For mirror, N-1 destroyed pools devices was removed or used " \
 	"by other pool, it still can be imported correctly."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 mirror $VDEV0 $VDEV1 $VDEV2
+log_must zpool create $TESTPOOL1 mirror $VDEV0 $VDEV1 $VDEV2
 typeset guid=$(get_config $TESTPOOL1 pool_guid)
 typeset target=$TESTPOOL1
 if (( RANDOM % 2 == 0 )) ; then
 	target=$guid
 	log_note "Import by guid."
 fi
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL1
 
-log_must $ZPOOL create $TESTPOOL2 $VDEV0 $VDEV2
-log_must $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool create $TESTPOOL2 $VDEV0 $VDEV2
+log_must zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL1
 
-log_must $ZPOOL destroy $TESTPOOL2
-log_must $RM -rf $VDEV2
-log_must $ZPOOL import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL2
+log_must rm -rf $VDEV2
+log_must zpool import -d $DEVICE_DIR -D -f $target
 
 log_pass "zpool import -D mirror passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_007_pos.ksh
index ec7a8672d3..6e93fd4711 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,10 +51,10 @@ function cleanup
 	destroy_pool $TESTPOOL2
 	destroy_pool $TESTPOOL1
 
-	log_must $RM -rf $DEVICE_DIR/*
+	log_must rm -rf $DEVICE_DIR/*
 	typeset i=0
 	while (( i < $MAX_NUM )); do
-		log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+		log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 		((i += 1))
 	done
 }
@@ -63,28 +63,28 @@ log_assert "For raidz, one destroyed pools devices was removed or used by " \
 	"other pool, it still can be imported correctly."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 raidz $VDEV0 $VDEV1 $VDEV2 $VDIV3
+log_must zpool create $TESTPOOL1 raidz $VDEV0 $VDEV1 $VDEV2 $VDIV3
 typeset guid=$(get_config $TESTPOOL1 pool_guid)
 typeset target=$TESTPOOL1
 if (( RANDOM % 2 == 0 )) ; then
 	target=$guid
 	log_note "Import by guid."
 fi
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL1
 
-log_must $ZPOOL create $TESTPOOL2 $VDEV0
-log_must $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool create $TESTPOOL2 $VDEV0
+log_must zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL1
 
-log_must $ZPOOL destroy $TESTPOOL2
-log_must $RM -rf $VDEV0
-log_must $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL2
+log_must rm -rf $VDEV0
+log_must zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL1
 
 log_note "For raidz, two destroyed pool's devices were used, import failed."
-log_must $MKFILE $FILE_SIZE $VDEV0
-log_must $ZPOOL create $TESTPOOL2 $VDEV0 $VDEV1
-log_mustnot $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy $TESTPOOL2
+log_must mkfile $FILE_SIZE $VDEV0
+log_must zpool create $TESTPOOL2 $VDEV0 $VDEV1
+log_mustnot zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL2
 
 log_pass "zpool import -D raidz passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_008_pos.ksh
index 45d76b369b..096bbe8114 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,10 +51,10 @@ function cleanup
 	destroy_pool $TESTPOOL2
 	destroy_pool $TESTPOOL1
 
-	log_must $RM -rf $DEVICE_DIR/*
+	log_must rm -rf $DEVICE_DIR/*
 	typeset i=0
 	while (( i < $MAX_NUM )); do
-		log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+		log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 		((i += 1))
 	done
 }
@@ -63,29 +63,29 @@ log_assert "For raidz2, two destroyed pools devices was removed or used by " \
 	"other pool, it still can be imported correctly."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 raidz2 $VDEV0 $VDEV1 $VDEV2 $VDIV3
+log_must zpool create $TESTPOOL1 raidz2 $VDEV0 $VDEV1 $VDEV2 $VDIV3
 typeset guid=$(get_config $TESTPOOL1 pool_guid)
 typeset target=$TESTPOOL1
 if (( RANDOM % 2 == 0 )) ; then
 	target=$guid
 	log_note "Import by guid."
 fi
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL1
 
-log_must $ZPOOL create $TESTPOOL2 $VDEV0 $VDEV1
-log_must $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool create $TESTPOOL2 $VDEV0 $VDEV1
+log_must zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL1
 
-log_must $ZPOOL destroy $TESTPOOL2
-log_must $RM -rf $VDEV0 $VDEV1
-log_must $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy $TESTPOOL1
+log_must zpool destroy $TESTPOOL2
+log_must rm -rf $VDEV0 $VDEV1
+log_must zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL1
 
 log_note "For raidz2, more than two destroyed pool's devices were used, " \
 	"import failed."
-log_must $MKFILE $FILE_SIZE $VDEV0 $VDEV1
-log_must $ZPOOL create $TESTPOOL2 $VDEV0 $VDEV1 $VDEV2
-log_mustnot $ZPOOL import -d $DEVICE_DIR -D -f $target
-log_must $ZPOOL destroy $TESTPOOL2
+log_must mkfile $FILE_SIZE $VDEV0 $VDEV1
+log_must zpool create $TESTPOOL2 $VDEV0 $VDEV1 $VDEV2
+log_mustnot zpool import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL2
 
 log_pass "zpool import -D raidz2 passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_009_neg.ksh
index a572ba00a6..e7886ef3c8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -68,13 +68,13 @@ function cleanup
 	while (( i < ${#pools[*]} )); do
 
 		poolexists ${pools[i]} && \
-			log_must $ZPOOL export ${pools[i]}
+			log_must zpool export ${pools[i]}
 
 		datasetexists "${pools[i]}/$TESTFS" || \
-			log_must $ZPOOL import ${devs[i]} ${pools[i]}
+			log_must zpool import ${devs[i]} ${pools[i]}
 
 		ismounted "${pools[i]}/$TESTFS" || \
-			log_must $ZFS mount ${pools[i]}/$TESTFS
+			log_must zfs mount ${pools[i]}/$TESTFS
 
 		((i = i + 1))
 	done
@@ -91,11 +91,11 @@ log_assert "Badly-formed 'zpool import' with inapplicable scenarios " \
 
 setup_filesystem "$DEVICE_FILES" $TESTPOOL1 $TESTFS $TESTDIR1
 
-log_must $ZPOOL export $TESTPOOL
+log_must zpool export $TESTPOOL
 
 typeset -i i=0
 while (( i < ${#args[*]} )); do
-	log_mustnot $ZPOOL import ${args[i]}
+	log_mustnot zpool import ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_010_pos.ksh
index 23d7f916f3..b337bd00f1 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_010_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,10 +54,10 @@ function cleanup
 		destroy_pool $dt
 	done
 
-	log_must $RM -rf $DEVICE_DIR/*
+	log_must rm -rf $DEVICE_DIR/*
 	typeset i=0
 	while (( i < $MAX_NUM )); do
-		log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+		log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 		((i += 1))
 	done
 }
@@ -68,22 +68,22 @@ log_onexit cleanup
 
 poolA=poolA.$$; poolB=poolB.$$; poolC=poolC.$$; poolD=poolD.$$; poolE=poolE.$$
 
-log_must $ZPOOL create $poolA mirror $VDEV0 $VDEV1 $VDEV2 $VDEV3 $VDEV4
-log_must $ZPOOL destroy $poolA
+log_must zpool create $poolA mirror $VDEV0 $VDEV1 $VDEV2 $VDEV3 $VDEV4
+log_must zpool destroy $poolA
 
-log_must $ZPOOL create $poolB $VDEV1
-log_must $ZPOOL destroy $poolB
+log_must zpool create $poolB $VDEV1
+log_must zpool destroy $poolB
 
-log_must $ZPOOL create $poolC raidz2 $VDEV2 $VDEV3 $VDEV4
-log_must $ZPOOL destroy $poolC
+log_must zpool create $poolC raidz2 $VDEV2 $VDEV3 $VDEV4
+log_must zpool destroy $poolC
 
-log_must $ZPOOL create $poolD raidz $VDEV3 $VDEV4
-log_must $ZPOOL destroy $poolD
+log_must zpool create $poolD raidz $VDEV3 $VDEV4
+log_must zpool destroy $poolD
 
-log_must $ZPOOL create $poolE $VDEV4
-log_must $ZPOOL destroy $poolE
+log_must zpool create $poolE $VDEV4
+log_must zpool destroy $poolE
 
-log_must $ZPOOL import -d $DEVICE_DIR -D -f -a
+log_must zpool import -d $DEVICE_DIR -D -f -a
 
 for dt in $poolA $poolB $poolC $poolD $poolE; do
 	log_must datasetexists $dt
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_011_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_011_neg.ksh
index fbc6e6d27a..b541689417 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_011_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_011_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,27 +55,27 @@ function cleanup
 	#
 	# Recreate virtual devices to avoid destroyed pool information on files.
 	#
-	log_must $RM -rf $VDEV0 $VDEV1 $VDEV2
-	log_must $MKFILE $FILE_SIZE $VDEV0 $VDEV1 $VDEV2
+	log_must rm -rf $VDEV0 $VDEV1 $VDEV2
+	log_must mkfile $FILE_SIZE $VDEV0 $VDEV1 $VDEV2
 }
 
 log_assert "For strip pool, any destroyed pool devices was demaged," \
 	"zpool import -D will failed."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 $VDEV0 $VDEV1 $VDEV2
+log_must zpool create $TESTPOOL1 $VDEV0 $VDEV1 $VDEV2
 typeset guid=$(get_config $TESTPOOL1 pool_guid)
 typeset target=$TESTPOOL1
 if (( RANDOM % 2 == 0 )) ; then
 	target=$guid
 	log_note "Import by guid."
 fi
-log_must $ZPOOL destroy $TESTPOOL1
-log_must $ZPOOL create $TESTPOOL2 $VDEV2
+log_must zpool destroy $TESTPOOL1
+log_must zpool create $TESTPOOL2 $VDEV2
 
-log_mustnot $ZPOOL import -d $DEVICE_DIR -D -f $target
+log_mustnot zpool import -d $DEVICE_DIR -D -f $target
 
-log_must $ZPOOL destroy $TESTPOOL2
-log_mustnot $ZPOOL import -d $DEVICE_DIR -D -f $target
+log_must zpool destroy $TESTPOOL2
+log_mustnot zpool import -d $DEVICE_DIR -D -f $target
 
 log_pass "Any strip pool devices damaged, pool can't be import passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh
index b4453b8a8c..ca0e51b993 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -63,20 +63,20 @@ function cleanup
 
 	while ((i < ${#pools[*]})); do
 		if poolexists ${pools[i]}; then
-			log_must $ZPOOL export ${pools[i]}
+			log_must zpool export ${pools[i]}
 			log_note "Try to import ${devs[i]} ${pools[i]}"
-			$ZPOOL import ${devs[i]} ${pools[i]}
+			zpool import ${devs[i]} ${pools[i]}
 		else
 			log_note "Try to import $option ${devs[i]} ${pools[i]}"
-			$ZPOOL import $option ${devs[i]} ${pools[i]}
+			zpool import $option ${devs[i]} ${pools[i]}
 		fi
 
 		if poolexists ${pools[i]}; then
 			is_shared ${pools[i]} && \
-			    log_must $ZFS set sharenfs=off ${pools[i]}
+			    log_must zfs set sharenfs=off ${pools[i]}
 
 			ismounted "${pools[i]}/$TESTFS" || \
-			    log_must $ZFS mount ${pools[i]}/$TESTFS
+			    log_must zfs mount ${pools[i]}/$TESTFS
 		fi
 
 		((i = i + 1))
@@ -85,13 +85,13 @@ function cleanup
 	destroy_pool $TESTPOOL1
 
 	if datasetexists $TESTPOOL/$TESTFS; then
-		log_must $ZFS destroy -Rf $TESTPOOL/$TESTFS
+		log_must zfs destroy -Rf $TESTPOOL/$TESTFS
 	fi
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
 	[[ -d $ALTER_ROOT ]] && \
-		log_must $RM -rf $ALTER_ROOT
+		log_must rm -rf $ALTER_ROOT
 }
 
 log_onexit cleanup
@@ -102,15 +102,15 @@ log_assert "Verify all mount & share status of sub-filesystems within a pool \
 setup_filesystem "$DEVICE_FILES" $TESTPOOL1 $TESTFS $TESTDIR1
 # create a heirarchy of filesystem
 for pool in ${pools[@]} ; do
-	log_must $ZFS create $pool/$TESTFS/$TESTCTR
-	log_must $ZFS create $pool/$TESTFS/$TESTCTR/$TESTCTR1
-	log_must $ZFS set canmount=off $pool/$TESTFS/$TESTCTR
-	log_must $ZFS set canmount=off $pool/$TESTFS/$TESTCTR/$TESTCTR1
-	log_must $ZFS create $pool/$TESTFS/$TESTCTR/$TESTFS1
-	log_must $ZFS create $pool/$TESTFS/$TESTCTR/$TESTCTR1/$TESTFS1
-	log_must $ZFS create $pool/$TESTFS/$TESTFS1
-	log_must $ZFS snapshot $pool/$TESTFS/$TESTFS1@snap
-	log_must $ZFS clone $pool/$TESTFS/$TESTFS1@snap $pool/$TESTCLONE1
+	log_must zfs create $pool/$TESTFS/$TESTCTR
+	log_must zfs create $pool/$TESTFS/$TESTCTR/$TESTCTR1
+	log_must zfs set canmount=off $pool/$TESTFS/$TESTCTR
+	log_must zfs set canmount=off $pool/$TESTFS/$TESTCTR/$TESTCTR1
+	log_must zfs create $pool/$TESTFS/$TESTCTR/$TESTFS1
+	log_must zfs create $pool/$TESTFS/$TESTCTR/$TESTCTR1/$TESTFS1
+	log_must zfs create $pool/$TESTFS/$TESTFS1
+	log_must zfs snapshot $pool/$TESTFS/$TESTFS1@snap
+	log_must zfs clone $pool/$TESTFS/$TESTFS1@snap $pool/$TESTCLONE1
 done
 
 typeset mount_fs="$TESTFS $TESTFS/$TESTFS1 $TESTCLONE1 \
@@ -137,7 +137,7 @@ for option in "" "-Df"; do
 				typeset nfs_flag="sharenfs=off"
 				if ((nfs_share_bit == 1)); then
 					log_note "Set sharenfs=on $pool"
-					log_must $ZFS set sharenfs=on $pool
+					log_must zfs set sharenfs=on $pool
 					log_must is_shared $pool
 					f_share="true"
 					nfs_flag="sharenfs=on"
@@ -147,9 +147,9 @@ for option in "" "-Df"; do
 				while ((guid_bit <= 1)); do
 					typeset guid_flag="pool name"
 					if [[ -z $option ]]; then
-						log_must $ZPOOL export $pool
+						log_must zpool export $pool
 					else
-						log_must $ZPOOL destroy $pool
+						log_must zpool destroy $pool
 					fi
 
 					typeset target=$pool
@@ -165,14 +165,14 @@ for option in "" "-Df"; do
 					fi
 					log_note "Import with $nfs_flag and " \
 					    "$guid_flag"
-					$ZPOOL import $option ${devs[i]} \
+					zpool import $option ${devs[i]} \
 					    ${options[j]} $target
 					#import by GUID if import by pool name fails
 					if [[ $? != 0 ]]; then
 						log_note "Possible pool name" \
 						    "duplicates. Try GUID import"
 						target=$guid
-						log_must $ZPOOL import $option \
+						log_must zpool import $option \
 						    ${devs[i]} ${options[j]} \
 						    $target
 					fi
@@ -192,7 +192,7 @@ for option in "" "-Df"; do
 				done
 				# reset nfsshare=off
 				if [[ -n $f_share ]]; then
-					log_must $ZFS set sharenfs=off $pool
+					log_must zfs set sharenfs=off $pool
 					log_mustnot is_shared $pool
 				fi
 				((nfs_share_bit = nfs_share_bit + 1))
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh
index d5522142ed..0a221b8e07 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_013_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,7 +52,7 @@ function uncompress_pool
 {
 
 	log_note "Creating pool from $POOL_FILE"
-	log_must $BZCAT \
+	log_must bzcat \
 	    $STF_SUITE/tests/functional/cli_root/zpool_import/blockfiles/$POOL_FILE.bz2 \
 	    > /$TESTPOOL/$POOL_FILE
 	return 0
@@ -60,8 +60,8 @@ function uncompress_pool
 
 function cleanup
 {
-	poolexists $POOL_NAME && log_must $ZPOOL destroy $POOL_NAME
-	[[ -e /$TESTPOOL/$POOL_FILE ]] && $RM /$TESTPOOL/$POOL_FILE
+	poolexists $POOL_NAME && log_must zpool destroy $POOL_NAME
+	[[ -e /$TESTPOOL/$POOL_FILE ]] && rm /$TESTPOOL/$POOL_FILE
 	return 0
 }
 
@@ -69,7 +69,7 @@ log_assert "'zpool import' fails for pool that was not cleanly exported"
 log_onexit cleanup
 
 uncompress_pool
-log_mustnot $ZPOOL import -d /$TESTPOOL $POOL_NAME
-log_must $ZPOOL import -d /$TESTPOOL -f $POOL_NAME
+log_mustnot zpool import -d /$TESTPOOL $POOL_NAME
+log_must zpool import -d /$TESTPOOL -f $POOL_NAME
 
 log_pass "'zpool import' fails for pool that was not cleanly exported"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_all_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_all_001_pos.ksh
index 5264399055..7c980dbf6e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_all_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_all_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -63,12 +63,12 @@ function setup_single_disk #disk #pool #fs #mtpt
 
 	setup_filesystem "$disk" "$pool" "$fs" "$mtpt"
 
-	log_must $CP $MYTESTFILE $mtpt/$TESTFILE0
+	log_must cp $MYTESTFILE $mtpt/$TESTFILE0
 
-	log_must $ZPOOL export $pool
+	log_must zpool export $pool
 
 	[[ -d $mtpt ]] && \
-		$RM -rf $mtpt
+		rm -rf $mtpt
 }
 
 function cleanup_all
@@ -78,12 +78,12 @@ function cleanup_all
 	#
 	# Try import individually if 'import -a' failed.
 	#
-	for pool in `$ZPOOL import | $GREP "pool:" | $AWK '{print $2}'`; do
-		$ZPOOL import -f $pool
+	for pool in `zpool import | grep "pool:" | awk '{print $2}'`; do
+		zpool import -f $pool
 	done
 
-	for pool in `$ZPOOL import -d $DEVICE_DIR | $GREP "pool:" | $AWK '{print $2}'`; do
-		log_must $ZPOOL import -d $DEVICE_DIR -f $pool
+	for pool in `zpool import -d $DEVICE_DIR | grep "pool:" | awk '{print $2}'`; do
+		log_must zpool import -d $DEVICE_DIR -f $pool
 	done
 
 	while (( id < number )); do
@@ -93,15 +93,15 @@ function cleanup_all
 		fi
 
 		if (( id == 0 )); then
-			log_must $ZPOOL export ${TESTPOOL}-$id
+			log_must zpool export ${TESTPOOL}-$id
 
 			[[ -d /${TESTPOOL}-$id ]] && \
-				log_must $RM -rf /${TESTPOOL}-$id
+				log_must rm -rf /${TESTPOOL}-$id
 
-			log_must $ZPOOL import -f ${TESTPOOL}-$id $TESTPOOL
+			log_must zpool import -f ${TESTPOOL}-$id $TESTPOOL
 
 			[[ -e $TESTDIR/$TESTFILE0 ]] && \
-				log_must $RM -rf $TESTDIR/$TESTFILE0
+				log_must rm -rf $TESTDIR/$TESTFILE0
 		else
 			cleanup_filesystem "${TESTPOOL}-$id" $TESTFS
 
@@ -112,7 +112,7 @@ function cleanup_all
         done
 
 	[[ -d $ALTER_ROOT ]] && \
-		$RM -rf $ALTER_ROOT
+		rm -rf $ALTER_ROOT
 }
 
 function checksum_all #alter_root
@@ -136,7 +136,7 @@ function checksum_all #alter_root
 		[[ ! -e $file ]] && \
 			log_fail "$file missing after import."
 
-		checksum2=$($SUM $file | $AWK '{print $1}')
+		checksum2=$(sum $file | awk '{print $1}')
 		[[ "$checksum1" != "$checksum2" ]] && \
 			log_fail "Checksums differ ($checksum1 != $checksum2)"
 
@@ -151,14 +151,14 @@ log_assert "Verify that 'zpool import -a' succeeds as root."
 
 log_onexit cleanup_all
 
-checksum1=$($SUM $MYTESTFILE | $AWK '{print $1}')
+checksum1=$(sum $MYTESTFILE | awk '{print $1}')
 
-log_must $ZPOOL export $TESTPOOL
-log_must $ZPOOL import $TESTPOOL ${TESTPOOL}-0
-log_must $CP $MYTESTFILE $TESTDIR/$TESTFILE0
-log_must $ZPOOL export ${TESTPOOL}-0
+log_must zpool export $TESTPOOL
+log_must zpool import $TESTPOOL ${TESTPOOL}-0
+log_must cp $MYTESTFILE $TESTDIR/$TESTFILE0
+log_must zpool export ${TESTPOOL}-0
 [[ -d /${TESTPOOL}-0 ]] && \
-	log_must $RM -rf /${TESTPOOL}-0
+	log_must rm -rf /${TESTPOOL}-0
 
 #
 # setup exported pools on normal devices
@@ -194,13 +194,13 @@ done
 
 while (( i < ${#options[*]} )); do
 
-	log_must $ZPOOL import -d /dev/dsk -d $DEVICE_DIR ${options[i]} -a -f
+	log_must zpool import -d /dev/dsk -d $DEVICE_DIR ${options[i]} -a -f
 
 	# destroy unintentional imported pools
-	typeset exclude=`eval $ECHO \"'(${KEEP})'\"`
-	for unwantedpool in $($ZPOOL list -H -o name \
-	     | $EGREP -v "$exclude" | $GREP -v $TESTPOOL); do
-		log_must $ZPOOL export $unwantedpool
+	typeset exclude=`eval echo \"'(${KEEP})'\"`
+	for unwantedpool in $(zpool list -H -o name \
+	     | egrep -v "$exclude" | grep -v $TESTPOOL); do
+		log_must zpool export $unwantedpool
 	done
 
 	if [[ -n ${options[i]} ]]; then
@@ -212,7 +212,7 @@ while (( i < ${#options[*]} )); do
 	id=0
 	while (( id < number )); do
 		if poolexists ${TESTPOOL}-$id ; then
-			log_must $ZPOOL export ${TESTPOOL}-$id
+			log_must zpool export ${TESTPOOL}-$id
 		fi
 		(( id = id + 1 ))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_001_pos.ksh
index ea71acfd2c..973efb7acf 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_001_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,23 +46,23 @@ function cleanup
 {
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 
-	log_must $RM $VDEV0
-	log_must $MKFILE $FILE_SIZE $VDEV0
+	log_must rm $VDEV0
+	log_must mkfile $FILE_SIZE $VDEV0
 }
 
 log_assert "Pool with inactive unsupported features can be imported."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 $VDEV0
-log_must $ZPOOL export $TESTPOOL1
+log_must zpool create $TESTPOOL1 $VDEV0
+log_must zpool export $TESTPOOL1
 
 for feature in $features; do
-	log_must $ZHACK -d $DEVICE_DIR feature enable $TESTPOOL1 $feature
+	log_must zhack -d $DEVICE_DIR feature enable $TESTPOOL1 $feature
 done
 
-log_must $ZPOOL import -d $DEVICE_DIR $TESTPOOL1
+log_must zpool import -d $DEVICE_DIR $TESTPOOL1
 for feature in $features; do
-	state=$($ZPOOL list -Ho unsupported@$feature $TESTPOOL1)
+	state=$(zpool list -Ho unsupported@$feature $TESTPOOL1)
         if [[ "$state" != "inactive" ]]; then
 		log_fail "unsupported@$feature is '$state'"
         fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_002_neg.ksh
index 26b99f07a7..d16ef217a4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_002_neg.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,39 +48,39 @@ function cleanup
 {
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 
-	log_must $RM $VDEV0
-	log_must $MKFILE $FILE_SIZE $VDEV0
+	log_must rm $VDEV0
+	log_must mkfile $FILE_SIZE $VDEV0
 }
 
 log_assert "Pool with active unsupported features cannot be imported."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 $VDEV0
-log_must $ZPOOL export $TESTPOOL1
+log_must zpool create $TESTPOOL1 $VDEV0
+log_must zpool export $TESTPOOL1
 
 for feature in $enabled_features $active_features; do
-	log_must $ZHACK -d $DEVICE_DIR feature enable $TESTPOOL1 $feature
+	log_must zhack -d $DEVICE_DIR feature enable $TESTPOOL1 $feature
 done
 
 for feature in $active_features; do
-	log_must $ZHACK -d $DEVICE_DIR feature ref $TESTPOOL1 $feature
+	log_must zhack -d $DEVICE_DIR feature ref $TESTPOOL1 $feature
 done
 
-log_mustnot $ZPOOL import -d $DEVICE_DIR $TESTPOOL1
+log_mustnot zpool import -d $DEVICE_DIR $TESTPOOL1
 
 # error message should not mention "readonly"
-log_mustnot eval "$ZPOOL import -d $DEVICE_DIR $TESTPOOL1 | $GREP readonly"
+log_mustnot eval "zpool import -d $DEVICE_DIR $TESTPOOL1 | grep readonly"
 log_mustnot poolexists $TESTPOOL1
 
 for feature in $active_features; do
-	log_must eval "$ZPOOL import -d $DEVICE_DIR $TESTPOOL1 \
-	    | $GREP $feature"
+	log_must eval "zpool import -d $DEVICE_DIR $TESTPOOL1 \
+	    | grep $feature"
 	log_mustnot poolexists $TESTPOOL1
 done
 
 for feature in $enabled_features; do
-	log_mustnot eval "$ZPOOL import -d $DEVICE_DIR $TESTPOOL1 \
-	    | $GREP $feature"
+	log_mustnot eval "zpool import -d $DEVICE_DIR $TESTPOOL1 \
+	    | grep $feature"
 	log_mustnot poolexists $TESTPOOL1
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_003_pos.ksh
index 3f0ea63d62..e92c95f54c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_features_003_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,53 +51,53 @@ function cleanup
 {
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 
-	log_must $RM $VDEV0
-	log_must $MKFILE $FILE_SIZE $VDEV0
+	log_must rm $VDEV0
+	log_must mkfile $FILE_SIZE $VDEV0
 }
 
 log_assert "Pool with active read-only compatible features can be imported."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL1 $VDEV0
-log_must $ZPOOL export $TESTPOOL1
+log_must zpool create $TESTPOOL1 $VDEV0
+log_must zpool export $TESTPOOL1
 
 for feature in $enabled_features $active_features; do
-	log_must $ZHACK -d $DEVICE_DIR feature enable -r $TESTPOOL1 $feature
+	log_must zhack -d $DEVICE_DIR feature enable -r $TESTPOOL1 $feature
 done
 
 for feature in $active_features; do
-	log_must $ZHACK -d $DEVICE_DIR feature ref $TESTPOOL1 $feature
+	log_must zhack -d $DEVICE_DIR feature ref $TESTPOOL1 $feature
 done
 
-log_mustnot $ZPOOL import -d $DEVICE_DIR $TESTPOOL1
+log_mustnot zpool import -d $DEVICE_DIR $TESTPOOL1
 
 # error message should mention "readonly"
-log_must eval "$ZPOOL import -d $DEVICE_DIR $TESTPOOL1 | $GREP readonly"
+log_must eval "zpool import -d $DEVICE_DIR $TESTPOOL1 | grep readonly"
 log_mustnot poolexists $TESTPOOL1
 
 for feature in $enabled_features; do
-	log_mustnot eval "$ZPOOL import -d $DEVICE_DIR $TESTPOOL1 \
-	    | $GREP $feature"
+	log_mustnot eval "zpool import -d $DEVICE_DIR $TESTPOOL1 \
+	    | grep $feature"
 	log_mustnot poolexists $TESTPOOL1
 done
 
 for feature in $active_features; do
-	log_must eval "$ZPOOL import -d $DEVICE_DIR $TESTPOOL1 \
-	    | $GREP $feature"
+	log_must eval "zpool import -d $DEVICE_DIR $TESTPOOL1 \
+	    | grep $feature"
 	log_mustnot poolexists $TESTPOOL1
 done
 
-log_must $ZPOOL import -o readonly=on -d $DEVICE_DIR $TESTPOOL1
+log_must zpool import -o readonly=on -d $DEVICE_DIR $TESTPOOL1
 
 for feature in $enabled_features; do
-	state=$($ZPOOL list -Ho unsupported@$feature $TESTPOOL1)
+	state=$(zpool list -Ho unsupported@$feature $TESTPOOL1)
         if [[ "$state" != "inactive" ]]; then
 		log_fail "unsupported@$feature is '$state'"
         fi
 done
 
 for feature in $active_features; do
-	state=$($ZPOOL list -Ho unsupported@$feature $TESTPOOL1)
+	state=$(zpool list -Ho unsupported@$feature $TESTPOOL1)
         if [[ "$state" != "readonly" ]]; then
 		log_fail "unsupported@$feature is '$state'"
         fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_001_pos.ksh
index d0447596b3..78e9bbf689 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -76,7 +76,7 @@ function cleanup
 	recreate_files
 
 	[[ -d $ALTER_ROOT ]] && \
-		log_must $RM -rf $ALTER_ROOT
+		log_must rm -rf $ALTER_ROOT
 }
 
 function recreate_files
@@ -86,10 +86,10 @@ function recreate_files
 		destroy_pool $TESTPOOL1
 	fi
 
-	log_must $RM -rf $DEVICE_DIR/*
+	log_must rm -rf $DEVICE_DIR/*
 	typeset i=0
 	while (( i < $MAX_NUM )); do
-		log_must $MKFILE $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
+		log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i
 		((i += 1))
 	done
 }
@@ -101,7 +101,7 @@ log_assert "Verify that import could handle damaged or missing device."
 CWD=$PWD
 cd $DEVICE_DIR || log_fail "Unable change directory to $DEVICE_DIR"
 
-checksum1=$($SUM $MYTESTFILE | $AWK '{print $1}')
+checksum1=$(sum $MYTESTFILE | awk '{print $1}')
 
 typeset -i i=0
 typeset -i j=0
@@ -117,9 +117,9 @@ while (( i < ${#vdevs[*]} )); do
 	backup=""
 
 	guid=$(get_config $TESTPOOL1 pool_guid)
-	log_must $CP $MYTESTFILE $TESTDIR1/$TESTFILE0
+	log_must cp $MYTESTFILE $TESTDIR1/$TESTFILE0
 
-	log_must $ZFS umount $TESTDIR1
+	log_must zfs umount $TESTDIR1
 
 	j=0
 	while (( j <  ${#options[*]} )); do
@@ -131,19 +131,19 @@ while (( i < ${#vdevs[*]} )); do
 		# Restore all device files.
 		#
 		[[ -n $backup ]] && \
-			log_must $TAR xf $DEVICE_DIR/$DEVICE_ARCHIVE
+			log_must tar xf $DEVICE_DIR/$DEVICE_ARCHIVE
 
 		for device in $DEVICE_FILES ; do
-			log_must $RM -f $device
+			log_must rm -f $device
 
 			poolexists $TESTPOOL1 && \
-				log_must $ZPOOL export $TESTPOOL1
+				log_must zpool export $TESTPOOL1
 
 			#
 			# Backup all device files while filesystem prepared.
 			#
 			if [[ -z $backup ]]; then
-				log_must $TAR cf $DEVICE_DIR/$DEVICE_ARCHIVE \
+				log_must tar cf $DEVICE_DIR/$DEVICE_ARCHIVE \
 					${DEVICE_FILE}*
 				backup="true"
 			fi
@@ -166,14 +166,14 @@ while (( i < ${#vdevs[*]} )); do
 				target=$guid
 				log_note "Import by guid."
 			fi
-			$action $ZPOOL import \
+			$action zpool import \
 				-d $DEVICE_DIR ${options[j]} $target
 
 			[[ $action == "log_mustnot" ]] && continue
 
 			log_must poolexists $TESTPOOL1
 
-			health=$($ZPOOL list -H -o health $TESTPOOL1)
+			health=$(zpool list -H -o health $TESTPOOL1)
 
 			[[ $health == "DEGRADED" ]] || \
 				log_fail "$TESTPOOL1: Incorrect health($health)"
@@ -186,7 +186,7 @@ while (( i < ${#vdevs[*]} )); do
 			[[ ! -e $basedir/$TESTFILE0 ]] && \
 				log_fail "$basedir/$TESTFILE0 missing after import."
 
-			checksum2=$($SUM $basedir/$TESTFILE0 | $AWK '{print $1}')
+			checksum2=$(sum $basedir/$TESTFILE0 | awk '{print $1}')
 			[[ "$checksum1" != "$checksum2" ]] && \
 				log_fail "Checksums differ ($checksum1 != $checksum2)"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
index 36fbe447e5..7534ebca87 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -69,10 +69,10 @@ function cleanup
 {
 	cd $DEVICE_DIR || log_fail "Unable change directory to $DEVICE_DIR"
 	[[ -e $DEVICE_DIR/$DEVICE_ARCHIVE ]] && \
-		log_must $TAR xf $DEVICE_DIR/$DEVICE_ARCHIVE
+		log_must tar xf $DEVICE_DIR/$DEVICE_ARCHIVE
 
 	poolexists $TESTPOOL1 || \
-		log_must $ZPOOL import -d $DEVICE_DIR $TESTPOOL1
+		log_must zpool import -d $DEVICE_DIR $TESTPOOL1
 
 	cleanup_filesystem $TESTPOOL1 $TESTFS
 
@@ -88,19 +88,19 @@ function cleanup_all
 	while (( i < $MAX_NUM )); do
 		typeset dev_file=${DEVICE_DIR}/${DEVICE_FILE}$i
 		if [[ ! -e ${dev_file} ]]; then
-			log_must $MKFILE $FILE_SIZE ${dev_file}
+			log_must mkfile $FILE_SIZE ${dev_file}
 		fi
 		((i += 1))
 	done
 
-	log_must $RM -f $DEVICE_DIR/$DEVICE_ARCHIVE
+	log_must rm -f $DEVICE_DIR/$DEVICE_ARCHIVE
 	cd $CWD || log_fail "Unable change directory to $CWD"
 
 	[[ -d $ALTER_ROOT ]] && \
-		log_must $RM -rf $ALTER_ROOT
+		log_must rm -rf $ALTER_ROOT
 
 	[[ -d $BACKUP_DEVICE_DIR ]] && \
-		log_must $RM -rf $BACKUP_DEVICE_DIR
+		log_must rm -rf $BACKUP_DEVICE_DIR
 }
 
 log_onexit cleanup_all
@@ -110,7 +110,7 @@ log_assert "Verify that import could handle moving device."
 CWD=$PWD
 
 [[ ! -d $BACKUP_DEVICE_DIR ]] &&
-	log_must $MKDIR -p $BACKUP_DEVICE_DIR
+	log_must mkdir -p $BACKUP_DEVICE_DIR
 
 cd $DEVICE_DIR || log_fail "Unable change directory to $DEVICE_DIR"
 
@@ -123,7 +123,7 @@ typeset action
 while (( i < ${#vdevs[*]} )); do
 
 	(( i != 0 )) && \
-		log_must $TAR xf $DEVICE_DIR/$DEVICE_ARCHIVE
+		log_must tar xf $DEVICE_DIR/$DEVICE_ARCHIVE
 
 	setup_filesystem "$DEVICE_FILES" \
 		$TESTPOOL1 $TESTFS $TESTDIR1 \
@@ -132,9 +132,9 @@ while (( i < ${#vdevs[*]} )); do
 	guid=$(get_config $TESTPOOL1 pool_guid)
 	backup=""
 
-	log_must $CP $MYTESTFILE $TESTDIR1/$TESTFILE0
+	log_must cp $MYTESTFILE $TESTDIR1/$TESTFILE0
 
-	log_must $ZFS umount $TESTDIR1
+	log_must zfs umount $TESTDIR1
 
 	j=0
 	while (( j <  ${#options[*]} )); do
@@ -145,24 +145,24 @@ while (( i < ${#vdevs[*]} )); do
 		# Restore all device files.
 		#
 		[[ -n $backup ]] && \
-			log_must $TAR xf $DEVICE_DIR/$DEVICE_ARCHIVE
+			log_must tar xf $DEVICE_DIR/$DEVICE_ARCHIVE
 
-		log_must $RM -f $BACKUP_DEVICE_DIR/*
+		log_must rm -f $BACKUP_DEVICE_DIR/*
 
 		for device in $DEVICE_FILES ; do
 
 			poolexists $TESTPOOL1 && \
-				log_must $ZPOOL export $TESTPOOL1
+				log_must zpool export $TESTPOOL1
 
 			#
 			# Backup all device files while filesystem prepared.
 			#
 			if [[ -z $backup ]] ; then
-				log_must $TAR cf $DEVICE_DIR/$DEVICE_ARCHIVE ${DEVICE_FILE}*
+				log_must tar cf $DEVICE_DIR/$DEVICE_ARCHIVE ${DEVICE_FILE}*
 				backup="true"
 			fi
 
-			log_must $MV $device $BACKUP_DEVICE_DIR
+			log_must mv $device $BACKUP_DEVICE_DIR
 
 			(( count = count + 1 ))
 
@@ -181,7 +181,7 @@ while (( i < ${#vdevs[*]} )); do
 				target=$guid
 				log_note "Import by guid."
 			fi
-			$action $ZPOOL import \
+			$action zpool import \
 				-d $DEVICE_DIR ${options[j]} $target
 
 		done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_003_pos.ksh
index 7f2d4f4a30..fc9c6ff20a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -76,7 +76,7 @@ function verify
 
 	log_must poolexists $pool
 
-	myhealth=$($ZPOOL list -H -o health $pool)
+	myhealth=$(zpool list -H -o health $pool)
 
 	[[ $myhealth == $health ]] || \
 		log_fail "$pool: Incorrect health ($myhealth), " \
@@ -92,7 +92,7 @@ function verify
 	[[ ! -e $mtpt/$file ]] && \
 		log_fail "$mtpt/$file missing after import."
 
-	checksum2=$($SUM $mymtpt/$file | $AWK '{print $1}')
+	checksum2=$(sum $mymtpt/$file | awk '{print $1}')
 	[[ "$checksum1" != "$checksum2" ]] && \
 		log_fail "Checksums differ ($checksum1 != $checksum2)"
 
@@ -112,7 +112,7 @@ function cleanup
 	done
 
 	[[ -e $DEVICE_DIR/$DEVICE_ARCHIVE ]] && \
-		log_must $TAR xf $DEVICE_DIR/$DEVICE_ARCHIVE
+		log_must tar xf $DEVICE_DIR/$DEVICE_ARCHIVE
 }
 
 function cleanup_all
@@ -124,13 +124,13 @@ function cleanup_all
 	while (( i < $MAX_NUM )); do
 		typeset file=${DEVICE_DIR}/${DEVICE_FILE}$i
 		if  [[ -e $file ]]; then
-			log_must $RM $file
+			log_must rm $file
 		fi
-		log_must $MKFILE $FILE_SIZE $file
+		log_must mkfile $FILE_SIZE $file
 		((i += 1))
 	done
 
-	log_must $RM -f $DEVICE_DIR/$DEVICE_ARCHIVE
+	log_must rm -f $DEVICE_DIR/$DEVICE_ARCHIVE
 	cd $CWD || log_fail "Unable change directory to $CWD"
 
 }
@@ -142,9 +142,9 @@ log_assert "Verify that import could handle device overlapped."
 CWD=$PWD
 
 cd $DEVICE_DIR || log_fail "Unable change directory to $DEVICE_DIR"
-log_must $TAR cf $DEVICE_DIR/$DEVICE_ARCHIVE ${DEVICE_FILE}*
+log_must tar cf $DEVICE_DIR/$DEVICE_ARCHIVE ${DEVICE_FILE}*
 
-checksum1=$($SUM $MYTESTFILE | $AWK '{print $1}')
+checksum1=$(sum $MYTESTFILE | awk '{print $1}')
 
 typeset -i i=0
 typeset -i j=0
@@ -164,7 +164,7 @@ while (( i < ${#vdevs[*]} )); do
 	while (( j < ${#vdevs[*]} )); do
 
 		(( j != 0 )) && \
-			log_must $TAR xf $DEVICE_DIR/$DEVICE_ARCHIVE
+			log_must tar xf $DEVICE_DIR/$DEVICE_ARCHIVE
 
 		typeset -i overlap=1
 		typeset -i begin
@@ -182,17 +182,17 @@ while (( i < ${#vdevs[*]} )); do
 
 			setup_filesystem "$vdev1" $TESTPOOL1 $TESTFS $TESTDIR1 \
 				"" ${vdevs[i]}
-			log_must $CP $MYTESTFILE $TESTDIR1/$TESTFILE0
-			log_must $ZFS umount $TESTDIR1
+			log_must cp $MYTESTFILE $TESTDIR1/$TESTFILE0
+			log_must zfs umount $TESTDIR1
 			poolexists $TESTPOOL1 && \
-				log_must $ZPOOL export $TESTPOOL1
+				log_must zpool export $TESTPOOL1
 
 			setup_filesystem "$vdev2" $TESTPOOL2 $TESTFS $TESTDIR2 \
 				"" ${vdevs[j]}
-			log_must $CP $MYTESTFILE $TESTDIR2/$TESTFILE0
-			log_must $ZFS umount $TESTDIR2
+			log_must cp $MYTESTFILE $TESTDIR2/$TESTFILE0
+			log_must zfs umount $TESTDIR2
 			poolexists $TESTPOOL2 && \
-				log_must $ZPOOL export $TESTPOOL2
+				log_must zpool export $TESTPOOL2
 
 			action=log_must
 			case "${vdevs[i]}" in
@@ -206,8 +206,8 @@ while (( i < ${#vdevs[*]} )); do
 					;;
 			esac
 
-			$action $ZPOOL import -d $DEVICE_DIR $TESTPOOL1
-			log_must $ZPOOL import -d $DEVICE_DIR $TESTPOOL2
+			$action zpool import -d $DEVICE_DIR $TESTPOOL1
+			log_must zpool import -d $DEVICE_DIR $TESTPOOL2
 
 			if [[ $action == log_must ]]; then
 				verify "$TESTPOOL1" "$TESTFS" "$TESTDIR1" \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh
index 441f7a7ae0..6d8db3b674 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_rename_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -64,23 +64,23 @@ function cleanup
 	typeset -i i=0
 	while (( i < ${#pools[*]} )); do
 		if poolexists "${pools[i]}-new" ; then
-			log_must $ZPOOL export "${pools[i]}-new"
+			log_must zpool export "${pools[i]}-new"
 
 			[[ -d /${pools[i]}-new ]] && \
-				log_must $RM -rf /${pools[i]}-new
+				log_must rm -rf /${pools[i]}-new
 
-			log_must $ZPOOL import ${devs[i]} \
+			log_must zpool import ${devs[i]} \
 				"${pools[i]}-new" ${pools[i]}
 		fi
 
 		datasetexists "${pools[i]}" || \
-			log_must $ZPOOL import ${devs[i]} ${pools[i]}
+			log_must zpool import ${devs[i]} ${pools[i]}
 
 		ismounted "${pools[i]}/$TESTFS" || \
-			log_must $ZFS mount ${pools[i]}/$TESTFS
+			log_must zfs mount ${pools[i]}/$TESTFS
 
 		[[ -e ${mtpts[i]}/$TESTFILE0 ]] && \
-			log_must $RM -rf ${mtpts[i]}/$TESTFILE0
+			log_must rm -rf ${mtpts[i]}/$TESTFILE0
 
 		((i = i + 1))
 
@@ -91,9 +91,9 @@ function cleanup
 	destroy_pool $TESTPOOL1
 
 	[[ -d $ALTER_ROOT ]] && \
-		log_must $RM -rf $ALTER_ROOT
+		log_must rm -rf $ALTER_ROOT
 	[[ -e $VDEV_FILE ]] && \
-		log_must $RM $VDEV_FILE
+		log_must rm $VDEV_FILE
 }
 
 log_onexit cleanup
@@ -101,7 +101,7 @@ log_onexit cleanup
 log_assert "Verify that an imported pool can be renamed."
 
 setup_filesystem "$DEVICE_FILES" $TESTPOOL1 $TESTFS $TESTDIR1
-checksum1=$($SUM $MYTESTFILE | $AWK '{print $1}')
+checksum1=$(sum $MYTESTFILE | awk '{print $1}')
 
 typeset -i i=0
 typeset -i j=0
@@ -109,16 +109,16 @@ typeset basedir
 
 while (( i < ${#pools[*]} )); do
 	guid=$(get_config ${pools[i]} pool_guid)
-	log_must $CP $MYTESTFILE ${mtpts[i]}/$TESTFILE0
+	log_must cp $MYTESTFILE ${mtpts[i]}/$TESTFILE0
 
-	log_must $ZFS umount ${mtpts[i]}
+	log_must zfs umount ${mtpts[i]}
 
 	j=0
 	while (( j <  ${#options[*]} )); do
-		log_must $ZPOOL export ${pools[i]}
+		log_must zpool export ${pools[i]}
 
 		[[ -d /${pools[i]} ]] && \
-			log_must $RM -rf /${pools[i]}
+			log_must rm -rf /${pools[i]}
 
 		typeset target=${pools[i]}
 		if (( RANDOM % 2 == 0 )) ; then
@@ -126,7 +126,7 @@ while (( i < ${#pools[*]} )); do
 			log_note "Import by guid."
 		fi
 
-		log_must $ZPOOL import ${devs[i]} ${options[j]} \
+		log_must zpool import ${devs[i]} ${options[j]} \
 			$target ${pools[i]}-new
 
 		log_must poolexists "${pools[i]}-new"
@@ -140,20 +140,20 @@ while (( i < ${#pools[*]} )); do
 		[[ ! -e $basedir/$TESTFILE0 ]] && \
 			log_fail "$basedir/$TESTFILE0 missing after import."
 
-		checksum2=$($SUM $basedir/$TESTFILE0 | $AWK '{print $1}')
+		checksum2=$(sum $basedir/$TESTFILE0 | awk '{print $1}')
 		[[ "$checksum1" != "$checksum2" ]] && \
 			log_fail "Checksums differ ($checksum1 != $checksum2)"
 
-		log_must $ZPOOL export "${pools[i]}-new"
+		log_must zpool export "${pools[i]}-new"
 
 		[[ -d /${pools[i]}-new ]] && \
-			log_must $RM -rf /${pools[i]}-new
+			log_must rm -rf /${pools[i]}-new
 
 		target=${pools[i]}-new
 		if (( RANDOM % 2 == 0 )) ; then
 			target=$guid
 		fi
-		log_must $ZPOOL import ${devs[i]} $target ${pools[i]}
+		log_must zpool import ${devs[i]} $target ${pools[i]}
 
 		((j = j + 1))
 	done
@@ -163,11 +163,12 @@ done
 
 VDEV_FILE=$(mktemp /tmp/tmp.XXXXXX)
 
-log_must $MKFILE -n 128M $VDEV_FILE
-log_must $ZPOOL create testpool $VDEV_FILE
-log_must $ZFS create testpool/testfs
-ID=$($ZPOOL get -Ho value guid testpool)
-log_must $ZPOOL export testpool
-log_mustnot $ZPOOL import $(echo $ID) $($PRINTF "%*s\n" 250 "" | $TR ' ' 'c')
+log_must mkfile -n 128M $VDEV_FILE
+log_must zpool create overflow $VDEV_FILE
+log_must zfs create overflow/testfs
+ID=$(zpool get -Ho value guid overflow)
+log_must zpool export overflow
+log_mustnot zpool import -d /tmp $(echo id) \
+    $(printf "%*s\n" 250 "" | tr ' ' 'c')
 
 log_pass "Successfully imported and renamed a ZPOOL"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_001_pos.ksh
index ddd657477f..c0ccf0bb86 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -50,7 +55,7 @@ function cleanup
 	# Ensure we don't leave disks in the offline state
 	#
 	for disk in $DISKLIST; do
-		log_must $ZPOOL online $TESTPOOL $disk
+		log_must zpool online $TESTPOOL $disk
 		check_state $TESTPOOL $disk "online"
 		if [[ $? != 0 ]]; then
 			log_fail "Unable to online $disk"
@@ -74,13 +79,13 @@ for disk in $DISKLIST; do
 	i=0
 	while [[ $i -lt ${#args[*]} ]]; do
 		if (( j < num )) ; then
-			log_must $ZPOOL offline ${args[$i]} $TESTPOOL $disk
+			log_must zpool offline ${args[$i]} $TESTPOOL $disk
 			check_state $TESTPOOL $disk "offline"
 			if [[ $? != 0 ]]; then
 				log_fail "$disk of $TESTPOOL did not match offline state"
 			fi
 		else
-			log_mustnot $ZPOOL offline ${args[$i]} $TESTPOOL $disk
+			log_mustnot zpool offline ${args[$i]} $TESTPOOL $disk
 			check_state $TESTPOOL $disk "online"
 			if [[ $? != 0 ]]; then
 				log_fail "$disk of $TESTPOOL did not match online state"
@@ -101,7 +106,7 @@ for disk in $DISKLIST; do
         i=0
         while [[ $i -lt $iters ]]; do
 		index=`expr $RANDOM % ${#args[*]}`
-                log_must $ZPOOL offline ${args[$index]} $TESTPOOL $disk
+                log_must zpool offline ${args[$index]} $TESTPOOL $disk
                 check_state $TESTPOOL $disk "offline"
                 if [[ $? != 0 ]]; then
                         log_fail "$disk of $TESTPOOL is not offline."
@@ -110,7 +115,7 @@ for disk in $DISKLIST; do
                 (( i = i + 1 ))
         done
 
-	log_must $ZPOOL online $TESTPOOL $disk
+	log_must zpool online $TESTPOOL $disk
 	check_state $TESTPOOL $disk "online"
 	if [[ $? != 0 ]]; then
 		log_fail "$disk of $TESTPOOL did not match online state"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_002_neg.ksh
index 9834d0731e..14e0ab3fa7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_offline/zpool_offline_002_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -83,7 +88,7 @@ typeset -i i=0
 
 while [[ $i -lt ${#args[*]} ]]; do
 
-	log_mustnot $ZPOOL offline ${args[$i]}
+	log_mustnot zpool offline ${args[$i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_001_pos.ksh
index f1ed6a047e..2fe6797760 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -48,7 +53,7 @@ function cleanup
 	# Ensure we don't leave disks in temporary online state (-t)
 	#
 	for disk in $DISKLIST; do
-		log_must $ZPOOL online $TESTPOOL $disk
+		log_must zpool online $TESTPOOL $disk
 		check_state $TESTPOOL $disk "online"
 		if [[ $? != 0 ]]; then
 			log_fail "Unable to online $disk"
@@ -70,13 +75,13 @@ typeset -i i=0
 for disk in $DISKLIST; do
 	i=0
 	while [[ $i -lt ${#args[*]} ]]; do
-		log_must $ZPOOL offline $TESTPOOL $disk
+		log_must zpool offline $TESTPOOL $disk
 		check_state $TESTPOOL $disk "offline"
 		if [[ $? != 0 ]]; then
 			log_fail "$disk of $TESTPOOL did not match offline state"
 		fi
 
-		log_must $ZPOOL online ${args[$i]} $TESTPOOL $disk
+		log_must zpool online ${args[$i]} $TESTPOOL $disk
 		check_state $TESTPOOL $disk "online"
 		if [[ $? != 0 ]]; then
 			log_fail "$disk of $TESTPOOL did not match online state"
@@ -95,7 +100,7 @@ for disk in $DISKLIST; do
         i=0
         while [[ $i -lt $iters ]]; do
 		index=`expr $RANDOM % ${#args[*]}`
-                log_must $ZPOOL online ${args[$index]} $TESTPOOL $disk
+                log_must zpool online ${args[$index]} $TESTPOOL $disk
                 check_state $TESTPOOL $disk "online"
                 if [[ $? != 0 ]]; then
                         log_fail "$disk of $TESTPOOL did not match online state"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_002_neg.ksh
index 307d196dc5..79855e64a8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_online/zpool_online_002_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -62,7 +67,7 @@ typeset -i i=0
 
 while [[ $i -lt ${#args[*]} ]]; do
 
-	log_mustnot $ZPOOL online ${args[$i]}
+	log_mustnot zpool online ${args[$i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_001_neg.ksh
index d4c2026ff6..4153c3eb46 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,7 +58,7 @@ function check_remove
         typeset dev
 
         for dev in $devs; do
-                log_mustnot $ZPOOL remove $dev
+                log_mustnot zpool remove $dev
         done
 
         destroy_pool $pool
@@ -88,7 +88,7 @@ log_onexit cleanup
 
 typeset -i i=0
 while [[ $i -lt ${#create_args[*]} ]]; do
-	log_must $ZPOOL create $TESTPOOL ${create_args[i]}
+	log_must zpool create $TESTPOOL ${create_args[i]}
 	check_remove $TESTPOOL "${verify_disks[i]}"
 	(( i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_002_pos.ksh
index d77132ceb3..891ac67b88 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,12 +58,12 @@ typeset spare_devs2="${disk}s${SLICE1}"
 log_assert "zpool remove can only remove inactive hotspare device from pool"
 
 log_note "check hotspare device which is created by zpool create"
-log_must $ZPOOL create $TESTPOOL $spare_devs1 spare $spare_devs2
-log_must $ZPOOL remove $TESTPOOL $spare_devs2
+log_must zpool create $TESTPOOL $spare_devs1 spare $spare_devs2
+log_must zpool remove $TESTPOOL $spare_devs2
 
 log_note "check hotspare device which is created by zpool add"
-log_must $ZPOOL add $TESTPOOL spare $spare_devs2
-log_must $ZPOOL remove $TESTPOOL $spare_devs2
-log_must $ZPOOL destroy $TESTPOOL
+log_must zpool add $TESTPOOL spare $spare_devs2
+log_must zpool remove $TESTPOOL $spare_devs2
+log_must zpool destroy $TESTPOOL
 
 log_pass "zpool remove can only remove inactive hotspare device from pool"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_003_pos.ksh
index afe944af88..9176b889ac 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_remove/zpool_remove_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -63,11 +63,11 @@ log_assert "zpool remove can remove hotspare device which state go though" \
 	" active to inactive in pool"
 
 log_note "Check spare device which state go through active to inactive"
-log_must $ZPOOL create $TESTPOOL $spare_devs1 $spare_devs2 spare \
+log_must zpool create $TESTPOOL $spare_devs1 $spare_devs2 spare \
                  $spare_devs3 $spare_devs4
-log_must $ZPOOL replace $TESTPOOL $spare_devs2 $spare_devs3
-log_mustnot $ZPOOL remove $TESTPOOL $spare_devs3
-log_must $ZPOOL detach $TESTPOOL $spare_devs3
-log_must $ZPOOL remove $TESTPOOL $spare_devs3
+log_must zpool replace $TESTPOOL $spare_devs2 $spare_devs3
+log_mustnot zpool remove $TESTPOOL $spare_devs3
+log_must zpool detach $TESTPOOL $spare_devs3
+log_must zpool remove $TESTPOOL $spare_devs3
 
 log_pass "'zpool remove device passed as expected.'"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/zpool_replace_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/zpool_replace_001_neg.ksh
index 853387798b..725e495ebb 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/zpool_replace_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_replace/zpool_replace_001_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -70,7 +75,7 @@ typeset -i i=0
 
 while [[ $i -lt ${#args[*]} ]]; do
 
-	log_mustnot $ZPOOL replace ${args[$i]}
+	log_mustnot zpool replace ${args[$i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/setup.ksh
index a5ee58634e..5db12ba164 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -40,7 +40,7 @@ default_mirror_setup_noexit $DISK1 $DISK2
 mntpnt=$(get_prop mountpoint $TESTPOOL)
 typeset -i i=0
 while ((i < 10)); do
-	log_must $MKFILE 500M $mntpnt/bigfile.$i
+	log_must mkfile 500M $mntpnt/bigfile.$i
 	((i += 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub.cfg b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub.cfg
index 36b4c0ebeb..93e4e171c3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub.cfg
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub.cfg
@@ -25,8 +25,8 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
-export DISK1=$($ECHO $DISKS | $AWK '{print $1}')
-export DISK2=$($ECHO $DISKS | $AWK '{print $2}')
+export DISK1=$(echo $DISKS | awk '{print $1}')
+export DISK2=$(echo $DISKS | awk '{print $2}')
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_001_neg.ksh
index c3214c13de..96bc185dd4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_001_neg.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -50,7 +55,7 @@ log_assert "Execute 'zpool scrub' using invalid parameters."
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL scrub ${args[i]}
+	log_mustnot zpool scrub ${args[i]}
 
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_002_pos.ksh
index 000b4f05a3..70250959f3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -41,8 +45,8 @@ verify_runnable "global"
 
 log_assert "Verify scrub -s works correctly."
 
-log_must $ZPOOL scrub $TESTPOOL
-log_must $ZPOOL scrub -s $TESTPOOL
+log_must zpool scrub $TESTPOOL
+log_must zpool scrub -s $TESTPOOL
 log_must is_pool_scrub_stopped $TESTPOOL
 
 log_pass "Verify scrub -s works correctly."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_003_pos.ksh
index 4f5019df1d..31027f12c5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_003_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -44,24 +48,24 @@ verify_runnable "global"
 function get_scrub_percent
 {
 	typeset -i percent
-	percent=$($ZPOOL status $TESTPOOL | $GREP "^ scrub" | \
-	    $AWK '{print $7}' | $AWK -F. '{print $1}')
+	percent=$(zpool status $TESTPOOL | grep "^ scrub" | \
+	    awk '{print $7}' | awk -F. '{print $1}')
 	if is_pool_scrubbed $TESTPOOL ; then
 		percent=100
 	fi
-	$ECHO $percent
+	echo $percent
 }
 
 log_assert "scrub command terminates the existing scrub process and starts" \
 	"a new scrub."
 
-log_must $ZPOOL scrub $TESTPOOL
+log_must zpool scrub $TESTPOOL
 typeset -i PERCENT=30 percent=0
 while ((percent < PERCENT)) ; do
 	percent=$(get_scrub_percent)
 done
 
-log_must $ZPOOL scrub $TESTPOOL
+log_must zpool scrub $TESTPOOL
 percent=$(get_scrub_percent)
 if ((percent > PERCENT)); then
 	log_fail "zpool scrub don't stop existing scrubbing process."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh
index f45764672a..a2065d477b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,14 +46,14 @@ verify_runnable "global"
 
 log_assert "Resilver prevent scrub from starting until the resilver completes"
 
-log_must $ZPOOL detach $TESTPOOL $DISK2
-log_must $ZPOOL attach $TESTPOOL $DISK1 $DISK2
+log_must zpool detach $TESTPOOL $DISK2
+log_must zpool attach $TESTPOOL $DISK1 $DISK2
 log_must is_pool_resilvering $TESTPOOL
-log_mustnot $ZPOOL scrub $TESTPOOL
+log_mustnot zpool scrub $TESTPOOL
 
 # Allow the resilver to finish, or it will interfere with the next test.
 while ! is_pool_resilvered $TESTPOOL; do
-	$SLEEP 1
+	sleep 1
 done
 
 log_pass "Resilver prevent scrub from starting until the resilver completes"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_005_pos.ksh
index 39e43fd86d..5bc5eedb64 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,16 +46,16 @@ verify_runnable "global"
 
 log_assert "When scrubbing, detach device should not break system."
 
-log_must $ZPOOL scrub $TESTPOOL
-log_must $ZPOOL detach $TESTPOOL $DISK2
-log_must $ZPOOL attach $TESTPOOL $DISK1 $DISK2
+log_must zpool scrub $TESTPOOL
+log_must zpool detach $TESTPOOL $DISK2
+log_must zpool attach $TESTPOOL $DISK1 $DISK2
 
 while ! is_pool_resilvered $TESTPOOL; do
-	$SLEEP 1
+	sleep 1
 done
 
-log_must $ZPOOL scrub $TESTPOOL
-log_must $ZPOOL detach $TESTPOOL $DISK1
-log_must $ZPOOL attach $TESTPOOL $DISK2 $DISK1
+log_must zpool scrub $TESTPOOL
+log_must zpool detach $TESTPOOL $DISK1
+log_must zpool attach $TESTPOOL $DISK2 $DISK1
 
 log_pass "When scrubbing, detach device should not break system."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_001_pos.ksh
index 31da71112a..ec8ff96804 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 #
 # DESCRIPTION:
@@ -40,14 +44,14 @@
 
 log_assert "zpool set usage message is displayed when called with no arguments"
 
-$ZPOOL set > /dev/null 2>&1
+zpool set > /dev/null 2>&1
 RET=$?
 if [ $RET != 2 ]
 then
 	log_fail "\"zpool set\" exit status $RET should be equal to 2."
 fi
 
-OUTPUT=$($ZPOOL set 2>&1 | $GREP -i usage)
+OUTPUT=$(zpool set 2>&1 | grep -i usage)
 if [ $? != 0 ]
 then
 	log_fail "Usage message for zpool set did not contain the word 'usage'."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh
index 943eb73a96..6a2aca290e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,8 +48,8 @@ verify_runnable "global"
 # before running this test...
 function cleanup {
 
-	$ZPOOL destroy bootfs
-	$RM /tmp/zpool_set_002.$$.dat
+	zpool destroy bootfs
+	rm /tmp/zpool_set_002.$$.dat
 }
 
 log_assert "Malformed zpool set commands are rejected"
@@ -103,20 +103,20 @@ arguments[${#arguments[@]}]="bootfs=$bigname"
 # Create a pool called bootfs (so-called, so as to trip any clashes between
 # property name, and pool name)
 # Also create a filesystem in this pool
-log_must $MKFILE $MINVDEVSIZE /tmp/zpool_set_002.$$.dat
-log_must $ZPOOL create bootfs /tmp/zpool_set_002.$$.dat
-log_must $ZFS create bootfs/root
+log_must mkfile $MINVDEVSIZE /tmp/zpool_set_002.$$.dat
+log_must zpool create bootfs /tmp/zpool_set_002.$$.dat
+log_must zfs create bootfs/root
 
 typeset -i i=0;
 while [ $i -lt "${#arguments[@]}" ]
 do
-	log_mustnot eval "$ZPOOL set ${arguments[$i]} > /dev/null 2>&1"
+	log_mustnot eval "zpool set ${arguments[$i]} > /dev/null 2>&1"
 
 	# now also try with a valid pool in the argument list
-	log_mustnot eval "$ZPOOL set ${arguments[$i]}bootfs > /dev/null 2>&1"
+	log_mustnot eval "zpool set ${arguments[$i]}bootfs > /dev/null 2>&1"
 
 	# now also try with two valid pools in the argument list
-	log_mustnot eval "$ZPOOL set ${arguments[$i]}bootfs bootfs > /dev/null"
+	log_mustnot eval "zpool set ${arguments[$i]}bootfs bootfs > /dev/null"
 	i=$(( $i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh
index dc5a284578..4d4c9a73fe 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,8 +45,8 @@ verify_runnable "global"
 
 function cleanup
 {
-        $ZPOOL destroy $TESTPOOL
-        $RM /tmp/zpool_set_003.$$.dat
+        zpool destroy $TESTPOOL
+        rm /tmp/zpool_set_003.$$.dat
 }
 
 set -A props "available" "capacity" "guid"  "health"  "size" "used"
@@ -56,14 +56,14 @@ log_onexit cleanup
 
 log_assert "zpool set cannot set a readonly property"
 
-log_must $MKFILE $MINVDEVSIZE /tmp/zpool_set_003.$$.dat
-log_must $ZPOOL create $TESTPOOL /tmp/zpool_set_003.$$.dat
+log_must mkfile $MINVDEVSIZE /tmp/zpool_set_003.$$.dat
+log_must zpool create $TESTPOOL /tmp/zpool_set_003.$$.dat
 
 typeset -i i=0;
 while [ $i -lt "${#props[@]}" ]
 do
 	# try to set each property in the prop list with it's corresponding val
-        log_mustnot eval "$ZPOOL set ${props[$i]}=${vals[$i]} $TESTPOOL \
+        log_mustnot eval "zpool set ${props[$i]}=${vals[$i]} $TESTPOOL \
  > /dev/null 2>&1"
         i=$(( $i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_001_pos.ksh
index d582e55f4c..88c0601032 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_001_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -49,7 +54,7 @@ typeset -i i=1
 
 while [[ $i -lt ${#args[*]} ]]; do
 
-	log_mustnot $ZPOOL status ${args[$i]}
+	log_mustnot zpool status ${args[$i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_002_pos.ksh
index 5ae84a8097..e2751b1125 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_002_pos.ksh
@@ -24,6 +24,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/include/libtest.shlib
 
 #
@@ -54,7 +59,7 @@ typeset -i i=0
 
 while [[ $i -lt ${#args[*]} ]]; do
 
-	log_must $ZPOOL status ${args[$i]}
+	log_must zpool status ${args[$i]}
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
index dd505053fd..9a8554648b 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -48,15 +48,15 @@ function create_old_pool
 
 	log_note "Creating $pool_name from $pool_files"
 	for pool_file in $pool_files; do
-		log_must $BZCAT \
+		log_must bzcat \
 		    $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/$pool_file.bz2 \
 		    >/$TESTPOOL/$pool_file
 	done
-	log_must $ZPOOL import -d /$TESTPOOL $pool_name
+	log_must zpool import -d /$TESTPOOL $pool_name
 
 	# Put some random contents into the pool
 	for i in {1..1024} ; do
-		$DD if=/dev/urandom of=/$pool_name/random.$i \
+		dd if=/dev/urandom of=/$pool_name/random.$i \
 		    count=1 bs=1024 > /dev/null 2>&1
 	done
 }
@@ -77,12 +77,12 @@ function check_upgrade
 
 	log_note "Checking if we can upgrade from ZFS version $vers"
 	pre_upgrade_checksum=$(check_pool $pool_name pre)
-	log_must $ZPOOL upgrade $pool_name
+	log_must zpool upgrade $pool_name
 	post_upgrade_checksum=$(check_pool $pool_name post)
 
 	log_note "Checking that there are no differences between checksum output"
-	log_must $DIFF $pre_upgrade_checksum $post_upgrade_checksum
-	$RM $pre_upgrade_checksum $post_upgrade_checksum
+	log_must diff $pre_upgrade_checksum $post_upgrade_checksum
+	rm $pre_upgrade_checksum $post_upgrade_checksum
 }
 
 # A function to destroy an upgraded pool, plus the files it was based on.
@@ -94,10 +94,10 @@ function destroy_upgraded_pool
 	typeset -n pool_name=ZPOOL_VERSION_${vers}_NAME
 
 	if poolexists $pool_name; then
-		log_must $ZPOOL destroy $pool_name
+		log_must zpool destroy $pool_name
 	fi
 	for file in $pool_files; do
-		$RM -f /$TESTPOOL/$file
+		rm -f /$TESTPOOL/$file
 	done
 }
 
@@ -111,7 +111,7 @@ function check_pool
 {
 	typeset pool=$1
 	typeset flag=$2
-	$FIND /$pool -type f -exec $CKSUM {} + > \
+	find /$pool -type f -exec cksum {} + > \
 		/$TESTPOOL/pool-checksums.$pool.$flag
 	echo /$TESTPOOL/pool-checksums.$pool.$flag
 }
@@ -127,14 +127,14 @@ function check_poolversion
 	typeset actual
 
 	# check version using zdb
-	actual=$($ZDB -C $pool | $SED -n 's/^.*version: \(.*\)$/\1/p')
+	actual=$(zdb -C $pool | sed -n 's/^.*version: \(.*\)$/\1/p')
 	if [[ $actual != $vers ]] ; then
 		log_fail "$pool: zdb reported version $actual, expected $vers"
 	fi
 
 	# check version using zpool upgrade
-	actual=$($ZPOOL upgrade | $GREP $pool$ | \
-	    $AWK '{print $1}' | $SED -e 's/ //g')
+	actual=$(zpool upgrade | grep $pool$ | \
+	    awk '{print $1}' | sed -e 's/ //g')
 	if [[ $actual != $vers ]] ; then
 		log_fail "$pool: zpool reported version $actual, expected $vers"
 	fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_001_pos.ksh
index aa4750f4c7..589ac3aa86 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -47,14 +47,14 @@ verify_runnable "global"
 
 log_assert "Executing 'zpool upgrade -v' command succeeds"
 
-log_must $ZPOOL upgrade -v
+log_must zpool upgrade -v
 
 # We also check that the usage message contains a description of legacy
 # versions and a note about feature flags.
 
-log_must eval "$ZPOOL upgrade -v | $HEAD -1 | $GREP 'feature flags'"
+log_must eval "zpool upgrade -v | head -1 | grep 'feature flags'"
 
-$ZPOOL upgrade -v > /tmp/zpool-versions.$$
+zpool upgrade -v > /tmp/zpool-versions.$$
 
 #
 # Current output for 'zpool upgrade -v' has different indent space
@@ -64,8 +64,8 @@ $ZPOOL upgrade -v > /tmp/zpool-versions.$$
 #
 for version in {1..28}; do
 	log_note "Checking for a description of pool version $version"
-	log_must eval "$AWK '/^ $version / { print $1 }' /tmp/zpool-versions.$$ | $GREP $version"
+	log_must eval "awk '/^ $version / { print $1 }' /tmp/zpool-versions.$$ | grep $version"
 done
-$RM /tmp/zpool-versions.$$
+rm /tmp/zpool-versions.$$
 
 log_pass "Executing 'zpool upgrade -v' command succeeds"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh
index c859fa628e..b175a9808f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -65,7 +65,7 @@ done
 
 # upgrade them all at once
 export __ZFS_POOL_RESTRICT="$TEST_POOLS"
-log_must $ZPOOL upgrade -a
+log_must zpool upgrade -a
 unset __ZFS_POOL_RESTRICT
 
 # verify their contents then destroy them
@@ -73,9 +73,9 @@ for config in $CONFIGS ; do
 	typeset -n pool_name=ZPOOL_VERSION_${config}_NAME
 
 	check_pool $pool_name post > /dev/null
-	log_must $DIFF /$TESTPOOL/pool-checksums.$pool_name.pre \
+	log_must diff /$TESTPOOL/pool-checksums.$pool_name.pre \
 	    /$TESTPOOL/pool-checksums.$pool_name.post
-	$RM /$TESTPOOL/pool-checksums.$pool_name.pre \
+	rm /$TESTPOOL/pool-checksums.$pool_name.pre \
 	    /$TESTPOOL/pool-checksums.$pool_name.post
 	destroy_upgraded_pool $config
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_005_neg.ksh
index ecd9ea413a..ceedb81813 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -47,7 +47,7 @@ log_assert "Variations of upgrade -v print usage message," \
     "return with non-zero status"
 
 for arg in "/tmp" "-?" "-va" "-v fakepool" "-a fakepool" ; do
-        log_mustnot $ZPOOL upgrade $arg
+        log_mustnot zpool upgrade $arg
 done
 
 log_pass "Variations of upgrade -v print usage message," \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_006_neg.ksh
index 97b5df6d3b..2b881abfd5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_006_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -49,7 +49,7 @@ while true ; do
 	if poolexists $NO_POOL ; then
 		NO_POOL="${NO_POOL}x"
 	else
-		log_mustnot $ZPOOL upgrade $NO_POOL
+		log_mustnot zpool upgrade $NO_POOL
 		break
 	fi
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_008_pos.ksh
index bd1934e7d7..1cf7af44da 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -70,7 +70,7 @@ for ver_old in $VERSIONS; do
 	typeset ver_new=$(random $ver_old $MAX_VER)
 
 	create_old_pool $ver_old
-	log_must $ZPOOL upgrade -V $ver_new $pool_name > /dev/null
+	log_must zpool upgrade -V $ver_new $pool_name > /dev/null
 	check_poolversion $pool_name $ver_new
 	destroy_upgraded_pool $ver_old
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_009_neg.ksh
index 56967a4ba9..697463590f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 #
 
@@ -57,8 +57,8 @@ typeset -i config=2
 typeset -n pool_name=ZPOOL_VERSION_${config}_NAME
 
 create_old_pool $config
-log_mustnot $ZPOOL upgrade -V 999 $pool_name
-log_mustnot $ZPOOL upgrade -V 999
+log_mustnot zpool upgrade -V 999 $pool_name
+log_mustnot zpool upgrade -V 999
 check_poolversion $pool_name $config
 destroy_upgraded_pool $config
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/cleanup.ksh
index e34c19aba2..f425718582 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -34,17 +34,17 @@
 
 if poolexists $TESTPOOL.virt
 then
-	log_must $ZPOOL destroy $TESTPOOL.virt
+	log_must zpool destroy $TESTPOOL.virt
 fi
 
 if poolexists v1-pool
 then
-	log_must $ZPOOL destroy v1-pool
+	log_must zpool destroy v1-pool
 fi
 
 if [[ -f /tmp/zfstest_datastream.dat ]]
 then
-	log_must $RM -f /tmp/zfstest_datastream.dat
+	log_must rm -f /tmp/zfstest_datastream.dat
 fi
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/setup.ksh
index 966421015d..bf4d24075a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -52,33 +52,33 @@ default_setup_noexit "$DISK" "" "volume"
 #
 
 # create a snapshot and a clone to test clone promote
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap
-log_must $ZFS clone $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS/clone
+log_must zfs snapshot $TESTPOOL/$TESTFS@snap
+log_must zfs clone $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS/clone
 # create a file in the filesystem that isn't in the above snapshot
-$TOUCH /$TESTDIR/file.txt
+touch /$TESTDIR/file.txt
 
 
 # create a non-default property and a child we can use to test inherit
-log_must $ZFS create $TESTPOOL/$TESTFS/$TESTFS2
-log_must $ZFS set snapdir=hidden $TESTPOOL/$TESTFS
+log_must zfs create $TESTPOOL/$TESTFS/$TESTFS2
+log_must zfs set snapdir=hidden $TESTPOOL/$TESTFS
 
 
 # create an unmounted filesystem to test unmount
-log_must $ZFS create $TESTPOOL/$TESTFS/$TESTFS2.unmounted
-log_must $ZFS unmount $TESTPOOL/$TESTFS/$TESTFS2.unmounted
+log_must zfs create $TESTPOOL/$TESTFS/$TESTFS2.unmounted
+log_must zfs unmount $TESTPOOL/$TESTFS/$TESTFS2.unmounted
 
 
 # send our snapshot to a known file in /tmp
-$ZFS send $TESTPOOL/$TESTFS@snap > /tmp/zfstest_datastream.dat
+zfs send $TESTPOOL/$TESTFS@snap > /tmp/zfstest_datastream.dat
 if [ ! -s /tmp/zfstest_datastream.dat ]
 then
 	log_fail "ZFS send datafile was not created!"
 fi
-log_must $CHMOD 644 /tmp/zfstest_datastream.dat
+log_must chmod 644 /tmp/zfstest_datastream.dat
 
 
 # create a filesystem that has particular properties to test set/get
-log_must $ZFS create -o version=1 $TESTPOOL/$TESTFS/prop
+log_must zfs create -o version=1 $TESTPOOL/$TESTFS/prop
 set -A props $PROP_NAMES
 set -A prop_vals $PROP_VALS
 typeset -i i=0
@@ -87,58 +87,58 @@ while [[ $i -lt ${#props[*]} ]]
 do
 	prop_name=${props[$i]}
 	prop_val=${prop_vals[$i]}
-	log_must $ZFS set $prop_name=$prop_val $TESTPOOL/$TESTFS/prop
+	log_must zfs set $prop_name=$prop_val $TESTPOOL/$TESTFS/prop
 	i=$(( $i + 1 ))
 done
 
 # create a filesystem we don't mind renaming
-log_must $ZFS create $TESTPOOL/$TESTFS/renameme
+log_must zfs create $TESTPOOL/$TESTFS/renameme
 
 
 if is_global_zone
 then
 	# create a filesystem we can share
-	log_must $ZFS create $TESTPOOL/$TESTFS/unshared
-	log_must $ZFS set sharenfs=off $TESTPOOL/$TESTFS/unshared
+	log_must zfs create $TESTPOOL/$TESTFS/unshared
+	log_must zfs set sharenfs=off $TESTPOOL/$TESTFS/unshared
 
 	# create a filesystem that we can unshare
-	log_must $ZFS create $TESTPOOL/$TESTFS/shared
-	log_must $ZFS set sharenfs=on $TESTPOOL/$TESTFS/shared
+	log_must zfs create $TESTPOOL/$TESTFS/shared
+	log_must zfs set sharenfs=on $TESTPOOL/$TESTFS/shared
 fi
 
 
-log_must $ZFS create -o version=1 $TESTPOOL/$TESTFS/version1
-log_must $ZFS create -o version=1 $TESTPOOL/$TESTFS/allowed
-log_must $ZFS allow everyone create $TESTPOOL/$TESTFS/allowed
+log_must zfs create -o version=1 $TESTPOOL/$TESTFS/version1
+log_must zfs create -o version=1 $TESTPOOL/$TESTFS/allowed
+log_must zfs allow everyone create $TESTPOOL/$TESTFS/allowed
 
 if is_global_zone
 then
 
 	# Now create several virtual disks to test zpool with
 
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk1.dat
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk2.dat
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk3.dat
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk-additional.dat
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk-export.dat
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk-offline.dat
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk-spare1.dat
-	$MKFILE $MINVDEVSIZE /$TESTDIR/disk-spare2.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk1.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk2.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk3.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk-additional.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk-export.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk-offline.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk-spare1.dat
+	mkfile $MINVDEVSIZE /$TESTDIR/disk-spare2.dat
 
 	# and create a pool we can perform attach remove replace,
 	# etc. operations with
-	log_must $ZPOOL create $TESTPOOL.virt mirror /$TESTDIR/disk1.dat \
+	log_must zpool create $TESTPOOL.virt mirror /$TESTDIR/disk1.dat \
 	/$TESTDIR/disk2.dat /$TESTDIR/disk3.dat /$TESTDIR/disk-offline.dat \
 	spare /$TESTDIR/disk-spare1.dat
 
 
 	# Offline one of the disks to test online
-	log_must $ZPOOL offline $TESTPOOL.virt /$TESTDIR/disk-offline.dat
+	log_must zpool offline $TESTPOOL.virt /$TESTDIR/disk-offline.dat
 
 
 	# create an exported pool to test import
-	log_must $ZPOOL create $TESTPOOL.exported /$TESTDIR/disk-export.dat
-	log_must $ZPOOL export $TESTPOOL.exported
+	log_must zpool create $TESTPOOL.exported /$TESTDIR/disk-export.dat
+	log_must zpool export $TESTPOOL.exported
 
 	set -A props $POOL_PROPS
 	set -A prop_vals $POOL_VALS
@@ -148,14 +148,14 @@ then
 	do
 		prop_name=${props[$i]}
 		prop_val=${prop_vals[$i]}
-		log_must $ZPOOL set $prop_name=$prop_val $TESTPOOL
+		log_must zpool set $prop_name=$prop_val $TESTPOOL
 		i=$(( $i + 1 ))
 	done
 
 	# copy a v1 pool from cli_root
-	$CP $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1.dat.bz2 \
+	cp $STF_SUITE/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v1.dat.bz2 \
 	    /$TESTDIR
-	log_must $BUNZIP2 /$TESTDIR/zfs-pool-v1.dat.bz2
-	log_must $ZPOOL import -d /$TESTDIR v1-pool
+	log_must bunzip2 /$TESTDIR/zfs-pool-v1.dat.bz2
+	log_must zpool import -d /$TESTDIR v1-pool
 fi
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zdb_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zdb_001_neg.ksh
index e99165cfe0..f10c0a751a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zdb_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zdb_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,12 +45,12 @@
 function check_zdb
 {
 	$@ > /tmp/zdb.$$
-	$GREP "Dataset mos" /tmp/zdb.$$
+	grep "Dataset mos" /tmp/zdb.$$
 	if [ $? -eq 0 ]
 	then
 		log_fail "$@ exited 0 when run as a non root user!"
 	fi
-	$RM /tmp/zdb.$$
+	rm /tmp/zdb.$$
 }
 
 
@@ -58,7 +58,7 @@ function cleanup
 {
 	if [ -e /tmp/zdb_001_neg.$$.txt ]
 	then
-		$RM /tmp/zdb_001_neg.$$.txt
+		rm /tmp/zdb_001_neg.$$.txt
 	fi
 
 }
@@ -68,15 +68,15 @@ verify_runnable "global"
 log_assert "zdb can't run as a user on datasets, but can run without arguments"
 log_onexit cleanup
 
-log_must eval "$ZDB > /tmp/zdb_001_neg.$$.txt"
+log_must eval "zdb > /tmp/zdb_001_neg.$$.txt"
 # verify the output looks okay
-log_must $GREP pool_guid /tmp/zdb_001_neg.$$.txt
-log_must $RM /tmp/zdb_001_neg.$$.txt
+log_must grep pool_guid /tmp/zdb_001_neg.$$.txt
+log_must rm /tmp/zdb_001_neg.$$.txt
 
 # we shouldn't able to run it on any dataset
-check_zdb $ZDB $TESTPOOL
-check_zdb $ZDB $TESTPOOL/$TESTFS
-check_zdb $ZDB $TESTPOOL/$TESTFS@snap
-check_zdb $ZDB $TESTPOOL/$TESTFS.clone
+check_zdb zdb $TESTPOOL
+check_zdb zdb $TESTPOOL/$TESTFS
+check_zdb zdb $TESTPOOL/$TESTFS@snap
+check_zdb zdb $TESTPOOL/$TESTFS.clone
 
 log_pass "zdb can't run as a user on datasets, but can run without arguments"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_001_neg.ksh
index e5a0332815..0520ab38f7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -46,14 +46,14 @@ function cleanup
 {
 	if [ -e /tmp/zfs_001_neg.$$.txt ]
 	then
-		$RM /tmp/zfs_001_neg.$$.txt
+		rm /tmp/zfs_001_neg.$$.txt
 	fi
 }
 
 log_onexit cleanup
 log_assert "zfs shows a usage message when run as a user"
 
-eval "$ZFS > /tmp/zfs_001_neg.$$.txt 2>&1"
-log_must $GREP "usage: zfs command args" /tmp/zfs_001_neg.$$.txt
+eval "zfs > /tmp/zfs_001_neg.$$.txt 2>&1"
+log_must grep "usage: zfs command args" /tmp/zfs_001_neg.$$.txt
 
 log_pass "zfs shows a usage message when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_allow_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_allow_001_neg.ksh
index 5e760620bb..ebebca4fb5 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_allow_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_allow_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,20 +45,20 @@
 #
 
 # check to see if we have zfs allow
-$ZFS 2>&1 | $GREP "allow" > /dev/null
+zfs 2>&1 | grep "allow" > /dev/null
 if (($? != 0)) then
 	log_unsupported "ZFS allow not supported on this machine."
 fi
 
 log_assert "zfs allow returns an error when run as a user"
 
-log_must $ZFS allow $TESTPOOL/$TESTFS
-log_mustnot $ZFS allow $($LOGNAME) create $TESTPOOL/$TESTFS
+log_must zfs allow $TESTPOOL/$TESTFS
+log_mustnot zfs allow $(logname) create $TESTPOOL/$TESTFS
 
 # now verify that the above command actually did nothing by
 # checking for any allow output. ( if no allows are granted,
 # nothing should be output )
-OUTPUT=$($ZFS allow $TESTPOOL/$TESTFS | $GREP "Local+Descendent" )
+OUTPUT=$(zfs allow $TESTPOOL/$TESTFS | grep "Local+Descendent" )
 if [ -n "$OUTPUT" ]
 then
 	log_fail "zfs allow permissions were granted on $TESTPOOL/$TESTFS"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_clone_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_clone_001_neg.ksh
index aaabcad9c2..b237c308e7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_clone_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_clone_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -44,7 +44,7 @@
 #
 
 log_assert "zfs clone returns an error when run as a user"
-log_mustnot $ZFS clone $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS.myclone
+log_mustnot zfs clone $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS.myclone
 
 # check to see that the above command really did nothing
 if datasetexists $TESTPOOL/$TESTFS.myclone
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_create_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_create_001_neg.ksh
index 579771e840..888ea87328 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_create_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_create_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -54,7 +54,7 @@ log_assert "Verify zfs create without parameters fails."
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZFS ${args[i]}
+	log_mustnot zfs ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_destroy_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_destroy_001_neg.ksh
index d7a23acedf..09d376b2d9 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_destroy_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_destroy_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -60,7 +60,7 @@ log_assert "zfs destroy [-f|-r] [fs|snap]"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZFS ${args[i]}
+	log_mustnot zfs ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_get_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_get_001_neg.ksh
index 680d2e5d15..5ec603dfea 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_get_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_get_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -54,7 +54,7 @@ while [[ $i -lt ${#args[*]} ]]
 do
 	PROP=${props[$i]}
 	EXPECTED=${prop_vals[$i]}
-	ACTUAL=$( $ZFS get $PROP -o value -H snapdir $TESTPOOl/$TESTFS/prop )
+	ACTUAL=$( zfs get $PROP -o value -H snapdir $TESTPOOl/$TESTFS/prop )
 	if [ "$ACTUAL" != "$EXPECTED" ]
 	then
 		log_fail "Property $PROP value was $ACTUAL, expected $EXPECTED"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_inherit_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_inherit_001_neg.ksh
index 2f6c0c41eb..92e6f4c8f6 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_inherit_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_inherit_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -44,10 +44,10 @@
 #
 
 log_assert "zfs inherit returns an error when run as a user"
-log_mustnot $ZFS inherit snapdir $TESTPOOL/$TESTFS/$TESTFS2
+log_mustnot zfs inherit snapdir $TESTPOOL/$TESTFS/$TESTFS2
 
 # check to see that the above command really did nothing
-PROP=$($ZFS get snapdir $TESTPOOL/$TESTFS)
+PROP=$(zfs get snapdir $TESTPOOL/$TESTFS)
 if [ "$PROP" = "visible" ]
 then
 	log_fail "snapdir property inherited from the $TESTPOOL/$TESTFS!"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_mount_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_mount_001_neg.ksh
index 9368dde9f7..e5ae0830ff 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_mount_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_mount_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,10 +45,10 @@
 
 log_assert "zfs mount returns an error when run as a user"
 
-log_mustnot $ZFS mount $TESTPOOL/$TESTFS/$TESTFS2.unmounted
+log_mustnot zfs mount $TESTPOOL/$TESTFS/$TESTFS2.unmounted
 
 # now verify that the above command didn't do anything
-MOUNTED=$($MOUNT | $GREP $TESTPOOL/$TESTFS/$TESTFS2.unmounted)
+MOUNTED=$(mount | grep $TESTPOOL/$TESTFS/$TESTFS2.unmounted)
 if [ -n "$MOUNTED" ]
 then
 	log_fail "Filesystem $TESTPOOL/$TESTFS/$TESTFS2.unmounted was mounted!"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_promote_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_promote_001_neg.ksh
index 7c8562a918..6a4798b8bd 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_promote_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_promote_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,7 +45,7 @@
 
 log_assert "zfs promote returns an error when run as a user"
 
-log_mustnot $ZFS promote $TESTPOOL/$TESTFS/clone
+log_mustnot zfs promote $TESTPOOL/$TESTFS/clone
 
 # Now verify that the above command didn't do anything
 if datasetexists $TESTPOOL/$TESTFS/clone@snap
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_receive_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_receive_001_neg.ksh
index ede741f53f..f8b5cf6bef 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_receive_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_receive_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,7 +45,7 @@
 
 log_assert "zfs receive returns an error when run as a user"
 
-log_mustnot eval "$ZFS receive -d $TESTPOOL/$TESTFS/$TESTFS2 \
+log_mustnot eval "zfs receive -d $TESTPOOL/$TESTFS/$TESTFS2 \
  < /tmp/zfstest_datastream.dat"
 
 # verify that command actually did nothing
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rename_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rename_001_neg.ksh
index e4eb6c9198..5de05a7da4 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rename_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rename_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,7 +45,7 @@
 
 log_assert "zfs rename returns an error when run as a user"
 
-log_mustnot $ZFS rename $TESTPOOL/$TESTFS/renameme $TESTPOOL/$TESTFS/renameme1
+log_mustnot zfs rename $TESTPOOL/$TESTFS/renameme $TESTPOOL/$TESTFS/renameme1
 
 # now verify the above command didn't actually do anything
 if datasetexists $TESTPOOL/$TESTFS/renameme1
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rollback_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rollback_001_neg.ksh
index 03e03b709d..0794af6303 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rollback_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_rollback_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -46,7 +46,7 @@
 
 log_assert "zfs rollback returns an error when run as a user"
 
-log_mustnot $ZFS rollback $TESTPOOL/$TESTFS@snap
+log_mustnot zfs rollback $TESTPOOL/$TESTFS@snap
 
 # now verify the above command didn't actually do anything
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_send_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_send_001_neg.ksh
index a6ab602fb9..4f0c89c4c7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_send_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_send_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -47,14 +47,14 @@ function cleanup
 {
 	if [ -e /tmp/zfstest_datastream.$$ ]
 	then
-		log_must $RM /tmp/zfstest_datastream.$$
+		log_must rm /tmp/zfstest_datastream.$$
 	fi
 }
 
 log_assert "zfs send returns an error when run as a user"
 log_onexit cleanup
 
-log_mustnot eval "$ZFS send $TESTPOOL/$TESTFS@snap > /tmp/zfstest_datastream.$$"
+log_mustnot eval "zfs send $TESTPOOL/$TESTFS@snap > /tmp/zfstest_datastream.$$"
 
 # Now check that the above command actually did nothing
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_set_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_set_001_neg.ksh
index 67ba6791bf..aac9554d37 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_set_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_set_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -56,10 +56,10 @@ do
 	PROP=${props[$i]}
 	EXPECTED=${prop_vals[$i]}
 	NEW=${prop_new[$i]}
-	log_mustnot $ZFS set $PROP=$NEW $TESTPOOL/$TESTFS/prop
+	log_mustnot zfs set $PROP=$NEW $TESTPOOL/$TESTFS/prop
 
 	# Now verify that the above command did nothing
-	ACTUAL=$($ZFS get $PROP -o value -H snapdir $TESTPOOl/$TESTFS/prop )
+	ACTUAL=$(zfs get $PROP -o value -H snapdir $TESTPOOl/$TESTFS/prop )
 	if [ "$ACTUAL" != "$EXPECTED" ]
 	then
 		log_fail "Property $PROP was set to $ACTUAL, expected $EXPECTED"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_share_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_share_001_neg.ksh
index 575d532194..0244a681ae 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_share_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_share_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -52,7 +52,7 @@ then
 	log_fail "$TESTPOOL/$TESTFS/unshared was incorrectly shared initially!"
 fi
 
-log_mustnot $ZFS share $TESTPOOL/$TESTFS/unshared
+log_mustnot zfs share $TESTPOOL/$TESTFS/unshared
 
 # Now verify that the above command didn't actually do anything
 if is_shared $TESTDIR/unshared
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_snapshot_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_snapshot_001_neg.ksh
index 8d3951887f..a1f338c78f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_snapshot_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_snapshot_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,7 +45,7 @@
 
 log_assert "zfs snapshot returns an error when run as a user"
 
-log_mustnot $ZFS snapshot $TESTPOOL/$TESTFS@usersnap1
+log_mustnot zfs snapshot $TESTPOOL/$TESTFS@usersnap1
 
 # Now verify that the above command didn't actually do anything
 if datasetexists $TESTPOOL/$TESTFS@usersnap1
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unallow_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unallow_001_neg.ksh
index 621782a019..4e3e4dd43e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unallow_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unallow_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -44,17 +44,17 @@
 #
 
 # check to see if we have zfs unallow
-$ZFS 2>&1 | $GREP "unallow" > /dev/null
+zfs 2>&1 | grep "unallow" > /dev/null
 if (($? != 0)) then
         log_unsupported "ZFS unallow not supported on this machine."
 fi
 
 log_assert "zfs unallow returns an error when run as a user"
 
-log_mustnot $ZFS unallow everyone $TESTPOOL/$TESTFS/allowed
+log_mustnot zfs unallow everyone $TESTPOOL/$TESTFS/allowed
 
 # now check with zfs allow to see if the permissions are still there
-OUTPUT=$($ZFS allow $TESTPOOL/$TESTFS/allowed | $GREP "Local+Descendent" )
+OUTPUT=$(zfs allow $TESTPOOL/$TESTFS/allowed | grep "Local+Descendent" )
 if [ -z "$OUTPUT" ]
 then
 	log_fail "Error - create permissions were unallowed on \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unmount_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unmount_001_neg.ksh
index 22a3d75e07..f825a00b61 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unmount_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unmount_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -58,7 +58,7 @@ log_assert "zfs u[n]mount [-f] [mountpoint|fs|snap]"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZFS ${args[i]}
+	log_mustnot zfs ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unshare_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unshare_001_neg.ksh
index e710e55417..142a5e99ab 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unshare_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_unshare_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -53,7 +53,7 @@ then
 	log_fail "$TESTPOOL/$TESTFS/shared was not shared initially at all!"
 fi
 
-log_mustnot $ZFS unshare $TESTPOOL/$TESTFS/shared
+log_mustnot zfs unshare $TESTPOOL/$TESTFS/shared
 
 # now verify that the above command didn't do anything
 if not_shared $TESTDIR/shared
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_upgrade_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_upgrade_001_neg.ksh
index 5cf1bb858e..e81a288b34 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_upgrade_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zfs_upgrade_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -44,7 +44,7 @@
 #
 
 # check to see if we have upgrade capability
-$ZFS upgrade > /dev/null 2>&1
+zfs upgrade > /dev/null 2>&1
 HAS_UPGRADE=$?
 if [ $HAS_UPGRADE -ne 0 ]
 then
@@ -54,11 +54,11 @@ fi
 log_assert "zfs upgrade returns an error when run as a user"
 
 
-log_mustnot $ZFS upgrade $TESTPOOL/$TESTFS/version1
+log_mustnot zfs upgrade $TESTPOOL/$TESTFS/version1
 
 # now check to see the above command didn't do anything
-VERSION=$($ZFS upgrade $TESTPOOL/$TESTFS/version1 2>&1 \
-	 | $GREP "already at this version")
+VERSION=$(zfs upgrade $TESTPOOL/$TESTFS/version1 2>&1 \
+	 | grep "already at this version")
 if [ -n "$VERSION" ]
 then
 	log_fail "A filesystem was upgraded!"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_001_neg.ksh
index fb4871f981..3f152252c9 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -47,14 +47,14 @@ function cleanup
 {
 	if [ -e /tmp/zpool_001_neg.$$.txt ]
 	then
-		$RM /tmp/zpool_001_neg.$$.txt
+		rm /tmp/zpool_001_neg.$$.txt
 	fi
 }
 
 log_onexit cleanup
 log_assert "zpool shows a usage message when run as a user"
 
-eval "$ZPOOL > /tmp/zpool_001_neg.$$.txt 2>&1"
-log_must $GREP "usage: zpool command args" /tmp/zpool_001_neg.$$.txt
+eval "zpool > /tmp/zpool_001_neg.$$.txt 2>&1"
+log_must grep "usage: zpool command args" /tmp/zpool_001_neg.$$.txt
 
 log_pass "zpool shows a usage message when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_add_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_add_001_neg.ksh
index d02dd0b9e3..d07724e34a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_add_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_add_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -62,7 +62,7 @@ log_assert "zpool add [-fn] pool_name vdev"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL ${args[i]}
+	log_mustnot zpool ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_attach_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_attach_001_neg.ksh
index 80aa4b9115..8c03a61c98 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_attach_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_attach_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,7 +45,7 @@
 
 function check_for_attach
 {
-	RESULT=$($ZPOOL status -v $TESTPOOL.virt | $GREP disk-additional.dat)
+	RESULT=$(zpool status -v $TESTPOOL.virt | grep disk-additional.dat)
 	if [ -n "$RESULT" ]
 	then
 		log_fail "A disk was attached to the pool!"
@@ -56,11 +56,11 @@ verify_runnable "global"
 
 log_assert "zpool attach returns an error when run as a user"
 
-log_mustnot $ZPOOL attach $TESTPOOL.virt /$TESTDIR/disk1.dat \
+log_mustnot zpool attach $TESTPOOL.virt /$TESTDIR/disk1.dat \
 	/$TESTDIR/disk-additional.dat
 check_for_attach
 
-log_mustnot $ZPOOL attach -f $TESTPOOL.virt /$TESTDIR/disk1.dat \
+log_mustnot zpool attach -f $TESTPOOL.virt /$TESTDIR/disk1.dat \
 	 /$TESTDIR/disk-additional.dat
 check_for_attach
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_clear_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_clear_001_neg.ksh
index 81951562a1..90f7189822 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_clear_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_clear_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -47,6 +47,6 @@ verify_runnable "global"
 
 log_assert "zpool clear returns an error when run as a user"
 
-log_mustnot $ZPOOL clear $TESTPOOL
+log_mustnot zpool clear $TESTPOOL
 
 log_pass "zpool clear returns an error when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_create_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_create_001_neg.ksh
index f77df30a09..b1d091ad66 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_create_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_create_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -62,7 +62,7 @@ log_assert "zpool create [-fn] pool_name vdev"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL ${args[i]}
+	log_mustnot zpool ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_destroy_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_destroy_001_neg.ksh
index 8d28f70935..b976014f77 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_destroy_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_destroy_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -52,7 +52,7 @@ log_assert "zpool destroy [-f] [pool_name ...]"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL ${args[i]}
+	log_mustnot zpool ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_detach_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_detach_001_neg.ksh
index 02013cc5bb..901590619f 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_detach_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_detach_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -47,9 +47,9 @@ verify_runnable "global"
 
 log_assert "zpool detach returns an error when run as a user"
 
-log_mustnot $ZPOOL detach $TESTPOOL.virt /$TESTDIR/disk1.dat
+log_mustnot zpool detach $TESTPOOL.virt /$TESTDIR/disk1.dat
 
-RESULT=$($ZPOOL status -v $TESTPOOL.virt | $GREP disk1.dat)
+RESULT=$(zpool status -v $TESTPOOL.virt | grep disk1.dat)
 if [ -z "$RESULT" ]
 then
 	log_fail "A disk was detached from the pool!"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_export_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_export_001_neg.ksh
index 697f3d3cdc..81e1f6671a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_export_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_export_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -44,7 +44,7 @@
 
 function check_for_export
 {
-	RESULT=$($ZPOOL list | $GREP $TESTPOOL.virt )
+	RESULT=$(zpool list | grep $TESTPOOL.virt )
 	if [ -z "$RESULT" ]
 	then
 		log_fail "A pool was exported!"
@@ -56,10 +56,10 @@ verify_runnable "global"
 
 log_assert "zpool export returns an error when run as a user"
 
-log_mustnot $ZPOOL export $TESTPOOL.virt
+log_mustnot zpool export $TESTPOOL.virt
 check_for_export
 
-log_mustnot $ZPOOL export -f $TESTPOOL.virt
+log_mustnot zpool export -f $TESTPOOL.virt
 check_for_export
 
 log_pass "zpool export returns an error when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_get_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_get_001_neg.ksh
index 8a691f4b37..0a27b9bb4e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_get_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_get_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -54,7 +54,7 @@ while [[ $i -lt ${#args[*]} ]]
 do
 	PROP=${props[$i]}
 	EXPECTED=${prop_vals[$i]}
-	ACTUAL=$( $ZPOOL get $PROP $TESTPOOL | $GREP $PROP | $AWK '{print $1}' )
+	ACTUAL=$( zpool get $PROP $TESTPOOL | grep $PROP | awk '{print $1}' )
 	if [ "$ACTUAL" != "$EXPECTED" ]
 	then
 		log_fail "Property $PROP value was $ACTUAL, expected $EXPECTED"
@@ -62,6 +62,6 @@ do
         i=$(( $i + 1 ))
 done
 
-log_must $ZPOOL get all $TESTPOOL
+log_must zpool get all $TESTPOOL
 
 log_pass "zpool get works when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_history_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_history_001_neg.ksh
index 7791e8d719..9b273ed493 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_history_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_history_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -46,10 +46,10 @@ verify_runnable "global"
 
 log_assert "zpool history returns an error when run as a user"
 
-log_mustnot $ZPOOL history
-log_mustnot $ZPOOL history $TESTPOOL
-log_mustnot $ZPOOL history -i $TESTPOOL
-log_mustnot $ZPOOL history -l $TESTPOOL
-log_mustnot $ZPOOL history -il $TESTPOOL
+log_mustnot zpool history
+log_mustnot zpool history $TESTPOOL
+log_mustnot zpool history -i $TESTPOOL
+log_mustnot zpool history -l $TESTPOOL
+log_mustnot zpool history -il $TESTPOOL
 
 log_assert "zpool history returns an error when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_001_neg.ksh
index 9f34118f6c..5d53bb57e3 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,7 +45,7 @@
 
 function check_for_import
 {
-	RESULT=$($ZPOOL list -H -o name | $GREP $TESTPOOL.exported)
+	RESULT=$(zpool list -H -o name | grep $TESTPOOL.exported)
 	if [ -n "$RESULT" ]
 	then
 		log_fail "Pool $TESTPOOL.export was successfully imported!"
@@ -55,12 +55,12 @@ function check_for_import
 verify_runnable "global"
 
 log_assert "zpool import returns an error when run as a user"
-log_mustnot $ZPOOL import
+log_mustnot zpool import
 
-log_mustnot $ZPOOL import -a
+log_mustnot zpool import -a
 check_for_import
 
-log_mustnot $ZPOOL import -d /$TESTDIR $TESTPOOL.exported
+log_mustnot zpool import -d /$TESTDIR $TESTPOOL.exported
 check_for_import
 
 log_pass "zpool import returns an error when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_002_neg.ksh
index 011cd1c030..146dbecd79 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_import_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -57,7 +57,7 @@ log_assert "Executing 'zpool import' by regular user fails"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL import ${args[i]}
+	log_mustnot zpool import ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_offline_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_offline_001_neg.ksh
index 5a32e3fd3b..57adcd902d 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_offline_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_offline_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,8 +45,8 @@
 
 function check_for_offline
 {
-	RESULT=$($ZPOOL status -v $TESTPOOL.virt | $GREP disk-1.dat \
-		 | $GREP OFFLINE )
+	RESULT=$(zpool status -v $TESTPOOL.virt | grep disk-1.dat \
+		 | grep OFFLINE )
 	if [ -n "$RESULT" ]
 	then
 		log_fail "A disk was taken offline!"
@@ -57,10 +57,10 @@ verify_runnable "global"
 
 log_assert "zpool offline returns an error when run as a user"
 
-log_mustnot $ZPOOL offline $TESTPOOL.virt /$TESTDIR/disk-1.dat
+log_mustnot zpool offline $TESTPOOL.virt /$TESTDIR/disk-1.dat
 check_for_offline
 
-log_mustnot $ZPOOL offline -t $TESTPOOL.virt /$TESTDIR/disk-1.dat
+log_mustnot zpool offline -t $TESTPOOL.virt /$TESTDIR/disk-1.dat
 check_for_offline
 
 log_pass "zpool offline returns an error when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh
index 03cf9aaf77..6c024d29e0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,8 +45,8 @@
 
 function check_for_online
 {
-	RESULT=$($ZPOOL status -v $TESTPOOL.virt | $GREP disk-offline.dat \
-		 | $GREP ONLINE )
+	RESULT=$(zpool status -v $TESTPOOL.virt | grep disk-offline.dat \
+		 | grep ONLINE )
 	if [ -n "$RESULT" ]
 	then
 		log_fail "A disk was brough online!"
@@ -57,10 +57,10 @@ verify_runnable "global"
 
 log_assert "zpool online returns an error when run as a user"
 
-log_mustnot $ZPOOL online $TESTPOOL.virt /$TESTDIR/disk-offline.dat
+log_mustnot zpool online $TESTPOOL.virt /$TESTDIR/disk-offline.dat
 check_for_online
 
-log_mustnot $ZPOOL online -t $TESTPOOL.virt /$TESTDIR/disk-offline.dat
+log_mustnot zpool online -t $TESTPOOL.virt /$TESTDIR/disk-offline.dat
 check_for_online
 
 log_pass "zpool online returns an error when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_remove_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_remove_001_neg.ksh
index d5d3e5a8c2..61ae69fbb8 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_remove_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_remove_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -47,9 +47,9 @@ verify_runnable "global"
 
 log_assert "zpool remove returns an error when run as a user"
 
-log_mustnot $ZPOOL remove $TESTPOOL.virt /$TESTDIR/disk-spare1.dat
+log_mustnot zpool remove $TESTPOOL.virt /$TESTDIR/disk-spare1.dat
 
-RESULT=$($ZPOOL status -v $TESTPOOL.virt | $GREP disk-spare1.dat)
+RESULT=$(zpool status -v $TESTPOOL.virt | grep disk-spare1.dat)
 if [ -z "$RESULT" ]
 then
 	log_fail "A disk was removed from the pool!"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_replace_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_replace_001_neg.ksh
index e67cabd2a4..14f27704ae 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_replace_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_replace_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,8 +45,8 @@
 
 function check_for_replace
 {
-	$SLEEP 10
-	RESULT=$($ZPOOL status -v $TESTPOOL.virt | $GREP disk-additional.dat)
+	sleep 10
+	RESULT=$(zpool status -v $TESTPOOL.virt | grep disk-additional.dat)
 	if [ -n "$RESULT" ]
 	then
 		log_fail "A disk was replaced in the pool!"
@@ -57,11 +57,11 @@ verify_runnable "global"
 
 log_assert "zpool replace returns an error when run as a user"
 
-log_mustnot $ZPOOL replace $TESTPOOL.virt /$TESTDIR/disk-1.dat \
+log_mustnot zpool replace $TESTPOOL.virt /$TESTDIR/disk-1.dat \
 	 /$TESTDIR/disk-additional.dat
 check_for_replace
 
-log_mustnot $ZPOOL replace -f $TESTPOOL.virt /$TESTDIR/disk-1.dat \
+log_mustnot zpool replace -f $TESTPOOL.virt /$TESTDIR/disk-1.dat \
  /$TESTDIR/disk-additional.dat
 check_for_replace
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_scrub_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_scrub_001_neg.ksh
index 8f39e0455d..0184d71470 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_scrub_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_scrub_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -47,7 +47,7 @@ verify_runnable "global"
 
 log_assert "zpool scrub returns an error when run as a user"
 
-log_mustnot $ZPOOL scrub $TESTPOOL
-log_mustnot $ZPOOL scrub -s $TESTPOOL
+log_mustnot zpool scrub $TESTPOOL
+log_mustnot zpool scrub -s $TESTPOOL
 
 log_pass "zpool scrub returns an error when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_set_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_set_001_neg.ksh
index b5cefb5483..eb7efd6a3a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_set_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_set_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -59,7 +59,7 @@ do
 	log_mustnot $POOL set $PROP=$NEW $TESTPOOL
 
 	# Now verify that the above command did nothing
-	ACTUAL=$( $ZPOOL get $PROP $TESTPOOL | $GREP $PROP | $AWK '{print $1}' )
+	ACTUAL=$( zpool get $PROP $TESTPOOL | grep $PROP | awk '{print $1}' )
 	if [ "$ACTUAL" != "$EXPECTED" ]
 	then
 		log_fail "Property $PROP was set to $ACTUAL, expected $EXPECTED"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_status_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_status_001_neg.ksh
index dfe063e5cf..9ae0ea752e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_status_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_status_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -45,32 +45,32 @@
 
 function check_pool_status
 {
-	RESULT=$($GREP "pool:" /tmp/pool-status.$$)
+	RESULT=$(grep "pool:" /tmp/pool-status.$$)
 	if [ -z "$RESULT" ]
 	then
 		log_fail "No pool: string found in zpool status output!"
 	fi
-	$RM /tmp/pool-status.$$
+	rm /tmp/pool-status.$$
 }
 
 verify_runnable "global"
 
 log_assert "zpool status works when run as a user"
 
-log_must eval "$ZPOOL status > /tmp/pool-status.$$"
+log_must eval "zpool status > /tmp/pool-status.$$"
 check_pool_status
 
-log_must eval "$ZPOOL status -v > /tmp/pool-status.$$"
+log_must eval "zpool status -v > /tmp/pool-status.$$"
 check_pool_status
 
-log_must eval "$ZPOOL status $TESTPOOL> /tmp/pool-status.$$"
+log_must eval "zpool status $TESTPOOL> /tmp/pool-status.$$"
 check_pool_status
 
-log_must eval "$ZPOOL status -v $TESTPOOL > /tmp/pool-status.$$"
+log_must eval "zpool status -v $TESTPOOL > /tmp/pool-status.$$"
 check_pool_status
 
 # $TESTPOOL.virt has an offline device, so -x will show it
-log_must eval "$ZPOOL status -x $TESTPOOL.virt > /tmp/pool-status.$$"
+log_must eval "zpool status -x $TESTPOOL.virt > /tmp/pool-status.$$"
 check_pool_status
 
 log_pass "zpool status works when run as a user"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh
index e4c6c02ff5..0b7f54e222 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/misc/zpool_upgrade_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/misc/misc.cfg
@@ -49,14 +49,14 @@ log_assert "zpool upgrade returns an error when run as a user"
 
 log_onexit cleanup
 # zpool upgrade returns 0 when it can't do anything
-log_must $ZPOOL upgrade $TESTPOOL.virt
+log_must zpool upgrade $TESTPOOL.virt
 
 # Now try to upgrade our version 1 pool
-log_mustnot $ZPOOL upgrade v1-pool
+log_mustnot zpool upgrade v1-pool
 
 # if the pool has been upgraded, then v1-pool won't be listed in the output
 # of zpool upgrade anymore
-RESULT=$($ZPOOL upgrade | $GREP v1-pool)
+RESULT=$(zpool upgrade | grep v1-pool)
 if [ -z "$RESULT" ]
 then
 	log_fail "A pool was upgraded successfully!"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/setup.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/setup.ksh
index 624c9e75b4..15566b38a7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -42,23 +42,23 @@ set -A cksumarray $CKSUMOPTS
 typeset -i index=0
 for dataset in $DATASETS
 do
-	log_must $ZFS create $TESTPOOL/$TESTFS/$dataset
-	$SLEEP 1
-        log_must $ZFS snapshot $TESTPOOL/$TESTFS/${dataset}@snap
+	log_must zfs create $TESTPOOL/$TESTFS/$dataset
+	sleep 1
+        log_must zfs snapshot $TESTPOOL/$TESTFS/${dataset}@snap
 
-	$SLEEP 1
+	sleep 1
 	if is_global_zone ; then
-		log_must $ZFS create -V 64M $TESTPOOL/$TESTFS/${dataset}-vol
-		$SLEEP 1
-		log_must $ZFS snapshot $TESTPOOL/$TESTFS/${dataset}-vol@snap
+		log_must zfs create -V 64M $TESTPOOL/$TESTFS/${dataset}-vol
+		sleep 1
+		log_must zfs snapshot $TESTPOOL/$TESTFS/${dataset}-vol@snap
 	fi
 
 	# sleep to ensure that the datasets have different creation dates
-	$SLEEP 1
-	log_must $ZFS set checksum=${cksumarray[$index]} \
+	sleep 1
+	log_must zfs set checksum=${cksumarray[$index]} \
 		$TESTPOOL/$TESTFS/$dataset
 	if datasetexists $TESTPOOL/$TESTFS/${dataset}-vol; then
-		log_must $ZFS set checksum=${cksumarray[$index]} \
+		log_must zfs set checksum=${cksumarray[$index]} \
 			$TESTPOOL/$TESTFS/${dataset}-vol
 	fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list.kshlib b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list.kshlib
index e64739dc31..03c9d1f07a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,7 +54,7 @@ function verify_sort { # command list name
 		ACTUAL=$(basename $dataset)
 		if [ "$dataset" != "$TESTPOOL/$TESTFS" ]
 		then
-			EXPECTED=$($ECHO $list | $AWK "{print \$$index}")
+			EXPECTED=$(echo $list | awk "{print \$$index}")
 			if [ "$ACTUAL" != "$EXPECTED" ]
 			then
 				log_note "WARNING:" \
@@ -67,7 +67,7 @@ function verify_sort { # command list name
 	done
 
 	# finally check to see if we have the expected number of elements
-	if [ $index -ne $($ECHO $list | $AWK '{print split($0,arr)+1}') ]
+	if [ $index -ne $(echo $list | awk '{print split($0,arr)+1}') ]
 	then
 		log_fail "Warning: " \
 			"unexpected number of filesystems found in list output!"
@@ -85,7 +85,7 @@ function verify_reverse_sort { # command list name
 	typeset name=$3
 
 	# set our index to the be number of elements in the list
-	typeset -i index=$($ECHO $list | $AWK '{print split($0,arr)}')
+	typeset -i index=$(echo $list | awk '{print split($0,arr)}')
 
 	log_note "Checking reverse sort by '$name'," \
 		"expecting the reverse of '$list'"
@@ -96,7 +96,7 @@ function verify_reverse_sort { # command list name
 		ACTUAL=$(basename $dataset)
 		if [ "$dataset" != "$TESTPOOL/$TESTFS" ]
 		then
-			EXPECTED=$($ECHO $list | $AWK "{print \$$index}")
+			EXPECTED=$(echo $list | awk "{print \$$index}")
 			if [ "$ACTUAL" != "$EXPECTED" ]
 			then
 				log_note "Warning:" \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_001_pos.ksh
index b0af4ebd92..5d995a79ba 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -100,7 +100,7 @@ log_assert "Verify 'zfs list [-rH] [-o property[,prop]*] [fs|clct|vol]'."
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_must eval "$ZFS ${args[i]} > /dev/null"
+	log_must eval "zfs ${args[i]} > /dev/null"
 	((i = i + 1))
 done
 
@@ -109,7 +109,7 @@ done
 cd /tmp
 typeset -i i=0
 while [[ $i -lt ${#pathargs[*]} ]]; do
-	log_must eval "$ZFS ${pathargs[i]} > /dev/null"
+	log_must eval "zfs ${pathargs[i]} > /dev/null"
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_002_pos.ksh
index 3d546ecca8..382b2cb7f0 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_user/zfs_list/zfs_list.kshlib
@@ -97,80 +97,80 @@ LC_ALL=C; export LC_ALL
 
 # sort by creation
 verify_sort \
-	"$ZFS list -H -r -o name -s creation -t filesystem $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s creation -t filesystem $TESTPOOL/$TESTFS" \
 	"$fs_creation" "creation date"
 if is_global_zone ; then
 	verify_sort \
-	"$ZFS list -H -r -o name -s creation -t volume $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s creation -t volume $TESTPOOL/$TESTFS" \
 	"$vol_creation" "creation date"
 fi
 verify_sort \
-	"$ZFS list -H -r -o name -s creation -t snapshot $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s creation -t snapshot $TESTPOOL/$TESTFS" \
 	"$snap_creation" "creation date"
 
 # sort by checksum
 verify_sort \
-	"$ZFS list -H -r -o name -s checksum -t filesystem $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s checksum -t filesystem $TESTPOOL/$TESTFS" \
 	"$fs_cksum" "checksum"
 if is_global_zone ; then
 	verify_sort \
-	"$ZFS list -H -r -o name -s checksum -t volume $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s checksum -t volume $TESTPOOL/$TESTFS" \
 	"$vol_cksum" "checksum"
 fi
 verify_sort \
-	"$ZFS list -H -r -o name -s checksum -t snapshot $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s checksum -t snapshot $TESTPOOL/$TESTFS" \
 	"$snap_cksum" "checksum"
 verify_sort \
-	"$ZFS list -H -r -o name -S checksum -t snapshot $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -S checksum -t snapshot $TESTPOOL/$TESTFS" \
 	"$snap_cksum" "checksum"
 
 # sort by name
 verify_sort \
-	"$ZFS list -H -r -o name -s name -t filesystem $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s name -t filesystem $TESTPOOL/$TESTFS" \
 	"$fs_name" "name"
 if is_global_zone ; then
 	verify_sort \
-	"$ZFS list -H -r -o name -s name -t volume $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s name -t volume $TESTPOOL/$TESTFS" \
 	"$vol_name" "name"
 fi
 verify_sort \
-	"$ZFS list -H -r -o name -s name -t snapshot $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -s name -t snapshot $TESTPOOL/$TESTFS" \
 	"$snap_name" "name"
 
 # reverse sort by creation
 verify_reverse_sort \
-	"$ZFS list -H -r -o name -S creation -t filesystem $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -S creation -t filesystem $TESTPOOL/$TESTFS" \
 	"$fs_creation" "creation date"
 if is_global_zone ; then
 	verify_reverse_sort \
-	"$ZFS list -H -r -o name -S creation -t volume $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -S creation -t volume $TESTPOOL/$TESTFS" \
 	"$vol_creation" "creation date"
 fi
 verify_reverse_sort \
-	"$ZFS list -H -r -o name -S creation -t snapshot $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -S creation -t snapshot $TESTPOOL/$TESTFS" \
 	"$snap_creation" "creation date"
 
 # reverse sort by checksum
 verify_reverse_sort \
-	"$ZFS list -H -r -o name -S checksum -t filesystem $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -S checksum -t filesystem $TESTPOOL/$TESTFS" \
 	"$fs_rev_cksum" "checksum"
 if is_global_zone ; then
 	verify_reverse_sort \
-	"$ZFS list -H -r -o name -S checksum -t volume $TESTPOOL/$TESTFS" \
+	"zfs list -H -r -o name -S checksum -t volume $TESTPOOL/$TESTFS" \
 	"$vol_rev_cksum" "checksum"
 fi
 
 # reverse sort by name
 verify_reverse_sort \
-	"$ZFS list -H -r -o name -S name -t filesystem $TESTPOOL/$TESTFS"\
+	"zfs list -H -r -o name -S name -t filesystem $TESTPOOL/$TESTFS"\
 	"$fs_name" "name"
 if is_global_zone ; then
 	verify_reverse_sort \
-	"$ZFS list -H -r -o name -S name -t volume $TESTPOOL/$TESTFS"\
+	"zfs list -H -r -o name -S name -t volume $TESTPOOL/$TESTFS"\
 	"$vol_name" "name"
 fi
 verify_reverse_sort \
-	"$ZFS list -H -r -o name -S name -t snapshot $TESTPOOL/$TESTFS"\
+	"zfs list -H -r -o name -S name -t snapshot $TESTPOOL/$TESTFS"\
 	"$snap_name" "name"
 
 log_pass "The sort functionality in 'zfs list' works as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_003_pos.ksh
index f685456d78..3c27cbf32a 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,7 +45,7 @@
 function cleanup
 {
 	if [[ -f $tmpfile ]]; then
-		$RM -f $tmpfile
+		rm -f $tmpfile
 	fi
 }
 
@@ -64,9 +64,9 @@ done
 cd /tmp
 
 for path in $TESTPOOL/$TESTFS $TESTDIR ./../$TESTDIR ; do
-	$ZFS list -rH -o name $path > $tmpfile
+	zfs list -rH -o name $path > $tmpfile
 	for fs in $children ; do
-		$GREP "^${fs}$" $tmpfile > /dev/null 2>&1
+		grep "^${fs}$" $tmpfile > /dev/null 2>&1
 		if (( $? != 0 )); then
 			log_fail "$fs not shown in the output list."
 		fi
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_004_neg.ksh
index 13d6233d3c..5d1114dacf 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_004_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,8 +55,8 @@ paths="$TESTPOOL/NONEXISTFS $TESTPOOL/$TESTFS/NONEXISTFS \
 cd /tmp
 
 for fs in $paths ; do
-	log_mustnot $ZFS list $fs
-	log_mustnot $ZFS list -r $fs
+	log_mustnot zfs list $fs
+	log_mustnot zfs list -r $fs
 done
 
 log_pass "'zfs list [-r]' fails while the given dataset/path does not exist " \
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_007_pos.ksh
index 984bc77d3e..6cf38e1138 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
@@ -50,8 +50,8 @@ fi
 
 function cleanup
 {
-	log_must $RM -f $DEPTH_OUTPUT
-	log_must $RM -f $EXPECT_OUTPUT
+	log_must rm -f $DEPTH_OUTPUT
+	log_must rm -f $EXPECT_OUTPUT
 }
 
 log_onexit cleanup
@@ -74,14 +74,14 @@ for dp in ${depth_array[@]}; do
 	while (( fs<${#fs_type[*]} )); do
 		if [[ "$dp" == "0" ]] && \
 		  [[ "${fs_type[$fs]}" == "volume" || "${fs_type[$fs]}" == "snapshot" ]]; then
-			log_must eval "$ZFS list -H -d $dp -o name -t ${fs_type[$fs]} $DEPTH_FS > $DEPTH_OUTPUT"
+			log_must eval "zfs list -H -d $dp -o name -t ${fs_type[$fs]} $DEPTH_FS > $DEPTH_OUTPUT"
 			[[ -s "$DEPTH_OUTPUT" ]] && \
 				log_fail "$DEPTH_OUTPUT should be null."
-			log_mustnot $ZFS list -rH -o name -t ${fs_type[$fs]} $DEPTH_FS | $EGREP -e '$eg_opt'
+			log_mustnot zfs list -rH -o name -t ${fs_type[$fs]} $DEPTH_FS | egrep -e '$eg_opt'
 		else
-			log_must eval "$ZFS list -H -d $dp -o name -t ${fs_type[$fs]} $DEPTH_FS > $DEPTH_OUTPUT"
-			log_must eval "$ZFS list -rH -o name -t ${fs_type[$fs]} $DEPTH_FS | $EGREP -e '$eg_opt' > $EXPECT_OUTPUT"
-			log_must $DIFF $DEPTH_OUTPUT $EXPECT_OUTPUT
+			log_must eval "zfs list -H -d $dp -o name -t ${fs_type[$fs]} $DEPTH_FS > $DEPTH_OUTPUT"
+			log_must eval "zfs list -rH -o name -t ${fs_type[$fs]} $DEPTH_FS | egrep -e '$eg_opt' > $EXPECT_OUTPUT"
+			log_must diff $DEPTH_OUTPUT $EXPECT_OUTPUT
 		fi
 		(( fs+=1 ))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_008_neg.ksh
index 74c0b8b71b..4f3504ac41 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_008_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_get/zfs_get_list_d.kshlib
@@ -49,7 +49,7 @@ set -A  badargs "a" "AB" "aBc" "2A" "a2b" "aB2" "-1" "-32" "-999"
 typeset -i i=0
 while (( i < ${#badargs[*]} ))
 do
-	log_mustnot eval "$ZFS list -d ${badargs[i]} $DEPTH_FS >/dev/null 2>&1"
+	log_mustnot eval "zfs list -d ${badargs[i]} $DEPTH_FS >/dev/null 2>&1"
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_001_neg.ksh
index a1fac987ec..d99d429847 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,7 +56,7 @@ log_assert "zpool iostat [pool_name ...] [interval]"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_must $ZPOOL ${args[i]}
+	log_must zpool ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_002_pos.ksh
index 37062ca536..903ea1c5f7 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ typeset -i stat_count=0
 function cleanup
 {
 	if [[ -f $tmpfile ]]; then
-		$RM -f $tmpfile
+		rm -f $tmpfile
 	fi
 }
 
@@ -60,9 +60,9 @@ if ! is_global_zone ; then
 	TESTPOOL=${TESTPOOL%%/*}
 fi
 
-$ZPOOL iostat $TESTPOOL 1 4 > $tmpfile 2>&1 &
+zpool iostat $TESTPOOL 1 4 > $tmpfile 2>&1 &
 sleep 4
-stat_count=$($GREP $TESTPOOL $tmpfile | $WC -l)
+stat_count=$(grep $TESTPOOL $tmpfile | wc -l)
 
 if [[ $stat_count -ne 4 ]]; then
 	log_fail "zpool iostat [pool_name] [interval] [count] failed"
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_003_neg.ksh
index d73f5d5c8e..0b4a87f66e 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,7 +58,7 @@ log_assert "Executing 'zpool iostat' with bad options fails"
 
 typeset -i i=1
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL iostat ${args[i]}
+	log_mustnot zpool iostat ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh
index 4de88675fc..61bb8b20f1 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,7 +56,7 @@ log_assert "zpool list [-H] [-o filed[,filed]*] [<pool_name> ...]"
 
 typeset -i i=0
 while [[ $i -lt ${#args[*]} ]]; do
-	log_must $ZPOOL ${args[i]}
+	log_must zpool ${args[i]}
 
 	((i = i + 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_002_neg.ksh
index 469437a384..4ed38d475c 100644
--- a/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ log_assert "Executing 'zpool list' with bad options fails"
 
 typeset -i i=1
 while [[ $i -lt ${#args[*]} ]]; do
-	log_mustnot $ZPOOL list ${args[i]}
+	log_mustnot zpool list ${args[i]}
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/compression/compress_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/compression/compress_001_pos.ksh
index ce2c26bd24..b35b1775a7 100644
--- a/usr/src/test/zfs-tests/tests/functional/compression/compress_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/compression/compress_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,22 +49,22 @@ typeset OP=create
 log_assert "Ensure that compressed files are smaller."
 
 log_note "Ensure compression is off"
-log_must $ZFS set compression=off $TESTPOOL/$TESTFS
+log_must zfs set compression=off $TESTPOOL/$TESTFS
 
 log_note "Writing file without compression..."
-log_must $FILE_WRITE -o $OP -f $TESTDIR/$TESTFILE0 -b $BLOCKSZ \
+log_must file_write -o $OP -f $TESTDIR/$TESTFILE0 -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
 log_note "Add compression property to the dataset and write another file"
-log_must $ZFS set compression=on $TESTPOOL/$TESTFS
+log_must zfs set compression=on $TESTPOOL/$TESTFS
 
-log_must $FILE_WRITE -o $OP -f $TESTDIR/$TESTFILE1 -b $BLOCKSZ \
+log_must file_write -o $OP -f $TESTDIR/$TESTFILE1 -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
-$SLEEP 60
+sleep 60
 
-FILE0_BLKS=`$DU -k $TESTDIR/$TESTFILE0 | $AWK '{ print $1}'`
-FILE1_BLKS=`$DU -k $TESTDIR/$TESTFILE1 | $AWK '{ print $1}'`
+FILE0_BLKS=`du -k $TESTDIR/$TESTFILE0 | awk '{ print $1}'`
+FILE1_BLKS=`du -k $TESTDIR/$TESTFILE1 | awk '{ print $1}'`
 
 if [[ $FILE0_BLKS -le $FILE1_BLKS ]]; then
 	log_fail "$TESTFILE0 is smaller than $TESTFILE1" \
diff --git a/usr/src/test/zfs-tests/tests/functional/compression/compress_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/compression/compress_002_pos.ksh
index 88e155611e..a07d708240 100644
--- a/usr/src/test/zfs-tests/tests/functional/compression/compress_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/compression/compress_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,22 +51,22 @@ typeset OP=create
 log_assert "Ensure that compressed files in a dataset are smaller."
 
 log_note "Ensure compression is off"
-log_must $ZFS set compression=off $TESTPOOL/$TESTCTR
+log_must zfs set compression=off $TESTPOOL/$TESTCTR
 
 log_note "Writing file without compression..."
-log_must $FILE_WRITE -o $OP -f $TESTDIR1/$TESTFILE0 -b $BLOCKSZ \
+log_must file_write -o $OP -f $TESTDIR1/$TESTFILE0 -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
 log_note "Add compression property to the dataset and write another file"
-log_must $ZFS set compression=on $TESTPOOL/$TESTCTR
+log_must zfs set compression=on $TESTPOOL/$TESTCTR
 
-log_must $FILE_WRITE -o $OP -f $TESTDIR1/$TESTFILE1 -b $BLOCKSZ \
+log_must file_write -o $OP -f $TESTDIR1/$TESTFILE1 -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
-$SLEEP 60
+sleep 60
 
-FILE0_BLKS=`$DU -k $TESTDIR1/$TESTFILE0 | $AWK '{ print $1}'`
-FILE1_BLKS=`$DU -k $TESTDIR1/$TESTFILE1 | $AWK '{ print $1}'`
+FILE0_BLKS=`du -k $TESTDIR1/$TESTFILE0 | awk '{ print $1}'`
+FILE1_BLKS=`du -k $TESTDIR1/$TESTFILE1 | awk '{ print $1}'`
 
 if [[ $FILE0_BLKS -le $FILE1_BLKS ]]; then
 	log_fail "$TESTFILE0 is smaller than $TESTFILE1" \
diff --git a/usr/src/test/zfs-tests/tests/functional/compression/compress_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/compression/compress_003_pos.ksh
index c995b53616..e0a450dd42 100644
--- a/usr/src/test/zfs-tests/tests/functional/compression/compress_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/compression/compress_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -f $TESTDIR/*
+	rm -f $TESTDIR/*
 }
 
 log_assert "Changing blocksize doesn't casue system panic with compression settings"
@@ -64,7 +64,7 @@ for propname in "compression" "compress"
 do
 	for value in $(get_compress_opts zfs_compress)
 	do
-		log_must $ZFS set $propname=$value $fs
+		log_must zfs set $propname=$value $fs
 		if [[ $value == "gzip-6" ]]; then
 			value="gzip"
 		fi
@@ -74,7 +74,7 @@ do
 
 		(( blksize = 512 ))
 		while (( blksize <= 131072 )); do
-			log_must $ZFS set recordsize=$blksize $fs
+			log_must zfs set recordsize=$blksize $fs
 			(( offset = $RANDOM ))
 			if (( offset > blksize )); then
 				(( offset = offset % blksize ))
@@ -84,9 +84,9 @@ do
 				(( offset = offset + 1 ))
 			fi
 			(( fsize = offset ))
-			log_must $MKFILE $fsize $single_blk_file
+			log_must mkfile $fsize $single_blk_file
 			(( fsize = blksize + offset ))
-			log_must $MKFILE $fsize $multi_blk_file
+			log_must mkfile $fsize $multi_blk_file
 
 			(( blksize = blksize * 2 ))
 		done
diff --git a/usr/src/test/zfs-tests/tests/functional/compression/compress_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/compression/compress_004_pos.ksh
index 09015e72bd..fbe48bdd7f 100644
--- a/usr/src/test/zfs-tests/tests/functional/compression/compress_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/compression/compress_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -f $TESTDIR/*
+	rm -f $TESTDIR/*
 }
 
 function create_free_testing #<file size> <file>
@@ -63,10 +63,10 @@ function create_free_testing #<file size> <file>
 		(( dist = fsz - start ))
 		for len in `expr $RANDOM % $dist` $dist \
 			`expr $start + $dist`; do
-			log_must $RANDFREE_FILE -l fsz -s $start \
+			log_must randfree_file -l fsz -s $start \
 				-n $len $file
 			[[ -e $file ]] && \
-				log_must $RM -f $file
+				log_must rm -f $file
 		done
 	done
 }
@@ -88,7 +88,7 @@ for propname in "compression" "compress"
 do
 	for value in $(get_compress_opts zfs_compress)
 	do
-		log_must $ZFS set compression=$value $fs
+		log_must zfs set compression=$value $fs
 		real_val=$(get_prop $propname $fs)
 		if [[ $value == "gzip-6" ]]; then
 			value="gzip"
@@ -98,7 +98,7 @@ do
 
 		(( blksize = 512 ))
 		while (( blksize <= 131072 )); do
-			log_must $ZFS set recordsize=$blksize $fs
+			log_must zfs set recordsize=$blksize $fs
 
 			# doing single block testing
 			(( fsize = $RANDOM ))
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/cleanup.ksh
index c82ae371cc..7e2e32262d 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -35,8 +35,8 @@ 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
+	log_must svcadm enable svc:/network/nis/client:default
+	log_must rm -f $NISSTAFILE
 fi
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
index 57b55cab50..771ada74a0 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -54,15 +54,15 @@ function cleanup_user_group
 function restore_root_datasets
 {
 	if datasetexists $ROOT_TESTFS ; then
-		log_must $ZFS destroy -Rf $ROOT_TESTFS
+		log_must zfs destroy -Rf $ROOT_TESTFS
 	fi
-	log_must $ZFS create $ROOT_TESTFS
+	log_must zfs create $ROOT_TESTFS
 
 	if is_global_zone ; then
 		if datasetexists $ROOT_TESTVOL ; then
-			log_must $ZFS destroy -Rf $ROOT_TESTVOL
+			log_must zfs destroy -Rf $ROOT_TESTVOL
 		fi
-		log_must $ZFS create -V $VOLSIZE $ROOT_TESTVOL
+		log_must zfs create -V $VOLSIZE $ROOT_TESTVOL
 	fi
 
 	return 0
@@ -86,7 +86,7 @@ function verify_perm
 	fi
 
 	typeset type=$(get_prop type $dtst)
-	permissions=$($ECHO $permissions | $TR -s "," " ")
+	permissions=$(echo $permissions | tr -s "," " ")
 
 	typeset user
 	for user in $@; do
@@ -130,7 +130,7 @@ function verify_noperm
 	fi
 
 	typeset type=$(get_prop type $dtst)
-	permissions=$($ECHO $permissions | $TR -s "," " ")
+	permissions=$(echo $permissions | tr -s "," " ")
 
 	typeset user
 	for user in $@; do
@@ -342,13 +342,13 @@ function setup_unallow_testenv
 {
 	log_must restore_root_datasets
 
-	log_must $ZFS create $SUBFS
+	log_must zfs create $SUBFS
 
 	for dtst in $DATASETS ; do
-		log_must $ZFS allow -l $STAFF1 $LOCAL_SET $dtst
-		log_must $ZFS allow -d $STAFF2 $DESC_SET  $dtst
-		log_must $ZFS allow $OTHER1 $LOCAL_DESC_SET $dtst
-		log_must $ZFS allow $OTHER2 $LOCAL_DESC_SET $dtst
+		log_must zfs allow -l $STAFF1 $LOCAL_SET $dtst
+		log_must zfs allow -d $STAFF2 $DESC_SET  $dtst
+		log_must zfs allow $OTHER1 $LOCAL_DESC_SET $dtst
+		log_must zfs allow $OTHER2 $LOCAL_DESC_SET $dtst
 
 		log_must verify_perm $dtst $LOCAL_SET $STAFF1
 		log_must verify_perm $dtst $LOCAL_DESC_SET $OTHER1
@@ -376,24 +376,24 @@ function verify_send
 	typeset dtst=$3
 
 	typeset oldval
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 	typeset snap=$dtst@snap.$stamp
 
 	typeset -i ret=1
 
-	log_must $ZFS snapshot $snap
+	log_must zfs snapshot $snap
 	typeset bak_user=/tmp/bak.$user.$stamp
 	typeset bak_root=/tmp/bak.root.$stamp
 
-	user_run $user eval "$ZFS send $snap > $bak_user"
-	log_must eval "$ZFS send $snap > $bak_root"
+	user_run $user eval "zfs send $snap > $bak_user"
+	log_must eval "zfs send $snap > $bak_root"
 
 	if [[ $(checksum $bak_user) == $(checksum $bak_root) ]]; then
 		ret=0
 	fi
 
-	$RM -rf $bak_user > /dev/null
-	$RM -rf $bak_root > /dev/null
+	rm -rf $bak_user > /dev/null
+	rm -rf $bak_root > /dev/null
 
 	return $ret
 }
@@ -405,65 +405,65 @@ function verify_fs_receive
 	typeset fs=$3
 
 	typeset dtst
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 	typeset newfs=$fs/newfs.$stamp
 	typeset newvol=$fs/newvol.$stamp
 	typeset bak_user=/tmp/bak.$user.$stamp
 	typeset bak_root=/tmp/bak.root.$stamp
 
-	log_must $ZFS create $newfs
+	log_must zfs create $newfs
 	typeset datasets="$newfs"
 	if is_global_zone ; then
-		log_must $ZFS create -V $VOLSIZE $newvol
+		log_must zfs create -V $VOLSIZE $newvol
 		datasets="$newfs $newvol"
 	fi
 
 	for dtst in $datasets ; do
 
 		typeset dtstsnap=$dtst@snap.$stamp
-		log_must $ZFS snapshot $dtstsnap
+		log_must zfs snapshot $dtstsnap
 
-		log_must eval "$ZFS send $dtstsnap > $bak_root"
-		log_must $ZFS destroy -rf $dtst
+		log_must eval "zfs send $dtstsnap > $bak_root"
+		log_must zfs destroy -rf $dtst
 
-		user_run $user eval "$ZFS receive $dtst < $bak_root"
+		user_run $user eval "zfs receive $dtst < $bak_root"
 		if datasetexists $dtstsnap ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user create $fs
-		user_run $user eval "$ZFS receive $dtst < $bak_root"
-		log_must $ZFS unallow $user create $fs
+		log_must zfs allow $user create $fs
+		user_run $user eval "zfs receive $dtst < $bak_root"
+		log_must zfs unallow $user create $fs
 		if datasetexists $dtstsnap ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user mount $fs
-		user_run $user eval "$ZFS receive $dtst < $bak_root"
-		log_must $ZFS unallow $user mount $fs
+		log_must zfs allow $user mount $fs
+		user_run $user eval "zfs receive $dtst < $bak_root"
+		log_must zfs unallow $user mount $fs
 		if datasetexists $dtstsnap ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user mount,create $fs
-		user_run $user eval "$ZFS receive $dtst < $bak_root"
-		log_must $ZFS unallow $user mount,create $fs
+		log_must zfs allow $user mount,create $fs
+		user_run $user eval "zfs receive $dtst < $bak_root"
+		log_must zfs unallow $user mount,create $fs
 		if ! datasetexists $dtstsnap ; then
 			return 1
 		fi
 
 		# check the data integrity
-		log_must eval "$ZFS send $dtstsnap > $bak_user"
-		log_must $ZFS destroy -rf $dtst
-		log_must eval "$ZFS receive $dtst < $bak_root"
-		log_must eval "$ZFS send $dtstsnap > $bak_root"
-		log_must $ZFS destroy -rf $dtst
+		log_must eval "zfs send $dtstsnap > $bak_user"
+		log_must zfs destroy -rf $dtst
+		log_must eval "zfs receive $dtst < $bak_root"
+		log_must eval "zfs send $dtstsnap > $bak_root"
+		log_must zfs destroy -rf $dtst
 		if [[ $(checksum $bak_user) != $(checksum $bak_root) ]]; then
 			return 1
 		fi
 
-		$RM -rf $bak_user > /dev/null
-		$RM -rf $bak_root > /dev/null
+		rm -rf $bak_user > /dev/null
+		rm -rf $bak_root > /dev/null
 
 	done
 
@@ -476,9 +476,9 @@ function verify_userprop
 	typeset perm=$2
 	typeset dtst=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 
-	user_run $user $ZFS set "$user:ts=$stamp" $dtst
+	user_run $user zfs set "$user:ts=$stamp" $dtst
 	if [[ $stamp != $(get_prop "$user:ts" $dtst) ]]; then
 		return 1
 	fi
@@ -501,8 +501,8 @@ function verify_ccr
 	elif [[ $oldval == "off" ]]; then
 		n=0
 	fi
-	log_note "$user $ZFS set $perm=${modes[$n]} $dtst"
-	user_run $user $ZFS set $perm=${modes[$n]} $dtst
+	log_note "$user zfs set $perm=${modes[$n]} $dtst"
+	user_run $user zfs set $perm=${modes[$n]} $dtst
 	if [[ ${modes[$n]} != $(get_prop $perm $dtst) ]]; then
 		return 1
 	fi
@@ -527,8 +527,8 @@ function verify_copies
 	elif [[ $oldval -eq 3 ]]; then
 		n=0
 	fi
-	log_note "$user $ZFS set $perm=${modes[$n]} $dtst"
-	user_run $user $ZFS set $perm=${modes[$n]} $dtst
+	log_note "$user zfs set $perm=${modes[$n]} $dtst"
+	user_run $user zfs set $perm=${modes[$n]} $dtst
 	if [[ ${modes[$n]} != $(get_prop $perm $dtst) ]]; then
 		return 1
 	fi
@@ -544,13 +544,13 @@ function verify_reservation
 
 	typeset value32m=$(( 1024 * 1024 * 32 ))
 	typeset oldval=$(get_prop reservation $dtst)
-	user_run $user $ZFS set reservation=$value32m $dtst
+	user_run $user zfs set reservation=$value32m $dtst
 	if [[ $value32m != $(get_prop reservation $dtst) ]]; then
-		log_must $ZFS set reservation=$oldval $dtst
+		log_must zfs set reservation=$oldval $dtst
 		return 1
 	fi
 
-	log_must $ZFS set reservation=$oldval $dtst
+	log_must zfs set reservation=$oldval $dtst
 	return 0
 }
 
@@ -560,78 +560,78 @@ function verify_fs_create
 	typeset perm=$2
 	typeset fs=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 	typeset newfs=$fs/nfs.$stamp
 	typeset newvol=$fs/nvol.$stamp
 
-	user_run $user $ZFS create $newfs
+	user_run $user zfs create $newfs
 	if datasetexists $newfs ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $fs
-	user_run $user $ZFS create $newfs
-	log_must $ZFS unallow $user mount $fs
+	log_must zfs allow $user mount $fs
+	user_run $user zfs create $newfs
+	log_must zfs unallow $user mount $fs
 	if ! datasetexists $newfs ; then
 		return 1
 	fi
 
-	log_must $ZFS destroy $newfs
+	log_must zfs destroy $newfs
 
 	if is_global_zone ; then
 		# mount permission is required for sparse volume
-		user_run $user $ZFS create -V 150m -s $newvol
+		user_run $user zfs create -V 150m -s $newvol
 		if datasetexists $newvol ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user mount $fs
-		user_run $user $ZFS create -V 150m -s $newvol
-		log_must $ZFS unallow $user mount $fs
+		log_must zfs allow $user mount $fs
+		user_run $user zfs create -V 150m -s $newvol
+		log_must zfs unallow $user mount $fs
 		if ! datasetexists $newvol ; then
 			return 1
 		fi
-		log_must $ZFS destroy $newvol
+		log_must zfs destroy $newvol
 
 		# mount and reserveration permission are
 		# required for normal volume
-		user_run $user $ZFS create -V 150m $newvol
+		user_run $user zfs create -V 150m $newvol
 		if datasetexists $newvol ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user mount $fs
-		user_run $user $ZFS create -V 150m $newvol
-		log_must $ZFS unallow $user mount $fs
+		log_must zfs allow $user mount $fs
+		user_run $user zfs create -V 150m $newvol
+		log_must zfs unallow $user mount $fs
 		if datasetexists $newvol ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user reservation $fs
-		user_run $user $ZFS create -V 150m $newvol
-		log_must $ZFS unallow $user reservation $fs
+		log_must zfs allow $user reservation $fs
+		user_run $user zfs create -V 150m $newvol
+		log_must zfs unallow $user reservation $fs
 		if datasetexists $newvol ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user refreservation $fs
-		user_run $user $ZFS create -V 150m $newvol
-		log_must $ZFS unallow $user refreservation $fs
+		log_must zfs allow $user refreservation $fs
+		user_run $user zfs create -V 150m $newvol
+		log_must zfs unallow $user refreservation $fs
 		if datasetexists $newvol ; then
 			return 1
 		fi
 
-		log_must $ZFS allow $user mount $fs
-		log_must $ZFS allow $user reservation $fs
-		log_must $ZFS allow $user refreservation $fs
-		user_run $user $ZFS create -V 150m $newvol
-		log_must $ZFS unallow $user mount $fs
-		log_must $ZFS unallow $user reservation $fs
-		log_must $ZFS unallow $user refreservation $fs
+		log_must zfs allow $user mount $fs
+		log_must zfs allow $user reservation $fs
+		log_must zfs allow $user refreservation $fs
+		user_run $user zfs create -V 150m $newvol
+		log_must zfs unallow $user mount $fs
+		log_must zfs unallow $user reservation $fs
+		log_must zfs unallow $user refreservation $fs
 		if ! datasetexists $newvol ; then
 			return 1
 		fi
-		log_must $ZFS destroy $newvol
+		log_must zfs destroy $newvol
 	fi
 
 	return 0
@@ -644,21 +644,21 @@ function verify_fs_destroy
 	typeset fs=$3
 
 	if ! ismounted $fs ; then
-		user_run $user $ZFS destroy $fs
+		user_run $user zfs destroy $fs
 		if datasetexists $fs ; then
 			return 1
 		fi
 	fi
 
 	if ismounted $fs ; then
-		user_run $user $ZFS destroy $fs
+		user_run $user zfs destroy $fs
 		if ! datasetexists $fs ; then
 			return 1
 		fi
 
 		# mount permission is required
-		log_must $ZFS allow $user mount $fs
-		user_run $user $ZFS destroy $fs
+		log_must zfs allow $user mount $fs
+		user_run $user zfs destroy $fs
 		if datasetexists $fs ; then
 			return 1
 		fi
@@ -677,36 +677,36 @@ function verify_fs_snapshot
 	typeset perm=$2
 	typeset fs=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 	typeset snap=$fs@snap.$stamp
 	typeset mntpt=$(get_prop mountpoint $fs)
 
 	if [[ "yes" == $(get_prop mounted $fs) ]]; then
-		log_must $ZFS umount $fs
+		log_must zfs umount $fs
 	fi
 
-	user_run $user $ZFS snapshot $snap
+	user_run $user zfs snapshot $snap
 	if ! datasetexists $snap ; then
 		return 1
 	fi
-	log_must $ZFS destroy $snap
+	log_must zfs destroy $snap
 
 	if [[ "no" == $(get_prop mounted $fs) ]]; then
-		log_must $ZFS mount $fs
+		log_must zfs mount $fs
 	fi
 
-	user_run $user $ZFS snapshot $snap
+	user_run $user zfs snapshot $snap
 	if ! datasetexists $snap ; then
 		return 1
 	fi
-	log_must $ZFS destroy $snap
+	log_must zfs destroy $snap
 
 	typeset snapdir=${mntpt}/.zfs/snapshot/snap.$stamp
-	user_run $user $MKDIR $snapdir
+	user_run $user mkdir $snapdir
 	if ! datasetexists $snap ; then
 		return 1
 	fi
-	log_must $ZFS destroy $snap
+	log_must zfs destroy $snap
 
 	return 0
 }
@@ -718,19 +718,19 @@ function verify_fs_rollback
 	typeset fs=$3
 
 	typeset oldval
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 	typeset snap=$fs@snap.$stamp
 	typeset mntpt=$(get_prop mountpoint $fs)
 
 	oldval=$(datasetcksum $fs)
-	log_must $ZFS snapshot $snap
+	log_must zfs snapshot $snap
 
 	if ! ismounted $fs; then
-		log_must $ZFS mount $fs
+		log_must zfs mount $fs
 	fi
-	log_must $TOUCH $mntpt/testfile.$stamp
+	log_must touch $mntpt/testfile.$stamp
 
-	user_run $user $ZFS rollback -R $snap
+	user_run $user zfs rollback -R $snap
 	if is_global_zone ; then
 		if [[ $oldval != $(datasetcksum $fs) ]]; then
 			return 1
@@ -751,41 +751,41 @@ function verify_fs_clone
 	typeset perm=$2
 	typeset fs=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basefs=${fs%/*}
 	typeset snap=$fs@snap.$stamp
 	typeset clone=$basefs/cfs.$stamp
 
-	log_must $ZFS snapshot $snap
-	user_run $user $ZFS clone $snap $clone
+	log_must zfs snapshot $snap
+	user_run $user zfs clone $snap $clone
 	if datasetexists $clone ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user create $basefs
-	user_run $user $ZFS clone $snap $clone
-	log_must $ZFS unallow $user create $basefs
+	log_must zfs allow $user create $basefs
+	user_run $user zfs clone $snap $clone
+	log_must zfs unallow $user create $basefs
 	if datasetexists $clone ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $basefs
-	user_run $user $ZFS clone $snap $clone
-	log_must $ZFS unallow $user mount $basefs
+	log_must zfs allow $user mount $basefs
+	user_run $user zfs clone $snap $clone
+	log_must zfs unallow $user mount $basefs
 	if datasetexists $clone ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $basefs
-	log_must $ZFS allow $user create $basefs
-	user_run $user $ZFS clone $snap $clone
-	log_must $ZFS unallow $user create $basefs
-	log_must $ZFS unallow $user mount $basefs
+	log_must zfs allow $user mount $basefs
+	log_must zfs allow $user create $basefs
+	user_run $user zfs clone $snap $clone
+	log_must zfs unallow $user create $basefs
+	log_must zfs unallow $user mount $basefs
 	if ! datasetexists $clone ; then
 		return 1
 	fi
 
-	log_must $ZFS destroy -R $snap
+	log_must zfs destroy -R $snap
 
 	return 0
 }
@@ -796,79 +796,79 @@ function verify_fs_rename
 	typeset perm=$2
 	typeset fs=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basefs=${fs%/*}
 	typeset snap=$fs@snap.$stamp
 	typeset renamefs=$basefs/nfs.$stamp
 
 	if ! ismounted $fs; then
-		log_must $ZFS mount $fs
+		log_must zfs mount $fs
 	fi
 
 	# case 1
-	user_run $user $ZFS rename $fs $renamefs
+	user_run $user zfs rename $fs $renamefs
 	if datasetexists $renamefs ; then
 		return 1
 	fi
 
 	# case 2
-	log_must $ZFS allow $user create $basefs
-	user_run $user $ZFS rename $fs $renamefs
-	log_must $ZFS unallow $user create $basefs
+	log_must zfs allow $user create $basefs
+	user_run $user zfs rename $fs $renamefs
+	log_must zfs unallow $user create $basefs
 	if datasetexists $renamefs ; then
 		return 1
 	fi
 
 	# case 3
-	log_must $ZFS allow $user mount $basefs
-	user_run $user $ZFS rename $fs $renamefs
-	log_must $ZFS unallow $user mount $basefs
+	log_must zfs allow $user mount $basefs
+	user_run $user zfs rename $fs $renamefs
+	log_must zfs unallow $user mount $basefs
 	if datasetexists $renamefs ; then
 		return 1
 	fi
 
 	# case 4
-	log_must $ZFS allow $user mount $fs
-	user_run $user $ZFS rename $fs $renamefs
+	log_must zfs allow $user mount $fs
+	user_run $user zfs rename $fs $renamefs
 	if datasetexists $renamefs ; then
-		log_must $ZFS unallow $user mount $renamefs
+		log_must zfs unallow $user mount $renamefs
 		return 1
 	fi
-	log_must $ZFS unallow $user mount $fs
+	log_must zfs unallow $user mount $fs
 
 	# case 5
-	log_must $ZFS allow $user create $basefs
-	log_must $ZFS allow $user mount $fs
-	user_run $user $ZFS rename $fs $renamefs
-	log_must $ZFS unallow $user create $basefs
+	log_must zfs allow $user create $basefs
+	log_must zfs allow $user mount $fs
+	user_run $user zfs rename $fs $renamefs
+	log_must zfs unallow $user create $basefs
 	if datasetexists $renamefs ; then
-		log_must $ZFS unallow $user mount $renamefs
+		log_must zfs unallow $user mount $renamefs
 		return 1
 	fi
-	log_must $ZFS unallow $user mount $fs
+	log_must zfs unallow $user mount $fs
 
 	# case 6
-	log_must $ZFS allow $user mount $basefs
-	log_must $ZFS allow $user mount $fs
-	user_run $user $ZFS rename $fs $renamefs
-	log_must $ZFS unallow $user mount $basefs
+	log_must zfs allow $user mount $basefs
+	log_must zfs allow $user mount $fs
+	user_run $user zfs rename $fs $renamefs
+	log_must zfs unallow $user mount $basefs
 	if datasetexists $renamefs ; then
-		log_must $ZFS unallow $user mount $renamefs
+		log_must zfs unallow $user mount $renamefs
 		return 1
 	fi
-	log_must $ZFS unallow $user mount $fs
+	log_must zfs unallow $user mount $fs
 
 	# case 7
-	log_must $ZFS allow $user create $basefs
-	log_must $ZFS allow $user mount $basefs
-	user_run $user $ZFS rename $fs $renamefs
-	log_must $ZFS unallow $user mount $basefs
-	log_must $ZFS unallow $user create $basefs
+	log_must zfs allow $user create $basefs
+	log_must zfs allow $user mount $basefs
+	user_run $user zfs rename $fs $renamefs
+	log_must zfs unallow $user mount $basefs
+	log_must zfs unallow $user create $basefs
 	if ! datasetexists $renamefs ; then
 		return 1
 	fi
 
-	log_must $ZFS rename $renamefs $fs
+	log_must zfs rename $renamefs $fs
 
 	return 0
 }
@@ -879,36 +879,36 @@ function verify_fs_mount
 	typeset perm=$2
 	typeset fs=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 	typeset mntpt=$(get_prop mountpoint $fs)
 	typeset newmntpt=/tmp/mnt.$stamp
 
 	if ismounted $fs ; then
-		user_run $user $ZFS unmount $fs
+		user_run $user zfs unmount $fs
 		if ismounted $fs ; then
 			return 1
 		fi
 	fi
 
 	if ! ismounted $fs ; then
-		log_must $ZFS set mountpoint=$newmntpt $fs
-		log_must $RM -rf $newmntpt
-		log_must $MKDIR $newmntpt
+		log_must zfs set mountpoint=$newmntpt $fs
+		log_must rm -rf $newmntpt
+		log_must mkdir $newmntpt
 
-		user_run $user $ZFS mount $fs
+		user_run $user zfs mount $fs
 		if ismounted $fs ; then
 			return 1
 		fi
 
 		# mountpoint's owner must be the user
-		log_must $CHOWN $user $newmntpt
-		user_run $user $ZFS mount $fs
+		log_must chown $user $newmntpt
+		user_run $user zfs mount $fs
 		if ! ismounted $fs ; then
 			return 1
 		fi
-		log_must $ZFS umount $fs
-		log_must $RM -rf $newmntpt
-		log_must $ZFS set mountpoint=$mntpt $fs
+		log_must zfs umount $fs
+		log_must rm -rf $newmntpt
+		log_must zfs set mountpoint=$mntpt $fs
 	fi
 
 	return 0
@@ -921,22 +921,22 @@ function verify_fs_share
 	typeset fs=$3
 	typeset -i ret=0
 
-	$SVCADM enable -rs nfs/server
-	typeset stat=$($SVCS -H -o STA nfs/server:default)
+	svcadm enable -rs nfs/server
+	typeset stat=$(svcs -H -o STA nfs/server:default)
 	if [[ $stat != "ON" ]]; then
 		log_fail "Could not enable nfs/server"
 	fi
 
-	log_must $ZFS set sharenfs=on $fs
-	$ZFS unshare $fs
+	log_must zfs set sharenfs=on $fs
+	zfs unshare $fs
 
-	user_run $user $ZFS share $fs
+	user_run $user zfs share $fs
 	if ! is_shared $fs; then
 		ret=1
 	fi
 
-	$ZFS unshare $fs
-	log_must $ZFS set sharenfs=off $fs
+	zfs unshare $fs
+	log_must zfs set sharenfs=off $fs
 
 	return $ret
 }
@@ -947,34 +947,34 @@ function verify_fs_mountpoint
 	typeset perm=$2
 	typeset fs=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 	typeset mntpt=$(get_prop mountpoint $fs)
 	typeset newmntpt=/tmp/mnt.$stamp
 
 	if ! ismounted $fs ; then
-		user_run $user $ZFS set mountpoint=$newmntpt $fs
+		user_run $user zfs set mountpoint=$newmntpt $fs
 		if [[ $newmntpt != \
 			$(get_prop mountpoint $fs) ]] ; then
 			return 1
 		fi
-		log_must $ZFS set mountpoint=$mntpt $fs
+		log_must zfs set mountpoint=$mntpt $fs
 	fi
 
 	if ismounted $fs ; then
-		user_run $user $ZFS set mountpoint=$newmntpt $fs
+		user_run $user zfs set mountpoint=$newmntpt $fs
 		if [[ $mntpt != $(get_prop mountpoint $fs) ]]; then
 			return 1
 		fi
 
 		# require mount permission when fs is mounted
-		log_must $ZFS allow $user mount $fs
-		user_run $user $ZFS set mountpoint=$newmntpt $fs
-		log_must $ZFS unallow $user mount $fs
+		log_must zfs allow $user mount $fs
+		user_run $user zfs set mountpoint=$newmntpt $fs
+		log_must zfs unallow $user mount $fs
 		if [[ $newmntpt != \
 			$(get_prop mountpoint $fs) ]] ; then
 			return 1
 		fi
-		log_must $ZFS set mountpoint=$mntpt $fs
+		log_must zfs set mountpoint=$mntpt $fs
 	fi
 
 	return 0
@@ -986,19 +986,19 @@ function verify_fs_promote
 	typeset perm=$2
 	typeset fs=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basefs=${fs%/*}
 	typeset snap=$fs@snap.$stamp
 	typeset clone=$basefs/cfs.$stamp
 
-	log_must $ZFS snapshot $snap
-	log_must $ZFS clone $snap $clone
-	log_must $ZFS promote $clone
+	log_must zfs snapshot $snap
+	log_must zfs clone $snap $clone
+	log_must zfs promote $clone
 
 	typeset fs_orig=$(get_prop origin $fs)
 	typeset clone_orig=$(get_prop origin $clone)
 
-	user_run $user $ZFS promote $fs
+	user_run $user zfs promote $fs
 	# promote should fail if original fs does not have
 	# promote permission
 	if [[ $fs_orig != $(get_prop origin $fs) || \
@@ -1006,27 +1006,27 @@ function verify_fs_promote
 		return 1
 	fi
 
-	log_must $ZFS allow $user promote $clone
-	user_run $user $ZFS promote $fs
-	log_must $ZFS unallow $user promote $clone
+	log_must zfs allow $user promote $clone
+	user_run $user zfs promote $fs
+	log_must zfs unallow $user promote $clone
 	if [[ $fs_orig != $(get_prop origin $fs) || \
 		$clone_orig != $(get_prop origin $clone) ]]; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $fs
-	user_run $user $ZFS promote $fs
-	log_must $ZFS unallow $user mount $fs
+	log_must zfs allow $user mount $fs
+	user_run $user zfs promote $fs
+	log_must zfs unallow $user mount $fs
 	if [[ $fs_orig != $(get_prop origin $fs) || \
 		$clone_orig != $(get_prop origin $clone) ]]; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $fs
-	log_must $ZFS allow $user promote $clone
-	user_run $user $ZFS promote $fs
-	log_must $ZFS unallow $user promote $clone
-	log_must $ZFS unallow $user mount $fs
+	log_must zfs allow $user mount $fs
+	log_must zfs allow $user promote $clone
+	user_run $user zfs promote $fs
+	log_must zfs unallow $user promote $clone
+	log_must zfs unallow $user mount $fs
 	if [[ $snap != $(get_prop origin $clone) || \
 		$clone_orig != $(get_prop origin $fs) ]]; then
 		return 1
@@ -1042,7 +1042,7 @@ function verify_fs_canmount
 	typeset fs=$3
 
 	typeset oldval
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
 
 	if ! ismounted $fs ; then
 		set -A modes "on" "off"
@@ -1052,8 +1052,8 @@ function verify_fs_canmount
 		elif [[ $oldval == "off" ]]; then
 			n=0
 		fi
-		log_note "$user $ZFS set $perm=${modes[$n]} $fs"
-		user_run $user $ZFS set $perm=${modes[$n]} $fs
+		log_note "$user zfs set $perm=${modes[$n]} $fs"
+		user_run $user zfs set $perm=${modes[$n]} $fs
 		if [[ ${modes[$n]} != $(get_prop $perm $fs) ]]; then
 			return 1
 		fi
@@ -1071,10 +1071,10 @@ function verify_fs_canmount
 		elif [[ $oldval == "off" ]]; then
 			n=0
 		fi
-		log_note "$user $ZFS set $perm=${modes[$n]} $fs"
-		log_must $ZFS allow $user mount $fs
-		user_run $user $ZFS set $perm=${modes[$n]} $fs
-		log_must $ZFS unallow $user mount $fs
+		log_note "$user zfs set $perm=${modes[$n]} $fs"
+		log_must zfs allow $user mount $fs
+		user_run $user zfs set $perm=${modes[$n]} $fs
+		log_must zfs unallow $user mount $fs
 		if [[ ${modes[$n]} != $(get_prop $perm $fs) ]]; then
 			return 1
 		fi
@@ -1090,7 +1090,7 @@ function verify_fs_recordsize
 	typeset fs=$3
 
 	typeset value8k=$(( 1024 * 8 ))
-	user_run $user $ZFS set recordsize=$value8k $fs
+	user_run $user zfs set recordsize=$value8k $fs
 	if [[ $value8k != $(get_prop recordsize $fs) ]]; then
 		return 1
 	fi
@@ -1105,7 +1105,7 @@ function verify_fs_quota
 	typeset fs=$3
 
 	typeset value32m=$(( 1024 * 1024 * 32 ))
-	user_run $user $ZFS set quota=$value32m $fs
+	user_run $user zfs set quota=$value32m $fs
 	if [[ $value32m != $(get_prop quota $fs) ]]; then
 		return 1
 	fi
@@ -1129,8 +1129,8 @@ function verify_fs_aclmode
 	elif [[ $oldval == "passthrough" ]]; then
 		n=0
 	fi
-	log_note "$user $ZFS set aclmode=${modes[$n]} $fs"
-	user_run $user $ZFS set aclmode=${modes[$n]} $fs
+	log_note "$user zfs set aclmode=${modes[$n]} $fs"
+	user_run $user zfs set aclmode=${modes[$n]} $fs
 	if [[ ${modes[$n]} != $(get_prop aclmode $fs) ]]; then
 		return 1
 	fi
@@ -1161,8 +1161,8 @@ function verify_fs_aclinherit
 	elif [[ $oldval == "passthrough" ]]; then
 		n=0
 	fi
-	log_note "$user $ZFS set aclinherit=${modes[$n]} $fs"
-	user_run $user $ZFS set aclinherit=${modes[$n]} $fs
+	log_note "$user zfs set aclinherit=${modes[$n]} $fs"
+	user_run $user zfs set aclinherit=${modes[$n]} $fs
 
 	typeset newval=$(get_prop aclinherit $fs)
 	if [[ ${modes[$n]} == "secure" && $newval == "restricted" ]]; then
@@ -1188,8 +1188,8 @@ function verify_fs_snapdir
 	elif [[ $oldval == "hidden" ]]; then
 		n=0
 	fi
-	log_note "$user $ZFS set snapdir=${modes[$n]} $fs"
-	user_run $user $ZFS set snapdir=${modes[$n]} $fs
+	log_note "$user zfs set snapdir=${modes[$n]} $fs"
+	user_run $user zfs set snapdir=${modes[$n]} $fs
 	if [[ ${modes[$n]} != $(get_prop snapdir $fs) ]]; then
 		return 1
 	fi
@@ -1211,8 +1211,8 @@ function verify_fs_aedsx
 	elif [[ $oldval == "off" ]]; then
 		n=0
 	fi
-	log_note "$user $ZFS set $perm=${modes[$n]} $fs"
-	user_run $user $ZFS set $perm=${modes[$n]} $fs
+	log_note "$user zfs set $perm=${modes[$n]} $fs"
+	user_run $user zfs set $perm=${modes[$n]} $fs
 	if [[ ${modes[$n]} != $(get_prop $perm $fs) ]]; then
 		return 1
 	fi
@@ -1234,25 +1234,25 @@ function verify_fs_zoned
 	elif [[ $oldval == "off" ]]; then
 		n=0
 	fi
-	log_note "$user $ZFS set $perm=${modes[$n]} $fs"
+	log_note "$user zfs set $perm=${modes[$n]} $fs"
 	if is_global_zone ; then
 		if ! ismounted $fs ; then
-			user_run $user $ZFS set \
+			user_run $user zfs set \
 				$perm=${modes[$n]} $fs
 			if [[ ${modes[$n]} != \
 				$(get_prop $perm $fs) ]]; then
 				return 1
 			fi
 			if [[ $n -eq 0 ]]; then
-				log_mustnot $ZFS mount $fs
+				log_mustnot zfs mount $fs
 			else
-				log_must $ZFS mount $fs
+				log_must zfs mount $fs
 			fi
 		fi
 
 		if ismounted $fs; then
 			# n always is 1 in this case
-			user_run $user $ZFS set \
+			user_run $user zfs set \
 				$perm=${modes[$n]} $fs
 			if [[ $oldval != \
 				$(get_prop $perm $fs) ]]; then
@@ -1261,10 +1261,10 @@ function verify_fs_zoned
 
 			# mount permission is needed
 			# to make zoned=on
-			log_must $ZFS allow $user mount $fs
-			user_run $user $ZFS set \
+			log_must zfs allow $user mount $fs
+			user_run $user zfs set \
 				$perm=${modes[$n]} $fs
-			log_must $ZFS unallow $user mount $fs
+			log_must zfs unallow $user mount $fs
 			if [[ ${modes[$n]} != \
 				$(get_prop $perm $fs) ]]; then
 				return 1
@@ -1273,7 +1273,7 @@ function verify_fs_zoned
 	fi
 
 	if ! is_global_zone; then
-		user_run $user $ZFS set $perm=${modes[$n]} $fs
+		user_run $user zfs set $perm=${modes[$n]} $fs
 		if [[ $oldval != $(get_prop $perm $fs) ]]; then
 			return 1
 		fi
@@ -1296,14 +1296,14 @@ function verify_fs_sharenfs
 		nmode="off"
 	fi
 
-	log_note "$user $ZFS set $perm=$nmode $fs"
-	user_run $user $ZFS set $perm=$nmode $fs
+	log_note "$user zfs set $perm=$nmode $fs"
+	user_run $user zfs set $perm=$nmode $fs
 	if [[ $(get_prop $perm $fs) != $nmode ]]; then
 		return 1
 	fi
 
-	log_note "$user $ZFS set $perm=$omode $fs"
-	user_run $user $ZFS set $perm=$omode $fs
+	log_note "$user zfs set $perm=$omode $fs"
+	user_run $user zfs set $perm=$omode $fs
 	if [[ $(get_prop $perm $fs) != $omode ]]; then
 		return 1
 	fi
@@ -1317,14 +1317,14 @@ function verify_vol_destroy
 	typeset perm=$2
 	typeset vol=$3
 
-	user_run $user $ZFS destroy $vol
+	user_run $user zfs destroy $vol
 	if ! datasetexists $vol ; then
 		return 1
 	fi
 
 	# mount permission is required
-	log_must $ZFS allow $user mount $vol
-	user_run $user $ZFS destroy $vol
+	log_must zfs allow $user mount $vol
+	user_run $user zfs destroy $vol
 	if datasetexists $vol ; then
 		return 1
 	fi
@@ -1338,18 +1338,18 @@ function verify_vol_snapshot
 	typeset perm=$2
 	typeset vol=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basevol=${vol%/*}
 	typeset snap=$vol@snap.$stamp
 
-	user_run $user $ZFS snapshot $snap
+	user_run $user zfs snapshot $snap
 	if datasetexists $snap ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $vol
-	user_run $user $ZFS snapshot $snap
-	log_must $ZFS unallow $user mount $vol
+	log_must zfs allow $user mount $vol
+	user_run $user zfs snapshot $snap
+	log_must zfs unallow $user mount $vol
 	if ! datasetexists $snap ; then
 		return 1
 	fi
@@ -1363,28 +1363,28 @@ function verify_vol_rollback
 	typeset perm=$2
 	typeset vol=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basevol=${vol%/*}
 	typeset snap=$vol@snap.$stamp
 
 	typeset oldval
-	log_must $ZFS snapshot $snap
+	log_must zfs snapshot $snap
 	oldval=$(datasetcksum $vol)
 
-	log_must $DD if=/dev/random of=/dev/zvol/rdsk/$vol \
+	log_must dd if=/dev/random of=/dev/zvol/rdsk/$vol \
 		bs=512 count=1
 
-	user_run $user $ZFS rollback -R $snap
-	$SLEEP 10
+	user_run $user zfs rollback -R $snap
+	sleep 10
 	if [[ $oldval == $(datasetcksum $vol) ]]; then
 		return 1
 	fi
 
 	# rollback on volume has to be with mount permission
-	log_must $ZFS allow $user mount $vol
-	user_run $user $ZFS rollback -R $snap
-	$SLEEP 10
-	log_must $ZFS unallow $user mount $vol
+	log_must zfs allow $user mount $vol
+	user_run $user zfs rollback -R $snap
+	sleep 10
+	log_must zfs unallow $user mount $vol
 	if [[ $oldval != $(datasetcksum $vol) ]]; then
 		return 1
 	fi
@@ -1398,39 +1398,39 @@ function verify_vol_clone
 	typeset perm=$2
 	typeset vol=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basevol=${vol%/*}
 	typeset snap=$vol@snap.$stamp
 	typeset clone=$basevol/cvol.$stamp
 
-	log_must $ZFS snapshot $snap
+	log_must zfs snapshot $snap
 
-	user_run $user $ZFS clone $snap $clone
+	user_run $user zfs clone $snap $clone
 	if datasetexists $clone ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user create $basevol
-	user_run $user $ZFS clone $snap $clone
-	log_must $ZFS unallow $user create $basevol
+	log_must zfs allow $user create $basevol
+	user_run $user zfs clone $snap $clone
+	log_must zfs unallow $user create $basevol
 	if datasetexists $clone ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $basevol
-	user_run $user $ZFS clone $snap $clone
-	log_must $ZFS unallow $user mount $basevol
+	log_must zfs allow $user mount $basevol
+	user_run $user zfs clone $snap $clone
+	log_must zfs unallow $user mount $basevol
 	if datasetexists $clone ; then
 		return 1
 	fi
 
 	# require create permission on parent and
 	# mount permission on itself as well
-	log_must $ZFS allow $user mount $basevol
-	log_must $ZFS allow $user create $basevol
-	user_run $user $ZFS clone $snap $clone
-	log_must $ZFS unallow $user create $basevol
-	log_must $ZFS unallow $user mount $basevol
+	log_must zfs allow $user mount $basevol
+	log_must zfs allow $user create $basevol
+	user_run $user zfs clone $snap $clone
+	log_must zfs unallow $user create $basevol
+	log_must zfs unallow $user mount $basevol
 	if ! datasetexists $clone ; then
 		return 1
 	fi
@@ -1444,43 +1444,43 @@ function verify_vol_rename
 	typeset perm=$2
 	typeset vol=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basevol=${vol%/*}
 	typeset snap=$vol@snap.$stamp
 	typeset clone=$basevol/cvol.$stamp
 	typeset renamevol=$basevol/nvol.$stamp
 
-	user_run $user $ZFS rename $vol $renamevol
+	user_run $user zfs rename $vol $renamevol
 	if datasetexists $renamevol ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user create $basevol
-	user_run $user $ZFS rename $vol $renamevol
-	log_must $ZFS unallow $user create $basevol
+	log_must zfs allow $user create $basevol
+	user_run $user zfs rename $vol $renamevol
+	log_must zfs unallow $user create $basevol
 	if datasetexists $renamevol ; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user mount $basevol
-	user_run $user $ZFS rename $vol $renamevol
-	log_must $ZFS unallow $user mount $basevol
+	log_must zfs allow $user mount $basevol
+	user_run $user zfs rename $vol $renamevol
+	log_must zfs unallow $user mount $basevol
 	if datasetexists $renamevol ; then
 		return 1
 	fi
 
 	# require both create permission on parent and
 	# mount permission on parent as well
-	log_must $ZFS allow $user mount $basevol
-	log_must $ZFS allow $user create $basevol
-	user_run $user $ZFS rename $vol $renamevol
-	log_must $ZFS unallow $user mount $basevol
-	log_must $ZFS unallow $user create $basevol
+	log_must zfs allow $user mount $basevol
+	log_must zfs allow $user create $basevol
+	user_run $user zfs rename $vol $renamevol
+	log_must zfs unallow $user mount $basevol
+	log_must zfs unallow $user create $basevol
 	if ! datasetexists $renamevol ; then
 		return 1
 	fi
 
-	log_must $ZFS rename $renamevol $vol
+	log_must zfs rename $renamevol $vol
 
 	return 0
 }
@@ -1491,14 +1491,14 @@ function verify_vol_promote
 	typeset perm=$2
 	typeset vol=$3
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
+	typeset stamp=${perm}.${user}.$(date +'%F-%H%M%S')
         typeset basevol=${vol%/*}
 	typeset snap=$vol@snap.$stamp
 	typeset clone=$basevol/cvol.$stamp
 
-	log_must $ZFS snapshot $snap
-	log_must $ZFS clone $snap $clone
-	log_must $ZFS promote $clone
+	log_must zfs snapshot $snap
+	log_must zfs clone $snap $clone
+	log_must zfs promote $clone
 
 	typeset vol_orig=$(get_prop origin $vol)
 	typeset clone_orig=$(get_prop origin $clone)
@@ -1506,7 +1506,7 @@ function verify_vol_promote
 	# promote should fail if $vol and $clone
 	# miss either mount or promote permission
 	# case 1
-	user_run $user $ZFS promote $vol
+	user_run $user zfs promote $vol
 	if [[ $vol_orig != $(get_prop origin $vol) || \
 		$clone_orig != $(get_prop origin $clone) ]];
 	then
@@ -1516,9 +1516,9 @@ function verify_vol_promote
 	# promote should fail if $vol and $clone
 	# miss either mount or promote permission
 	# case 2
-	log_must $ZFS allow $user promote $clone
-	user_run $user $ZFS promote $vol
-	log_must $ZFS unallow $user promote $clone
+	log_must zfs allow $user promote $clone
+	user_run $user zfs promote $vol
+	log_must zfs unallow $user promote $clone
 	if [[ $vol_orig != $(get_prop origin $vol) || \
 		$clone_orig != $(get_prop origin $clone) ]];
 	then
@@ -1528,9 +1528,9 @@ function verify_vol_promote
 	# promote should fail if $vol and $clone
 	# miss either mount or promote permission
 	# case 3
-	log_must $ZFS allow $user mount $vol
-	user_run $user $ZFS promote $vol
-	log_must $ZFS unallow $user mount $vol
+	log_must zfs allow $user mount $vol
+	user_run $user zfs promote $vol
+	log_must zfs unallow $user mount $vol
 	if [[ $vol_orig != $(get_prop origin $vol) || \
 		$clone_orig != $(get_prop origin $clone) ]];
 	then
@@ -1540,9 +1540,9 @@ function verify_vol_promote
 	# promote should fail if $vol and $clone
 	# miss either mount or promote permission
 	# case 4
-	log_must $ZFS allow $user mount $clone
-	user_run $user $ZFS promote $vol
-	log_must $ZFS unallow $user mount $clone
+	log_must zfs allow $user mount $clone
+	user_run $user zfs promote $vol
+	log_must zfs unallow $user mount $clone
 	if [[ $vol_orig != $(get_prop origin $vol) || \
 		$clone_orig != $(get_prop origin $clone) ]];
 	then
@@ -1552,11 +1552,11 @@ function verify_vol_promote
 	# promote should fail if $vol and $clone
 	# miss either mount or promote permission
 	# case 5
-	log_must $ZFS allow $user promote $clone
-	log_must $ZFS allow $user mount $vol
-	user_run $user $ZFS promote $vol
-	log_must $ZFS unallow $user promote $clone
-	log_must $ZFS unallow $user mount $vol
+	log_must zfs allow $user promote $clone
+	log_must zfs allow $user mount $vol
+	user_run $user zfs promote $vol
+	log_must zfs unallow $user promote $clone
+	log_must zfs unallow $user mount $vol
 	if [[ $vol_orig != $(get_prop origin $vol) || \
 		$clone_orig != $(get_prop origin $clone) ]];
 	then
@@ -1566,11 +1566,11 @@ function verify_vol_promote
 	# promote should fail if $vol and $clone
 	# miss either mount or promote permission
 	# case 6
-	log_must $ZFS allow $user promote $clone
-	log_must $ZFS allow $user mount $clone
-	user_run $user $ZFS promote $vol
-	log_must $ZFS unallow $user promote $clone
-	log_must $ZFS unallow $user mount $vol
+	log_must zfs allow $user promote $clone
+	log_must zfs allow $user mount $clone
+	user_run $user zfs promote $vol
+	log_must zfs unallow $user promote $clone
+	log_must zfs unallow $user mount $vol
 	if [[ $vol_orig != $(get_prop origin $vol) || \
 		$clone_orig != $(get_prop origin $clone) ]];
 	then
@@ -1580,11 +1580,11 @@ function verify_vol_promote
 	# promote should fail if $vol and $clone
 	# miss either mount or promote permission
 	# case 7
-	log_must $ZFS allow $user mount $vol
-	log_must $ZFS allow $user mount $clone
-	user_run $user $ZFS promote $vol
-	log_must $ZFS unallow $user mount $vol
-	log_must $ZFS unallow $user mount $clone
+	log_must zfs allow $user mount $vol
+	log_must zfs allow $user mount $clone
+	user_run $user zfs promote $vol
+	log_must zfs unallow $user mount $vol
+	log_must zfs unallow $user mount $clone
 	if [[ $vol_orig != $(get_prop origin $vol) || \
 		$clone_orig != $(get_prop origin $clone) ]];
 	then
@@ -1594,13 +1594,13 @@ function verify_vol_promote
 	# promote only succeeds when $vol and $clone
 	# have both mount and promote permission
 	# case 8
-	log_must $ZFS allow $user promote $clone
-	log_must $ZFS allow $user mount $vol
-	log_must $ZFS allow $user mount $clone
-	user_run $user $ZFS promote $vol
-	log_must $ZFS unallow $user promote $clone
-	log_must $ZFS unallow $user mount $vol
-	log_must $ZFS unallow $user mount $clone
+	log_must zfs allow $user promote $clone
+	log_must zfs allow $user mount $vol
+	log_must zfs allow $user mount $clone
+	user_run $user zfs promote $vol
+	log_must zfs unallow $user promote $clone
+	log_must zfs unallow $user mount $vol
+	log_must zfs unallow $user mount $clone
 	if [[ $snap != $(get_prop origin $clone) || \
 		$clone_orig != $(get_prop origin $vol) ]]; then
 		return 1
@@ -1623,7 +1623,7 @@ function verify_vol_volsize
 
 	if [[ "0" == $reserv_size ]]; then
 		# sparse volume
-		user_run $user $ZFS set volsize=$newval $vol
+		user_run $user zfs set volsize=$newval $vol
 		if [[ $oldval == $(get_prop volsize $vol) ]];
 		then
 			return 1
@@ -1632,17 +1632,17 @@ function verify_vol_volsize
 	else
 		# normal volume, reservation permission
 		# is required
-		user_run $user $ZFS set volsize=$newval $vol
+		user_run $user zfs set volsize=$newval $vol
 		if [[ $newval == $(get_prop volsize $vol) ]];
 		then
 			return 1
 		fi
 
-		log_must $ZFS allow $user reservation $vol
-		log_must $ZFS allow $user refreservation $vol
-		user_run $user $ZFS set volsize=$newval $vol
-		log_must $ZFS unallow $user reservation $vol
-		log_must $ZFS unallow $user refreservation $vol
+		log_must zfs allow $user reservation $vol
+		log_must zfs allow $user refreservation $vol
+		user_run $user zfs set volsize=$newval $vol
+		log_must zfs unallow $user reservation $vol
+		log_must zfs unallow $user refreservation $vol
 		if [[ $oldval == $(get_prop volsize $vol) ]];
 		then
 			return 1
@@ -1660,16 +1660,16 @@ function verify_allow
 
 	typeset -i ret
 
-	user_run $user $ZFS allow $user allow $dtst
+	user_run $user zfs allow $user allow $dtst
 	ret=$?
 	if [[ $ret -eq 0 ]]; then
 		return 1
 	fi
 
-	log_must $ZFS allow $user copies $dtst
-	user_run $user $ZFS allow $user copies $dtst
+	log_must zfs allow $user copies $dtst
+	user_run $user zfs allow $user copies $dtst
 	ret=$?
-	log_must $ZFS unallow $user copies $dtst
+	log_must zfs unallow $user copies $dtst
 	if [[ $ret -eq 1 ]]; then
 		return 1
 	fi
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/setup.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/setup.ksh
index eed8faee26..58cbba2b96 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -34,10 +34,10 @@
 # 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
+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
@@ -54,6 +54,6 @@ log_must add_user $OTHER_GROUP $OTHER2
 
 DISK=${DISKS%% *}
 default_volume_setup $DISK
-log_must $CHMOD 777 $TESTDIR
+log_must chmod 777 $TESTDIR
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_001_pos.ksh
index 32b1a8841a..23db028b25 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -65,34 +65,34 @@ eval set -A dataset $DATASETS
 typeset perms="snapshot,reservation,compression,checksum,send,userprop"
 
 log_note "Create a user called 'everyone'."
-if ! $ID everyone > /dev/null 2>&1; then
+if ! id everyone > /dev/null 2>&1; then
 	user_added="TRUE"
-	log_must $USERADD everyone
+	log_must useradd everyone
 fi
 for dtst in $DATASETS ; do
-	log_must $ZFS allow everyone $perms $dtst
+	log_must zfs allow everyone $perms $dtst
 	log_must verify_perm $dtst $perms $EVERYONE "everyone"
 done
 log_must restore_root_datasets
 if [[ $user_added == "TRUE" ]]; then
-	log_must $USERDEL everyone
+	log_must userdel everyone
 fi
 
 log_note "Created a group called 'everyone'."
-if ! $CAT /etc/group | $AWK -F: '{print $1}' | \
-	$GREP -w 'everyone' > /dev/null 2>&1
+if ! cat /etc/group | awk -F: '{print $1}' | \
+	grep -w 'everyone' > /dev/null 2>&1
 then
 	group_added="TRUE"
-	log_must $GROUPADD everyone
+	log_must groupadd everyone
 fi
 
 for dtst in $DATASETS ; do
-	log_must $ZFS allow everyone $perms $dtst
+	log_must zfs allow everyone $perms $dtst
 	log_must verify_perm $dtst $perms $EVERYONE
 done
 log_must restore_root_datasets
 if [[ $group_added == "TRUE" ]]; then
-	log_must $GROUPDEL everyone
+	log_must groupdel everyone
 fi
 
 log_pass "everyone is always interpreted as keyword passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_002_pos.ksh
index 2da435eec3..71473da451 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -48,7 +48,7 @@ verify_runnable "both"
 
 function cleanup
 {
-	if $ID $STAFF_GROUP > /dev/null 2>&1; then
+	if id $STAFF_GROUP > /dev/null 2>&1; then
 		log_must del_user $STAFF_GROUP
 	fi
 
@@ -61,9 +61,9 @@ log_onexit cleanup
 eval set -A dataset $DATASETS
 typeset perms="snapshot,reservation,compression,checksum,send,userprop"
 
-log_must $USERADD $STAFF_GROUP
+log_must useradd $STAFF_GROUP
 for dtst in $DATASETS ; do
-	log_must $ZFS allow $STAFF_GROUP $perms $dtst
+	log_must zfs allow $STAFF_GROUP $perms $dtst
 	log_must verify_perm $dtst $perms $STAFF_GROUP
 	log_must verify_noperm $dtst $perms $STAFF1 $STAFF2
 done
@@ -72,7 +72,7 @@ log_must restore_root_datasets
 
 log_must del_user $STAFF_GROUP
 for dtst in $datasets ; do
-	log_must $ZFS allow $STAFF_GROUP $perms $dtst
+	log_must zfs allow $STAFF_GROUP $perms $dtst
 	log_must verify_perm $dtst $perms $STAFF1 $STAFF2
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_003_pos.ksh
index 21cf4a04ad..d8eb58ae1d 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -53,10 +53,10 @@ childfs=$ROOT_TESTFS/childfs
 eval set -A dataset $DATASETS
 typeset perms="snapshot,reservation,compression,checksum,userprop"
 
-log_must $ZFS create $childfs
+log_must zfs create $childfs
 
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -l $STAFF1 $perms $dtst
+	log_must zfs allow -l $STAFF1 $perms $dtst
 	log_must verify_perm $dtst $perms $STAFF1
 	if [[ $dtst == $ROOT_TESTFS ]] ; then
 		log_must verify_noperm $childfs $perms \
@@ -66,9 +66,9 @@ done
 
 log_must restore_root_datasets
 
-log_must $ZFS create $childfs
+log_must zfs create $childfs
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -l -g $STAFF_GROUP $perms $dtst
+	log_must zfs allow -l -g $STAFF_GROUP $perms $dtst
 	log_must verify_perm $dtst $perms $STAFF1 $STAFF2
 	if [[ $dtst == $ROOT_TESTFS ]] ; then
 		log_must verify_noperm $childfs $perms \
@@ -78,9 +78,9 @@ done
 
 log_must restore_root_datasets
 
-log_must $ZFS create $childfs
+log_must zfs create $childfs
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -l -e $perms $dtst
+	log_must zfs allow -l -e $perms $dtst
 	log_must verify_perm $dtst $perms $STAFF1 $STAFF2 $OTHER1 $OTHER2
 	if [[ $dtst == $ROOT_TESTFS ]] ; then
 		log_must verify_noperm $childfs $perms \
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_004_pos.ksh
index c1cdb3c343..1462f5ebe9 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -58,9 +58,9 @@ eval set -A dataset $DATASETS
 typeset perms="snapshot,reservation,compression,checksum,userprop"
 
 # Verify option '-d' only affect sub-datasets
-log_must $ZFS create $childfs
+log_must zfs create $childfs
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -d $STAFF1 $perms $dtst
+	log_must zfs allow -d $STAFF1 $perms $dtst
 	log_must verify_noperm $dtst $perms $STAFF1
 	if [[ $dtst == $ROOT_TESTFS ]]; then
 		log_must verify_perm $childfs $perms $STAFF1
@@ -70,9 +70,9 @@ done
 log_must restore_root_datasets
 
 # Verify option '-d + -g' affect group in sub-datasets.
-log_must $ZFS create $childfs
+log_must zfs create $childfs
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -d -g $STAFF_GROUP $perms $dtst
+	log_must zfs allow -d -g $STAFF_GROUP $perms $dtst
 	log_must verify_noperm $dtst $perms $STAFF2
 	if [[ $dtst == $ROOT_TESTFS ]]; then
 		log_must verify_perm $childfs $perms $STAFF2
@@ -82,9 +82,9 @@ done
 log_must restore_root_datasets
 
 # Verify option '-d + -e' affect everyone in sub-datasets.
-log_must $ZFS create $childfs
+log_must zfs create $childfs
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -d -e $perms $dtst
+	log_must zfs allow -d -e $perms $dtst
 	log_must verify_noperm $dtst $perms $OTHER1 $OTHER2
 	if [[ $dtst == $ROOT_TESTFS ]]; then
 		log_must verify_perm $childfs $perms $OTHER1 $OTHER2
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_005_pos.ksh
index 93426430e6..3feb598c4c 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -52,16 +52,16 @@ log_onexit restore_root_datasets
 eval set -A dataset $DATASETS
 typeset perms="snapshot,reservation,compression,checksum,userprop"
 
-log_must $ZFS allow -l everyone create,mount $ROOT_TESTFS
-log_must $ZFS allow -c $perms $ROOT_TESTFS
+log_must zfs allow -l everyone create,mount $ROOT_TESTFS
+log_must zfs allow -c $perms $ROOT_TESTFS
 
 mntpnt=$(get_prop mountpoint $ROOT_TESTFS)
-log_must $CHMOD 777 $mntpnt
+log_must chmod 777 $mntpnt
 
 for user in $EVERYONE; do
 	childfs=$ROOT_TESTFS/$user
 
-	user_run $user $ZFS create $childfs
+	user_run $user zfs create $childfs
 
 	for other in $EVERYONE; do
 		#
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_006_pos.ksh
index e8cdf2586a..2fc05dee90 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -51,21 +51,21 @@ log_assert "Changing permissions in a set will change what is allowed " \
 log_onexit restore_root_datasets
 
 fs1=$ROOT_TESTFS/fs1; fs2=$ROOT_TESTFS/fs2
-log_must $ZFS create $fs1
-log_must $ZFS create $fs2
+log_must zfs create $fs1
+log_must zfs create $fs2
 
 eval set -A dataset $DATASETS
 perms1="snapshot,checksum,reservation"
 
 for dtst in $DATASETS $fs1 $fs2; do
-	log_must $ZFS allow -s @basic $perms1 $dtst
-	log_must $ZFS allow $STAFF1 @basic $dtst
+	log_must zfs allow -s @basic $perms1 $dtst
+	log_must zfs allow $STAFF1 @basic $dtst
 	log_must verify_perm $dtst $perms1 $STAFF1
 done
 
 perms2="send,compression,userprop"
 for dtst in $DATASETS $fs1 $fs2; do
-	log_must $ZFS allow -s @basic $perms2 $dtst
+	log_must zfs allow -s @basic $perms2 $dtst
 	log_must verify_perm $dtst ${perms1},${perms2} $STAFF1
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh
index 5305deb532..ea43fcf033 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -62,16 +62,16 @@ typeset perms2="checksum,send,userprop"
 #
 childfs=$ROOT_TESTFS/childfs
 grandchild=$childfs/grandchild
-log_must $ZFS create $childfs
-log_must $ZFS create $grandchild
+log_must zfs create $childfs
+log_must zfs create $grandchild
 
 #
 # Setting different permissions to the same set on two level.
 # But only assign the user at one level.
 #
-log_must $ZFS allow -s @set $perms1 $ROOT_TESTFS
-log_must $ZFS allow -s @set $perms2 $childfs
-log_must $ZFS allow $STAFF1 @set $childfs
+log_must zfs allow -s @set $perms1 $ROOT_TESTFS
+log_must zfs allow -s @set $perms2 $childfs
+log_must zfs allow $STAFF1 @set $childfs
 
 #
 # Verify only perms2 is valid to user on the level which he was assigned.
@@ -86,7 +86,7 @@ done
 # Delegate @set to STAFF1 on ROOT_TESTFS, verify $perms1 will not be appended
 # to its descendent datasets since it is masked
 #
-log_must $ZFS allow $STAFF1 @set $ROOT_TESTFS
+log_must zfs allow $STAFF1 @set $ROOT_TESTFS
 log_must verify_perm $ROOT_TESTFS $perms1 $STAFF1
 for fs in $childfs $grandchild ; do
 	log_must verify_noperm $fs $perms1 $STAFF1
@@ -94,7 +94,7 @@ for fs in $childfs $grandchild ; do
 done
 
 # Remove the mask, $perms1 will be allowed to its descendent datasets
-log_must $ZFS unallow -s @set $childfs
+log_must zfs unallow -s @set $childfs
 for fs in $childfs $grandchild ; do
 	log_must verify_noperm $fs $perms2 $STAFF1
 	log_must verify_perm $fs $perms1 $STAFF1
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh
index fb02b9af33..48de842b7e 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -51,27 +51,27 @@ perms1="snapshot,reservation"
 perms2="send,compression,checksum,userprop"
 childfs=$ROOT_TESTFS/childfs
 
-log_must $ZFS create $childfs
+log_must zfs create $childfs
 
 for dtst in $DATASETS ; do
 	# Delegate local permission to $STAFF1
-	log_must $ZFS allow -l $STAFF1 $perms1 $dtst
-	log_must $ZFS allow -l $STAFF1 allow $dtst
+	log_must zfs allow -l $STAFF1 $perms1 $dtst
+	log_must zfs allow -l $STAFF1 allow $dtst
 
 	if [[ $dtst == $ROOT_TESTFS ]]; then
-		log_must $ZFS allow -l $STAFF1 $perms2 $childfs
+		log_must zfs allow -l $STAFF1 $perms2 $childfs
 		# $perms1 is local permission in $ROOT_TESTFS
-		log_mustnot user_run $STAFF1 $ZFS allow $OTHER1 $perms1 $childfs
+		log_mustnot user_run $STAFF1 zfs allow $OTHER1 $perms1 $childfs
 		log_must verify_noperm $childfs $perms1 $OTHER1
 	fi
 
 	# Verify 'allow' give non-privilege user delegated permission.
-	log_must user_run $STAFF1 $ZFS allow -l $OTHER1 $perms1 $dtst
+	log_must user_run $STAFF1 zfs allow -l $OTHER1 $perms1 $dtst
 	log_must verify_perm $dtst $perms1 $OTHER1
 
 	# $perms2 was not allow to $STAFF1, so he have no permission to
 	# delegate permission to other else.
-	log_mustnot user_run $STAFF1 $ZFS allow $OTHER1 $perms2 $dtst
+	log_mustnot user_run $STAFF1 zfs allow $OTHER1 $perms2 $dtst
 	log_must verify_noperm $dtst $perms2 $OTHER1
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_009_neg.ksh
index 4da16538cc..c2c9110204 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -49,16 +49,16 @@ log_onexit restore_root_datasets
 # Permission sets are limited to 64 characters in length.
 longset="set123456789012345678901234567890123456789012345678901234567890123"
 for dtst in $DATASETS ; do
-	log_mustnot eval "$ZFS allow -s @$longset $dtst"
+	log_mustnot eval "zfs allow -s @$longset $dtst"
 	# Create non-existent permission set
-	typeset timestamp=$($DATE +'%F-%R:%S')
-	log_mustnot $ZFS allow -s @non-existent $dtst
-	log_mustnot $ZFS allow $STAFF "atime,created,mounted" $dtst
-	log_mustnot $ZFS allow $dtst $TESTPOOL
-	log_mustnot $ZFS allow -c $dtst
-	log_mustnot $ZFS allow -u $STAFF1 $dtst
-	log_mustnot $ZFS allow -u $STAFF1 -g $STAFF_GROUP "create,destroy" $dtst
-	log_mustnot $ZFS allow -u $STAFF1 -e "mountpoint" $dtst
+	typeset timestamp=$(date +'%F-%R:%S')
+	log_mustnot zfs allow -s @non-existent $dtst
+	log_mustnot zfs allow $STAFF "atime,created,mounted" $dtst
+	log_mustnot zfs allow $dtst $TESTPOOL
+	log_mustnot zfs allow -c $dtst
+	log_mustnot zfs allow -u $STAFF1 $dtst
+	log_mustnot zfs allow -u $STAFF1 -g $STAFF_GROUP "create,destroy" $dtst
+	log_mustnot zfs allow -u $STAFF1 -e "mountpoint" $dtst
 done
 
 log_pass "Invalid arguments are handled correctly."
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh
index 397b1a568f..98e58f9097 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -95,7 +95,7 @@ for dtst in $DATASETS; do
 
 	typeset -i i=0
 	while (( i < ${#perms[@]} )); do
-		log_must $ZFS allow $STAFF1 ${perms[$i]} $dtst
+		log_must zfs allow $STAFF1 ${perms[$i]} $dtst
 
 		if [[ ${perms[((i+k))]} == "true" ]]; then
 			log_must verify_perm $dtst ${perms[$i]} $STAFF1
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_011_neg.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_011_neg.ksh
index 60031c92ca..d4203a8143 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_011_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_011_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -59,7 +59,7 @@ for dtst in $DATASETS ; do
 	typeset -i i=0
 
 	while ((i < ${#invalid_perms[@]})); do
-		log_mustnot $ZFS allow $STAFF1 ${invalid_perms[$i]} $dtst
+		log_mustnot zfs allow $STAFF1 ${invalid_perms[$i]} $dtst
 
 		((i += 1))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_012_neg.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_012_neg.ksh
index c33c29b99e..31e51c819c 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_012_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_allow_012_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -46,7 +46,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	log_must $ZPOOL set delegation=on $TESTPOOL
+	log_must zpool set delegation=on $TESTPOOL
 	log_must restore_root_datasets
 }
 
@@ -61,13 +61,13 @@ set -A perms	create snapshot mount send allow quota reservation \
 		aclmode aclinherit rollback clone rename promote \
 		zoned xattr receive destroy sharenfs share
 
-log_must $ZPOOL set delegation=off $TESTPOOL
+log_must zpool set delegation=off $TESTPOOL
 
 for dtst in $DATASETS; do
 	typeset -i i=0
 	while (( i < ${#perms[@]} )); do
 
-		log_must $ZFS allow $STAFF1 ${perms[$i]} $dtst
+		log_must zfs allow $STAFF1 ${perms[$i]} $dtst
 		log_must verify_noperm $dtst ${perms[$i]} $STAFF1
 
 		log_must restore_root_datasets
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_001_pos.ksh
index a2c34de7a2..178d250ca5 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -49,10 +49,10 @@ log_onexit restore_root_datasets
 log_must setup_unallow_testenv
 
 for dtst in $DATASETS ; do
-	log_must $ZFS unallow -l $STAFF1 $dtst
+	log_must zfs unallow -l $STAFF1 $dtst
 	log_must verify_noperm $dtst $LOCAL_SET $STAFF1
 
-	log_must $ZFS unallow -l $OTHER1 $dtst
+	log_must zfs unallow -l $OTHER1 $dtst
 	log_must verify_noperm $dtst $LOCAL_DESC_SET $OTHER1
 
 	log_must verify_perm $dtst $LOCAL_DESC_SET $OTHER2
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_002_pos.ksh
index c48df76d8a..ea1de97614 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -48,10 +48,10 @@ log_onexit restore_root_datasets
 
 log_must setup_unallow_testenv
 
-log_must $ZFS unallow -d $STAFF2 $ROOT_TESTFS
+log_must zfs unallow -d $STAFF2 $ROOT_TESTFS
 log_must verify_noperm $SUBFS $DESC_SET $STAFF2
 
-log_must $ZFS unallow -d $OTHER1 $ROOT_TESTFS
+log_must zfs unallow -d $OTHER1 $ROOT_TESTFS
 log_must verify_noperm $SUBFS $LOCAL_DESC_SET $OTHER1
 log_must verify_perm $ROOT_TESTFS $LOCAL_DESC_SET $OTHER1
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_003_pos.ksh
index 57dff54620..35eb9a961e 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -53,15 +53,15 @@ log_onexit restore_root_datasets
 log_must setup_unallow_testenv
 
 for dtst in $DATASETS ; do
-	log_must $ZFS unallow $STAFF1 $dtst
-	log_must $ZFS unallow -l -d $STAFF2 $dtst
+	log_must zfs unallow $STAFF1 $dtst
+	log_must zfs unallow -l -d $STAFF2 $dtst
 	log_must verify_noperm $dtst $LOCAL_SET $STAFF1
 	if [[ $dtst == $ROOT_TESTFS ]]; then
 		log_must verify_noperm $SUBFS $DESC_SET $STAFF2
 	fi
 
-	log_must $ZFS unallow -l -d $OTHER1 $dtst
-	log_must $ZFS unallow -r $OTHER2 $dtst
+	log_must zfs unallow -l -d $OTHER1 $dtst
+	log_must zfs unallow -r $OTHER2 $dtst
 	log_must verify_noperm $dtst $LOCAL_DESC_SET $OTHER1 $OTHER2
 	if [[ $dtst == $ROOT_TESTFS ]]; then
 		log_must verify_noperm $SUBFS $LOCAL_DESC_SET $OTHER1 $OTHER2
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_004_pos.ksh
index 0c55551ee5..d41d76bd09 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -48,11 +48,11 @@ log_assert "Verify '-s' will remove permissions from the named set."
 log_onexit restore_root_datasets
 
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -s @basic $LOCAL_DESC_SET $dtst
-	log_must $ZFS allow -u $STAFF1 @basic $dtst
+	log_must zfs allow -s @basic $LOCAL_DESC_SET $dtst
+	log_must zfs allow -u $STAFF1 @basic $dtst
 
 	log_must verify_perm $dtst $LOCAL_DESC_SET $STAFF1
-	log_must $ZFS unallow -s @basic $LOCAL_DESC_SET $dtst
+	log_must zfs unallow -s @basic $LOCAL_DESC_SET $dtst
 	log_must verify_noperm $dtst $LOCAL_DESC_SET $STAFF1
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_005_pos.ksh
index a723e8f961..a97f500ea9 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -49,13 +49,13 @@ verify_runnable "both"
 log_assert "Verify option '-c' will remove the created permission set."
 log_onexit restore_root_datasets
 
-log_must $ZFS allow -c $LOCAL_SET $ROOT_TESTFS
-log_must $ZFS allow -l $STAFF1 create,mount $ROOT_TESTFS
+log_must zfs allow -c $LOCAL_SET $ROOT_TESTFS
+log_must zfs allow -l $STAFF1 create,mount $ROOT_TESTFS
 
 # Create $SUBFS and verify $SUBFS has created time permissions.
-user_run $STAFF1 $ZFS create $SUBFS
+user_run $STAFF1 zfs create $SUBFS
 if ! datasetexists $SUBFS ; then
-	log_fail "ERROR: ($STAFF1): $ZFS create $SUBFS"
+	log_fail "ERROR: ($STAFF1): zfs create $SUBFS"
 fi
 log_must verify_perm $SUBFS $LOCAL_SET $STAFF1
 
@@ -63,10 +63,10 @@ log_must verify_perm $SUBFS $LOCAL_SET $STAFF1
 # After unallow -c, create $SUBFS2 and verify $SUBFS2 has not created time
 # permissions any more.
 #
-log_must $ZFS unallow -c $LOCAL_SET $ROOT_TESTFS
-user_run $STAFF1 $ZFS create $SUBFS2
+log_must zfs unallow -c $LOCAL_SET $ROOT_TESTFS
+user_run $STAFF1 zfs create $SUBFS2
 if ! datasetexists $SUBFS2 ; then
-	log_fail "ERROR: ($STAFF1): $ZFS create $SUBFS2"
+	log_fail "ERROR: ($STAFF1): zfs create $SUBFS2"
 fi
 log_must verify_noperm $SUBFS2 $LOCAL_SET $STAFF1
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_006_pos.ksh
index af9ea49f01..2bba43de9d 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -49,22 +49,22 @@ log_assert "Verify option '-u', '-g' and '-e' only removed the specified type "\
 log_onexit restore_root_datasets
 
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -u $STAFF1 $LOCAL_DESC_SET $dtst
-	log_must $ZFS allow -g $STAFF_GROUP $LOCAL_DESC_SET $dtst
-	log_must $ZFS allow -e $LOCAL_DESC_SET $dtst
+	log_must zfs allow -u $STAFF1 $LOCAL_DESC_SET $dtst
+	log_must zfs allow -g $STAFF_GROUP $LOCAL_DESC_SET $dtst
+	log_must zfs allow -e $LOCAL_DESC_SET $dtst
 
 	log_must verify_perm $dtst $LOCAL_DESC_SET \
 		$STAFF1 $STAFF2 $OTHER1 $OTHER2
 
-	log_must $ZFS unallow -e $dtst
+	log_must zfs unallow -e $dtst
 	log_must verify_perm $dtst $LOCAL_DESC_SET $STAFF1 $STAFF2
 	log_must verify_noperm $dtst $LOCAL_DESC_SET $OTHER1 $OTHER2
 
-	log_must $ZFS unallow -g $STAFF_GROUP $dtst
+	log_must zfs unallow -g $STAFF_GROUP $dtst
 	log_must verify_perm $dtst $LOCAL_DESC_SET $STAFF1
 	log_must verify_noperm $dtst $LOCAL_DESC_SET $STAFF2
 
-	log_must $ZFS unallow -u $STAFF1 $dtst
+	log_must zfs unallow -u $STAFF1 $dtst
 	log_must verify_noperm $dtst $LOCAL_DESC_SET $STAFF1
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_007_neg.ksh
index e9bd3bfd0f..b1a221be0b 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_007_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -49,16 +49,16 @@ log_assert "zfs unallow won't remove those permissions which inherited from " \
 log_onexit restore_root_datasets
 
 perm1="atime,devices"; perm2="compression,checksum"
-log_must $ZFS create $SUBFS
-log_must $ZFS allow $STAFF1 $perm1 $ROOT_TESTFS
-log_must $ZFS allow $STAFF1 $perm2 $SUBFS
+log_must zfs create $SUBFS
+log_must zfs allow $STAFF1 $perm1 $ROOT_TESTFS
+log_must zfs allow $STAFF1 $perm2 $SUBFS
 
 log_must verify_perm $SUBFS ${perm1},${perm2} $STAFF1
 #
 # Athrough unallow the permissions which don't exists on the specific dataset
 # return 0, the inherited permissions can't be removed in fact.
 #
-log_must $ZFS unallow -u $STAFF1 $perm1 $SUBFS
+log_must zfs unallow -u $STAFF1 $perm1 $SUBFS
 log_must verify_perm $SUBFS ${perm1},${perm2} $STAFF1
 
 log_pass "Verify zfs unallow won't remove inherited permissions passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_008_neg.ksh
index 7cd824cdb4..6bc9112cdc 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/zfs_unallow_008_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/delegate/delegate_common.kshlib
@@ -61,15 +61,15 @@ set -A badopts "everyone -e" "everyone -u $STAFF1" "everyone everyone" \
 log_must setup_unallow_testenv
 
 for dtst in $DATASETS ; do
-	log_must $ZFS allow -c create $dtst
+	log_must zfs allow -c create $dtst
 
 	typeset -i i=0
 	while ((i < ${#badopts[@]})); do
-		neg_test $ZFS unallow ${badopts[$i]} $dtst
+		neg_test zfs unallow ${badopts[$i]} $dtst
 		((i += 1))
 	done
 
-	# Causes test failure: neg_test user_run $STAFF1 $ZFS unallow $dtst
+	# Causes test failure: neg_test user_run $STAFF1 zfs unallow $dtst
 done
 
 log_pass "zfs unallow can handle invalid arguments passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/devices/devices_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/devices/devices_001_pos.ksh
index acea6e24d2..ac031ed6a5 100644
--- a/usr/src/test/zfs-tests/tests/functional/devices/devices_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/devices/devices_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,15 +52,15 @@ log_assert "Setting devices=on on file system, the devices files in this file" \
 	"system can be used."
 log_onexit cleanup
 
-log_must $ZFS set devices=on $TESTPOOL/$TESTFS
+log_must zfs set devices=on $TESTPOOL/$TESTFS
 
 #
 # Separately create block device file and character device file, then try to
 # open them and make sure it succeed.
 #
 create_dev_file b $TESTDIR/$TESTFILE1
-log_must $DD if=$TESTDIR/$TESTFILE1 of=$TESTDIR/$TESTFILE1.out count=1
+log_must dd if=$TESTDIR/$TESTFILE1 of=$TESTDIR/$TESTFILE1.out count=1
 create_dev_file c $TESTDIR/$TESTFILE2
-log_must $DD if=$TESTDIR/$TESTFILE2 of=$TESTDIR/$TESTFILE2.out count=1
+log_must dd if=$TESTDIR/$TESTFILE2 of=$TESTDIR/$TESTFILE2.out count=1
 
 log_pass "Setting devices=on on file system and testing it pass."
diff --git a/usr/src/test/zfs-tests/tests/functional/devices/devices_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/devices/devices_002_neg.ksh
index 8a1f828775..ce25502b81 100644
--- a/usr/src/test/zfs-tests/tests/functional/devices/devices_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/devices/devices_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,15 +52,15 @@ log_assert "Setting devices=off on file system, the devices files in this file"\
 	"system can not be used."
 log_onexit cleanup
 
-log_must $ZFS set devices=off $TESTPOOL/$TESTFS
+log_must zfs set devices=off $TESTPOOL/$TESTFS
 
 #
 # Separately create block device file and character device file, then try to
 # open them and make sure it failed.
 #
 create_dev_file b $TESTDIR/$TESTFILE1
-log_mustnot $DD if=$TESTDIR/$TESTFILE1 of=$TESTDIR/$TESTFILE1.out count=1
+log_mustnot dd if=$TESTDIR/$TESTFILE1 of=$TESTDIR/$TESTFILE1.out count=1
 create_dev_file c $TESTDIR/$TESTFILE2
-log_mustnot $DD if=$TESTDIR/$TESTFILE2 of=$TESTDIR/$TESTFILE2.out count=1
+log_mustnot dd if=$TESTDIR/$TESTFILE2 of=$TESTDIR/$TESTFILE2.out count=1
 
 log_pass "Setting devices=off on file system and testing it pass."
diff --git a/usr/src/test/zfs-tests/tests/functional/devices/devices_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/devices/devices_003_pos.ksh
index 05463be809..12ff873c40 100644
--- a/usr/src/test/zfs-tests/tests/functional/devices/devices_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/devices/devices_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -44,6 +44,6 @@
 
 log_assert "Writing random data into /dev/zfs should do no harm."
 
-log_mustnot $DD if=/dev/urandom of=/dev/zfs count=1024
+log_mustnot dd if=/dev/urandom of=/dev/zfs count=1024
 
 log_pass "Writing random data into /dev/zfs should do no harm."
diff --git a/usr/src/test/zfs-tests/tests/functional/devices/devices_common.kshlib b/usr/src/test/zfs-tests/tests/functional/devices/devices_common.kshlib
index 7399445052..24f7c7e018 100644
--- a/usr/src/test/zfs-tests/tests/functional/devices/devices_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/devices/devices_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/devices/devices.cfg
@@ -44,17 +44,17 @@ function create_dev_file
 
 	case $filetype in
 		b)
-			devtype=$($DF -n / | $AWK '{print $3}')
+			devtype=$(df -n / | awk '{print $3}')
 			case $devtype in
 				zfs)
-					rootpool=$($DF / | \
-						$AWK '{print $2}')
+					rootpool=$(df / | \
+						awk '{print $2}')
 					rootpool=${rootpool#\(}
 					rootpool=${rootpool%%/*}
 
 					devstr=$(get_disklist $rootpool)
-					devstr=$($ECHO "$devstr" | \
-						$AWK '{print $1}')
+					devstr=$(echo "$devstr" | \
+						awk '{print $1}')
 					[[ -z $devstr ]] && \
 						log_fail "Can not get block device file."
 					devstr=/dev/dsk/${devstr}
@@ -64,11 +64,11 @@ function create_dev_file
 			# Get the existing block device file in current system.
 			# And bring out the first one.
 			#
-					devstr=$($DF -lhF ufs | \
-						$GREP "^/dev/dsk" | \
-						$AWK '{print $1}')
-					devstr=$($ECHO "$devstr" | \
-						$AWK '{print $1}')
+					devstr=$(df -lhF ufs | \
+						grep "^/dev/dsk" | \
+						awk '{print $1}')
+					devstr=$(echo "$devstr" | \
+						awk '{print $1}')
 					[[ -z $devstr ]] && \
 						log_fail "Can not get block device file."
 					;;
@@ -83,7 +83,7 @@ function create_dev_file
 			# Get the device file information. i.e:
 			# /dev/dsk/c0t0d0s0:      block special (28/768)
 			#
-			devstr=$($FILE $devstr)
+			devstr=$(file $devstr)
 
 			#
 			# Bring out major and minor number.
@@ -93,13 +93,13 @@ function create_dev_file
 			minor=${devstr##*/}
 			minor=${minor%\)}
 
-			log_must $MKNOD $filename b $major $minor
+			log_must mknod $filename b $major $minor
 			;;
 		c)
 			#
 			# Create device file '/dev/null'
 			#
-			log_must $MKNOD $filename c $($GETMAJOR mm) 2
+			log_must mknod $filename c $(getmajor mm) 2
 			;;
 		*)
 			log_fail "'$filetype' is wrong."
@@ -111,9 +111,9 @@ function create_dev_file
 
 function cleanup
 {
-	log_must $ZFS set devices=on $TESTPOOL/$TESTFS
-	log_must $RM -f $TESTDIR/$TESTFILE1
-	log_must $RM -f $TESTDIR/$TESTFILE2
-	log_must $RM -f $TESTDIR/$TESTFILE1.out
-	log_must $RM -f $TESTDIR/$TESTFILE2.out
+	log_must zfs set devices=on $TESTPOOL/$TESTFS
+	log_must rm -f $TESTDIR/$TESTFILE1
+	log_must rm -f $TESTDIR/$TESTFILE2
+	log_must rm -f $TESTDIR/$TESTFILE1.out
+	log_must rm -f $TESTDIR/$TESTFILE2.out
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/exec/exec_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/exec/exec_001_pos.ksh
index ecffc9c1b4..2b1081b819 100644
--- a/usr/src/test/zfs-tests/tests/functional/exec/exec_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/exec/exec_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,15 +49,15 @@ MMAP_EXEC=$STF_SUITE/tests/functional/exec/mmap_exec
 
 function cleanup
 {
-	log_must $RM $TESTDIR/myls
+	log_must rm $TESTDIR/myls
 }
 
 log_assert "Setting exec=on on a filesystem, processes can be executed from " \
 	"this file system."
 log_onexit cleanup
 
-log_must $CP $LS $TESTDIR/myls
-log_must $ZFS set exec=on $TESTPOOL/$TESTFS
+log_must cp /usr/bin/ls $TESTDIR/myls
+log_must zfs set exec=on $TESTPOOL/$TESTFS
 log_must $TESTDIR/myls
 log_must $MMAP_EXEC $TESTDIR/myls
 
diff --git a/usr/src/test/zfs-tests/tests/functional/exec/exec_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/exec/exec_002_neg.ksh
index 3e087df264..39b1202f41 100644
--- a/usr/src/test/zfs-tests/tests/functional/exec/exec_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/exec/exec_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ MMAP_EXEC=$STF_SUITE/tests/functional/exec/mmap_exec
 
 function cleanup
 {
-	log_must $RM $TESTDIR/myls
+	log_must rm $TESTDIR/myls
 }
 
 #
@@ -76,8 +76,8 @@ log_assert "Setting exec=off on a filesystem, processes can not be executed " \
 	"from this file system."
 log_onexit cleanup
 
-log_must $CP $LS $TESTDIR/myls
-log_must $ZFS set exec=off $TESTPOOL/$TESTFS
+log_must cp /usr/bin/ls $TESTDIR/myls
+log_must zfs set exec=off $TESTPOOL/$TESTFS
 
 log_must exec_n_check 126 $TESTDIR/myls
 log_must exec_n_check 13 $MMAP_EXEC $TESTDIR/myls
diff --git a/usr/src/test/zfs-tests/tests/functional/features/async_destroy/async_destroy_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/features/async_destroy/async_destroy_001_pos.ksh
index ae1fb73c2c..4b3f2065a4 100644
--- a/usr/src/test/zfs-tests/tests/functional/features/async_destroy/async_destroy_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/features/async_destroy/async_destroy_001_pos.ksh
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	datasetexists $TEST_FS && log_must $ZFS destroy $TEST_FS
+	datasetexists $TEST_FS && log_must zfs destroy $TEST_FS
 }
 
 log_onexit cleanup
 log_assert "async_destroy can suspend and resume traversal"
 
-log_must $ZFS create -o recordsize=512 -o compression=off $TEST_FS
+log_must zfs create -o recordsize=512 -o compression=off $TEST_FS
 
 # Fill with 2G
-log_must $DD bs=1024k count=2048 if=/dev/zero of=/$TEST_FS/file
+log_must dd bs=1024k count=2048 if=/dev/zero of=/$TEST_FS/file
 
-log_must $ZFS destroy $TEST_FS
+log_must zfs destroy $TEST_FS
 
 #
 # We monitor the freeing property, to verify we can see blocks being
@@ -68,20 +68,20 @@ log_must $ZFS destroy $TEST_FS
 t0=$SECONDS
 count=0
 while [[ $((SECONDS - t0)) -lt 10 ]]; do
-	[[ "0" != "$($ZPOOL list -Ho freeing $TESTPOOL)" ]] && ((count++))
+	[[ "0" != "$(zpool list -Ho freeing $TESTPOOL)" ]] && ((count++))
 	[[ $count -gt 1 ]] && break
-	$SLEEP 1
+	sleep 1
 done
 
 [[ $count -eq 0 ]] && log_fail "Freeing property remained empty"
 
 # Wait for everything to be freed.
-while [[ "0" != "$($ZPOOL list -Ho freeing $TESTPOOL)" ]]; do
+while [[ "0" != "$(zpool list -Ho freeing $TESTPOOL)" ]]; do
 	[[ $((SECONDS - t0)) -gt 180 ]] && \
 	    log_fail "Timed out waiting for freeing to drop to zero"
 done
 
 # Check for leaked blocks.
-log_must $ZDB -b $TESTPOOL
+log_must zdb -b $TESTPOOL
 
 log_pass "async_destroy can suspend and resume traversal"
diff --git a/usr/src/test/zfs-tests/tests/functional/grow_pool/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/grow_pool/cleanup.ksh
index d47a2a1219..e417c3aadc 100644
--- a/usr/src/test/zfs-tests/tests/functional/grow_pool/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/grow_pool/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -35,7 +35,7 @@
 verify_runnable "global"
 
 ismounted $TESTFS && \
-        log_must $ZFS umount $TESTDIR
+        log_must zfs umount $TESTDIR
 destroy_pool "$TESTPOOL"
 
 #
diff --git a/usr/src/test/zfs-tests/tests/functional/grow_pool/grow_pool_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/grow_pool/grow_pool_001_pos.ksh
index ac3e09b9d1..cc03fec399 100644
--- a/usr/src/test/zfs-tests/tests/functional/grow_pool/grow_pool_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/grow_pool/grow_pool_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,8 +48,8 @@ verify_runnable "global"
 
 log_assert "A zpool may be increased in capacity by adding a disk"
 
-log_must $ZFS set compression=off $TESTPOOL/$TESTFS
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 \
+log_must zfs set compression=off $TESTPOOL/$TESTFS
+file_write -o create -f $TESTDIR/$TESTFILE1 \
 	-b $BLOCK_SIZE -c $WRITE_COUNT -d 0
 typeset -i zret=$?
 readonly ENOSPC=28
@@ -62,13 +62,13 @@ if [[ ! -s $TESTDIR/$TESTFILE1 ]]; then
 fi
 
 if [[ -n $DISK ]]; then
-	log_must $ZPOOL add $TESTPOOL $DISK"s"$SLICE1
+	log_must zpool add $TESTPOOL $DISK"s"$SLICE1
 else
-	log_must $ZPOOL add $TESTPOOL $DISK1
+	log_must zpool add $TESTPOOL $DISK1
 fi
 
-log_must $FILE_WRITE -o append -f $TESTDIR/$TESTFILE1 \
+log_must file_write -o append -f $TESTDIR/$TESTFILE1 \
 	-b $BLOCK_SIZE -c $SMALL_WRITE_COUNT -d 0
 
-log_must $ZFS inherit compression $TESTPOOL/$TESTFS
+log_must zfs inherit compression $TESTPOOL/$TESTFS
 log_pass "TESTPOOL successfully grown"
diff --git a/usr/src/test/zfs-tests/tests/functional/grow_replicas/grow_replicas_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/grow_replicas/grow_replicas_001_pos.ksh
index d9081895cf..4a1ab9121d 100644
--- a/usr/src/test/zfs-tests/tests/functional/grow_replicas/grow_replicas_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/grow_replicas/grow_replicas_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -51,7 +51,7 @@ fi
 function cleanup
 {
 	datasetexists $TESTPOOL && log_must destroy_pool $TESTPOOL
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR
 }
 
 log_assert "mirror/raidz pool may be increased in capacity by adding a disk"
@@ -76,12 +76,12 @@ for pooltype in "mirror" "raidz"; do
 		create_pool $TESTPOOL $pooltype ${DISK0}s0 ${DISK1}s0
 	fi
 
-	[[ -d $TESTDIR ]] && log_must $RM -rf $TESTDIR
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	[[ -d $TESTDIR ]] && log_must rm -rf $TESTDIR
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
-	log_must $ZFS set compression=off $TESTPOOL/$TESTFS
-	$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 \
+	log_must zfs set compression=off $TESTPOOL/$TESTFS
+	file_write -o create -f $TESTDIR/$TESTFILE1 \
             -b $BLOCK_SIZE -c $WRITE_COUNT -d 0
 
 	[[ $? -ne $ENOSPC ]] && \
@@ -92,14 +92,14 @@ for pooltype in "mirror" "raidz"; do
 
 	# $DISK will be set if we're using slices on one disk
 	if [[ -n $DISK ]]; then
-		log_must $ZPOOL add $TESTPOOL $pooltype ${DISK}s3 ${DISK}s4
+		log_must zpool add $TESTPOOL $pooltype ${DISK}s3 ${DISK}s4
 	else
 		[[ -z $DISK2 || -z $DISK3 ]] && 
 		    log_unsupported "No spare disks available"
-		log_must $ZPOOL add $TESTPOOL $pooltype ${DISK2}s0 ${DISK3}s0
+		log_must zpool add $TESTPOOL $pooltype ${DISK2}s0 ${DISK3}s0
 	fi
 
-	log_must $FILE_WRITE -o append -f $TESTDIR/$TESTFILE1 \
+	log_must file_write -o append -f $TESTDIR/$TESTFILE1 \
 	    -b $BLOCK_SIZE -c $SMALL_WRITE_COUNT -d 0
 
 	log_must destroy_pool $TESTPOOL
diff --git a/usr/src/test/zfs-tests/tests/functional/history/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/history/cleanup.ksh
index 42c5390062..784f808e32 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/cleanup.ksh
@@ -26,13 +26,13 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
-[[ -f $OLD_HISTORY ]] && $RM -f $OLD_HISTORY
-[[ -f $TMP_HISTORY ]] && $RM -f $TMP_HISTORY
-[[ -f $NEW_HISTORY ]] && $RM -f $NEW_HISTORY
+[[ -f $OLD_HISTORY ]] && rm -f $OLD_HISTORY
+[[ -f $TMP_HISTORY ]] && rm -f $TMP_HISTORY
+[[ -f $NEW_HISTORY ]] && rm -f $NEW_HISTORY
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_001_pos.ksh
index b65fa99d3c..9c4c9a915f 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_001_pos.ksh
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/history/history_common.kshlib
@@ -49,9 +49,9 @@ function cleanup
 	destroy_pool $MPOOL
 	destroy_pool $upgrade_pool
 
-	[[ -d $import_dir ]] && $RM -rf $import_dir
+	[[ -d $import_dir ]] && rm -rf $import_dir
 	for file in $VDEV1 $VDEV2 $VDEV3 $VDEV4; do
-		[[ -f $file ]] && $RM -f $file
+		[[ -f $file ]] && rm -f $file
 	done
 }
 
@@ -63,49 +63,49 @@ mntpnt=$(get_prop mountpoint $TESTPOOL)
 VDEV1=$mntpnt/vdev1; VDEV2=$mntpnt/vdev2;
 VDEV3=$mntpnt/vdev3; VDEV4=$mntpnt/vdev4;
 
-log_must $MKFILE $MINVDEVSIZE $VDEV1 $VDEV2 $VDEV3
-log_must $MKFILE $(($MINVDEVSIZE * 2)) $VDEV4
+log_must mkfile $MINVDEVSIZE $VDEV1 $VDEV2 $VDEV3
+log_must mkfile $(($MINVDEVSIZE * 2)) $VDEV4
 
-run_and_verify -p "$MPOOL" "$ZPOOL create $MPOOL mirror $VDEV1 $VDEV2"
-run_and_verify -p "$MPOOL" "$ZPOOL add -f $MPOOL spare $VDEV3"
-run_and_verify -p "$MPOOL" "$ZPOOL remove $MPOOL $VDEV3"
-run_and_verify -p "$MPOOL" "$ZPOOL offline $MPOOL $VDEV1"
-run_and_verify -p "$MPOOL" "$ZPOOL online $MPOOL $VDEV1"
-run_and_verify -p "$MPOOL" "$ZPOOL attach $MPOOL $VDEV1 $VDEV4"
-run_and_verify -p "$MPOOL" "$ZPOOL detach $MPOOL $VDEV4"
-run_and_verify -p "$MPOOL" "$ZPOOL replace -f $MPOOL $VDEV1 $VDEV4"
-run_and_verify -p "$MPOOL" "$ZPOOL scrub $MPOOL"
-run_and_verify -p "$MPOOL" "$ZPOOL clear $MPOOL"
+run_and_verify -p "$MPOOL" "zpool create $MPOOL mirror $VDEV1 $VDEV2"
+run_and_verify -p "$MPOOL" "zpool add -f $MPOOL spare $VDEV3"
+run_and_verify -p "$MPOOL" "zpool remove $MPOOL $VDEV3"
+run_and_verify -p "$MPOOL" "zpool offline $MPOOL $VDEV1"
+run_and_verify -p "$MPOOL" "zpool online $MPOOL $VDEV1"
+run_and_verify -p "$MPOOL" "zpool attach $MPOOL $VDEV1 $VDEV4"
+run_and_verify -p "$MPOOL" "zpool detach $MPOOL $VDEV4"
+run_and_verify -p "$MPOOL" "zpool replace -f $MPOOL $VDEV1 $VDEV4"
+run_and_verify -p "$MPOOL" "zpool scrub $MPOOL"
+run_and_verify -p "$MPOOL" "zpool clear $MPOOL"
 
 # For export and destroy, mimic the behavior of run_and_verify using two
 # commands since the history will be unavailable until the pool is imported
 # again.
-commands=("$ZPOOL export $MPOOL" "$ZPOOL import -d $mntpnt $MPOOL"
-    "$ZPOOL destroy $MPOOL" "$ZPOOL import -D -f -d $mntpnt $MPOOL")
+commands=("zpool export $MPOOL" "zpool import -d $mntpnt $MPOOL"
+    "zpool destroy $MPOOL" "zpool import -D -f -d $mntpnt $MPOOL")
 for i in 0 2; do
 	cmd1="${commands[$i]}"
 	cmd2="${commands[(($i + 1 ))]}"
 
-	$ZPOOL history $MPOOL > $OLD_HISTORY 2>/dev/null
+	zpool history $MPOOL > $OLD_HISTORY 2>/dev/null
 	log_must $cmd1
 	log_must $cmd2
-	$ZPOOL history $MPOOL > $TMP_HISTORY 2>/dev/null
-	$DIFF $OLD_HISTORY $TMP_HISTORY | $GREP "^> " | $SED 's/^> //g' > \
+	zpool history $MPOOL > $TMP_HISTORY 2>/dev/null
+	diff $OLD_HISTORY $TMP_HISTORY | grep "^> " | sed 's/^> //g' > \
 	    $NEW_HISTORY
-	$GREP "$($ECHO "$cmd1" | $SED 's/\/usr\/sbin\///g')" $NEW_HISTORY \
+	grep "$(echo "$cmd1" | sed 's/\/usr\/sbin\///g')" $NEW_HISTORY \
 	    >/dev/null 2>&1 || log_fail "Didn't find \"$cmd1\" in pool history"
-	$GREP "$($ECHO "$cmd2" | $SED 's/\/usr\/sbin\///g')" $NEW_HISTORY \
+	grep "$(echo "$cmd2" | sed 's/\/usr\/sbin\///g')" $NEW_HISTORY \
 	    >/dev/null 2>&1 || log_fail "Didn't find \"$cmd2\" in pool history"
 done
 
-run_and_verify -p "$MPOOL" "$ZPOOL split $MPOOL ${MPOOL}_split"
+run_and_verify -p "$MPOOL" "zpool split $MPOOL ${MPOOL}_split"
 
 import_dir=/var/tmp/import_dir.$$
-log_must $MKDIR $import_dir
-log_must $CP $STF_SUITE/tests/functional/history/zfs-pool-v4.dat.Z $import_dir
-log_must $UNCOMPRESS $import_dir/zfs-pool-v4.dat.Z
-upgrade_pool=$($ZPOOL import -d $import_dir | $GREP "pool:" | $AWK '{print $2}')
-log_must $ZPOOL import -d $import_dir $upgrade_pool
-run_and_verify -p "$upgrade_pool" "$ZPOOL upgrade $upgrade_pool"
+log_must mkdir $import_dir
+log_must cp $STF_SUITE/tests/functional/history/zfs-pool-v4.dat.Z $import_dir
+log_must uncompress $import_dir/zfs-pool-v4.dat.Z
+upgrade_pool=$(zpool import -d $import_dir | grep "pool:" | awk '{print $2}')
+log_must zpool import -d $import_dir $upgrade_pool
+run_and_verify -p "$upgrade_pool" "zpool upgrade $upgrade_pool"
 
 log_pass "zpool sub-commands which modify state are logged passed. "
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_002_pos.ksh
index ab54e5a345..f92af382bf 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_002_pos.ksh
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/history/history_common.kshlib
@@ -46,12 +46,12 @@ verify_runnable "global"
 function cleanup
 {
 
-	[[ -f $tmpfile ]] && $RM -f $tmpfile
-	[[ -f $tmpfile2 ]] && $RM -f $tmpfile2
+	[[ -f $tmpfile ]] && rm -f $tmpfile
+	[[ -f $tmpfile2 ]] && rm -f $tmpfile2
 	for dataset in $fs $newfs $fsclone $vol $newvol $volclone; do
-		datasetexists $dataset && $ZFS destroy -Rf $dataset
+		datasetexists $dataset && zfs destroy -Rf $dataset
 	done
-	$RM -rf /history.$$
+	rm -rf /history.$$
 }
 
 log_assert "Verify zfs sub-commands which modify state are logged."
@@ -89,54 +89,54 @@ props=(
 	copies		$((RANDOM%3 + 1))
 )
 
-run_and_verify "$ZFS create $fs"
+run_and_verify "zfs create $fs"
 # Set all the property for filesystem
 typeset -i i=0
 while ((i < ${#props[@]})) ; do
-	run_and_verify "$ZFS set ${props[$i]}=${props[((i+1))]} $fs"
+	run_and_verify "zfs set ${props[$i]}=${props[((i+1))]} $fs"
 
 	# quota, reservation, canmount can not be inherited.
 	#
 	if [[ ${props[$i]} != "quota" && ${props[$i]} != "reservation" && \
 	    ${props[$i]} != "canmount" ]];
 	then
-		run_and_verify "$ZFS inherit ${props[$i]} $fs"
+		run_and_verify "zfs inherit ${props[$i]} $fs"
 	fi
 
 	((i += 2))
 done
 
-run_and_verify "$ZFS create -V 64M $vol"
-run_and_verify "$ZFS set volsize=32M $vol"
-run_and_verify "$ZFS snapshot $fssnap"
-run_and_verify "$ZFS hold tag $fssnap"
-run_and_verify "$ZFS release tag $fssnap"
-run_and_verify "$ZFS snapshot $volsnap"
-run_and_verify "$ZFS snapshot $fssnap2"
-run_and_verify "$ZFS snapshot $volsnap2"
+run_and_verify "zfs create -V 64M $vol"
+run_and_verify "zfs set volsize=32M $vol"
+run_and_verify "zfs snapshot $fssnap"
+run_and_verify "zfs hold tag $fssnap"
+run_and_verify "zfs release tag $fssnap"
+run_and_verify "zfs snapshot $volsnap"
+run_and_verify "zfs snapshot $fssnap2"
+run_and_verify "zfs snapshot $volsnap2"
 
 # Send isn't logged...
-log_must $ZFS send -i $fssnap $fssnap2 > $tmpfile
-log_must $ZFS send -i $volsnap $volsnap2 > $tmpfile2
+log_must zfs send -i $fssnap $fssnap2 > $tmpfile
+log_must zfs send -i $volsnap $volsnap2 > $tmpfile2
 # Verify that's true
-$ZPOOL history $TESTPOOL | $GREP 'zfs send' >/dev/null 2>&1 && \
+zpool history $TESTPOOL | grep 'zfs send' >/dev/null 2>&1 && \
     log_fail "'zfs send' found in history of \"$TESTPOOL\""
 
-run_and_verify "$ZFS destroy $fssnap2"
-run_and_verify "$ZFS destroy $volsnap2"
-run_and_verify "$ZFS receive $fs < $tmpfile"
-run_and_verify "$ZFS receive $vol < $tmpfile2"
-run_and_verify "$ZFS rollback -r $fssnap"
-run_and_verify "$ZFS rollback -r $volsnap"
-run_and_verify "$ZFS clone $fssnap $fsclone"
-run_and_verify "$ZFS clone $volsnap $volclone"
-run_and_verify "$ZFS rename $fs $newfs"
-run_and_verify "$ZFS rename $vol $newvol"
-run_and_verify "$ZFS promote $fsclone"
-run_and_verify "$ZFS promote $volclone"
-run_and_verify "$ZFS destroy $newfs"
-run_and_verify "$ZFS destroy $newvol"
-run_and_verify "$ZFS destroy -rf $fsclone"
-run_and_verify "$ZFS destroy -rf $volclone"
+run_and_verify "zfs destroy $fssnap2"
+run_and_verify "zfs destroy $volsnap2"
+run_and_verify "zfs receive $fs < $tmpfile"
+run_and_verify "zfs receive $vol < $tmpfile2"
+run_and_verify "zfs rollback -r $fssnap"
+run_and_verify "zfs rollback -r $volsnap"
+run_and_verify "zfs clone $fssnap $fsclone"
+run_and_verify "zfs clone $volsnap $volclone"
+run_and_verify "zfs rename $fs $newfs"
+run_and_verify "zfs rename $vol $newvol"
+run_and_verify "zfs promote $fsclone"
+run_and_verify "zfs promote $volclone"
+run_and_verify "zfs destroy $newfs"
+run_and_verify "zfs destroy $newvol"
+run_and_verify "zfs destroy -rf $fsclone"
+run_and_verify "zfs destroy -rf $volclone"
 
 log_pass "zfs sub-commands which modify state are logged passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_003_pos.ksh
index 01bba0c966..3f6df99a09 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,9 +46,9 @@ verify_runnable "global"
 
 function cleanup
 {
-	datasetexists $spool && log_must $ZPOOL destroy $spool
-	[[ -f $VDEV0 ]] && log_must $RM -f $VDEV0
-	[[ -f $TMPFILE ]] && log_must $RM -f $TMPFILE
+	datasetexists $spool && log_must zpool destroy $spool
+	[[ -f $VDEV0 ]] && log_must rm -f $VDEV0
+	[[ -f $TMPFILE ]] && log_must rm -f $TMPFILE
 }
 
 log_assert "zpool history limitation test."
@@ -58,39 +58,39 @@ mntpnt=$(get_prop mountpoint $TESTPOOL)
 (( $? != 0 )) && log_fail "get_prop mountpoint $TESTPOOL"
 
 VDEV0=$mntpnt/vdev0
-log_must $MKFILE $MINVDEVSIZE $VDEV0
+log_must mkfile $MINVDEVSIZE $VDEV0
 
 spool=smallpool.$$; sfs=smallfs.$$
-log_must $ZPOOL create $spool $VDEV0
-log_must $ZFS create $spool/$sfs
+log_must zpool create $spool $VDEV0
+log_must zfs create $spool/$sfs
 
-typeset -i orig_count=$($ZPOOL history $spool | $WC -l)
-typeset orig_md5=$($ZPOOL history $spool | $HEAD -2 | $MD5SUM | \
-    $AWK '{print $1}')
+typeset -i orig_count=$(zpool history $spool | wc -l)
+typeset orig_md5=$(zpool history $spool | head -2 | md5sum | \
+    awk '{print $1}')
 
 typeset -i i=0
 while ((i < 300)); do
-	$ZFS set compression=off $spool/$sfs
-	$ZFS set compression=on $spool/$sfs
-	$ZFS set compression=off $spool/$sfs
-	$ZFS set compression=on $spool/$sfs
-	$ZFS set compression=off $spool/$sfs
+	zfs set compression=off $spool/$sfs
+	zfs set compression=on $spool/$sfs
+	zfs set compression=off $spool/$sfs
+	zfs set compression=on $spool/$sfs
+	zfs set compression=off $spool/$sfs
 
 	((i += 1))
 done
 
 TMPFILE=/tmp/spool.$$
-$ZPOOL history $spool >$TMPFILE
-typeset -i entry_count=$($WC -l $TMPFILE | $AWK '{print $1}')
-typeset final_md5=$($HEAD -2 $TMPFILE | $MD5SUM | $AWK '{print $1}')
+zpool history $spool >$TMPFILE
+typeset -i entry_count=$(wc -l $TMPFILE | awk '{print $1}')
+typeset final_md5=$(head -2 $TMPFILE | md5sum | awk '{print $1}')
 
-$GREP 'zpool create' $TMPFILE >/dev/null 2>&1 ||
+grep 'zpool create' $TMPFILE >/dev/null 2>&1 ||
     log_fail "'zpool create' was not found in pool history"
 
-$GREP 'zfs create' $TMPFILE >/dev/null 2>&1 &&
+grep 'zfs create' $TMPFILE >/dev/null 2>&1 &&
     log_fail "'zfs create' was found in pool history"
 
-$GREP 'zfs set compress' $TMPFILE >/dev/null 2>&1 ||
+grep 'zfs set compress' $TMPFILE >/dev/null 2>&1 ||
     log_fail "'zfs set compress' was found in pool history"
 
 # Verify that the creation of the pool was preserved in the history.
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_004_pos.ksh
index e29173f860..1b8e7dfe02 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,51 +46,51 @@ verify_runnable "global"
 
 log_assert "'zpool history' can cope with simultaneous commands."
 
-typeset -i orig_count=$($ZPOOL history $spool | $WC -l | $AWK '{print $1}')
+typeset -i orig_count=$(zpool history $spool | wc -l | awk '{print $1}')
 
 typeset -i i=0
 while ((i < 10)); do
-	$ZFS set compression=off $TESTPOOL/$TESTFS &
-	$ZFS set atime=off $TESTPOOL/$TESTFS &
-	$ZFS create $TESTPOOL/$TESTFS1 &
-	$ZFS create $TESTPOOL/$TESTFS2 &
-	$ZFS create $TESTPOOL/$TESTFS3 &
+	zfs set compression=off $TESTPOOL/$TESTFS &
+	zfs set atime=off $TESTPOOL/$TESTFS &
+	zfs create $TESTPOOL/$TESTFS1 &
+	zfs create $TESTPOOL/$TESTFS2 &
+	zfs create $TESTPOOL/$TESTFS3 &
 
 	wait
 
-	$ZFS snapshot $TESTPOOL/$TESTFS1@snap &
-	$ZFS snapshot $TESTPOOL/$TESTFS2@snap &
-	$ZFS snapshot $TESTPOOL/$TESTFS3@snap &
+	zfs snapshot $TESTPOOL/$TESTFS1@snap &
+	zfs snapshot $TESTPOOL/$TESTFS2@snap &
+	zfs snapshot $TESTPOOL/$TESTFS3@snap &
 
 	wait
 
-	$ZFS clone $TESTPOOL/$TESTFS1@snap $TESTPOOL/clone1 &
-	$ZFS clone $TESTPOOL/$TESTFS2@snap $TESTPOOL/clone2 &
-	$ZFS clone $TESTPOOL/$TESTFS3@snap $TESTPOOL/clone3 &
+	zfs clone $TESTPOOL/$TESTFS1@snap $TESTPOOL/clone1 &
+	zfs clone $TESTPOOL/$TESTFS2@snap $TESTPOOL/clone2 &
+	zfs clone $TESTPOOL/$TESTFS3@snap $TESTPOOL/clone3 &
 
 	wait
 
-	$ZFS promote $TESTPOOL/clone1 &
-	$ZFS promote $TESTPOOL/clone2 &
-	$ZFS promote $TESTPOOL/clone3 &
+	zfs promote $TESTPOOL/clone1 &
+	zfs promote $TESTPOOL/clone2 &
+	zfs promote $TESTPOOL/clone3 &
 
 	wait
 
-	$ZFS destroy $TESTPOOL/$TESTFS1 &
-	$ZFS destroy $TESTPOOL/$TESTFS2 &
-	$ZFS destroy $TESTPOOL/$TESTFS3 &
+	zfs destroy $TESTPOOL/$TESTFS1 &
+	zfs destroy $TESTPOOL/$TESTFS2 &
+	zfs destroy $TESTPOOL/$TESTFS3 &
 
 	wait
 
-	$ZFS destroy -Rf $TESTPOOL/clone1 &
-	$ZFS destroy -Rf $TESTPOOL/clone2 &
-	$ZFS destroy -Rf $TESTPOOL/clone3 &
+	zfs destroy -Rf $TESTPOOL/clone1 &
+	zfs destroy -Rf $TESTPOOL/clone2 &
+	zfs destroy -Rf $TESTPOOL/clone3 &
 
 	wait
 	((i += 1))
 done
 
-typeset -i entry_count=$($ZPOOL history $spool | $WC -l | $AWK '{print $1}')
+typeset -i entry_count=$(zpool history $spool | wc -l | awk '{print $1}')
 
 if ((entry_count - orig_count != 200)); then
 	log_fail "The entries count error: entry_count=$entry_count " \
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_005_neg.ksh
index 7a3ac27c26..f6a81a4ac5 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,14 +52,14 @@ verify_runnable "global"
 log_assert "Verify 'zpool get|history|list|status|iostat' will not be logged."
 
 # Save initial TESTPOOL history
-log_must eval "$ZPOOL history $TESTPOOL >$OLD_HISTORY"
+log_must eval "zpool history $TESTPOOL >$OLD_HISTORY"
 
-log_must $ZPOOL get all $TESTPOOL >/dev/null
-log_must $ZPOOL list $TESTPOOL >/dev/null
-log_must $ZPOOL status $TESTPOOL >/dev/null
-log_must $ZPOOL iostat $TESTPOOL >/dev/null
+log_must zpool get all $TESTPOOL >/dev/null
+log_must zpool list $TESTPOOL >/dev/null
+log_must zpool status $TESTPOOL >/dev/null
+log_must zpool iostat $TESTPOOL >/dev/null
 
-log_must eval "$ZPOOL history $TESTPOOL >$NEW_HISTORY"
-log_must $DIFF $OLD_HISTORY $NEW_HISTORY
+log_must eval "zpool history $TESTPOOL >$NEW_HISTORY"
+log_must diff $OLD_HISTORY $NEW_HISTORY
 
 log_pass "Verify 'zpool get|history|list|status|iostat' will not be logged."
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_006_neg.ksh
index e93e4c1de8..4db7ee737a 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_006_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/history/history_common.kshlib
@@ -48,9 +48,9 @@ verify_runnable "global"
 function cleanup
 {
 	if datasetexists $fs ; then
-		log_must $ZFS destroy -rf $fs
+		log_must zfs destroy -rf $fs
 	fi
-	log_must $ZFS create $fs
+	log_must zfs create $fs
 }
 
 log_assert "Verify 'zfs list|get|holds|mount|unmount|share|unshare|send' " \
@@ -59,26 +59,26 @@ log_onexit cleanup
 
 # Create initial test environment
 fs=$TESTPOOL/$TESTFS; snap1=$fs@snap1; snap2=$fs@snap2
-log_must $ZFS set sharenfs=on $fs
-log_must $ZFS snapshot $snap1
-log_must $ZFS hold tag $snap1
-log_must $ZFS snapshot $snap2
+log_must zfs set sharenfs=on $fs
+log_must zfs snapshot $snap1
+log_must zfs hold tag $snap1
+log_must zfs snapshot $snap2
 
 # Save initial TESTPOOL history
-log_must eval "$ZPOOL history $TESTPOOL > $OLD_HISTORY"
+log_must eval "zpool history $TESTPOOL > $OLD_HISTORY"
 
-log_must $ZFS list $fs > /dev/null
-log_must $ZFS get mountpoint $fs > /dev/null
-log_must $ZFS unmount $fs
-log_must $ZFS mount $fs
-log_must $ZFS share $fs
-log_must $ZFS unshare $fs
-log_must $ZFS send -i $snap1 $snap2 > /dev/null
-log_must $ZFS holds $snap1
+log_must zfs list $fs > /dev/null
+log_must zfs get mountpoint $fs > /dev/null
+log_must zfs unmount $fs
+log_must zfs mount $fs
+log_must zfs share $fs
+log_must zfs unshare $fs
+log_must zfs send -i $snap1 $snap2 > /dev/null
+log_must zfs holds $snap1
 
-log_must eval "$ZPOOL history $TESTPOOL > $NEW_HISTORY"
-log_must $DIFF $OLD_HISTORY $NEW_HISTORY
+log_must eval "zpool history $TESTPOOL > $NEW_HISTORY"
+log_must diff $OLD_HISTORY $NEW_HISTORY
 
-log_must $ZFS release tag $snap1
+log_must zfs release tag $snap1
 
 log_pass "Verify 'zfs list|get|mount|unmount|share|unshare|send' passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_007_pos.ksh
index 66d2191058..b65e855d8c 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,9 +47,9 @@ verify_runnable "global"
 function cleanup
 {
 	poolexists $migratedpoolname &&  \
-		log_must $ZPOOL destroy -f $migratedpoolname
+		log_must zpool destroy -f $migratedpoolname
 
-	[[ -d $import_dir ]] && $RM -rf $import_dir
+	[[ -d $import_dir ]] && rm -rf $import_dir
 }
 
 log_assert "Verify command history moves with migrated pool."
@@ -62,28 +62,28 @@ migratedpoolname=$MIGRATEDPOOLNAME
 typeset -i RET=1
 typeset -i linenum=0
 
-[[ ! -d $import_dir ]] && log_must $MKDIR $import_dir
+[[ ! -d $import_dir ]] && log_must mkdir $import_dir
 
 # We test the migrations on both uniform platform and cross platform
 for arch in "i386" "sparc"; do
-	log_must $CP $tst_dir/${arch}.orig_history.txt $import_dir
+	log_must cp $tst_dir/${arch}.orig_history.txt $import_dir
 	orig_cmds_f=$import_dir/${arch}.orig_history.txt
 	# remove blank line
 	orig_cmds_f1=$import_dir/${arch}.orig_history_1.txt
-	$CAT $orig_cmds_f | $GREP -v "^$" > $orig_cmds_f1
+	cat $orig_cmds_f | grep -v "^$" > $orig_cmds_f1
 
-	log_must $CP $tst_dir/${arch}.migratedpool.DAT.Z $import_dir
-	log_must $UNCOMPRESS $import_dir/${arch}.migratedpool.DAT.Z
+	log_must cp $tst_dir/${arch}.migratedpool.DAT.Z $import_dir
+	log_must uncompress $import_dir/${arch}.migratedpool.DAT.Z
 
 	# destroy the pool with same name, so that import operation succeeds.
 	poolexists $migratedpoolname && \
-	    log_must $ZPOOL destroy -f $migratedpoolname
+	    log_must zpool destroy -f $migratedpoolname
 
-	log_must $ZPOOL import -d $import_dir $migratedpoolname
-	TZ=$TIMEZONE $ZPOOL history $migratedpoolname | $GREP -v "^$" \
+	log_must zpool import -d $import_dir $migratedpoolname
+	TZ=$TIMEZONE zpool history $migratedpoolname | grep -v "^$" \
 	    >$migrated_cmds_f
 	RET=$?
-	(( $RET != 0 )) && log_fail "$ZPOOL histroy $migratedpoolname fails."
+	(( $RET != 0 )) && log_fail "zpool histroy $migratedpoolname fails."
 
 	# The migrated history file should differ with original history file on
 	# two commands -- 'export' and 'import', which are included in migrated
@@ -92,21 +92,21 @@ for arch in "i386" "sparc"; do
 	# then compare this filtered file with the original history file. They
 	# should be identical at this time.
 	for subcmd in "export" "import"; do
-		$GREP "$subcmd" $migrated_cmds_f >/dev/null 2>&1
+		grep "$subcmd" $migrated_cmds_f >/dev/null 2>&1
 		RET=$?
 		(( $RET != 0 )) && log_fail "zpool $subcmd is not logged for" \
 		    "the imported pool $migratedpoolname."
 	done
 
 	tmpfile=$import_dir/cmds_tmp.$$
-	linenum=`$CAT $migrated_cmds_f | $WC -l`
+	linenum=`cat $migrated_cmds_f | wc -l`
 	(( linenum = linenum - 2 ))
-	$HEAD -n $linenum $migrated_cmds_f > $tmpfile
-	log_must $DIFF $tmpfile $orig_cmds_f1
+	head -n $linenum $migrated_cmds_f > $tmpfile
+	log_must diff $tmpfile $orig_cmds_f1
 
 	# cleanup for next loop testing
-	log_must $ZPOOL destroy -f $migratedpoolname
-	log_must $RM -f `$LS $import_dir`
+	log_must zpool destroy -f $migratedpoolname
+	log_must rm -f `ls $import_dir`
 done
 
 log_pass "Verify command history moves with migrated pool."
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_008_pos.ksh
index 56df2939c2..996c7658c3 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/history/history_common.kshlib
@@ -48,9 +48,9 @@ verify_runnable "global"
 function cleanup
 {
 	if datasetexists $root_testfs; then
-		log_must $ZFS destroy -rf $root_testfs
+		log_must zfs destroy -rf $root_testfs
 	fi
-	log_must $ZFS create $root_testfs
+	log_must zfs create $root_testfs
 }
 
 log_assert "Pool history records all recursive operations."
@@ -59,16 +59,16 @@ log_onexit cleanup
 root_testfs=$TESTPOOL/$TESTFS
 fs1=$root_testfs/fs1; fs2=$root_testfs/fs2; fs3=$root_testfs/fs3
 for fs in $fs1 $fs2 $fs3; do
-	log_must $ZFS create $fs
+	log_must zfs create $fs
 done
 
-run_and_verify "$ZFS snapshot -r $root_testfs@snap" "-i"
-run_and_verify "$ZFS hold -r tag $root_testfs@snap" "-i"
-run_and_verify "$ZFS release -r tag $root_testfs@snap" "-i"
-log_must $ZFS snapshot $root_testfs@snap2
-log_must $ZFS snapshot $root_testfs@snap3
-run_and_verify "$ZFS rollback -r $root_testfs@snap" "-i"
-run_and_verify "$ZFS inherit -r mountpoint $root_testfs" "-i"
-run_and_verify "$ZFS destroy -r $root_testfs" "-i"
+run_and_verify "zfs snapshot -r $root_testfs@snap" "-i"
+run_and_verify "zfs hold -r tag $root_testfs@snap" "-i"
+run_and_verify "zfs release -r tag $root_testfs@snap" "-i"
+log_must zfs snapshot $root_testfs@snap2
+log_must zfs snapshot $root_testfs@snap3
+run_and_verify "zfs rollback -r $root_testfs@snap" "-i"
+run_and_verify "zfs inherit -r mountpoint $root_testfs" "-i"
+run_and_verify "zfs destroy -r $root_testfs" "-i"
 
 log_pass "Pool history records all recursive operations."
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_009_pos.ksh
index 8a10d16f20..cf40df84ec 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/history/history_common.kshlib
@@ -107,7 +107,7 @@ while ((i < ${#array[@]})); do
 	subcmd=${array[$i]}
 	options=${array[((i + 1))]}
 
-	run_and_verify "$ZFS $subcmd $options $testfs" "-i"
+	run_and_verify "zfs $subcmd $options $testfs" "-i"
 	((i += 2))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/history/history_010_pos.ksh
index 4c146d8f31..6ba0389f5f 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_010_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/history/history_common.kshlib
@@ -47,7 +47,7 @@ function cleanup
 {
 	del_user $HIST_USER
 	del_group $HIST_GROUP
-	datasetexists $root_testfs && log_must $ZFS destroy -rf $root_testfs
+	datasetexists $root_testfs && log_must zfs destroy -rf $root_testfs
 }
 
 log_assert "Verify internal long history information are correct."
@@ -59,18 +59,18 @@ root_testfs=$TESTPOOL/$TESTFS1
 add_group $HIST_GROUP
 add_user $HIST_GROUP $HIST_USER
 
-run_and_verify "$ZFS create $root_testfs" "-l"
-run_and_verify "$ZFS allow $HIST_GROUP snapshot,mount $root_testfs" "-l"
-run_and_verify "$ZFS allow $HIST_USER destroy,mount $root_testfs" "-l"
-run_and_verify "$ZFS allow $HIST_USER reservation $root_testfs" "-l"
-run_and_verify "$ZFS allow $HIST_USER allow $root_testfs" "-l"
-run_and_verify -u "$HIST_USER" "$ZFS snapshot $root_testfs@snap" "-l"
-run_and_verify -u "$HIST_USER" "$ZFS destroy $root_testfs@snap" "-l"
-run_and_verify -u "$HIST_USER" "$ZFS set reservation=64M $root_testfs" "-l"
+run_and_verify "zfs create $root_testfs" "-l"
+run_and_verify "zfs allow $HIST_GROUP snapshot,mount $root_testfs" "-l"
+run_and_verify "zfs allow $HIST_USER destroy,mount $root_testfs" "-l"
+run_and_verify "zfs allow $HIST_USER reservation $root_testfs" "-l"
+run_and_verify "zfs allow $HIST_USER allow $root_testfs" "-l"
+run_and_verify -u "$HIST_USER" "zfs snapshot $root_testfs@snap" "-l"
+run_and_verify -u "$HIST_USER" "zfs destroy $root_testfs@snap" "-l"
+run_and_verify -u "$HIST_USER" "zfs set reservation=64M $root_testfs" "-l"
 run_and_verify -u "$HIST_USER" \
-    "$ZFS allow $HIST_USER reservation $root_testfs" "-l"
-run_and_verify "$ZFS unallow $HIST_USER create $root_testfs" "-l"
-run_and_verify "$ZFS unallow $HIST_GROUP snapshot $root_testfs" "-l"
-run_and_verify "$ZFS destroy -r $root_testfs" "-l"
+    "zfs allow $HIST_USER reservation $root_testfs" "-l"
+run_and_verify "zfs unallow $HIST_USER create $root_testfs" "-l"
+run_and_verify "zfs unallow $HIST_GROUP snapshot $root_testfs" "-l"
+run_and_verify "zfs destroy -r $root_testfs" "-l"
 
 log_pass "Verify internal long history information pass."
diff --git a/usr/src/test/zfs-tests/tests/functional/history/history_common.kshlib b/usr/src/test/zfs-tests/tests/functional/history/history_common.kshlib
index 7950cb3a4e..27f1e2c800 100644
--- a/usr/src/test/zfs-tests/tests/functional/history/history_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/history/history_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,9 +51,9 @@ function run_and_verify
 	fullcmd="$1"
 	flags="$2"
 
-	histcmd=$($ECHO $fullcmd | $SED 's/\/usr\/sbin\///g')
-	cmd=$($ECHO $histcmd | $AWK '{print $1}')
-	subcmd=$($ECHO $histcmd | $AWK '{print $2}')
+	histcmd=$(echo $fullcmd | sed 's/\/usr\/sbin\///g')
+	cmd=$(echo $histcmd | awk '{print $1}')
+	subcmd=$(echo $histcmd | awk '{print $2}')
 
 	# If we aren't running zpool or zfs, something is wrong
 	[[ $cmd == "zpool" || $cmd == "zfs" ]] || \
@@ -64,18 +64,18 @@ function run_and_verify
 	    histcmd=${histcmd%% <*}
 
 	# Run the command as the specified user, and find the new history.
-	$ZPOOL history $flags $pool > $OLD_HISTORY 2>/dev/null
+	zpool history $flags $pool > $OLD_HISTORY 2>/dev/null
 	if [[ $user == "root" ]]; then
 		log_must eval "$fullcmd"
 	else
-		log_must $SU $user -c "eval $fullcmd"
+		log_must su $user -c "eval $fullcmd"
 	fi
-	$ZPOOL history $flags $pool > $TMP_HISTORY 2>/dev/null
-	$DIFF $OLD_HISTORY $TMP_HISTORY | $GREP "^> " | $SED 's/^> //g' \
+	zpool history $flags $pool > $TMP_HISTORY 2>/dev/null
+	diff $OLD_HISTORY $TMP_HISTORY | grep "^> " | sed 's/^> //g' \
 	    > $NEW_HISTORY
 
 	# Verify what's common to every case, regardless of zpool history flags.
-	$GREP "$histcmd" $NEW_HISTORY >/dev/null 2>&1 || \
+	grep "$histcmd" $NEW_HISTORY >/dev/null 2>&1 || \
 	    log_fail "Didn't find \"$histcmd\" in pool history"
 
 	# If 'zpool history' was called without any flags, then we're done.
@@ -97,13 +97,13 @@ function verify_long
 
 	[[ $flags =~ "l" ]] || return 1
 
-	typeset uid=$($ID -u $user)
-	typeset hname=$($HOSTNAME)
+	typeset uid=$(id -u $user)
+	typeset hname=$(hostname)
 	if ! is_global_zone; then
-		hname=$hname:$($ZONENAME)
+		hname=$hname:$(zonename)
 	fi
 
-	$GREP "$cmd \[user $uid ($user) on $hname\]" $NEW_HISTORY >/dev/null \
+	grep "$cmd \[user $uid ($user) on $hname\]" $NEW_HISTORY >/dev/null \
 	    2>&1
 	if [[ $? != 0 ]]; then
 		log_note "Couldn't find long information for \"$cmd\""
@@ -121,15 +121,15 @@ function verify_hold
 
 	[[ $flags =~ "i" ]] || return 1
 
-	typeset tag=$($ECHO $cmd | $AWK '{print $4}')
+	typeset tag=$(echo $cmd | awk '{print $4}')
 	typeset fullname=${cmd##* }
 	typeset dsname=${fullname%%@*}
 	typeset snapname=${fullname##*@}
 
 	# This works whether or not the hold was recursive
-	for ds in $($ZFS list -r -Ho name -t snapshot $dsname | \
-	    $GREP "@$snapname"); do
-		$GREP "$subcmd $ds ([0-9]*) tag=$tag" $NEW_HISTORY \
+	for ds in $(zfs list -r -Ho name -t snapshot $dsname | \
+	    grep "@$snapname"); do
+		grep "$subcmd $ds ([0-9]*) tag=$tag" $NEW_HISTORY \
 		    >/dev/null 2>&1
 		if [[ $? != 0 ]]; then
 			log_note "Didn't find hold on $ds with $tag"
@@ -160,14 +160,14 @@ function verify_rollback
 	typeset rb_fs=${dsname}/%rollback
 	typeset snapname=${fullname##*@}
 
-	$GREP "clone swap $rb_fs ([0-9]*) parent=$parent_fs" $NEW_HISTORY \
+	grep "clone swap $rb_fs ([0-9]*) parent=$parent_fs" $NEW_HISTORY \
 	    >/dev/null 2>&1
 	if [[ $? != 0 ]]; then
 		log_note "Didn't find rollback clone swap in pool history"
 		return 1
 	fi
 
-	$GREP "destroy $rb_fs" $NEW_HISTORY >/dev/null 2>&1
+	grep "destroy $rb_fs" $NEW_HISTORY >/dev/null 2>&1
 	if [[ $? != 0 ]]; then
 		log_note "Didn't find rollback destroy in pool history"
 		return 1
@@ -188,8 +188,8 @@ function verify_inherit
 	prop=${prop##* }
 
 	# This works whether or not the inherit was recursive
-	for ds in $($ZFS list -r -Ho name -t filesystem $dsname); do
-		$GREP "$subcmd $ds ([0-9]*) ${prop}=" $NEW_HISTORY >/dev/null \
+	for ds in $(zfs list -r -Ho name -t filesystem $dsname); do
+		grep "$subcmd $ds ([0-9]*) ${prop}=" $NEW_HISTORY >/dev/null \
 		    2>&1
 		if [[ $? != 0 ]]; then
 			log_note "Didn't find inherit history for $ds"
@@ -219,7 +219,7 @@ function verify_allow
 	# - Whether the operation applies locally or to descendent datasets (or
 	#   both)
 	#
-	$ECHO $cmd  | $AWK '{i = NF - 1; print $i}' | $GREP '@' >/dev/null \
+	echo $cmd  | awk '{i = NF - 1; print $i}' | grep '@' >/dev/null \
 	    2>&1 && is_set=1
 	dsname=${cmd##* }
 	[[ $cmd =~ "-l " ]] && lflag=1
@@ -242,7 +242,7 @@ function verify_allow
 		[[ -n $is_set ]] && str="S-\$@"
 		tmp=${cmd#*@}
 		code="$str${tmp% *}"
-		$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+		grep "permission $subcmd $dsname ([0-9]*) $code" \
 		    $NEW_HISTORY >/dev/null 2>&1
 		if [[ $? != 0 ]]; then
 			 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -253,7 +253,7 @@ function verify_allow
 		[[ -n $is_set ]] && str="C-\$"
 		tmp=${cmd#*-c}
 		code="$str${tmp% *}"
-		$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+		grep "permission $subcmd $dsname ([0-9]*) $code" \
 		    $NEW_HISTORY >/dev/null 2>&1
 		if [ $? != 0 ]]; then
 			 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -263,11 +263,11 @@ function verify_allow
 		str="u"
 		[[ -n $is_set ]] && str="U"
 		tmp=${cmd##*-u }
-		opt=$($ECHO $tmp | $AWK '{print $2}')
-		uid=$($ID -u ${tmp%% *})
+		opt=$(echo $tmp | awk '{print $2}')
+		uid=$(id -u ${tmp%% *})
 		if [[ -n $lflag ]]; then
 			code="${str}l\$$uid $opt"
-			$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+			grep "permission $subcmd $dsname ([0-9]*) $code" \
 			    $NEW_HISTORY >/dev/null 2>&1
 			if [ $? != 0 ]]; then
 				 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -276,7 +276,7 @@ function verify_allow
 		fi
 		if [[ -n $dflag ]]; then
 			code="${str}d\$$uid $opt"
-			$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+			grep "permission $subcmd $dsname ([0-9]*) $code" \
 			    $NEW_HISTORY >/dev/null 2>&1
 			if [ $? != 0 ]]; then
 				 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -287,11 +287,11 @@ function verify_allow
 		str="g"
 		[[ -n $is_set ]] && str="G"
 		tmp=${cmd##*-g }
-		opt=$($ECHO $tmp | $AWK '{print $2}')
-		gid=$($AWK -F: "/^${tmp%% *}:/ {print \$3}" /etc/group)
+		opt=$(echo $tmp | awk '{print $2}')
+		gid=$(awk -F: "/^${tmp%% *}:/ {print \$3}" /etc/group)
 		if [[ -n $lflag ]]; then
 			code="${str}l\$$gid $opt"
-			$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+			grep "permission $subcmd $dsname ([0-9]*) $code" \
 			    $NEW_HISTORY >/dev/null 2>&1
 			if [ $? != 0 ]]; then
 				 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -300,7 +300,7 @@ function verify_allow
 		fi
 		if [[ -n $dflag ]]; then
 			code="${str}d\$$gid $opt"
-			$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+			grep "permission $subcmd $dsname ([0-9]*) $code" \
 			    $NEW_HISTORY >/dev/null 2>&1
 			if [ $? != 0 ]]; then
 				 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -314,7 +314,7 @@ function verify_allow
 		opt=${opt%% *}
 		if [[ -n $lflag ]]; then
 			code="${str}l\$ $opt"
-			$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+			grep "permission $subcmd $dsname ([0-9]*) $code" \
 			    $NEW_HISTORY >/dev/null 2>&1
 			if [ $? != 0 ]]; then
 				 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -323,7 +323,7 @@ function verify_allow
 		fi
 		if [[ -n $dflag ]]; then
 			code="${str}d\$ $opt"
-			$GREP "permission $subcmd $dsname ([0-9]*) $code" \
+			grep "permission $subcmd $dsname ([0-9]*) $code" \
 			    $NEW_HISTORY >/dev/null 2>&1
 			if [ $? != 0 ]]; then
 				 log_note "Couldn't find $code in $NEW_HISTORY"
@@ -361,7 +361,7 @@ function verify_destroy
 	[[ $dsname =~ "@" ]] && typeset is_snap=1
 
 	if [[ -n $is_snap ]]; then
-		$GREP "ioctl destroy_snaps" $NEW_HISTORY >/dev/null 2>&1
+		grep "ioctl destroy_snaps" $NEW_HISTORY >/dev/null 2>&1
 		if [[ $? != 0 ]]; then
 			log_note "Didn't find ioctl while destroying $dsname"
 			return 1
@@ -369,7 +369,7 @@ function verify_destroy
 	fi
 
 	# This should be present for datasets and snapshots alike
-	$GREP "destroy $dsname" $NEW_HISTORY >/dev/null 2>&1
+	grep "destroy $dsname" $NEW_HISTORY >/dev/null 2>&1
 	if [[ $? != 0 ]]; then
 		log_note "Didn't find \"destroy\" for $dsname"
 		return 1
@@ -389,7 +389,7 @@ function verify_snapshot
 	typeset dsname=${fullname%%@*}
 	typeset snapname=${fullname##*@}
 
-	$GREP "\[txg:[0-9]*\] $subcmd $fullname ([0-9]*)" $NEW_HISTORY \
+	grep "\[txg:[0-9]*\] $subcmd $fullname ([0-9]*)" $NEW_HISTORY \
 	    >/dev/null 2>&1
 	if [[ $? != 0 ]]; then
 		log_note "Didn't find snapshot command for $fullname"
@@ -397,9 +397,9 @@ function verify_snapshot
 	fi
 
 	# This works whether or not the snapshot was recursive
-	for ds in $($ZFS list -r -Ho name -t snapshot $dsname | \
-	    $GREP "@$snapname"); do
-		$GREP "^[ ]* $ds$" $NEW_HISTORY >/dev/null 2>&1
+	for ds in $(zfs list -r -Ho name -t snapshot $dsname | \
+	    grep "@$snapname"); do
+		grep "^[ ]* $ds$" $NEW_HISTORY >/dev/null 2>&1
 		if [[ $? != 0 ]]; then
 			log_note "Didn't find \"ioctl snapshot\" for $ds"
 			return 1
diff --git a/usr/src/test/zfs-tests/tests/functional/holes/holes.shlib b/usr/src/test/zfs-tests/tests/functional/holes/holes.shlib
index 9420c82120..bf66364172 100644
--- a/usr/src/test/zfs-tests/tests/functional/holes/holes.shlib
+++ b/usr/src/test/zfs-tests/tests/functional/holes/holes.shlib
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 # testfile The file to examine.
@@ -23,8 +23,8 @@ function verify_holes_and_data_blocks
 	typeset -i data_blks=$3
 	typeset -i failures=0
 
-	found_hole_blks=$($GETHOLES -h $testfile)
-	found_data_blks=$($GETHOLES -d $testfile)
+	found_hole_blks=$(getholes -h $testfile)
+	found_data_blks=$(getholes -d $testfile)
 	if [[ $found_hole_blks -ne $hole_blks ]] then;
 		log_note "Found $found_hole_blks, not $hole_blks hole blocks."
 		((failures++))
diff --git a/usr/src/test/zfs-tests/tests/functional/holes/holes_sanity.ksh b/usr/src/test/zfs-tests/tests/functional/holes/holes_sanity.ksh
index f00bba59de..cb1fda9430 100644
--- a/usr/src/test/zfs-tests/tests/functional/holes/holes_sanity.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/holes/holes_sanity.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -34,52 +34,52 @@ verify_runnable "both"
 testfile="$TESTDIR/testfile"
 
 for bs in 512 1024 2048 4096 8192 16384 32768 65536 131072; do
-	log_must $ZFS set recsize=$bs $TESTPOOL/$TESTFS
+	log_must zfs set recsize=$bs $TESTPOOL/$TESTFS
 
 	#
 	# Create combinations of holes and data to verify holes ending files
 	# and the like. (hhh, hhd, hdh...)
 	#
-	log_must $MKHOLES -h 0:$((bs * 6)) $testfile
+	log_must mkholes -h 0:$((bs * 6)) $testfile
 	verify_holes_and_data_blocks $testfile 6 0
-	log_must $RM $testfile
+	log_must rm $testfile
 
-	log_must $MKHOLES -h 0:$((bs * 4)) -d $((bs * 4)):$((bs * 2)) $testfile
+	log_must mkholes -h 0:$((bs * 4)) -d $((bs * 4)):$((bs * 2)) $testfile
 	verify_holes_and_data_blocks $testfile 4 2
-	log_must $RM $testfile
+	log_must rm $testfile
 
-	log_must $MKHOLES -h 0:$((bs * 2)) -d $((bs * 2)):$((bs * 2)) \
+	log_must mkholes -h 0:$((bs * 2)) -d $((bs * 2)):$((bs * 2)) \
 	    -h $((bs * 4)):$((bs * 2)) $testfile
 	verify_holes_and_data_blocks $testfile 4 2
-	log_must $RM $testfile
+	log_must rm $testfile
 
-	log_must $MKHOLES -h 0:$((bs * 2)) -d $((bs * 2)):$((bs * 4)) $testfile
+	log_must mkholes -h 0:$((bs * 2)) -d $((bs * 2)):$((bs * 4)) $testfile
 	verify_holes_and_data_blocks $testfile 2 4
-	log_must $RM $testfile
+	log_must rm $testfile
 
-	log_must $MKHOLES -d 0:$((bs * 2)) -h $((bs * 2)):$((bs * 4)) $testfile
+	log_must mkholes -d 0:$((bs * 2)) -h $((bs * 2)):$((bs * 4)) $testfile
 	verify_holes_and_data_blocks $testfile 4 2
-	log_must $RM $testfile
+	log_must rm $testfile
 
-	log_must $MKHOLES -d 0:$((bs * 2)) -h $((bs * 2)):$((bs * 2)) \
+	log_must mkholes -d 0:$((bs * 2)) -h $((bs * 2)):$((bs * 2)) \
 	    -d $((bs * 4)):$((bs * 2)) $testfile
 	verify_holes_and_data_blocks $testfile 2 4
-	log_must $RM $testfile
+	log_must rm $testfile
 
-	log_must $MKHOLES -d 0:$((bs * 4)) -h $((bs * 4)):$((bs * 2)) $testfile
+	log_must mkholes -d 0:$((bs * 4)) -h $((bs * 4)):$((bs * 2)) $testfile
 	verify_holes_and_data_blocks $testfile 2 4
-	log_must $RM $testfile
+	log_must rm $testfile
 
-	log_must $MKHOLES -d 0:$((bs * 6)) $testfile
+	log_must mkholes -d 0:$((bs * 6)) $testfile
 	verify_holes_and_data_blocks $testfile 0 6
-	log_must $RM $testfile
+	log_must rm $testfile
 
 	# Verify holes are correctly seen past the largefile limit.
 	len=$((1024**3 * 5))
 	nblks=$((len / bs))
-	log_must $MKHOLES -h 0:$len -d $len:$bs $testfile
+	log_must mkholes -h 0:$len -d $len:$bs $testfile
 	verify_holes_and_data_blocks $testfile $nblks 1
-	log_must $RM $testfile
+	log_must rm $testfile
 done
 
 log_pass "Basic hole tests pass."
diff --git a/usr/src/test/zfs-tests/tests/functional/inheritance/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/inheritance/cleanup.ksh
index 9ff335a333..750956b3ba 100644
--- a/usr/src/test/zfs-tests/tests/functional/inheritance/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inheritance/cleanup.ksh
@@ -26,10 +26,10 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . ${STF_SUITE}/include/libtest.shlib
 
-$RM -rf $TESTDIR.*
+rm -rf $TESTDIR.*
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/inheritance/inherit.kshlib b/usr/src/test/zfs-tests/tests/functional/inheritance/inherit.kshlib
index cee0cfdf13..cd6bd5c027 100644
--- a/usr/src/test/zfs-tests/tests/functional/inheritance/inherit.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/inheritance/inherit.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -38,7 +38,7 @@ function get_prop_src # property dataset
         typeset prop=$1
         typeset dataset=$2
 
-	prop_val=`$ZFS get -H -o source $prop $dataset`
+	prop_val=`zfs get -H -o source $prop $dataset`
 
         if [[ $? -ne 0 ]]; then
                 log_fail "Unable to determine the source of $prop " \
@@ -104,7 +104,7 @@ function set_n_verify_prop #property value dataset
 	typeset prop_val=$2
 	typeset dataset=$3
 
-	$ZFS set $prop=$prop_val $dataset
+	zfs set $prop=$prop_val $dataset
 	check_val=`get_prop $prop $dataset`
 
 	if [[ $check_val != $prop_val ]]; then
diff --git a/usr/src/test/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh
index b65ac20bb8..84e82f9eb8 100644
--- a/usr/src/test/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,10 +58,10 @@ function create_dataset { #name type disks
 	if [[ $type == "POOL" ]]; then
 		create_pool "$dataset" "$disks"
 	elif [[ $type == "CTR" ]]; then
-		log_must $ZFS create $dataset
-		log_must $ZFS set canmount=off $dataset
+		log_must zfs create $dataset
+		log_must zfs set canmount=off $dataset
 	elif [[ $type == "FS" ]]; then
-		log_must $ZFS create $dataset
+		log_must zfs create $dataset
 	else
 		log_fail "Unrecognised type $type"
 	fi
@@ -143,7 +143,7 @@ function update_recordsize { #dataset init_code
 		def_val[idx]=$record_val
 		def_recordsize=1
 	elif [[ $init_code == "local" ]]; then
-		log_must $ZFS set recordsize=$record_val $dataset
+		log_must zfs set recordsize=$record_val $dataset
 		local_val[idx]=$record_val
 	fi
 }
@@ -332,13 +332,13 @@ function scan_state { #state-file
 					log_note "No operation specified"
 				else
 					export __ZFS_POOL_RESTRICT="$TESTPOOL"
-					log_must $ZFS unmount -a
+					log_must zfs unmount -a
 					unset __ZFS_POOL_RESTRICT
 
 					for p in ${prop[i]} ${prop[((i+1))]}; do
-						$ZFS $op $p $target
+						zfs $op $p $target
 						ret=$?
-						check_failure $ret "$ZFS $op $p \
+						check_failure $ret "zfs $op $p \
 						    $target"
 					done
 				fi
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_001_pos.ksh
index 0317d6d0b2..26e771c4fc 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ function cleanup
 	# Remove dump device.
 	#
 	if [[ -n $PREVDUMPDEV ]]; then
-		log_must $DUMPADM -u -d $PREVDUMPDEV > /dev/null
+		log_must dumpadm -u -d $PREVDUMPDEV > /dev/null
 	fi
 
 	destroy_pool $TESTPOOL
@@ -62,17 +62,17 @@ log_onexit cleanup
 typeset dumpdev=""
 typeset diskslice=""
 
-PREVDUMPDEV=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
+PREVDUMPDEV=`dumpadm | grep "Dump device" | awk '{print $3}'`
 
 log_note "Zero $FS_DISK0 and place free space in to slice 0"
 log_must cleanup_devices $FS_DISK0
 
 diskslice="/dev/dsk/${FS_DISK0}s0"
 log_note "Configuring $diskslice as dump device"
-log_must $DUMPADM -d $diskslice > /dev/null
+log_must dumpadm -d $diskslice > /dev/null
 
 log_note "Confirm that dump device has been setup"
-dumpdev=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
+dumpdev=`dumpadm | grep "Dump device" | awk '{print $3}'`
 [[ -z "$dumpdev" ]] && log_untested "No dump device has been configured"
 
 [[ "$dumpdev" != "$diskslice" ]] && \
@@ -80,7 +80,7 @@ dumpdev=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
 
 log_note "Attempt to zpool the dump device"
 unset NOINUSE_CHECK
-log_mustnot $ZPOOL create $TESTPOOL "$diskslice"
+log_mustnot zpool create $TESTPOOL "$diskslice"
 log_mustnot poolexists $TESTPOOL
 
 log_pass "Unable to zpool a device in use by dumpadm"
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_003_pos.ksh
index 9f17f9db6f..6c7a47ec78 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,26 +57,26 @@ function cleanup
 	poolexists $TESTPOOL2 && destroy_pool $TESTPOOL2
 
 	log_note "Kill off ufsdump process if still running"
-	$KILL -0 $PIDUFSDUMP > /dev/null 2>&1 && \
-	    log_must $KILL -9 $PIDUFSDUMP  > /dev/null 2>&1
+	kill -0 $PIDUFSDUMP > /dev/null 2>&1 && \
+	    log_must kill -9 $PIDUFSDUMP  > /dev/null 2>&1
 	#
 	# Note: It would appear that ufsdump spawns a number of processes
 	# which are not killed when the $PIDUFSDUMP is whacked.  So best bet
 	# is to find the rest of the them and deal with them individually.
 	#
-	for all in `$PGREP ufsdump`
+	for all in `pgrep ufsdump`
 	do
-		$KILL -9 $all > /dev/null 2>&1
+		kill -9 $all > /dev/null 2>&1
 	done
 
 	log_note "Kill off ufsrestore process if still running"
-	$KILL -0 $PIDUFSRESTORE > /dev/null 2>&1 && \
-	    log_must $KILL -9 $PIDUFSRESTORE  > /dev/null 2>&1
+	kill -0 $PIDUFSRESTORE > /dev/null 2>&1 && \
+	    log_must kill -9 $PIDUFSRESTORE  > /dev/null 2>&1
 
-	ismounted $UFSMP ufs && log_must $UMOUNT $UFSMP
+	ismounted $UFSMP ufs && log_must umount $UFSMP
 
-	$RM -rf $UFSMP
-	$RM -rf $TESTDIR
+	rm -rf $UFSMP
+	rm -rf $TESTDIR
 
 	#
 	# Tidy up the disks we used.
@@ -103,23 +103,23 @@ for num in 0 1 2; do
 done
 
 log_note "Make a ufs filesystem on source $rawdisk1"
-$ECHO "y" | $NEWFS -v $rawdisk1 > /dev/null 2>&1
+echo "y" | newfs -v $rawdisk1 > /dev/null 2>&1
 (($? != 0)) && log_untested "Unable to create ufs filesystem on $rawdisk1"
 
-log_must $MKDIR -p $UFSMP
+log_must mkdir -p $UFSMP
 
 log_note "mount source $disk1 on $UFSMP"
-log_must $MOUNT $disk1 $UFSMP
+log_must mount $disk1 $UFSMP
 
 log_note "Now create some directories and files to be ufsdump'ed"
 while (($dirnum <= 2)); do
-	log_must $MKDIR $bigdir${dirnum}
+	log_must mkdir $bigdir${dirnum}
 	while (( $filenum <= 2 )); do
-		$FILE_WRITE -o create -f $bigdir${dirnum}/file${filenum} \
+		file_write -o create -f $bigdir${dirnum}/file${filenum} \
 		    -b $BLOCK_SIZE -c $BLOCK_COUNT
 		if [[ $? -ne 0 ]]; then
 			if [[ $dirnum -lt 3 ]]; then
-				log_fail "$FILE_WRITE only wrote" \
+				log_fail "file_write only wrote" \
 				    "<(( $dirnum * 3 + $filenum ))>" \
 				    "files, this is not enough"
 			fi
@@ -130,46 +130,46 @@ while (($dirnum <= 2)); do
 	((dirnum = dirnum + 1))
 done
 
-log_must $UMOUNT $UFSMP
+log_must umount $UFSMP
 
 log_note "Start ufsdump in the background"
-log_note "$UFSDUMP 0bf 512 $rawdisk0 $disk1"
-$UFSDUMP 0bf 512 $rawdisk0 $disk1 &
+log_note "ufsdump 0bf 512 $rawdisk0 $disk1"
+ufsdump 0bf 512 $rawdisk0 $disk1 &
 PIDUFSDUMP=$!
 
 unset NOINUSE_CHECK
 log_note "Attempt to zpool the source device in use by ufsdump"
-log_mustnot $ZPOOL create $TESTPOOL1 "$disk1"
+log_mustnot zpool create $TESTPOOL1 "$disk1"
 log_mustnot poolexists $TESTPOOL1
 
 log_note "Attempt to take the source device in use by ufsdump as spare device"
-log_mustnot $ZPOOL create $TESTPOOL1 "$FS_SIDE2" spare "$disk1"
+log_mustnot zpool create $TESTPOOL1 "$FS_SIDE2" spare "$disk1"
 log_mustnot poolexists $TESTPOOL1
 
 wait $PIDUFSDUMP
 typeset -i retval=$?
-(($retval != 0)) && log_fail "$UFSDUMP failed with error code $ret_val"
+(($retval != 0)) && log_fail "ufsdump failed with error code $ret_val"
 
-log_must $MOUNT $disk1 $UFSMP
+log_must mount $disk1 $UFSMP
 
-log_must $RM -rf $UFSMP/*
-log_must $MKDIR $restored_files
+log_must rm -rf $UFSMP/*
+log_must mkdir $restored_files
 
 cwd=$PWD
 log_must cd $restored_files
 log_note "Start ufsrestore in the background from the target device"
-log_note "$UFSRESTORE rbf 512 $rawdisk0"
-$UFSRESTORE rbf 512 $rawdisk0 &
+log_note "ufsrestore rbf 512 $rawdisk0"
+ufsrestore rbf 512 $rawdisk0 &
 PIDUFSRESTORE=$!
 log_must cd $cwd
 
 log_note "Attempt to zpool the restored device in use by ufsrestore"
-log_mustnot $ZPOOL create -f $TESTPOOL2 "$disk1"
+log_mustnot zpool create -f $TESTPOOL2 "$disk1"
 log_mustnot poolexists $TESTPOOL2
 
 log_note "Attempt to take the restored device in use by ufsrestore as spare" \
     "device"
-log_mustnot $ZPOOL create -f $TESTPOOL2 "$FS_SIDE2" spare "$disk1"
+log_mustnot zpool create -f $TESTPOOL2 "$FS_SIDE2" spare "$disk1"
 log_mustnot poolexists $TESTPOOL2
 
 log_pass "Unable to zpool over a device in use by ufsdump or ufsrestore"
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_004_pos.ksh
index 9755c11be9..ad288ec4c9 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,12 +52,12 @@ function cleanup
 	# to work correctly.  So its reproduced below.  Still need to full
 	# understand why default_cleanup does not work correctly from here.
 	#
-        log_must $ZFS umount $TESTPOOL/$TESTFS
+        log_must zfs umount $TESTPOOL/$TESTFS
 
-        $RM -rf $TESTDIR || \
+        rm -rf $TESTDIR || \
             log_unresolved Could not remove $TESTDIR
 
-	log_must $ZFS destroy $TESTPOOL/$TESTFS
+	log_must zfs destroy $TESTPOOL/$TESTFS
 	destroy_pool $TESTPOOL
 }
 #
@@ -70,12 +70,12 @@ function mini_format
         typeset disk=$1
 
 	typeset format_file=/var/tmp/format_in.$$.1
-	$ECHO "partition" > $format_file
-	$ECHO "modify" >> $format_file
+	echo "partition" > $format_file
+	echo "modify" >> $format_file
 
-	$FORMAT -e -s -d $disk -f $format_file
+	format -e -s -d $disk -f $format_file
 	typeset -i retval=$?
-	$RM -rf $format_file
+	rm -rf $format_file
 	return $retval
 }
 
@@ -84,7 +84,7 @@ log_assert "format will disallow modification of a mounted zfs disk partition"\
 
 log_onexit cleanup
 log_must default_setup_noexit $FS_DISK0
-log_must $ZPOOL add $TESTPOOL spare $FS_DISK1
+log_must zpool add $TESTPOOL spare $FS_DISK1
 
 log_note "Attempt to format a ZFS disk"
 log_mustnot mini_format $FS_DISK0
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh
index 4a35a92c65..882ae25576 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -59,7 +59,7 @@ function verify_assertion #slices
 	typeset targets=$1
 
 	for t in $targets; do
-		$ECHO "y" | $NEWFS -v $t > /dev/null 2>&1
+		echo "y" | newfs -v $t > /dev/null 2>&1
 		(( $? !=0 )) || \
 			log_fail "newfs over active pool " \
 			"unexpected return code of 0"
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_006_pos.ksh
index aaaff2f232..445ba0ccd2 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "global"
 function cleanup
 {
 	if [[ -n $PREVDUMPDEV ]]; then
-		log_must $DUMPADM -u -d $PREVDUMPDEV
+		log_must dumpadm -u -d $PREVDUMPDEV
 	fi
 
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
@@ -63,7 +63,7 @@ function verify_assertion #slices
 	typeset targets=$1
 
 	for t in $targets; do
-		log_mustnot $DUMPADM -d $t
+		log_mustnot dumpadm -d $t
 	done
 
         return 0
@@ -77,7 +77,7 @@ set -A vdevs "" "mirror" "raidz" "raidz1" "raidz2"
 
 typeset -i i=0
 
-PREVDUMPDEV=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
+PREVDUMPDEV=`dumpadm | grep "Dump device" | awk '{print $3}'`
 
 unset NOINUSE_CHECK
 while (( i < ${#vdevs[*]} )); do
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_007_pos.ksh
index 5a7d9c6957..fe6e7e9183 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,10 +48,10 @@ verify_runnable "global"
 function cleanup
 {
 	if [[ -n $PREVDUMPDEV ]]; then
-		log_must $DUMPADM -u -d $PREVDUMPDEV
+		log_must dumpadm -u -d $PREVDUMPDEV
 	fi
 
-	poolexists $TESTPOOL1 || $ZPOOL import $TESTPOOL1 >/dev/null 2>&1
+	poolexists $TESTPOOL1 || zpool import $TESTPOOL1 >/dev/null 2>&1
 
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 
@@ -66,9 +66,9 @@ function verify_assertion #slices
 	typeset targets=$1
 
 	for t in $targets; do
-		log_must $DUMPADM -u -d $t
+		log_must dumpadm -u -d $t
 
-		log_must $DUMPADM -u -d $PREVDUMPDEV
+		log_must dumpadm -u -d $PREVDUMPDEV
 	done
 
 	return 0
@@ -82,7 +82,7 @@ set -A vdevs "" "mirror" "raidz" "raidz1" "raidz2"
 
 typeset -i i=0
 
-PREVDUMPDEV=`$DUMPADM | $GREP "Dump device" | $AWK '{print $3}'`
+PREVDUMPDEV=`dumpadm | grep "Dump device" | awk '{print $3}'`
 
 while (( i < ${#vdevs[*]} )); do
 
@@ -99,9 +99,9 @@ while (( i < ${#vdevs[*]} )); do
 	fi
 
 	create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
-	log_must $ZPOOL export $TESTPOOL1
+	log_must zpool export $TESTPOOL1
 	verify_assertion "$disktargets"
-	log_must $ZPOOL import $TESTPOOL1
+	log_must zpool import $TESTPOOL1
 	destroy_pool $TESTPOOL1
 
 	if [[ ( $FS_DISK0 == $FS_DISK2 ) && -n ${vdevs[i]} ]]; then
@@ -115,9 +115,9 @@ while (( i < ${#vdevs[*]} )); do
 	fi
 
 	create_pool $TESTPOOL1 ${vdevs[i]} $vdisks spare $sdisks
-	log_must $ZPOOL export $TESTPOOL1
+	log_must zpool export $TESTPOOL1
 	verify_assertion "$disktargets"
-	log_must $ZPOOL import $TESTPOOL1
+	log_must zpool import $TESTPOOL1
 	destroy_pool $TESTPOOL1
 
 	(( i = i + 1 ))
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh
index 5d51831c9a..3c9eaa696e 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	poolexists $TESTPOOL1 || $ZPOOL import $TESTPOOL1 >/dev/null 2>&1
+	poolexists $TESTPOOL1 || zpool import $TESTPOOL1 >/dev/null 2>&1
 
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 
@@ -62,7 +62,7 @@ function verify_assertion #slices
 	typeset targets=$1
 
 	for t in $targets; do
-		$ECHO "y" | $NEWFS -v $t > /dev/null 2>&1
+		echo "y" | newfs -v $t > /dev/null 2>&1
 		(( $? !=0 )) && \
 			log_fail "newfs over exported pool " \
 				"failes unexpected."
@@ -93,7 +93,7 @@ while (( i < ${#vdevs[*]} )); do
 	fi
 
 	create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
-	log_must $ZPOOL export $TESTPOOL1
+	log_must zpool export $TESTPOOL1
 	verify_assertion "$rawtargets"
 	cleanup_devices $vslices $sslices
 
diff --git a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh
index 6fb244c5e8..d7d19ef02f 100644
--- a/usr/src/test/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/inuse/inuse_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	poolexists $TESTPOOL1 || $ZPOOL import $TESTPOOL1 >/dev/null 2>&1
+	poolexists $TESTPOOL1 || zpool import $TESTPOOL1 >/dev/null 2>&1
 
 	poolexists $TESTPOOL1 && destroy_pool $TESTPOOL1
 
@@ -91,7 +91,7 @@ while (( i < ${#vdevs[*]} )); do
 	fi
 
 	create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
-	log_must $ZPOOL export $TESTPOOL1
+	log_must zpool export $TESTPOOL1
 	verify_assertion "$vdisks $sdisks"
 
 	if [[ ( $FS_DISK0 == $FS_DISK2 ) && -n ${vdevs[i]} ]]; then
@@ -105,7 +105,7 @@ while (( i < ${#vdevs[*]} )); do
 	fi
 
 	create_pool $TESTPOOL1 ${vdevs[i]} $vdisks spare $sdisks
-	log_must $ZPOOL export $TESTPOOL1
+	log_must zpool export $TESTPOOL1
 	verify_assertion "$vdisks $sdisks"
 
 	(( i = i + 1 ))
diff --git a/usr/src/test/zfs-tests/tests/functional/large_files/large_files_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/large_files/large_files_001_pos.ksh
index 4591735eb6..0414cefea0 100644
--- a/usr/src/test/zfs-tests/tests/functional/large_files/large_files_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/large_files/large_files_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,6 +48,6 @@ verify_runnable "both"
 log_assert "Write a file to the allowable ZFS fs size."
 
 log_note "Invoke 'largest_file' with $TESTDIR/bigfile"
-log_must $LARGEST_FILE $TESTDIR/bigfile
+log_must largest_file $TESTDIR/bigfile
 
 log_pass "Successfully created a file to the maximum allowable size."
diff --git a/usr/src/test/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
index 8ca4d9dd7b..9c75bce23e 100644
--- a/usr/src/test/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,7 +57,7 @@ verify_runnable "global"
 #
 function parse_expected_output
 {
-	UNITS=`$ECHO $1 | $SED -e 's/^\([0-9].*\)\([a-z].\)/\2/'`
+	UNITS=`echo $1 | sed -e 's/^\([0-9].*\)\([a-z].\)/\2/'`
 	case "$UNITS" in
 		'mb') CHKUNIT="M" ;;
 		'gb') CHKUNIT="G" ;;
@@ -68,14 +68,14 @@ function parse_expected_output
 	esac
 
 	log_note "Detect zpool $TESTPOOL in this test machine."
-	log_must eval "$ZPOOL list $TESTPOOL > /tmp/j.$$"
-	log_must eval "$GREP $TESTPOOL /tmp/j.$$ | \
-		$AWK '{print $2}' | $GREP $CHKUNIT"
+	log_must eval "zpool list $TESTPOOL > /tmp/j.$$"
+	log_must eval "grep $TESTPOOL /tmp/j.$$ | \
+		awk '{print $2}' | grep $CHKUNIT"
 
 	log_note "Detect the file system in this test machine."
-	log_must eval "$DF -F zfs -h > /tmp/j.$$"
-	log_must eval "$GREP $TESTPOOL /tmp/j.$$ | \
-		$AWK '{print $2}' | $GREP $CHKUNIT"
+	log_must eval "df -F zfs -h > /tmp/j.$$"
+	log_must eval "grep $TESTPOOL /tmp/j.$$ | \
+		awk '{print $2}' | grep $CHKUNIT"
 
 	return 0
 }
@@ -89,19 +89,19 @@ function cleanup
 
 	if datasetexists $TESTPOOL/$TESTFS ; then
 		if ismounted $TESTPOOL/$TESTFS ; then
-			log_must $ZFS unmount $TESTPOOL/$TESTFS
+			log_must zfs unmount $TESTPOOL/$TESTFS
 		fi
-		log_must $ZFS destroy $TESTPOOL/$TESTFS
+		log_must zfs destroy $TESTPOOL/$TESTFS
 	fi
 
 	destroy_pool $TESTPOOL
 
 	datasetexists $TESTPOOL2/$TESTVOL && \
-		log_must $ZFS destroy $TESTPOOL2/$TESTVOL
+		log_must zfs destroy $TESTPOOL2/$TESTVOL
 
 	destroy_pool $TESTPOOL2
 
-	$RM -f /tmp/j.* > /dev/null
+	rm -f /tmp/j.* > /dev/null
 }
 
 log_assert "The largest pool can be created and a dataset in that" \
@@ -123,10 +123,10 @@ for volsize in $VOLSIZES; do
 	create_pool $TESTPOOL2 "$DISKS"
 
 	log_note "Create a volume device of desired sizes: $volsize"
-	str=$($ZFS create -sV $volsize $TESTPOOL2/$TESTVOL 2>&1)
+	str=$(zfs create -sV $volsize $TESTPOOL2/$TESTVOL 2>&1)
 	ret=$?
 	if (( ret != 0 )); then
-		if [[ $($ISAINFO -b) == 32 && \
+		if [[ $(isainfo -b) == 32 && \
 			$str == *${VOL_LIMIT_KEYWORD1}* || \
 			$str == *${VOL_LIMIT_KEYWORD2}* || \
 			$str == *${VOL_LIMIT_KEYWORD3}* ]]
@@ -134,7 +134,7 @@ for volsize in $VOLSIZES; do
 			log_unsupported \
 				"Max volume size is 1TB on 32-bit systems."
 		else
-			log_fail "$ZFS create -sV $volsize $TESTPOOL2/$TESTVOL"
+			log_fail "zfs create -sV $volsize $TESTPOOL2/$TESTVOL"
 		fi
 	fi
 
@@ -142,18 +142,18 @@ for volsize in $VOLSIZES; do
 	create_pool $TESTPOOL "$VOL_PATH"
 
 	log_note "Create a zfs file system in the largest pool"
-	log_must $ZFS create $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
 
 	log_note "Parse the execution result"
 	parse_expected_output $volsize
 
 	log_note "unmount this zfs file system $TESTPOOL/$TESTFS"
-	log_must $ZFS unmount $TESTPOOL/$TESTFS
+	log_must zfs unmount $TESTPOOL/$TESTFS
 
 	log_note "Destroy zfs, volume & zpool"
-	log_must $ZFS destroy $TESTPOOL/$TESTFS
+	log_must zfs destroy $TESTPOOL/$TESTFS
 	destroy_pool $TESTPOOL
-	log_must $ZFS destroy $TESTPOOL2/$TESTVOL
+	log_must zfs destroy $TESTPOOL2/$TESTVOL
 	destroy_pool $TESTPOOL2
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/link_count/link_count_001.ksh b/usr/src/test/zfs-tests/tests/functional/link_count/link_count_001.ksh
index 53e89ae3f0..71e617ecf5 100644
--- a/usr/src/test/zfs-tests/tests/functional/link_count/link_count_001.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/link_count/link_count_001.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,38 +52,38 @@ export NUMFILES=10000
 # Detect and make sure this test must be executed on a multi-process system
 is_mp || log_fail "This test requires a multi-processor system."
 
-log_must $MKDIR -p ${TESTDIR}/tmp
+log_must mkdir -p ${TESTDIR}/tmp
 
 typeset -i i=0
 while [ $i -lt $NUMFILES ]; do
         (( i = i + 1 ))
-        $TOUCH ${TESTDIR}/tmp/x$i > /dev/null 2>&1
+        touch ${TESTDIR}/tmp/x$i > /dev/null 2>&1
 done
 
 sleep 3
 
-$RM -f ${TESTDIR}/tmp/x* >/dev/null 2>&1
+rm -f ${TESTDIR}/tmp/x* >/dev/null 2>&1
 
-$RM_LNKCNT_ZERO_FILE ${TESTDIR}/tmp/test$$ > /dev/null 2>&1 &
+rm_lnkcnt_zero_file ${TESTDIR}/tmp/test$$ > /dev/null 2>&1 &
 PID=$!
-log_note "$RM_LNKCNT_ZERO_FILE ${TESTDIR}/tmp/test$$ pid: $PID"
+log_note "rm_lnkcnt_zero_file ${TESTDIR}/tmp/test$$ pid: $PID"
 
 i=0
 while [ $i -lt $ITERS ]; do
-	if ! $PGREP $RM_LNKCNT_ZERO_FILE > /dev/null ; then
-		log_note "$RM_LNKCNT_ZERO_FILE completes"
+	if ! pgrep rm_lnkcnt_zero_file > /dev/null ; then
+		log_note "rm_lnkcnt_zero_file completes"
 		break
 	fi
-	log_must $SLEEP 10
+	log_must sleep 10
 	(( i = i + 1 ))
 done
 
-if $PGREP $RM_LNKCNT_ZERO_FILE > /dev/null; then
-	log_must $KILL -TERM $PID
+if pgrep rm_lnkcnt_zero_file > /dev/null; then
+	log_must kill -TERM $PID
 	log_fail "file link count is zero"
 fi
 
-log_must $KILL -TERM $PID
-log_must $RM -f ${TESTDIR}/tmp/test$$*
+log_must kill -TERM $PID
+log_must rm -f ${TESTDIR}/tmp/test$$*
 
 log_pass "Verify file link count is zero on zfs"
diff --git a/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh
index 03389c614d..a4f90be49b 100644
--- a/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mdb/mdb_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -43,7 +43,7 @@
 
 function cleanup
 {
-	$RM -f $OUTFILE
+	rm -f $OUTFILE
 }
 
 verify_runnable "global"
@@ -81,7 +81,7 @@ typeset -i RET=0
 i=0
 while (( $i < ${#dcmds[*]} )); do
 	log_note "Verifying: '${dcmds[i]}'"
-        $ECHO "${dcmds[i]}" | $MDB -k > $OUTFILE 2>&1
+        echo "${dcmds[i]}" | mdb -k > $OUTFILE 2>&1
 	RET=$?
 	if (( $RET != 0 )); then
 		log_fail "mdb '${dcmds[i]}' returned error $RET"
@@ -90,12 +90,12 @@ while (( $i < ${#dcmds[*]} )); do
 	#
 	# mdb prefixes all errors with "mdb: " so we check the output.
 	#
-	$GREP "mdb:" $OUTFILE > /dev/null 2>&1
+	grep "mdb:" $OUTFILE > /dev/null 2>&1
 	RET=$?
 	if (( $RET == 0 )); then
-		$ECHO "mdb '${dcmds[i]}' contained 'mdb:'"
-		# Using $TAIL limits the number of lines in the log
-		$TAIL -100 $OUTFILE
+		echo "mdb '${dcmds[i]}' contained 'mdb:'"
+		# Using tail limits the number of lines in the log
+		tail -100 $OUTFILE
 		log_fail "mdb walker or dcmd failed"
 	fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/migration/cleanup.ksh
index 7cb7999c6b..5ea8e12f66 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -35,10 +35,10 @@
 verify_runnable "global"
 
 ismounted $NONZFS_TESTDIR ufs
-(( $? == 0 )) && log_must $UMOUNT -f $NONZFS_TESTDIR
+(( $? == 0 )) && log_must umount -f $NONZFS_TESTDIR
 
 ismounted $TESTPOOL/$TESTFS
-[[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR
+[[ $? == 0 ]] && log_must zfs umount -f $TESTDIR
 destroy_pool $TESTPOOL
 
 # recreate and destroy a zpool over the disks to restore the partitions to
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration.cfg b/usr/src/test/zfs-tests/tests/functional/migration/migration.cfg
index c8df90edc6..7d770f3b7c 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration.cfg
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration.cfg
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,9 +58,9 @@ export DISK_COUNT ZFS_DISK NONZFS_DISK SINGLE_DISK ZFSSIDE_DISK NONZFSSIDE_DISK
 
 export TESTFILE=/etc/passwd
 export NONZFS_TESTDIR=$TESTDIR/nonzfstestdir
-tmp=`$SUM $TESTFILE`
-export SUMA=`$ECHO $tmp | $AWK '{print $1}'`
-export SUMB=`$ECHO $tmp | $AWK '{print $2}'`
+tmp=`sum $TESTFILE`
+export SUMA=`echo $tmp | awk '{print $1}'`
+export SUMB=`echo $tmp | awk '{print $2}'`
 export FS_SIZE=1g
-export BNAME=`$BASENAME $TESTFILE`
-export DNAME=`$DIRNAME $TESTFILE`
+export BNAME=`basename $TESTFILE`
+export DNAME=`dirname $TESTFILE`
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration.kshlib b/usr/src/test/zfs-tests/tests/functional/migration/migration.kshlib
index e0799afd1b..a2b4ed99b1 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/migration/migration.cfg
@@ -43,7 +43,7 @@
 #	srcdir: is the directory where the testfile is
 #	cmd:	is the command to be executed.
 #		E.g.
-#		$TAR cf $TESTDIR/tar$$.tar
+#		tar cf $TESTDIR/tar$$.tar
 #
 function prepare #srcdir cmd
 {
@@ -82,7 +82,7 @@ function prepare #srcdir cmd
 #	oldsumb: is the second part of the values returned by sum
 #	cmd: is the command to be executed;
 #		E.g.
-#		"$TAR xf $TESTDIR/tar$$.tar"
+#		"tar xf $TESTDIR/tar$$.tar"
 #
 function migrate #destdir oldsuma oldsumb cmd
 {
@@ -99,17 +99,17 @@ function migrate #destdir oldsuma oldsumb cmd
 	$cmd
 	(( $? != 0 )) && return 1
 
-	sumy=`$SUM ./$BNAME`
-	suma=`$ECHO $sumy | $AWK '{print $1}'`
-	sumb=`$ECHO $sumy | $AWK '{print $2}'`
+	sumy=`sum ./$BNAME`
+	suma=`echo $sumy | awk '{print $1}'`
+	sumb=`echo $sumy | awk '{print $2}'`
 
 	if (( $oldsuma != $suma )); then
-		log_note "$SUM values are not the same"
+		log_note "sum values are not the same"
 		retval=1
 	fi
 
 	if (( $oldsumb != $sumb )); then
-		log_note "$SUM values are not the same"
+		log_note "sum values are not the same"
 		retval=1
 	fi
 
@@ -130,20 +130,20 @@ function migrate_cpio
 	cd $destdir
 	(( $? != 0 )) && return 1
 
-	$CPIO -iv < $archive
+	cpio -iv < $archive
 	(( $? != 0 )) && return 1
 
-	sumy=`$SUM ./$BNAME`
-	suma=`$ECHO $sumy | $AWK '{print $1}'`
-	sumb=`$ECHO $sumy | $AWK '{print $2}'`
+	sumy=`sum ./$BNAME`
+	suma=`echo $sumy | awk '{print $1}'`
+	sumb=`echo $sumy | awk '{print $2}'`
 
 	if (( $oldsuma != $suma )); then
-		log_note "$SUM values are not the same"
+		log_note "sum values are not the same"
 		retval=1
 	fi
 
 	if (( $oldsumb != $sumb )); then
-		log_note "$SUM values are not the same"
+		log_note "sum values are not the same"
 		retval=1
 	fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_001_pos.ksh
index f6d6119077..fb7e68dd8f 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/tar$$.tar
-	$RM -rf $TESTDIR/$BNAME
+	rm -rf $TESTDIR/tar$$.tar
+	rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to ZFS fs using tar"
 
 log_onexit cleanup
 
-prepare $DNAME "$TAR cf $TESTDIR/tar$$.tar $BNAME"
+prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $TESTDIR $SUMA $SUMB "$TAR xf $TESTDIR/tar$$.tar"
+migrate $TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "ZFS fs to ZFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_002_pos.ksh
index 3c48039eb8..df5407d0ac 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/tar$$.tar
-	$RM -rf $NONZFS_TESTDIR/$BNAME
+	rm -rf $TESTDIR/tar$$.tar
+	rm -rf $NONZFS_TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to UFS fs using tar"
 
 log_onexit cleanup
 
-prepare $DNAME "$TAR cf $TESTDIR/tar$$.tar $BNAME"
+prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $NONZFS_TESTDIR $SUMA $SUMB "$TAR xf $TESTDIR/tar$$.tar"
+migrate $NONZFS_TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "ZFS fs to UFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_003_pos.ksh
index 8385a31cf4..72425077e8 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $NONZFS_TESTDIR/tar$$.tar
-	$RM -rf $TESTDIR/$BNAME
+	rm -rf $NONZFS_TESTDIR/tar$$.tar
+	rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from UFS fs to ZFS fs using tar"
 
 log_onexit cleanup
 
-prepare $DNAME "$TAR cf $NONZFS_TESTDIR/tar$$.tar $BNAME"
+prepare $DNAME "tar cf $NONZFS_TESTDIR/tar$$.tar $BNAME"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $TESTDIR $SUMA $SUMB "$TAR xvf $NONZFS_TESTDIR/tar$$.tar"
+migrate $TESTDIR $SUMA $SUMB "tar xvf $NONZFS_TESTDIR/tar$$.tar"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "UFS fs to ZFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_004_pos.ksh
index 3e74d6fc60..9e9117d369 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,8 +48,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/cpio$$.cpio
-	$RM -rf $TESTDIR/$BNAME
+	rm -rf $TESTDIR/cpio$$.cpio
+	rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to ZFS fs using cpio"
@@ -60,7 +60,7 @@ cwd=$PWD
 cd $DNAME
 (( $? != 0 )) && log_untested "Could not change directory to $DNAME"
 
-$LS $BNAME | $CPIO -oc > $TESTDIR/cpio$$.cpio
+ls $BNAME | cpio -oc > $TESTDIR/cpio$$.cpio
 (( $? != 0 )) && log_failED "Unable to create cpio archive"
 
 cd $cwd
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_005_pos.ksh
index c2c8995241..8e79e17568 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,8 +48,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/cpio$$.cpio
-	$RM -rf $NONZFS_TESTDIR/$BNAME
+	rm -rf $TESTDIR/cpio$$.cpio
+	rm -rf $NONZFS_TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to uFS fs using cpio"
@@ -60,7 +60,7 @@ cwd=$PWD
 cd $DNAME
 (( $? != 0 )) && log_untested "Could not change directory to $DNAME"
 
-$LS $BNAME | $CPIO -oc > $TESTDIR/cpio$$.cpio
+ls $BNAME | cpio -oc > $TESTDIR/cpio$$.cpio
 (( $? != 0 )) && log_failED "Unable to create cpio archive"
 
 cd $cwd
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_006_pos.ksh
index 99a6b979eb..55fd9b4db8 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,8 +48,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $NONZFS_TESTDIR/cpio$$.cpio
-	$RM -rf $TESTDIR/$BNAME
+	rm -rf $NONZFS_TESTDIR/cpio$$.cpio
+	rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from UFS fs to ZFS fs using cpio"
@@ -60,7 +60,7 @@ cwd=$PWD
 cd $DNAME
 (( $? != 0 )) && log_untested "Could not change directory to $DNAME"
 
-$LS $BNAME | $CPIO -oc > $NONZFS_TESTDIR/cpio$$.cpio
+ls $BNAME | cpio -oc > $NONZFS_TESTDIR/cpio$$.cpio
 (( $? != 0 )) && log_failED "Unable to create cpio archive"
 
 cd $cwd
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_007_pos.ksh
index 71b556cbd0..bbc86959d4 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/dd$$.dd
-	$RM -rf $TESTDIR/$BNAME
+	rm -rf $TESTDIR/dd$$.dd
+	rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to ZFS fs using dd"
 
 log_onexit cleanup
 
-prepare $DNAME "$DD if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
+prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $TESTDIR $SUMA $SUMB "$DD if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
+migrate $TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "ZFS fs to ZFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_008_pos.ksh
index 2eeb882782..35cec14ef1 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/dd$$.dd
-	$RM -rf $NONZFS_TESTDIR/$BNAME
+	rm -rf $TESTDIR/dd$$.dd
+	rm -rf $NONZFS_TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to UFS fs using dd"
 
 log_onexit cleanup
 
-prepare $DNAME "$DD if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
+prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $NONZFS_TESTDIR $SUMA $SUMB "$DD if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
+migrate $NONZFS_TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "ZFS fs to ZFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_009_pos.ksh
index 84f2e6dbb9..3189cad8b5 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/dd$$.dd
-	$RM -rf $NONZFS_TESTDIR/$BNAME
+	rm -rf $TESTDIR/dd$$.dd
+	rm -rf $NONZFS_TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from UFS fs to ZFS fs using dd"
 
 log_onexit cleanup
 
-prepare $DNAME "$DD if=$BNAME obs=128k of=$NONZFS_TESTDIR/dd$$.dd"
+prepare $DNAME "dd if=$BNAME obs=128k of=$NONZFS_TESTDIR/dd$$.dd"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $TESTDIR $SUMA $SUMB "$DD if=$NONZFS_TESTDIR/dd$$.dd obs=128k of=$BNAME"
+migrate $TESTDIR $SUMA $SUMB "dd if=$NONZFS_TESTDIR/dd$$.dd obs=128k of=$BNAME"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "ZFS fs to ZFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_010_pos.ksh
index bafa06600d..346d9556f9 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_010_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/cp$$.cp
-	$RM -rf $TESTDIR/$BNAME
+	rm -rf $TESTDIR/cp$$.cp
+	rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to ZFS fs using cp"
 
 log_onexit cleanup
 
-prepare $DNAME "$CP $BNAME $TESTDIR/cp$$.cp"
+prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $TESTDIR $SUMA $SUMB "$CP $TESTDIR/cp$$.cp $BNAME"
+migrate $TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "ZFS fs to ZFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_011_pos.ksh
index 63c7461402..b064e17223 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_011_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $NONZFS_TESTDIR/cp$$.cp
-	$RM -rf $TESTDIR/$BNAME
+	rm -rf $NONZFS_TESTDIR/cp$$.cp
+	rm -rf $TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from ZFS fs to UFS fs using cp"
 
 log_onexit cleanup
 
-prepare $DNAME "$CP $BNAME $TESTDIR/cp$$.cp"
+prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $NONZFS_TESTDIR $SUMA $SUMB "$CP $TESTDIR/cp$$.cp $BNAME"
+migrate $NONZFS_TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "ZFS fs to UFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/migration_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/migration/migration_012_pos.ksh
index ca37d6c6d1..d2a62819e6 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/migration_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/migration_012_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,18 +48,18 @@ verify_runnable "both"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/cp$$.cp
-	$RM -rf $NONZFS_TESTDIR/$BNAME
+	rm -rf $TESTDIR/cp$$.cp
+	rm -rf $NONZFS_TESTDIR/$BNAME
 }
 
 log_assert "Migrating test file from UFS fs to ZFS fs using cp"
 
 log_onexit cleanup
 
-prepare $DNAME "$CP $BNAME $NONZFS_TESTDIR/cp$$.cp"
+prepare $DNAME "cp $BNAME $NONZFS_TESTDIR/cp$$.cp"
 (( $? != 0 )) && log_fail "Unable to create src archive"
 
-migrate $TESTDIR $SUMA $SUMB "$CP $NONZFS_TESTDIR/cp$$.cp $BNAME"
+migrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME"
 (( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
     "UFS fs to ZFS fs"
 
diff --git a/usr/src/test/zfs-tests/tests/functional/migration/setup.ksh b/usr/src/test/zfs-tests/tests/functional/migration/setup.ksh
index 86b9a371ce..bc7c6771d8 100644
--- a/usr/src/test/zfs-tests/tests/functional/migration/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/migration/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,19 +51,19 @@ set_partition ${NONZFSSIDE_DISK##*s} "" $FS_SIZE $NONZFS_DISK
 
 create_pool $TESTPOOL "$ZFSSIDE_DISK"
 
-$RM -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
-$MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR
+rm -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
+mkdir -p $TESTDIR || log_unresolved Could not create $TESTDIR
 
-log_must $ZFS create $TESTPOOL/$TESTFS
-log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+log_must zfs create $TESTPOOL/$TESTFS
+log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
-$RM -rf $NONZFS_TESTDIR  || log_unresolved Could not remove $NONZFS_TESTDIR
-$MKDIR -p $NONZFS_TESTDIR || log_unresolved Could not create $NONZFS_TESTDIR
+rm -rf $NONZFS_TESTDIR  || log_unresolved Could not remove $NONZFS_TESTDIR
+mkdir -p $NONZFS_TESTDIR || log_unresolved Could not create $NONZFS_TESTDIR
 
-$ECHO "y" | $NEWFS -v /dev/rdsk/$NONZFSSIDE_DISK
+echo "y" | newfs -v /dev/rdsk/$NONZFSSIDE_DISK
 (( $? != 0 )) &&
 	log_untested "Unable to setup a UFS file system"
 
-log_must $MOUNT /dev/dsk/$NONZFSSIDE_DISK $NONZFS_TESTDIR
+log_must mount /dev/dsk/$NONZFSSIDE_DISK $NONZFS_TESTDIR
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh
index 0b3ddb6626..5e38d2c113 100644
--- a/usr/src/test/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mmap/mmap_read_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,9 +46,9 @@ verify_runnable "global"
 
 log_assert "read()s from mmap()'ed file contain correct data."
 
-log_must $CHMOD 777 $TESTDIR
-log_must $READMMAP $TESTDIR/test-read-file
-log_must $ZFS unmount $TESTPOOL/$TESTFS
+log_must chmod 777 $TESTDIR
+log_must readmmap $TESTDIR/test-read-file
+log_must zfs unmount $TESTPOOL/$TESTFS
 
 typeset dir=$(get_device_dir $DISKS)
 verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir"
diff --git a/usr/src/test/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh
index 6bede53bf7..f65a4c1c4a 100644
--- a/usr/src/test/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mmap/mmap_write_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,13 +50,13 @@ log_assert "write()s to a file and mmap() that file at the same time does not "\
 # Detect and make sure this test must be executed on a multi-process system
 is_mp || log_fail "This test requires a multi-processor system."
 
-log_must $CHMOD 777 $TESTDIR
-$MMAPWRITE $TESTDIR/test-write-file &
+log_must chmod 777 $TESTDIR
+mmapwrite $TESTDIR/test-write-file &
 PID_MMAPWRITE=$!
-log_note "$MMAPWRITE $TESTDIR/test-write-file pid: $PID_MMAPWRITE"
-log_must $SLEEP 30
+log_note "mmapwrite $TESTDIR/test-write-file pid: $PID_MMAPWRITE"
+log_must sleep 30
 
-log_must $KILL -9 $PID_MMAPWRITE
-log_must $LS -l $TESTDIR/test-write-file
+log_must kill -9 $PID_MMAPWRITE
+log_must ls -l $TESTDIR/test-write-file
 
 log_pass "write(2) a mmap(2)'ing file succeeded."
diff --git a/usr/src/test/zfs-tests/tests/functional/mount/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/mount/cleanup.ksh
index e02840ddcb..cde5610a37 100644
--- a/usr/src/test/zfs-tests/tests/functional/mount/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mount/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -34,5 +34,5 @@
 log_must destroy_pool $TESTPOOL
 
 for dir in $TESTDIRS; do
-	$RM -rf $dir
+	rm -rf $dir
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/mount/setup.ksh b/usr/src/test/zfs-tests/tests/functional/mount/setup.ksh
index 50b93fd35c..adcdc26374 100644
--- a/usr/src/test/zfs-tests/tests/functional/mount/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mount/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -38,9 +38,9 @@ for i in 1 2 3; do
 	dir=$TESTDIR.$i
 	fs=$TESTPOOL/$TESTFS.$i
 
-	log_must $ZFS create $fs
-	log_must $MKDIR -p $dir
-	log_must $ZFS set mountpoint=$dir $fs
+	log_must zfs create $fs
+	log_must mkdir -p $dir
+	log_must zfs set mountpoint=$dir $fs
 
 	log_must mounted $fs
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/mount/umount_001.ksh b/usr/src/test/zfs-tests/tests/functional/mount/umount_001.ksh
index ad3c3346f8..a1749aab2a 100644
--- a/usr/src/test/zfs-tests/tests/functional/mount/umount_001.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mount/umount_001.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,9 +45,9 @@
 
 for fs in 1 2 3; do
 	log_must mounted $TESTDIR.$fs
-	log_must $ZFS umount $TESTPOOL/$TESTFS.$fs
+	log_must zfs umount $TESTPOOL/$TESTFS.$fs
 	log_must unmounted $TESTDIR.$fs
-	log_must $ZFS mount $TESTPOOL/$TESTFS.$fs
+	log_must zfs mount $TESTPOOL/$TESTFS.$fs
 	log_must mounted $TESTDIR.$fs
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/mount/umountall_001.ksh b/usr/src/test/zfs-tests/tests/functional/mount/umountall_001.ksh
index 1495b5cece..b650b821b6 100644
--- a/usr/src/test/zfs-tests/tests/functional/mount/umountall_001.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mount/umountall_001.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -32,7 +32,7 @@
 # 3. Run umountall -n and verify the file systems it reports are in the list.
 #
 
-log_must $ZFS mount -a
+log_must zfs mount -a
 for fs in 1 2 3 ; do
 	log_must mounted $TESTPOOL/$TESTFS.$fs
 done
@@ -43,12 +43,12 @@ done
 zfs_list="/ /lib /sbin /tmp /usr /var /var/adm /var/run"
 
 # Append our ZFS filesystems to the list, not worrying about duplicates.
-for fs in $($MOUNT -p | $AWK '{if ($4 == "zfs") print $3}'); do
+for fs in $(mount -p | awk '{if ($4 == "zfs") print $3}'); do
 	zfs_list="$zfs_list $fs"
 done
 
 fs=''
-for fs in $($UMOUNTALL -n -F zfs 2>&1 | $AWK '{print $2}'); do
+for fs in $(umountall -n -F zfs 2>&1 | awk '{print $2}'); do
 	for i in $zfs_list; do
 		[[ $fs = $i ]] && continue 2
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/mv_files/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/mv_files/cleanup.ksh
index 971cf8f08b..eb95dbd4cf 100644
--- a/usr/src/test/zfs-tests/tests/functional/mv_files/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mv_files/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -35,14 +35,14 @@
 verify_runnable "global"
 
 [[ -f /var/tmp/exitsZero.ksh ]] && \
-	log_must $RM -f /var/tmp/exitsZero.ksh
+	log_must rm -f /var/tmp/exitsZero.ksh
 [[ -f /var/tmp/testbackgprocs.ksh ]] && \
-	log_must $RM -f /var/tmp/testbackgprocs.ksh
+	log_must rm -f /var/tmp/testbackgprocs.ksh
 
 ismounted $TESTPOOL/$TESTFS_TGT
-(( $? == 0 )) && log_must $ZFS umount $TESTPOOL/$TESTFS_TGT
-log_must $ZFS destroy $TESTPOOL/$TESTFS_TGT
+(( $? == 0 )) && log_must zfs umount $TESTPOOL/$TESTFS_TGT
+log_must zfs destroy $TESTPOOL/$TESTFS_TGT
 
-[[ -d $TESTDIR_TGT ]] && log_must $RM -rf $TESTDIR_TGT
+[[ -d $TESTDIR_TGT ]] && log_must rm -rf $TESTDIR_TGT
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_001_pos.ksh
index 834ee3b6bb..4ea5e3db38 100644
--- a/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,8 +54,8 @@ verify_runnable "global"
 function cleanup
 {
 	PIDS=""
-	$RM -f $OLDDIR/* >/dev/null 2>&1
-	$RM -f $NEWDIR_IN_FS/* >/dev/null 2>&1
+	rm -f $OLDDIR/* >/dev/null 2>&1
+	rm -f $NEWDIR_IN_FS/* >/dev/null 2>&1
 }
 
 log_assert "Doing a 'mv' of a large amount of files within a zfs filesystem" \
diff --git a/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_002_pos.ksh
index f80447f359..283770d4a4 100644
--- a/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,8 +55,8 @@ verify_runnable "global"
 function cleanup
 {
 	PIDS=""
-	$RM -f $OLDDIR/* >/dev/null 2>&1
-	$RM -f $NEWDIR_ACROSS_FS/* >/dev/null 2>&1
+	rm -f $OLDDIR/* >/dev/null 2>&1
+	rm -f $NEWDIR_ACROSS_FS/* >/dev/null 2>&1
 }
 
 log_assert "Doing a 'mv' of a large amount of files across two zfs filesystems" \
diff --git a/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib b/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib
index b3c7e28201..4957b8ea92 100644
--- a/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/mv_files/mv_files_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/mv_files/mv_files.cfg
@@ -37,11 +37,11 @@
 #
 function check_bg_procs_limit_num
 {
-$ECHO "#!/usr/bin/ksh" > /var/tmp/exitsZero.ksh
-$ECHO  "exit 0" >> /var/tmp/exitsZero.ksh
-$CHMOD 777 /var/tmp/exitsZero.ksh
+echo "#!/usr/bin/ksh" > /var/tmp/exitsZero.ksh
+echo  "exit 0" >> /var/tmp/exitsZero.ksh
+chmod 777 /var/tmp/exitsZero.ksh
 
-$CAT <<EOF > /var/tmp/testbackgprocs.ksh
+cat <<EOF > /var/tmp/testbackgprocs.ksh
 #!/usr/bin/ksh
 #
 # exitsZero.ksh is a one line script
@@ -57,17 +57,17 @@ do
         (( i = i + 1 ))
 done
 
-\$SLEEP 1
+\sleep 1
 
 for pid in \$PIDS
 do
-	\$WAIT \$pid
+	\wait \$pid
         (( \$? == 127 )) && exit 1
 done
 exit 0
 EOF
 
-$KSH /var/tmp/testbackgprocs.ksh
+ksh /var/tmp/testbackgprocs.ksh
 if [[ $? -eq 1 ]]; then
 #
 # Current ksh being executed has a limit
@@ -90,21 +90,21 @@ function init_setup
 		reexport_pool
 	fi
 
-        $RM -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
-        $MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR
+        rm -rf $TESTDIR  || log_unresolved Could not remove $TESTDIR
+        mkdir -p $TESTDIR || log_unresolved Could not create $TESTDIR
 
-        $RM -rf $TESTDIR_TGT  || log_unresolved Could not remove $TESTDIR_TGT
-        $MKDIR -p $TESTDIR_TGT || log_unresolved Could not create $TESTDIR_TGT
+        rm -rf $TESTDIR_TGT  || log_unresolved Could not remove $TESTDIR_TGT
+        mkdir -p $TESTDIR_TGT || log_unresolved Could not create $TESTDIR_TGT
 
-        log_must $ZFS create $TESTPOOL/$TESTFS
-        log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+        log_must zfs create $TESTPOOL/$TESTFS
+        log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 
-        log_must $ZFS create $TESTPOOL/$TESTFS_TGT
-        log_must $ZFS set mountpoint=$TESTDIR_TGT $TESTPOOL/$TESTFS_TGT
+        log_must zfs create $TESTPOOL/$TESTFS_TGT
+        log_must zfs set mountpoint=$TESTDIR_TGT $TESTPOOL/$TESTFS_TGT
 
-        $MKDIR -p $OLDDIR || log_unresolved Could not create $OLDDIR
-        $MKDIR -p $NEWDIR_IN_FS || log_unresolved Could not create $NEWDIR_IN_FS
-        $MKDIR -p $NEWDIR_ACROSS_FS || log_unresolved Could not create $NEWDIR_ACROSS_FS
+        mkdir -p $OLDDIR || log_unresolved Could not create $OLDDIR
+        mkdir -p $NEWDIR_IN_FS || log_unresolved Could not create $NEWDIR_IN_FS
+        mkdir -p $NEWDIR_ACROSS_FS || log_unresolved Could not create $NEWDIR_ACROSS_FS
 
 }
 
@@ -112,8 +112,8 @@ function wait_pid
 {
 	for pid in $1
 	do
-		$PS -e | $GREP $pid >/dev/null 2>&1
-		(( $? == 0 )) && $WAIT $pid
+		ps -e | grep $pid >/dev/null 2>&1
+		(( $? == 0 )) && wait $pid
         done
 }
 
@@ -138,12 +138,12 @@ function generate_files
 
         while (( count <= $2 ))
         do
-                $CP /etc/passwd $1/file_$count \
+                cp /etc/passwd $1/file_$count \
                          > /dev/null 2>&1 &
 
                 PIDS="$PIDS $!"
 
-                proc_num=`$ECHO $PIDS | $WC -w`
+                proc_num=`echo $PIDS | wc -w`
                 if (( proc_num >= GANGPIDS )); then
                         wait_pid "$PIDS"
                         proc_num=0
@@ -164,8 +164,8 @@ function generate_files
 function mv_files
 {
 
-        $FIND $1 -type f -print | xargs -i \
-                $MV {} $2 > /dev/null 2>&1
+        find $1 -type f -print | xargs -i \
+                mv {} $2 > /dev/null 2>&1
 }
 
 #
@@ -177,7 +177,7 @@ function mv_files
 function count_files
 {
         typeset -i file_num
-        file_num=`$FIND $1  -type f -print | \
+        file_num=`find $1  -type f -print | \
                 wc -l`
         (( file_num != $2 )) && \
                 log_fail "The file number of target directory"\
diff --git a/usr/src/test/zfs-tests/tests/functional/nestedfs/nestedfs_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/nestedfs/nestedfs_001_pos.ksh
index b27dd6e148..b576b78c8a 100644
--- a/usr/src/test/zfs-tests/tests/functional/nestedfs/nestedfs_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nestedfs/nestedfs_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,11 +49,11 @@ verify_runnable "both"
 
 log_assert "Verify a nested file system can be created/destroyed."
 
-log_must $FILE_WRITE -o create -f $TESTDIR1/file -b 8192 -c 600 -d 0
-log_must $ZFS unmount $TESTDIR1
+log_must file_write -o create -f $TESTDIR1/file -b 8192 -c 600 -d 0
+log_must zfs unmount $TESTDIR1
 
 log_note "Verify that a nested file system with a mounted file system "\
     "cannot be destroyed."
-log_mustnot $ZFS destroy $TESTPOOL/$TESTCTR
+log_mustnot zfs destroy $TESTPOOL/$TESTCTR
 
 log_pass "A nested file system was successfully populated."
diff --git a/usr/src/test/zfs-tests/tests/functional/no_space/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/no_space/cleanup.ksh
index 35380c1419..4f80221458 100644
--- a/usr/src/test/zfs-tests/tests/functional/no_space/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/no_space/cleanup.ksh
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 #
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -37,7 +37,7 @@ DISK=${DISKS%% *}
 
 ismounted "$TESTPOOL/$TESTFS"
 (( $? == 0 )) && \
-        log_must $ZFS umount $TESTDIR
+        log_must zfs umount $TESTDIR
 
 destroy_pool $TESTPOOL
 #
diff --git a/usr/src/test/zfs-tests/tests/functional/no_space/enospc_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/no_space/enospc_001_pos.ksh
index 7b20eb7c5e..fd48dfb715 100644
--- a/usr/src/test/zfs-tests/tests/functional/no_space/enospc_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/no_space/enospc_001_pos.ksh
@@ -25,7 +25,7 @@
 # Use is subject to license terms.
 #
 #
-# Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,10 +55,10 @@ function cleanup
 log_onexit cleanup
 
 log_assert "ENOSPC is returned when file system is full."
-log_must $ZFS set compression=off $TESTPOOL/$TESTFS
+log_must zfs set compression=off $TESTPOOL/$TESTFS
 
 log_note "Writing file: $TESTFILE0 until ENOSPC."
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE0 -b $BLOCKSZ \
+file_write -o create -f $TESTDIR/$TESTFILE0 -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 ret=$?
 
@@ -66,7 +66,7 @@ ret=$?
     log_fail "$TESTFILE0 returned: $ret rather than ENOSPC."
 
 log_note "Write another file: $TESTFILE1 but expect ENOSPC."
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCKSZ \
+file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 ret=$?
 
diff --git a/usr/src/test/zfs-tests/tests/functional/no_space/enospc_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/no_space/enospc_002_pos.ksh
index 25d88d7c5a..472d80ee0b 100644
--- a/usr/src/test/zfs-tests/tests/functional/no_space/enospc_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/no_space/enospc_002_pos.ksh
@@ -15,7 +15,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -30,45 +30,45 @@ verify_runnable "both"
 
 log_assert "ENOSPC is returned when file system is full."
 sync
-log_must $ZFS set compression=off $TESTPOOL/$TESTFS
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap
+log_must zfs set compression=off $TESTPOOL/$TESTFS
+log_must zfs snapshot $TESTPOOL/$TESTFS@snap
 
 log_note "Writing file: $TESTFILE0 until ENOSPC."
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE0 -b $BLOCKSZ \
+file_write -o create -f $TESTDIR/$TESTFILE0 -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 ret=$?
 
 (( $ret != $ENOSPC )) && \
     log_fail "$TESTFILE0 returned: $ret rather than ENOSPC."
 
-log_mustnot_expect space $ZFS create $TESTPOOL/$TESTFS/subfs
-log_mustnot_expect space $ZFS clone $TESTPOOL/$TESTFS@snap $TESTPOOL/clone
-log_mustnot_expect space $ZFS snapshot $TESTPOOL/$TESTFS@snap2
-log_mustnot_expect space $ZFS bookmark \
+log_mustnot_expect space zfs create $TESTPOOL/$TESTFS/subfs
+log_mustnot_expect space zfs clone $TESTPOOL/$TESTFS@snap $TESTPOOL/clone
+log_mustnot_expect space zfs snapshot $TESTPOOL/$TESTFS@snap2
+log_mustnot_expect space zfs bookmark \
     $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS#bookmark
 
-log_must $ZFS send $TESTPOOL/$TESTFS@snap >/tmp/stream.$$
-log_mustnot_expect space $ZFS receive $TESTPOOL/$TESTFS/recvd </tmp/stream.$$
+log_must zfs send $TESTPOOL/$TESTFS@snap >/tmp/stream.$$
+log_mustnot_expect space zfs receive $TESTPOOL/$TESTFS/recvd </tmp/stream.$$
 log_must rm /tmp/stream.$$
 
-log_must $ZFS rename $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS@snap_newname
-log_must $ZFS rename $TESTPOOL/$TESTFS@snap_newname $TESTPOOL/$TESTFS@snap
-log_must $ZFS rename $TESTPOOL/$TESTFS $TESTPOOL/${TESTFS}_newname
-log_must $ZFS rename $TESTPOOL/${TESTFS}_newname $TESTPOOL/$TESTFS
-log_must $ZFS allow staff snapshot $TESTPOOL/$TESTFS
-log_must $ZFS unallow staff snapshot $TESTPOOL/$TESTFS
-log_must $ZFS set user:prop=value $TESTPOOL/$TESTFS
-log_must $ZFS set quota=1EB $TESTPOOL/$TESTFS
-log_must $ZFS set quota=none $TESTPOOL/$TESTFS
-log_must $ZFS set reservation=1KB $TESTPOOL/$TESTFS
-log_must $ZFS set reservation=none $TESTPOOL/$TESTFS
-log_must $ZPOOL scrub $TESTPOOL
-$ZPOOL scrub -s $TESTPOOL
-log_must $ZPOOL set comment="Use the force, Luke." $TESTPOOL
-log_must $ZPOOL set comment="" $TESTPOOL
+log_must zfs rename $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS@snap_newname
+log_must zfs rename $TESTPOOL/$TESTFS@snap_newname $TESTPOOL/$TESTFS@snap
+log_must zfs rename $TESTPOOL/$TESTFS $TESTPOOL/${TESTFS}_newname
+log_must zfs rename $TESTPOOL/${TESTFS}_newname $TESTPOOL/$TESTFS
+log_must zfs allow staff snapshot $TESTPOOL/$TESTFS
+log_must zfs unallow staff snapshot $TESTPOOL/$TESTFS
+log_must zfs set user:prop=value $TESTPOOL/$TESTFS
+log_must zfs set quota=1EB $TESTPOOL/$TESTFS
+log_must zfs set quota=none $TESTPOOL/$TESTFS
+log_must zfs set reservation=1KB $TESTPOOL/$TESTFS
+log_must zfs set reservation=none $TESTPOOL/$TESTFS
+log_must zpool scrub $TESTPOOL
+zpool scrub -s $TESTPOOL
+log_must zpool set comment="Use the force, Luke." $TESTPOOL
+log_must zpool set comment="" $TESTPOOL
 
 # destructive tests must come last
-log_must $ZFS rollback $TESTPOOL/$TESTFS@snap
-log_must $ZFS destroy $TESTPOOL/$TESTFS@snap
+log_must zfs rollback $TESTPOOL/$TESTFS@snap
+log_must zfs destroy $TESTPOOL/$TESTFS@snap
 
 log_pass "ENOSPC returned as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite.shlib b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite.shlib
index a03bc54123..1c0f0517db 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite.shlib
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite.shlib
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/math.shlib
@@ -27,7 +27,7 @@ function verify_nopwrite
 	typeset low=1
 	typeset high=99
 
-	$SYNC
+	sync
 	for i in origin snap clone; do
 		for j in used refer usedbychildren written; do
 			typeset ${i}_$j=$(get_prop $j $(eval echo \$$i))
@@ -60,7 +60,7 @@ function verify_nopwrite
 	# The comparisons below should pass regardless of nopwrite. They're
 	# here for sanity.
 	#
-	typeset deadlist=$($ZDB -Pddd $clone | $AWK '/Deadlist:/ {print $2}')
+	typeset deadlist=$(zdb -Pddd $clone | awk '/Deadlist:/ {print $2}')
 	within_percent $deadlist $clone_written $high || return 1
 	within_percent $snap_refer $snap_written $high || return 1
 
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_copies.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_copies.ksh
index c85fedc3ea..9c04ed8bc8 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_copies.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_copies.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -34,37 +34,37 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $origin
-	log_must $ZFS create -o mountpoint=$TESTDIR $origin
+	datasetexists $origin && log_must zfs destroy -R $origin
+	log_must zfs create -o mountpoint=$TESTDIR $origin
 }
 
 log_assert "nopwrite requires copies property to remain constant"
 
 # Verify nopwrite is disabled with increased redundancy
-log_must $ZFS set compress=on $origin
-log_must $ZFS set checksum=sha256 $origin
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+log_must zfs set compress=on $origin
+log_must zfs set checksum=sha256 $origin
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $origin/clone
-$ZFS set copies=3 $origin/clone
-$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $origin/clone
+zfs set copies=3 $origin/clone
+dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 log_mustnot verify_nopwrite $origin $origin@a $origin/clone
 
 # Verify nopwrite is disabled with decreased redundancy
-$ZFS destroy -R $origin || log_fail "Couldn't destroy $origin"
-$ZFS create -o mountpoint=$TESTDIR $origin || \
+zfs destroy -R $origin || log_fail "Couldn't destroy $origin"
+zfs create -o mountpoint=$TESTDIR $origin || \
     log_fail "Couldn't recreate $origin"
-log_must $ZFS set compress=on $origin
-log_must $ZFS set copies=3 $origin
-log_must $ZFS set checksum=sha256 $origin
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+log_must zfs set compress=on $origin
+log_must zfs set copies=3 $origin
+log_must zfs set checksum=sha256 $origin
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $origin/clone
-$ZFS set copies=1 $origin/clone
-$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $origin/clone
+zfs set copies=1 $origin/clone
+dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 log_mustnot verify_nopwrite $origin $origin@a $origin/clone
 
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_mtime.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_mtime.ksh
index 2a2d7b77b3..c36f22c9f7 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_mtime.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_mtime.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -34,27 +34,27 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $origin
-	log_must $ZFS create -o mountpoint=$TESTDIR $origin
+	datasetexists $origin && log_must zfs destroy -R $origin
+	log_must zfs create -o mountpoint=$TESTDIR $origin
 }
 
 log_assert "nopwrite updates file metadata correctly"
 
-log_must $ZFS set compress=on $origin
-log_must $ZFS set checksum=sha256 $origin
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+log_must zfs set compress=on $origin
+log_must zfs set checksum=sha256 $origin
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $origin/clone
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $origin/clone
 
-o_atime=$($LS -E% all $TESTDIR/clone/file | $AWK '/atime/ {print $4}')
-o_ctime=$($LS -E% all $TESTDIR/clone/file | $AWK '/ctime/ {print $4}')
-o_mtime=$($LS -E% all $TESTDIR/clone/file | $AWK '/mtime/ {print $4}')
-$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+o_atime=$(ls -E% all $TESTDIR/clone/file | awk '/atime/ {print $4}')
+o_ctime=$(ls -E% all $TESTDIR/clone/file | awk '/ctime/ {print $4}')
+o_mtime=$(ls -E% all $TESTDIR/clone/file | awk '/mtime/ {print $4}')
+dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
-atime=$($LS -E% all $TESTDIR/clone/file | $AWK '/atime/ {print $4}')
-ctime=$($LS -E% all $TESTDIR/clone/file | $AWK '/ctime/ {print $4}')
-mtime=$($LS -E% all $TESTDIR/clone/file | $AWK '/mtime/ {print $4}')
+atime=$(ls -E% all $TESTDIR/clone/file | awk '/atime/ {print $4}')
+ctime=$(ls -E% all $TESTDIR/clone/file | awk '/ctime/ {print $4}')
+mtime=$(ls -E% all $TESTDIR/clone/file | awk '/mtime/ {print $4}')
 
 [[ $o_atime = $atime ]] || log_fail "atime changed: $o_atime $atime"
 [[ $o_ctime = $ctime ]] && log_fail "ctime unchanged: $o_ctime $ctime"
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_negative.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_negative.ksh
index 0ac87888dd..2c166c2414 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_negative.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_negative.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -36,54 +36,54 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $origin
-	log_must $ZFS create -o mountpoint=$TESTDIR $origin
+	datasetexists $origin && log_must zfs destroy -R $origin
+	log_must zfs create -o mountpoint=$TESTDIR $origin
 }
 
 log_assert "nopwrite isn't enabled without the prerequisites"
 
 # Data written into origin fs without compression or sha256
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd of $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone -o compress=on $origin@a $origin/clone
-log_must $ZFS set checksum=sha256 $origin/clone
-$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone -o compress=on $origin@a $origin/clone
+log_must zfs set checksum=sha256 $origin/clone
+dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 log_mustnot verify_nopwrite $origin $origin@a $origin/clone
-$ZFS destroy -R $origin@a || log_fail "zfs destroy failed"
-log_must $RM -f $TESTDIR/file
+zfs destroy -R $origin@a || log_fail "zfs destroy failed"
+log_must rm -f $TESTDIR/file
 
 # Data written to origin fs before checksum enabled
-log_must $ZFS set compress=on $origin
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+log_must zfs set compress=on $origin
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-log_must $ZFS set checksum=sha256 $origin
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $origin/clone
-$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+log_must zfs set checksum=sha256 $origin
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $origin/clone
+dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 log_mustnot verify_nopwrite $origin $origin@a $origin/clone
-$ZFS destroy -R $origin@a || log_fail "zfs destroy failed"
-log_must $RM -f $TESTDIR/file
+zfs destroy -R $origin@a || log_fail "zfs destroy failed"
+log_must rm -f $TESTDIR/file
 
 # Clone with compression=off
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone -o compress=off $origin@a $origin/clone
-$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone -o compress=off $origin@a $origin/clone
+dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 log_mustnot verify_nopwrite $origin $origin@a $origin/clone
-$ZFS destroy -R $origin@a || log_fail "zfs destroy failed"
-log_must $RM -f $TESTDIR/file
+zfs destroy -R $origin@a || log_fail "zfs destroy failed"
+log_must rm -f $TESTDIR/file
 
 # Clone with fletcher4, rather than sha256
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone -o checksum=fletcher4 $origin@a $origin/clone
-$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone -o checksum=fletcher4 $origin@a $origin/clone
+dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 log_mustnot verify_nopwrite $origin $origin@a $origin/clone
 
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_promoted_clone.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_promoted_clone.ksh
index 2e0816ea37..aa366e4130 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_promoted_clone.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_promoted_clone.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -36,22 +36,22 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $TESTPOOL/clone
-	log_must $ZFS create -o mountpoint=$TESTDIR $origin
+	datasetexists $origin && log_must zfs destroy -R $TESTPOOL/clone
+	log_must zfs create -o mountpoint=$TESTDIR $origin
 }
 
 log_assert "nopwrite works on a dataset that becomes a clone via promotion."
 
-log_must $ZFS set compress=on $origin
-log_must $ZFS set checksum=sha256 $origin
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+log_must zfs set compress=on $origin
+log_must zfs set checksum=sha256 $origin
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $TESTPOOL/clone
-log_must $ZFS set compress=off $TESTPOOL/clone
-log_must $ZFS set checksum=off $TESTPOOL/clone
-log_must $ZFS promote $TESTPOOL/clone
-$DD if=/$TESTPOOL/clone/file of=/$TESTDIR/file bs=1024k count=$MEGS \
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $TESTPOOL/clone
+log_must zfs set compress=off $TESTPOOL/clone
+log_must zfs set checksum=off $TESTPOOL/clone
+log_must zfs promote $TESTPOOL/clone
+dd if=/$TESTPOOL/clone/file of=/$TESTDIR/file bs=1024k count=$MEGS \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 log_must verify_nopwrite $TESTPOOL/clone $TESTPOOL/clone@a $origin
 
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_recsize.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_recsize.ksh
index fea9fb90a7..4e535b8061 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_recsize.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_recsize.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -34,22 +34,22 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $origin
-	log_must $ZFS create -o mountpoint=$TESTDIR $origin
+	datasetexists $origin && log_must zfs destroy -R $origin
+	log_must zfs create -o mountpoint=$TESTDIR $origin
 }
 
 log_assert "nopwrite updates file metadata correctly"
 
-log_must $ZFS set compress=on $origin
-log_must $ZFS set checksum=sha256 $origin
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+log_must zfs set compress=on $origin
+log_must zfs set checksum=sha256 $origin
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $origin/clone
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $origin/clone
 
 for rs in 512 1024 2048 4096 8192 16384 32768 65536 131072 ; do
-	log_must $ZFS set recsize=$rs $origin/clone
-	$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+	log_must zfs set recsize=$rs $origin/clone
+	dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
 	    conv=notrunc >/tmp/null 2>&1 || log_fail "dd failed."
 	log_must verify_nopwrite $origin $origin@a $origin/clone
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh
index b64223e877..415c8bdc5e 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_sync.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -34,20 +34,20 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $origin
-	log_must $ZFS create -o mountpoint=$TESTDIR $origin
+	datasetexists $origin && log_must zfs destroy -R $origin
+	log_must zfs create -o mountpoint=$TESTDIR $origin
 }
 
 log_assert "nopwrite works for sync writes"
 
-log_must $ZFS set compress=on $origin
-log_must $ZFS set checksum=sha256 $origin
-$GNUDD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS oflag=sync \
+log_must zfs set compress=on $origin
+log_must zfs set checksum=sha256 $origin
+gnu_dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS oflag=sync \
     conv=notrunc >/dev/null 2>&1 || log_fail "dd into $TESTDIR/file failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $origin/clone
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $origin/clone
 
-$GNUDD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+gnu_dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
     oflag=sync conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 
 log_must verify_nopwrite $origin $origin@a $origin/clone
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_varying_compression.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_varying_compression.ksh
index b88acd5e9b..9194cffe03 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_varying_compression.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_varying_compression.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -40,25 +40,25 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $origin
-	log_must $ZFS create -o mountpoint=$TESTDIR $origin
+	datasetexists $origin && log_must zfs destroy -R $origin
+	log_must zfs create -o mountpoint=$TESTDIR $origin
 }
 
 log_assert "nopwrite works with sha256 and any compression algorithm"
 
-log_must $ZFS set compress=on $origin
-log_must $ZFS set checksum=sha256 $origin
-$DD if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
+log_must zfs set compress=on $origin
+log_must zfs set checksum=sha256 $origin
+dd if=/dev/urandom of=$TESTDIR/file bs=1024k count=$MEGS conv=notrunc \
     >/dev/null 2>&1 || log_fail "initial dd failed."
 
 # Verify nop_write for 4 random compression algorithms
 for i in $(get_rand_compress 4); do
-	$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-	log_must $ZFS clone -o compress=$i $origin@a $origin/clone
-	$DD if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
+	zfs snapshot $origin@a || log_fail "zfs snap failed"
+	log_must zfs clone -o compress=$i $origin@a $origin/clone
+	dd if=/$TESTDIR/file of=/$TESTDIR/clone/file bs=1024k count=$MEGS \
 	    conv=notrunc >/dev/null 2>&1 || log_fail "dd failed."
 	log_must verify_nopwrite $origin $origin@a $origin/clone
-	$ZFS destroy -R $origin@a || log_fail "zfs destroy failed"
+	zfs destroy -R $origin@a || log_fail "zfs destroy failed"
 done
 
 log_pass "nopwrite works with sha256 and any compression algorithm"
diff --git a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh
index f00b1999c8..4a6060bced 100644
--- a/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -37,21 +37,21 @@ log_onexit cleanup
 
 function cleanup
 {
-	datasetexists $origin && log_must $ZFS destroy -R $origin
+	datasetexists $origin && log_must zfs destroy -R $origin
 	# No need to recreate the volume as no other tests expect it.
 }
 
 log_assert "nopwrite works on volumes"
 
-log_must $ZFS set compress=on $origin
-log_must $ZFS set checksum=sha256 $origin
-$DD if=/dev/urandom of=$vol bs=8192 count=4096 conv=notrunc >/dev/null \
+log_must zfs set compress=on $origin
+log_must zfs set checksum=sha256 $origin
+dd if=/dev/urandom of=$vol bs=8192 count=4096 conv=notrunc >/dev/null \
     2>&1 || log_fail "dd into $orgin failed."
-$ZFS snapshot $origin@a || log_fail "zfs snap failed"
-log_must $ZFS clone $origin@a $clone
-log_must $ZFS set compress=on $clone
-log_must $ZFS set checksum=sha256 $clone
-$DD if=$vol of=$volclone bs=8192 count=4096 conv=notrunc >/dev/null 2>&1 || \
+zfs snapshot $origin@a || log_fail "zfs snap failed"
+log_must zfs clone $origin@a $clone
+log_must zfs set compress=on $clone
+log_must zfs set checksum=sha256 $clone
+dd if=$vol of=$volclone bs=8192 count=4096 conv=notrunc >/dev/null 2>&1 || \
     log_fail "dd into $clone failed."
 log_must verify_nopwrite $origin $origin@a $clone
 
diff --git a/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_001_pos.ksh
index b1b9b1383c..7531cd3782 100644
--- a/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,7 +52,7 @@ function cleanup
 	# Ensure we don't leave disks in the offline state
 	#
 	for disk in $DISKLIST; do
-		log_must $ZPOOL online $TESTPOOL $disk
+		log_must zpool online $TESTPOOL $disk
 		check_state $TESTPOOL $disk "online"
 		if [[ $? != 0 ]]; then
 			log_fail "Unable to online $disk"
@@ -60,33 +60,33 @@ function cleanup
 
 	done
 
-	$KILL $killpid >/dev/null 2>&1
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	kill $killpid >/dev/null 2>&1
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Turning a disk offline and back online during I/O completes."
 
-$FILE_TRUNC -f $((64 * 1024 * 1024)) -b 8192 -c 0 -r $TESTDIR/$TESTFILE1 &
+file_trunc -f $((64 * 1024 * 1024)) -b 8192 -c 0 -r $TESTDIR/$TESTFILE1 &
 typeset killpid="$! "
 
 for disk in $DISKLIST; do
         for i in 'do_offline' 'do_offline_while_already_offline'; do
-		log_must $ZPOOL offline $TESTPOOL $disk
+		log_must zpool offline $TESTPOOL $disk
 		check_state $TESTPOOL $disk "offline"
                 if [[ $? != 0 ]]; then
                         log_fail "$disk of $TESTPOOL is not offline."
                 fi
         done
 
-        log_must $ZPOOL online $TESTPOOL $disk
+        log_must zpool online $TESTPOOL $disk
         check_state $TESTPOOL $disk "online"
         if [[ $? != 0 ]]; then
                 log_fail "$disk of $TESTPOOL did not match online state"
         fi
 done
 
-log_must $KILL $killpid
-$SYNC
+log_must kill $killpid
+sync
 
 typeset dir=$(get_device_dir $DISKS)
 verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir"
diff --git a/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_002_neg.ksh
index 6bd2411b11..1ed43df4e7 100644
--- a/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,7 +53,7 @@ function cleanup
 	# Ensure we don't leave disks in the offline state
 	#
 	for disk in $DISKLIST; do
-		log_must $ZPOOL online $TESTPOOL $disk
+		log_must zpool online $TESTPOOL $disk
 		check_state $TESTPOOL $disk "online"
 		if [[ $? != 0 ]]; then
 			log_fail "Unable to online $disk"
@@ -61,15 +61,15 @@ function cleanup
 
 	done
 
-	$KILL $killpid >/dev/null 2>&1
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	kill $killpid >/dev/null 2>&1
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Turning both disks offline should fail."
 
 log_onexit cleanup
 
-$FILE_TRUNC -f $((64 * 1024 * 1024)) -b 8192 -c 0 -r $TESTDIR/$TESTFILE1 &
+file_trunc -f $((64 * 1024 * 1024)) -b 8192 -c 0 -r $TESTDIR/$TESTFILE1 &
 typeset killpid="$! "
 
 disks=($DISKLIST)
@@ -79,14 +79,14 @@ disks=($DISKLIST)
 # all but one vdev offlined, whereas with raidz there can be only one.
 #
 pooltype='mirror'
-$ZPOOL list -v $TESTPOOL | $GREP raidz >/dev/null 2>&1 && pooltype='raidz'
+zpool list -v $TESTPOOL | grep raidz >/dev/null 2>&1 && pooltype='raidz'
 
 typeset -i i=0
 while [[ $i -lt ${#disks[*]} ]]; do
 	typeset -i j=0
 	if [[ $pooltype = 'mirror' ]]; then
 		# Hold one disk online, verify the others can be offlined.
-		log_must $ZPOOL online $TESTPOOL ${disks[$i]}
+		log_must zpool online $TESTPOOL ${disks[$i]}
 		check_state $TESTPOOL ${disks[$i]} "online" || \
 		    log_fail "Failed to set ${disks[$i]} online"
 		while [[ $j -lt ${#disks[*]} ]]; do
@@ -94,14 +94,14 @@ while [[ $i -lt ${#disks[*]} ]]; do
 				((j++))
 				continue
 			fi
-			log_must $ZPOOL offline $TESTPOOL ${disks[$j]}
+			log_must zpool offline $TESTPOOL ${disks[$j]}
 			check_state $TESTPOOL ${disks[$j]} "offline" || \
 			    log_fail "Failed to set ${disks[$j]} offline"
 			((j++))
 		done
 	elif [[ $pooltype = 'raidz' ]]; then
 		# Hold one disk offline, verify the others can't be offlined.
-		log_must $ZPOOL offline $TESTPOOL ${disks[$i]}
+		log_must zpool offline $TESTPOOL ${disks[$i]}
 		check_state $TESTPOOL ${disks[$i]} "offline" || \
 		    log_fail "Failed to set ${disks[$i]} offline"
 		while [[ $j -lt ${#disks[*]} ]]; do
@@ -109,22 +109,22 @@ while [[ $i -lt ${#disks[*]} ]]; do
 				((j++))
 				continue
 			fi
-			log_mustnot $ZPOOL offline $TESTPOOL ${disks[$j]}
+			log_mustnot zpool offline $TESTPOOL ${disks[$j]}
 			check_state $TESTPOOL ${disks[$j]} "online" || \
 			    log_fail "Failed to set ${disks[$j]} online"
 			check_state $TESTPOOL ${disks[$i]} "offline" || \
 			    log_fail "Failed to set ${disks[$i]} offline"
 			((j++))
 		done
-		log_must $ZPOOL online $TESTPOOL ${disks[$i]}
+		log_must zpool online $TESTPOOL ${disks[$i]}
 		check_state $TESTPOOL ${disks[$i]} "online" || \
 		    log_fail "Failed to set ${disks[$i]} online"
 	fi
 	((i++))
 done
 
-log_must $KILL $killpid
-$SYNC
+log_must kill $killpid
+sync
 
 typeset dir=$(get_device_dir $DISKS)
 verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir"
diff --git a/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_003_neg.ksh
index 51eddbb815..2ac198eac5 100644
--- a/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/online_offline/online_offline_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,8 +48,8 @@ function cleanup
 		destroy_pool $TESTPOOL1
 	fi
 
-	$KILL $killpid >/dev/null 2>&1
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	kill $killpid >/dev/null 2>&1
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Offlining disks in a non-redundant pool should fail."
@@ -58,24 +58,24 @@ log_onexit cleanup
 
 specials_list=""
 for i in 0 1 2; do
-	$MKFILE $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
+	mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
 	specials_list="$specials_list $TESTDIR/$TESTFILE1.$i"
 done
 disk=($specials_list)
 
 create_pool $TESTPOOL1 $specials_list
-log_must $ZFS create $TESTPOOL1/$TESTFS1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
+log_must zfs create $TESTPOOL1/$TESTFS1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
 
-$FILE_TRUNC -f $((64 * 1024 * 1024)) -b 8192 -c 0 -r $TESTDIR/$TESTFILE1 &
+file_trunc -f $((64 * 1024 * 1024)) -b 8192 -c 0 -r $TESTDIR/$TESTFILE1 &
 typeset killpid="$! "
 
 for i in 0 1 2; do
-	log_mustnot $ZPOOL offline $TESTPOOL1 ${disk[$i]}
+	log_mustnot zpool offline $TESTPOOL1 ${disk[$i]}
 	check_state $TESTPOOL1 ${disk[$i]} "online"
 done
 
-log_must $KILL $killpid
-$SYNC
+log_must kill $killpid
+sync
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_001_pos.ksh
index ad10740f34..5a0fa2b415 100644
--- a/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,11 +51,11 @@ log_assert "Ensure that pool names can use the ASCII subset of UTF-8"
 function cleanup
 {
 	if [[ -n $name ]] && poolexists $name ; then
-		log_must $ZPOOL destroy $name
+		log_must zpool destroy $name
 	fi
 
 	if [[ -d $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR
+		log_must rm -rf $TESTDIR
 	fi
 
 }
@@ -64,7 +64,7 @@ log_onexit cleanup
 
 DISK=${DISKS%% *}
 if [[ ! -e $TESTDIR ]]; then
-	log_must $MKDIR $TESTDIR
+	log_must mkdir $TESTDIR
 fi
 
 log_note "Ensure letters of the alphabet are allowable"
@@ -76,12 +76,12 @@ for name in A B C D E F G H I J K L M \
     a b c d e f g h i j k l m \
     n o p q r s t u v w x y z
 do
-	log_must $ZPOOL create -m $TESTDIR $name $DISK
+	log_must zpool create -m $TESTDIR $name $DISK
 	if ! poolexists $name; then
 		log_fail "Could not create a pool called '$name'"
 	fi
 
-	log_must $ZPOOL destroy $name
+	log_must zpool destroy $name
 done
 
 log_note "Ensure a variety of unusual names passes"
@@ -95,7 +95,7 @@ for name in "a.............................." "a_" "a-" "a:" \
     "spar3-p00l" "hiddenmirrorpool" "hiddenraidzpool" \
     "hiddensparepool"
 do
-	log_must $ZPOOL create -m $TESTDIR $name $DISK
+	log_must zpool create -m $TESTDIR $name $DISK
 	if ! poolexists $name; then
 		log_fail "Could not create a pool called '$name'"
 	fi
@@ -104,12 +104,12 @@ do
 	# Since the naming convention applies to datasets too,
 	# create datasets with the same names as above.
 	#
-	log_must $ZFS create $name/$name
-	log_must $ZFS snapshot $name/$name@$name
-	log_must $ZFS clone $name/$name@$name $name/clone_$name
-	log_must $ZFS create -V 150m $name/$name/$name
+	log_must zfs create $name/$name
+	log_must zfs snapshot $name/$name@$name
+	log_must zfs clone $name/$name@$name $name/clone_$name
+	log_must zfs create -V 150m $name/$name/$name
 
-	log_must $ZPOOL destroy $name
+	log_must zpool destroy $name
 done
 
 log_pass "Valid pool names were accepted correctly."
diff --git a/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh
index d54fddfe96..4d5c83f07b 100644
--- a/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,27 +53,27 @@ POOLNAME=""
 function cleanup
 {
 	if poolexists $POOLNAME; then
-		log_must $ZPOOL destroy $POOLNAME
+		log_must zpool destroy $POOLNAME
 	fi
 
 	if [[ -d $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR
+		log_must rm -rf $TESTDIR
 	fi
 }
 
 log_onexit cleanup
 
-typeset exclude=`eval $ECHO \"'(${KEEP})'\"`
-for pool in $($ZPOOL list -H -o name | \
-	$EGREP -v "$exclude" | \
-	$GREP -v "$TESTPOOL" | \
-	$EGREP -v "$NO_POOLS"); do
-	log_must $ZPOOL destroy $pool
+typeset exclude=`eval echo \"'(${KEEP})'\"`
+for pool in $(zpool list -H -o name | \
+	egrep -v "$exclude" | \
+	grep -v "$TESTPOOL" | \
+	egrep -v "$NO_POOLS"); do
+	log_must zpool destroy $pool
 done
 
 DISK=${DISKS%% *}
 if [[ ! -e $TESTDIR ]]; then
-        log_must $MKDIR $TESTDIR
+        log_must mkdir $TESTDIR
 fi
 
 log_note "Ensure invalid characters fail"
@@ -83,12 +83,12 @@ for POOLNAME in "!" "\"" "#" "$" "%" "&" "'" "(" ")" \
     ":" ";" "<" "=" ">" "\?" "@" \
     "[" "]" "^" "_" "\`" "{" "|" "}" "~"
 do
-	log_mustnot $ZPOOL create -m $TESTDIR $POOLNAME $DISK
+	log_mustnot zpool create -m $TESTDIR $POOLNAME $DISK
         if poolexists $POOLNAME; then
                 log_fail "Unexpectedly created pool: '$POOLNAME'"
         fi
 
-	log_mustnot $ZPOOL destroy $POOLNAME
+	log_mustnot zpool destroy $POOLNAME
 done
 
 log_note "Check that invalid octal values fail"
@@ -99,12 +99,12 @@ for oct in "\000" "\001" "\002" "\003" "\004" "\005" "\006" "\007" \
     "\040" "\177"
 do
 	POOLNAME=`eval "echo x | tr 'x' '$oct'"`
-	log_mustnot $ZPOOL create -m $TESTDIR $POOLNAME $DISK
+	log_mustnot zpool create -m $TESTDIR $POOLNAME $DISK
         if poolexists $POOLNAME; then
                 log_fail "Unexpectedly created pool: '$POOLNAME'"
         fi
 
-	log_mustnot $ZPOOL destroy $POOLNAME
+	log_mustnot zpool destroy $POOLNAME
 done
 
 log_note "Verify invalid pool names fail"
@@ -118,12 +118,12 @@ if verify_slog_support ; then
 fi
 typeset -i i=0
 while ((i < ${#POOLNAME[@]})); do
-	log_mustnot $ZPOOL create -m $TESTDIR ${POOLNAME[$i]} $DISK
+	log_mustnot zpool create -m $TESTDIR ${POOLNAME[$i]} $DISK
         if poolexists ${POOLNAME[$i]}; then
                 log_fail "Unexpectedly created pool: '${POOLNAME[$i]}'"
         fi
 
-	log_mustnot $ZPOOL destroy ${POOLNAME[$i]}
+	log_mustnot zpool destroy ${POOLNAME[$i]}
 
 	((i += 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/poolversion/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/poolversion/cleanup.ksh
index 047761b090..6a1b132117 100644
--- a/usr/src/test/zfs-tests/tests/functional/poolversion/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/poolversion/cleanup.ksh
@@ -26,17 +26,17 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 verify_runnable "global"
 
-log_must $ZPOOL destroy $TESTPOOL
-log_must $ZPOOL destroy $TESTPOOL2
+log_must zpool destroy $TESTPOOL
+log_must zpool destroy $TESTPOOL2
 
-log_must $RM /tmp/zpool_version_1.dat
-log_must $RM /tmp/zpool2_version_1.dat
+log_must rm /tmp/zpool_version_1.dat
+log_must rm /tmp/zpool2_version_1.dat
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_001_pos.ksh
index 42989e0715..fcc66a053e 100644
--- a/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,9 +46,9 @@ verify_runnable "global"
 log_assert "zpool set version can upgrade a pool"
 for version in 1 2 3 4 5 6 7 8
 do
-	log_must $ZPOOL set version=$version $TESTPOOL
-	ACTUAL=$($ZPOOL get version $TESTPOOL | $GREP version \
-		| $AWK '{print $3}')
+	log_must zpool set version=$version $TESTPOOL
+	ACTUAL=$(zpool get version $TESTPOOL | grep version \
+		| awk '{print $3}')
 	if [ "$ACTUAL" != "$version" ]
 	then
 		log_fail "v. $ACTUAL set for $TESTPOOL, expected v. $version!"
diff --git a/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_002_pos.ksh
index d5e063a784..d9742346e2 100644
--- a/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/poolversion/poolversion_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,23 +46,23 @@
 verify_runnable "global"
 log_assert "zpool set version can only increment pool version"
 
-log_must $ZPOOL set version=6 $TESTPOOL2
+log_must zpool set version=6 $TESTPOOL2
 # verify it's actually that version - by checking the version property
 # and also by trying to set bootfs (which should fail if it is not version 6)
 
-VERSION=$($ZPOOL get version $TESTPOOL2| $GREP version | $AWK '{print $3}')
+VERSION=$(zpool get version $TESTPOOL2| grep version | awk '{print $3}')
 if [ "$VERSION" != "6" ]
 then
 	log_fail "Version $VERSION set for $TESTPOOL2 expected version 6!"
 fi
-log_must $ZPOOL set bootfs=$TESTPOOL2 $TESTPOOL2
+log_must zpool set bootfs=$TESTPOOL2 $TESTPOOL2
 
 # now verify we can't downgrade the version
-log_mustnot $ZPOOL set version=5 $TESTPOOL2
-log_mustnot $ZPOOL set version=-1 $TESTPOOL2
+log_mustnot zpool set version=5 $TESTPOOL2
+log_mustnot zpool set version=-1 $TESTPOOL2
 
 # verify the version is still 6
-VERSION=$($ZPOOL get version $TESTPOOL2 | $GREP version | $AWK '{print $3}')
+VERSION=$(zpool get version $TESTPOOL2 | grep version | awk '{print $3}')
 if [ "$VERSION" != "6" ]
 then
 	log_fail "Version $VERSION set for $TESTPOOL2, expected version 6!"
diff --git a/usr/src/test/zfs-tests/tests/functional/poolversion/setup.ksh b/usr/src/test/zfs-tests/tests/functional/poolversion/setup.ksh
index 0bb0caf2d9..1335e2ad4b 100644
--- a/usr/src/test/zfs-tests/tests/functional/poolversion/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/poolversion/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -34,12 +34,12 @@
 verify_runnable "global"
 
 # create a version 1 pool
-log_must $MKFILE $MINVDEVSIZE /tmp/zpool_version_1.dat
-log_must $ZPOOL create -o version=1 $TESTPOOL /tmp/zpool_version_1.dat
+log_must mkfile $MINVDEVSIZE /tmp/zpool_version_1.dat
+log_must zpool create -o version=1 $TESTPOOL /tmp/zpool_version_1.dat
 
 
 # create another version 1 pool
-log_must $MKFILE $MINVDEVSIZE /tmp/zpool2_version_1.dat
-log_must $ZPOOL create -o version=1 $TESTPOOL2 /tmp/zpool2_version_1.dat
+log_must mkfile $MINVDEVSIZE /tmp/zpool2_version_1.dat
+log_must zpool create -o version=1 $TESTPOOL2 /tmp/zpool2_version_1.dat
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/privilege/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/privilege/cleanup.ksh
index 35370dd5c9..89b3da7651 100644
--- a/usr/src/test/zfs-tests/tests/functional/privilege/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/privilege/cleanup.ksh
@@ -26,24 +26,24 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 verify_runnable "global"
 
-ZFS_USER=$($CAT /tmp/zfs-privs-test-user.txt)
-USES_NIS=$($CAT /tmp/zfs-privs-test-nis.txt)
+ZFS_USER=$(cat /tmp/zfs-privs-test-user.txt)
+USES_NIS=$(cat /tmp/zfs-privs-test-nis.txt)
 
 if [ "${USES_NIS}" == "true" ]
 then
-    $SVCADM enable svc:/network/nis/client:default
+    svcadm enable svc:/network/nis/client:default
 fi
 
-$USERDEL $ZFS_USER
-[[ -d /export/home/$ZFS_USER ]] && $RM -rf /export/home/$ZFS_USER
-$RM /tmp/zfs-privs-test-nis.txt
-$RM /tmp/zfs-privs-test-user.txt
+userdel $ZFS_USER
+[[ -d /export/home/$ZFS_USER ]] && rm -rf /export/home/$ZFS_USER
+rm /tmp/zfs-privs-test-nis.txt
+rm /tmp/zfs-privs-test-user.txt
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/privilege/privilege_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/privilege/privilege_001_pos.ksh
index 3208b815d4..5346e10244 100644
--- a/usr/src/test/zfs-tests/tests/functional/privilege/privilege_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/privilege/privilege_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -59,33 +59,33 @@ verify_runnable "global"
 
 log_assert "The RBAC profile \"ZFS Storage Management\" works"
 
-ZFS_USER=$($CAT /tmp/zfs-privs-test-user.txt)
+ZFS_USER=$(cat /tmp/zfs-privs-test-user.txt)
 
 # the user shouldn't be able to do anything initially
-log_mustnot $SU $ZFS_USER -c "$ZPOOL create $TESTPOOL $DISKS"
-log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZPOOL create $TESTPOOL $DISKS"
+log_mustnot su $ZFS_USER -c "zpool create $TESTPOOL $DISKS"
+log_mustnot su $ZFS_USER -c "pfexec zpool create $TESTPOOL $DISKS"
 
 # the first time we assign the profile, we insist it should work
-log_must $USERMOD -P "ZFS Storage Management" $ZFS_USER
-log_must $SU $ZFS_USER -c "$PFEXEC $ZPOOL create -f $TESTPOOL $DISKS"
+log_must usermod -P "ZFS Storage Management" $ZFS_USER
+log_must su $ZFS_USER -c "pfexec zpool create -f $TESTPOOL $DISKS"
 
 # ensure the user can't create a filesystem with this profile
-log_mustnot $SU $ZFS_USER -c "$ZFS create $TESTPOOL/fs"
+log_mustnot su $ZFS_USER -c "zfs create $TESTPOOL/fs"
 
 # add ZFS File System Management profile, and try to create a fs
-log_must $USERMOD -P "ZFS File System Management" $ZFS_USER
-log_must $SU $ZFS_USER -c "$PFEXEC $ZFS create $TESTPOOL/fs"
+log_must usermod -P "ZFS File System Management" $ZFS_USER
+log_must su $ZFS_USER -c "pfexec zfs create $TESTPOOL/fs"
 
 # revoke File System Management profile
-$USERMOD -P, $ZFS_USER
-$USERMOD -P "ZFS Storage Management" $ZFS_USER
+usermod -P, $ZFS_USER
+usermod -P "ZFS Storage Management" $ZFS_USER
 
 # ensure the user can destroy pools
-log_mustnot $SU $ZFS_USER -c "$ZPOOL destroy $TESTPOOL"
-log_must $SU $ZFS_USER -c "$PFEXEC $ZPOOL destroy $TESTPOOL"
+log_mustnot su $ZFS_USER -c "zpool destroy $TESTPOOL"
+log_must su $ZFS_USER -c "pfexec zpool destroy $TESTPOOL"
 
 # revoke Storage Management profile
-$USERMOD -P, $ZFS_USER
-log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZPOOL create -f $TESTPOOL $DISKS"
+usermod -P, $ZFS_USER
+log_mustnot su $ZFS_USER -c "pfexec zpool create -f $TESTPOOL $DISKS"
 
 log_pass "The RBAC profile \"ZFS Storage Management\" works"
diff --git a/usr/src/test/zfs-tests/tests/functional/privilege/privilege_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/privilege/privilege_002_pos.ksh
index 22e8eee8c7..9075ca4ede 100644
--- a/usr/src/test/zfs-tests/tests/functional/privilege/privilege_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/privilege/privilege_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -62,40 +62,40 @@ verify_runnable "both"
 
 log_assert "The RBAC profile \"ZFS File System Management\" works"
 
-ZFS_USER=$($CAT /tmp/zfs-privs-test-user.txt)
+ZFS_USER=$(cat /tmp/zfs-privs-test-user.txt)
 
 # Set a $DATASET where we can create child files systems
 if is_global_zone; then
-	log_must $ZPOOL create -f $TESTPOOL $DISKS
+	log_must zpool create -f $TESTPOOL $DISKS
 	DATASET=$TESTPOOL
 else
 	DATASET=zonepool/zonectr0
 fi
 
 # A user shouldn't be able to create filesystems
-log_mustnot $SU $ZFS_USER -c "$ZFS create $DATASET/zfsprivfs"
+log_mustnot su $ZFS_USER -c "zfs create $DATASET/zfsprivfs"
 
 # Insist this invocation of usermod works
-log_must $USERMOD -P "ZFS File System Management" $ZFS_USER
+log_must usermod -P "ZFS File System Management" $ZFS_USER
 
 # Now try to create file systems as the user
-log_mustnot $SU $ZFS_USER -c "$ZFS create $DATASET/zfsprivfs"
-log_must $SU $ZFS_USER -c "$PFEXEC $ZFS create $DATASET/zfsprivfs"
+log_mustnot su $ZFS_USER -c "zfs create $DATASET/zfsprivfs"
+log_must su $ZFS_USER -c "pfexec zfs create $DATASET/zfsprivfs"
 
 # Ensure the user can't do anything to pools in this state:
-log_mustnot $SU $ZFS_USER -c "$ZPOOL destroy $DATASET"
-log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZPOOL destroy $DATASET"
+log_mustnot su $ZFS_USER -c "zpool destroy $DATASET"
+log_mustnot su $ZFS_USER -c "pfexec zpool destroy $DATASET"
 
 # revoke File System Management profile
-$USERMOD -P, $ZFS_USER
+usermod -P, $ZFS_USER
 
 # Ensure the user can't create more filesystems
-log_mustnot $SU $ZFS_USER -c "$ZFS create $DATASET/zfsprivfs2"
-log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZFS create $DATASET/zfsprivfs2"
+log_mustnot su $ZFS_USER -c "zfs create $DATASET/zfsprivfs2"
+log_mustnot su $ZFS_USER -c "pfexec zfs create $DATASET/zfsprivfs2"
 
 # assign the profile again and destroy the fs.
-$USERMOD -P "ZFS File System Management" $ZFS_USER
-log_must $SU $ZFS_USER -c "$PFEXEC $ZFS destroy $DATASET/zfsprivfs"
-$USERMOD -P, $ZFS_USER
+usermod -P "ZFS File System Management" $ZFS_USER
+log_must su $ZFS_USER -c "pfexec zfs destroy $DATASET/zfsprivfs"
+usermod -P, $ZFS_USER
 
 log_pass "The RBAC profile \"ZFS File System Management\" works"
diff --git a/usr/src/test/zfs-tests/tests/functional/privilege/setup.ksh b/usr/src/test/zfs-tests/tests/functional/privilege/setup.ksh
index bfb858fb7b..3c946d21f2 100644
--- a/usr/src/test/zfs-tests/tests/functional/privilege/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/privilege/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -36,10 +36,10 @@ USES_NIS=false
 
 # if we're running NIS, turn it off until we clean up
 # (it can cause useradd to take a long time, hitting our TIMEOUT)
-$SVCS svc:/network/nis/client:default | $GREP online > /dev/null
+svcs svc:/network/nis/client:default | grep online > /dev/null
 if [ $? -eq 0 ]
 then
-  $SVCADM disable svc:/network/nis/client:default
+  svcadm disable svc:/network/nis/client:default
   USES_NIS=true
 fi
 
@@ -58,8 +58,8 @@ do
   fi
 done
 
-log_must $MKDIR -p /export/home/$ZFS_USER
-log_must $USERADD -c "ZFS Privileges Test User" -d /export/home/$ZFS_USER $ZFS_USER
+log_must mkdir -p /export/home/$ZFS_USER
+log_must useradd -c "ZFS Privileges Test User" -d /export/home/$ZFS_USER $ZFS_USER
 
 echo $ZFS_USER > /tmp/zfs-privs-test-user.txt
 echo $USES_NIS > /tmp/zfs-privs-test-nis.txt
diff --git a/usr/src/test/zfs-tests/tests/functional/quota/quota.kshlib b/usr/src/test/zfs-tests/tests/functional/quota/quota.kshlib
index ad273d9de0..3af961dbc5 100644
--- a/usr/src/test/zfs-tests/tests/functional/quota/quota.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/quota/quota.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/quota/quota.cfg
@@ -44,19 +44,19 @@ function fill_quota
 	typeset FILESYSTEM="$1"
 	typeset MNTPT="$2"
 
-	log_must $ZFS set quota=$QUOTA_VALUE $FILESYSTEM
+	log_must zfs set quota=$QUOTA_VALUE $FILESYSTEM
 
 	typeset -i write_size=0
 	(( write_size = 2 * QUOTA_VALUE ))
 
 	typeset -i zret=0
-	$FILE_WRITE -o create -f $MNTPT/$TESTFILE1 -b $BLOCK_SIZE \
+	file_write -o create -f $MNTPT/$TESTFILE1 -b $BLOCK_SIZE \
 		 -c $write_size -d 0
 	zret=$?
         [[ $zret -ne EDQUOT ]] && \
             log_fail "Returned error code: $zret. Expected: $EDQUOT."
 
-	typeset -i file_size=`$LS -ls $MNTPT/$TESTFILE1 | $AWK '{ print $1 }'`
+	typeset -i file_size=`ls -ls $MNTPT/$TESTFILE1 | awk '{ print $1 }'`
 	typeset -i limit=0
 	(( file_size = file_size * 512 ))
 	(( limit = QUOTA_VALUE + TOLERANCE ))
@@ -82,7 +82,7 @@ function exceed_quota
 	# Writing a file without API to access return code
 	#
 	log_note "Creating a file in a FS that has already exceeded its quota"
-	$FILE_WRITE -o create -f $MNTPT/$TESTFILE2 \
+	file_write -o create -f $MNTPT/$TESTFILE2 \
 		-b $BLOCK_SIZE -c $write_size -d 0
 	zret=$?
 	[[ $zret -ne EDQUOT ]] && \
diff --git a/usr/src/test/zfs-tests/tests/functional/quota/quota_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/quota/quota_001_pos.ksh
index 6c5cf368b8..9364a9f60f 100644
--- a/usr/src/test/zfs-tests/tests/functional/quota/quota_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/quota/quota_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,7 +56,7 @@ log_assert "Verify that file size is limited by the file system quota"
 function cleanup
 {
 	[[ -e $TESTDIR/$TESTFILE1 ]] && \
-	    log_must $RM $TESTDIR/$TESTFILE1
+	    log_must rm $TESTDIR/$TESTFILE1
 	#
 	# Need to allow time for space to be released back to
 	# pool, otherwise next test will fail trying to set a
diff --git a/usr/src/test/zfs-tests/tests/functional/quota/quota_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/quota/quota_002_pos.ksh
index 3b8ba668ac..7e5733ae1d 100644
--- a/usr/src/test/zfs-tests/tests/functional/quota/quota_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/quota/quota_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,10 +57,10 @@ log_assert "Verify that a file write cannot exceed the file system quota"
 function cleanup
 {
         [[ -e $TESTDIR/$TESTFILE1 ]] && \
-            log_must $RM $TESTDIR/$TESTFILE1
+            log_must rm $TESTDIR/$TESTFILE1
 
 	[[ -e $TESTDIR/$TESTFILE2 ]] && \
-            log_must $RM $TESTDIR/$TESTFILE2
+            log_must rm $TESTDIR/$TESTFILE2
 }
 
 log_onexit cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/quota/quota_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/quota/quota_003_pos.ksh
index afcc4a14c4..bec2243f9f 100644
--- a/usr/src/test/zfs-tests/tests/functional/quota/quota_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/quota/quota_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,7 +58,7 @@ log_assert "Verify that file size is limited by the file system quota" \
 function cleanup
 {
 	[[ -e $TESTDIR1/$TESTFILE1 ]] && \
-	    log_must $RM $TESTDIR1/$TESTFILE1
+	    log_must rm $TESTDIR1/$TESTFILE1
 
 	#
         # Need to allow time for space to be released back to
diff --git a/usr/src/test/zfs-tests/tests/functional/quota/quota_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/quota/quota_004_pos.ksh
index def8b2b37d..6930cbeae8 100644
--- a/usr/src/test/zfs-tests/tests/functional/quota/quota_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/quota/quota_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,10 +58,10 @@ log_assert "Verify that a file write cannot exceed the file system quota" \
 function cleanup
 {
         [[ -e $TESTDIR1/$TESTFILE1 ]] && \
-            log_must $RM $TESTDIR1/$TESTFILE1
+            log_must rm $TESTDIR1/$TESTFILE1
 
 	[[ -e $TESTDIR1/$TESTFILE2 ]] && \
-            log_must $RM $TESTDIR1/$TESTFILE2
+            log_must rm $TESTDIR1/$TESTFILE2
 }
 
 log_onexit cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/quota/quota_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/quota/quota_005_pos.ksh
index 55bddb5302..ed28cc1f0c 100644
--- a/usr/src/test/zfs-tests/tests/functional/quota/quota_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/quota/quota_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,9 +49,9 @@ verify_runnable "both"
 function cleanup
 {
 	datasetexists $fs_child && \
-		log_must $ZFS destroy $fs_child
+		log_must zfs destroy $fs_child
 
-	log_must $ZFS set quota=$quota_val $fs
+	log_must zfs set quota=$quota_val $fs
 }
 
 log_onexit cleanup
@@ -66,9 +66,9 @@ space_avail=$(get_prop available $fs)
 quota_val=$(get_prop quota $fs)
 typeset -i quotasize=$space_avail
 ((quotasize = quotasize * 2 ))
-log_must $ZFS set quota=$quotasize $fs
+log_must zfs set quota=$quotasize $fs
 
-log_must $ZFS create $fs_child
+log_must zfs create $fs_child
 quota_space=$(get_prop quota $fs_child)
 [[ $quota_space == $quotasize ]] && \
 	log_fail "The quota of child dataset inherits its value from parent."
diff --git a/usr/src/test/zfs-tests/tests/functional/quota/quota_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/quota/quota_006_neg.ksh
index a22520c699..ca5ea5f82f 100644
--- a/usr/src/test/zfs-tests/tests/functional/quota/quota_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/quota/quota_006_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ log_assert "Verify cannot set quota lower than the space currently in use"
 
 function cleanup
 {
-	log_must $ZFS set quota=none $TESTPOOL/$TESTFS
+	log_must zfs set quota=none $TESTPOOL/$TESTFS
 }
 
 log_onexit cleanup
@@ -64,8 +64,8 @@ quota_fp_size=${quota_integer_size}.123
 
 for size in 0 -1 $quota_integer_size -$quota_integer_size $quota_fp_size -$quota_fp_size \
 	$invalid_size ; do
-	log_mustnot $ZFS set quota=$size $TESTPOOL/$TESTFS
+	log_mustnot zfs set quota=$size $TESTPOOL/$TESTFS
 done
-log_must $ZFS set quota=$space_used $TESTPOOL/$TESTFS
+log_must zfs set quota=$space_used $TESTPOOL/$TESTFS
 
 log_pass "As expected cannot set quota lower than space currently in use"
diff --git a/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy.kshlib b/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy.kshlib
index 3428eb9eca..fb7b3752ac 100644
--- a/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -39,7 +39,7 @@ function cleanup
 	typeset dir
 	for dir in $TESTDIR $BASEDIR; do
 		if [[ -d $dir ]]; then
-			log_must $RM -rf $dir
+			log_must rm -rf $dir
 		fi
 	done
 }
@@ -63,7 +63,7 @@ function random
 		fi
 	done
 
-	$ECHO $value
+	echo $value
 }
 
 #
@@ -79,16 +79,16 @@ function record_data
 	typeset recordfile=$2
 
 	[[ -z $pool ]] && log_fail "No specified pool."
-	[[ -f $recordfile ]] && log_must $RM -f $recordfile
+	[[ -f $recordfile ]] && log_must rm -f $recordfile
 
 	typeset mntpnt
 	mntpnt=$(get_prop mountpoint $pool)
-	log_must eval "$DU -a $mntpnt > $recordfile 2>&1"
+	log_must eval "du -a $mntpnt > $recordfile 2>&1"
 	#
 	# When the data was damaged, checksum is failing and return 1
 	# So, will not use log_must
 	#
-	$FIND $mntpnt -type f -exec $CKSUM {} + >> $recordfile 2>&1
+	find $mntpnt -type f -exec cksum {} + >> $recordfile 2>&1
 }
 
 #
@@ -112,29 +112,29 @@ function setup_test_env
 	done
 
 	if [[ ! -d $BASEDIR ]]; then
-		log_must $MKDIR $BASEDIR
+		log_must mkdir $BASEDIR
 	fi
 
 	if poolexists $pool ; then
 		destroy_pool $pool
 	fi
 
-	log_must $MKFILE $MINVDEVSIZE $vdevs
+	log_must mkfile $MINVDEVSIZE $vdevs
 
-	log_must $ZPOOL create -m $TESTDIR $pool $keyword $vdevs
+	log_must zpool create -m $TESTDIR $pool $keyword $vdevs
 
 	log_note "Filling up the filesystem ..."
 	typeset -i ret=0
 	typeset -i i=0
 	typeset file=$TESTDIR/file
-	while $TRUE ; do
-		$FILE_WRITE -o create -f $file.$i \
+	while true ; do
+		file_write -o create -f $file.$i \
 			-b $BLOCKSZ -c $NUM_WRITES
 		ret=$?
 		(( $ret != 0 )) && break
 		(( i = i + 1 ))
 	done
-	(($ret != 28 )) && log_note "$FILE_WRITE return value($ret) is unexpected."
+	(($ret != 28 )) && log_note "file_write return value($ret) is unexpected."
 
 	record_data $TESTPOOL $PRE_RECORD_FILE
 }
@@ -149,21 +149,21 @@ function is_healthy
 	typeset pool=$1
 
 	typeset healthy_output="pool '$pool' is healthy"
-	typeset real_output=$($ZPOOL status -x $pool)
+	typeset real_output=$(zpool status -x $pool)
 
 	if [[ "$real_output" == "$healthy_output" ]]; then
 		return 0
 	else
 		typeset -i ret
-		$ZPOOL status -x $pool | $GREP "state:" | \
-			$GREP "FAULTED" >/dev/null 2>&1
+		zpool status -x $pool | grep "state:" | \
+			grep "FAULTED" >/dev/null 2>&1
 		ret=$?
 		(( $ret == 0 )) && return 1
 		typeset l_scan
 		typeset errnum
-		l_scan=$($ZPOOL status -x $pool | $GREP "scan:")
+		l_scan=$(zpool status -x $pool | grep "scan:")
 		l_scan=${l_scan##*"with"}
-		errnum=$($ECHO $l_scan | $AWK '{print $1}')
+		errnum=$(echo $l_scan | awk '{print $1}')
 
 		return $errnum
 	fi
@@ -179,7 +179,7 @@ function is_data_valid
 	typeset pool=$1
 
 	record_data $pool $PST_RECORD_FILE
-	if ! $DIFF $PRE_RECORD_FILE $PST_RECORD_FILE > /dev/null 2>&1; then
+	if ! diff $PRE_RECORD_FILE $PST_RECORD_FILE > /dev/null 2>&1; then
 		return 1
 	fi
 
@@ -197,20 +197,20 @@ function get_vdevs #pool cnt
 	typeset pool=$1
 	typeset -i cnt=$2
 
-	typeset all_devs=$($ZPOOL iostat -v $pool | $AWK '{print $1}'| \
-		$EGREP -v "^pool$|^capacity$|^mirror$|^raidz1$|^raidz2$|---" | \
-		$EGREP -v "/old$|^$pool$")
+	typeset all_devs=$(zpool iostat -v $pool | awk '{print $1}'| \
+		egrep -v "^pool$|^capacity$|^mirror$|^raidz1$|^raidz2$|---" | \
+		egrep -v "/old$|^$pool$")
 	typeset -i i=0
 	typeset vdevs
 	while ((i < cnt)); do
-		typeset dev=$($ECHO $all_devs | $AWK '{print $1}')
+		typeset dev=$(echo $all_devs | awk '{print $1}')
 		eval all_devs=\${all_devs##*$dev}
 
 		vdevs="$dev $vdevs"
 		((i += 1))
 	done
 
-	$ECHO "$vdevs"
+	echo "$vdevs"
 }
 
 #
@@ -222,20 +222,20 @@ function sync_pool #pool
 {
 	typeset pool=$1
 
-	log_must $SYNC
-	log_must $SLEEP 2
+	log_must sync
+	log_must sleep 2
 	# Flush all the pool data.
 	typeset -i ret
-	$ZPOOL scrub $pool >/dev/null 2>&1
+	zpool scrub $pool >/dev/null 2>&1
 	ret=$?
 	(( $ret != 0 )) && \
-		log_fail "$ZPOOL scrub $pool failed."
+		log_fail "zpool scrub $pool failed."
 
 	while ! is_pool_scrubbed $pool; do
 		if is_pool_resilvered $pool ; then
 			log_fail "$pool should not be resilver completed."
 		fi
-		log_must $SLEEP 2
+		log_must sleep 2
 	done
 }
 
@@ -252,11 +252,11 @@ function replace_missing_devs
 
 	typeset vdev
 	for vdev in $@; do
-		log_must $MKFILE $MINVDEVSIZE $vdev
-		log_must $ZPOOL replace -f $pool $vdev $vdev
+		log_must mkfile $MINVDEVSIZE $vdev
+		log_must zpool replace -f $pool $vdev $vdev
 		while true; do
 			if ! is_pool_resilvered $pool ; then
-				log_must $SLEEP 2
+				log_must sleep 2
 			else
 				break
 			fi
@@ -284,12 +284,12 @@ function damage_devs
 	typeset dev
 	if [[ -n $label ]]; then
 		for dev in $vdevs; do
-			$DD if=/dev/zero of=$dev seek=512 bs=1024 \
+			dd if=/dev/zero of=$dev seek=512 bs=1024 \
 			    count=$bs_count conv=notrunc >/dev/null 2>&1
 		done
 	else
 		for dev in $vdevs; do
-			$DD if=/dev/zero of=$dev bs=1024 count=$bs_count \
+			dd if=/dev/zero of=$dev bs=1024 count=$bs_count \
 			    conv=notrunc >/dev/null 2>&1
 		done
 	fi
@@ -306,7 +306,7 @@ function clear_errors
 {
 	typeset pool=$1
 
-	log_must $ZPOOL clear $pool
+	log_must zpool clear $pool
 
 	if ! is_healthy $pool ; then
 		log_note "$pool should be healthy."
@@ -333,7 +333,7 @@ function remove_devs
 	typeset vdevs
 
 	vdevs=$(get_vdevs $pool $cnt)
-	log_must $RM -f $vdevs
+	log_must rm -f $vdevs
 
 	sync_pool $pool
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy_004_neg.ksh b/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy_004_neg.ksh
index 0d40c576a2..4332736a1a 100644
--- a/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy_004_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/redundancy/redundancy_004_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/redundancy/redundancy.kshlib
@@ -54,7 +54,7 @@ typeset -i cnt=$(random 2 5)
 setup_test_env $TESTPOOL "" $cnt
 
 damage_devs $TESTPOOL 1 "keep_label"
-log_must $ZPOOL clear $TESTPOOL
+log_must zpool clear $TESTPOOL
 
 # Wait for the scrub intiated by the clear to wrap, or is_healthy will be wrong.
 while ! is_pool_scrubbed $TESTPOOL; do
diff --git a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_001_pos.ksh
index 9f974d89b2..411fab8459 100644
--- a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,9 +47,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "refquota limits the amount of space a dataset can consume, " \
@@ -58,20 +58,20 @@ log_onexit cleanup
 
 fs=$TESTPOOL/$TESTFS
 sub=$fs/sub
-log_must $ZFS create $sub
+log_must zfs create $sub
 
-log_must $ZFS set refquota=10M $fs
+log_must zfs set refquota=10M $fs
 mntpnt=$(get_prop mountpoint $fs)
 
-log_mustnot $MKFILE 11M $mntpnt/file
-log_must $MKFILE 9M $mntpnt/file
-log_must $ZFS snapshot $fs@snap
-log_mustnot $MKFILE 2M $mntpnt/file2
+log_mustnot mkfile 11M $mntpnt/file
+log_must mkfile 9M $mntpnt/file
+log_must zfs snapshot $fs@snap
+log_mustnot mkfile 2M $mntpnt/file2
 
 mntpnt=$(get_prop mountpoint $sub)
-log_must $MKFILE 10M $mntpnt/file
-log_must $ZFS snapshot $sub@snap
-log_must $MKFILE 10 $mntpnt/file2
+log_must mkfile 10M $mntpnt/file
+log_must zfs snapshot $sub@snap
+log_must mkfile 10 $mntpnt/file2
 
 log_pass "refquota limits the amount of space a dataset can consume, " \
 	"but does not include space used by descendents."
diff --git a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_002_pos.ksh
index 7ee5967f7f..e1d3aa8203 100644
--- a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,9 +47,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "Quotas are enforced using the minimum of the two properties"
@@ -57,11 +57,11 @@ log_onexit cleanup
 
 TESTFILE='testfile'
 fs=$TESTPOOL/$TESTFS
-log_must $ZFS set quota=15M $fs
-log_must $ZFS set refquota=25M $fs
+log_must zfs set quota=15M $fs
+log_must zfs set refquota=25M $fs
 
 mntpnt=$(get_prop mountpoint $fs)
-log_mustnot $MKFILE 20M $mntpnt/$TESTFILE
+log_mustnot mkfile 20M $mntpnt/$TESTFILE
 typeset -i used quota
 used=$(get_prop used $fs)
 quota=$(get_prop quota $fs)
@@ -74,11 +74,11 @@ fi
 #
 # Switch the value of them and try again
 #
-log_must $RM $mntpnt/$TESTFILE
-log_must $ZFS set quota=25M $fs
-log_must $ZFS set refquota=15M $fs
+log_must rm $mntpnt/$TESTFILE
+log_must zfs set quota=25M $fs
+log_must zfs set refquota=15M $fs
 
-log_mustnot $MKFILE 20M $mntpnt/$TESTFILE
+log_mustnot mkfile 20M $mntpnt/$TESTFILE
 used=$(get_prop used $fs)
 refquota=$(get_prop refquota $fs)
 ((used = used / (1024 * 1024)))
diff --git a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_003_pos.ksh
index 8026e7d6c2..e4def1a0a7 100644
--- a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,9 +45,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "Sub-filesystem quotas are not enforced by property 'refquota'"
@@ -55,12 +55,12 @@ log_onexit cleanup
 
 TESTFILE='testfile'
 fs=$TESTPOOL/$TESTFS
-log_must $ZFS set quota=25M $fs
-log_must $ZFS set refquota=10M $fs
-log_must $ZFS create $fs/subfs
+log_must zfs set quota=25M $fs
+log_must zfs set refquota=10M $fs
+log_must zfs create $fs/subfs
 
 mntpnt=$(get_prop mountpoint $fs/subfs)
-log_must $MKFILE 20M $mntpnt/$TESTFILE
+log_must mkfile 20M $mntpnt/$TESTFILE
 
 typeset -i used quota refquota
 used=$(get_prop used $fs)
@@ -71,7 +71,7 @@ if [[ $used -lt $refquota ]]; then
 	log_fail "ERROR: $used < $refquota subfs quotas are limited by refquota"
 fi
 
-log_mustnot $MKFILE 20M $mntpnt/$TESTFILE.2
+log_mustnot mkfile 20M $mntpnt/$TESTFILE.2
 used=$(get_prop used $fs)
 quota=$(get_prop quota $fs)
 ((used = used / (1024 * 1024)))
diff --git a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_004_pos.ksh
index 2d7902e4e5..291cfbd25c 100644
--- a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,9 +45,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "refquotas are not limited by snapshots."
@@ -55,15 +55,15 @@ log_onexit cleanup
 
 TESTFILE='testfile'
 fs=$TESTPOOL/$TESTFS
-log_must $ZFS set quota=25M $fs
-log_must $ZFS set refquota=15M $fs
+log_must zfs set quota=25M $fs
+log_must zfs set refquota=15M $fs
 
 mntpnt=$(get_prop mountpoint $fs)
 typeset -i i=0
 while ((i < 3)); do
-	log_must $MKFILE 7M $mntpnt/$TESTFILE.$i
-	log_must $ZFS snapshot $fs@snap.$i
-	log_must $RM $mntpnt/$TESTFILE.$i
+	log_must mkfile 7M $mntpnt/$TESTFILE.$i
+	log_must zfs snapshot $fs@snap.$i
+	log_must rm $mntpnt/$TESTFILE.$i
 
 	((i += 1))
 done
@@ -71,6 +71,6 @@ done
 #
 # Verify out of the limitation of 'quota'
 #
-log_mustnot $MKFILE 7M $mntpnt/$TESTFILE
+log_mustnot mkfile 7M $mntpnt/$TESTFILE
 
 log_pass "refquotas are not limited by snapshots."
diff --git a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_005_pos.ksh
index 5e6ad12547..16c2ae7851 100644
--- a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,9 +45,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "refquotas are not limited by sub-filesystem snapshots."
@@ -55,16 +55,16 @@ log_onexit cleanup
 
 TESTFILE='testfile'
 fs=$TESTPOOL/$TESTFS
-log_must $ZFS set quota=25M $fs
-log_must $ZFS set refquota=15M $fs
-log_must $ZFS create $fs/subfs
+log_must zfs set quota=25M $fs
+log_must zfs set refquota=15M $fs
+log_must zfs create $fs/subfs
 
 mntpnt=$(get_prop mountpoint $fs/subfs)
 typeset -i i=0
 while ((i < 3)); do
-	log_must $MKFILE 7M $mntpnt/$TESTFILE.$i
-	log_must $ZFS snapshot $fs/subfs@snap.$i
-	log_must $RM $mntpnt/$TESTFILE.$i
+	log_must mkfile 7M $mntpnt/$TESTFILE.$i
+	log_must zfs snapshot $fs/subfs@snap.$i
+	log_must rm $mntpnt/$TESTFILE.$i
 
 	((i += 1))
 done
@@ -72,6 +72,6 @@ done
 #
 # Verify out of the limitation of 'quota'
 #
-log_mustnot $MKFILE 7M $mntpnt/$TESTFILE
+log_mustnot mkfile 7M $mntpnt/$TESTFILE
 
 log_pass "refquotas are not limited by sub-filesystem snapshots"
diff --git a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_006_neg.ksh b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_006_neg.ksh
index 18b0a4f10a..39b317512d 100644
--- a/usr/src/test/zfs-tests/tests/functional/refquota/refquota_006_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refquota/refquota_006_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,8 +45,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS set refquota=none $TESTPOOL/$TESTFS
-	log_must $ZFS set refreserv=none $TESTPOOL/$TESTFS
+	log_must zfs set refquota=none $TESTPOOL/$TESTFS
+	log_must zfs set refreserv=none $TESTPOOL/$TESTFS
 }
 
 log_assert "'zfs set refquota' can handle incorrect arguments correctly."
@@ -61,8 +61,8 @@ set -A badopt	\
 
 typeset -i i=0
 while ((i < ${#badopt[@]})); do
-	log_mustnot $ZFS set refquota=${badopt[$i]} $TESTPOOL/$TESTFS
-	log_mustnot $ZFS set refreserv=${badopt[$i]} $TESTPOOL/$TESTFS
+	log_mustnot zfs set refquota=${badopt[$i]} $TESTPOOL/$TESTFS
+	log_mustnot zfs set refreserv=${badopt[$i]} $TESTPOOL/$TESTFS
 
 	((i += 1))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_001_pos.ksh
index f0f45ac70a..527949f27c 100644
--- a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,9 +47,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "Reservations are enforced using the maximum of " \
@@ -57,19 +57,19 @@ log_assert "Reservations are enforced using the maximum of " \
 log_onexit cleanup
 
 fs=$TESTPOOL/$TESTFS ; subfs=$fs/subfs
-log_must $ZFS create $subfs
-log_must $ZFS set quota=25M $fs
+log_must zfs create $subfs
+log_must zfs set quota=25M $fs
 
-log_must $ZFS set reserv=10M $subfs
-log_must $ZFS set refreserv=20M $subfs
+log_must zfs set reserv=10M $subfs
+log_must zfs set refreserv=20M $subfs
 mntpnt=$(get_prop mountpoint $fs)
-log_mustnot $MKFILE 15M $mntpnt/$TESTFILE
+log_mustnot mkfile 15M $mntpnt/$TESTFILE
 
-log_must $RM -f $mntpnt/$TESTFILE
+log_must rm -f $mntpnt/$TESTFILE
 
-log_must $ZFS set reserv=20M $subfs
-log_must $ZFS set refreserv=10M $subfs
-log_mustnot $MKFILE 15M $mntpnt/$TESTFILE
+log_must zfs set reserv=20M $subfs
+log_must zfs set refreserv=10M $subfs
+log_mustnot mkfile 15M $mntpnt/$TESTFILE
 
 log_pass "Reservations are enforced using the maximum of " \
 	"'reserv' and 'refreserv'"
diff --git a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_002_pos.ksh
index 7a39a8dae8..d4c0a4faeb 100644
--- a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,15 +48,15 @@ verify_runnable "both"
 function cleanup
 {
 	if is_global_zone ; then
-		log_must $ZFS set refreservation=none $TESTPOOL
+		log_must zfs set refreservation=none $TESTPOOL
 
 		if datasetexists $TESTPOOL@snap ; then
-			log_must $ZFS destroy -f $TESTPOOL@snap
+			log_must zfs destroy -f $TESTPOOL@snap
 		fi
 	fi
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 # This function iteratively increases refreserv to its highest possible
@@ -68,9 +68,9 @@ function max_refreserv
 	typeset -i incsize=131072
 	typeset -i rr=$(get_prop available $ds)
 
-	log_must $ZFS set refreserv=$rr $ds
+	log_must zfs set refreserv=$rr $ds
 	while :; do
-		$ZFS set refreserv=$((rr + incsize)) $ds >/dev/null 2>&1
+		zfs set refreserv=$((rr + incsize)) $ds >/dev/null 2>&1
 		if [[ $? == 0 ]]; then
 			((rr += incsize))
 			continue
@@ -86,7 +86,7 @@ log_assert "Setting full size as refreservation, verify no snapshot " \
 	"can be created."
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS/subfs
+log_must zfs create $TESTPOOL/$TESTFS/subfs
 
 typeset datasets
 if is_global_zone; then
@@ -99,15 +99,15 @@ for ds in $datasets; do
 	#
 	# Verify refreservation on dataset
 	#
-	log_must $ZFS set quota=25M $ds
+	log_must zfs set quota=25M $ds
 	max_refreserv $ds
-	log_mustnot $ZFS snapshot $ds@snap
+	log_mustnot zfs snapshot $ds@snap
 	if datasetexists $ds@snap ; then
 		log_fail "ERROR: $ds@snap should not exists."
 	fi
 
-	log_must $ZFS set quota=none $ds
-	log_must $ZFS set refreservation=none $ds
+	log_must zfs set quota=none $ds
+	log_must zfs set refreservation=none $ds
 done
 
 log_pass "Setting full size as refreservation, verify no snapshot " \
diff --git a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_003_pos.ksh
index 17382918e9..da36609f2c 100644
--- a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,9 +47,9 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "Verify a snapshot will only be allowed if there is enough " \
@@ -57,18 +57,18 @@ log_assert "Verify a snapshot will only be allowed if there is enough " \
 log_onexit cleanup
 
 fs=$TESTPOOL/$TESTFS
-log_must $ZFS set quota=25M $fs
-log_must $ZFS set refreservation=10M $fs
+log_must zfs set quota=25M $fs
+log_must zfs set refreservation=10M $fs
 
 mntpnt=$(get_prop mountpoint $fs)
-log_must $MKFILE 7M $mntpnt/$TESTFILE
-log_must $ZFS snapshot $fs@snap
+log_must mkfile 7M $mntpnt/$TESTFILE
+log_must zfs snapshot $fs@snap
 
-log_must $MKFILE 7M $mntpnt/$TESTFILE.2
-log_must $ZFS snapshot $fs@snap2
+log_must mkfile 7M $mntpnt/$TESTFILE.2
+log_must zfs snapshot $fs@snap2
 
-log_must $MKFILE 7M $mntpnt/$TESTFILE.3
-log_mustnot $ZFS snapshot $fs@snap3
+log_must mkfile 7M $mntpnt/$TESTFILE.3
+log_mustnot zfs snapshot $fs@snap3
 if datasetexists $fs@snap3 ; then
 	log_fail "ERROR: $fs@snap3 should not exists."
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_004_pos.ksh
index 8238573ef5..529d918c36 100644
--- a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,18 +47,18 @@ verify_runnable "both"
 function cleanup
 {
 	if is_global_zone ; then
-		log_must $ZFS set refreservation=none $TESTPOOL
+		log_must zfs set refreservation=none $TESTPOOL
 	fi
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "Verify refreservation is limited by available space."
 log_onexit cleanup
 
 pool=$TESTPOOL ; fs=$pool/$TESTFS ; subfs=$fs/subfs
-log_must $ZFS create $subfs
+log_must zfs create $subfs
 
 typeset datasets
 if is_global_zone; then
@@ -68,23 +68,23 @@ else
 fi
 
 for ds in $datasets; do
-	log_must $ZFS set quota=25M $ds
-	log_must $ZFS set refreservation=15M $ds
+	log_must zfs set quota=25M $ds
+	log_must zfs set refreservation=15M $ds
 
 	typeset -i avail
 	avail=$(get_prop avail $subfs)
-	log_must $ZFS set refreservation=$avail $subfs
+	log_must zfs set refreservation=$avail $subfs
 	typeset mntpnt
 	mntpnt=$(get_prop mountpoint $subfs)
-	log_must $MKFILE $avail $mntpnt/$TESTFILE
+	log_must mkfile $avail $mntpnt/$TESTFILE
 
 	typeset -i exceed
 	((exceed = avail + 1))
-	log_mustnot $ZFS set refreservation=$exceed $subfs
-	log_mustnot $MKFILE $avail $mntpnt/$TESTFILE
+	log_mustnot zfs set refreservation=$exceed $subfs
+	log_mustnot mkfile $avail $mntpnt/$TESTFILE
 
-	log_must $ZFS set quota=none $ds
-	log_must $ZFS set reservation=15M $ds
+	log_must zfs set quota=none $ds
+	log_must zfs set reservation=15M $ds
 done
 
 log_pass "Verify refreservation is limited by available space."
diff --git a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_005_pos.ksh
index 5a3adbb5f7..29651b2f5d 100644
--- a/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/refreserv/refreserv_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,26 +46,26 @@ verify_runnable "global"
 
 function cleanup
 {
-	log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs destroy -rf $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "Volume refreservation is limited by volsize"
 log_onexit cleanup
 
 fs=$TESTPOOL/$TESTFS; vol=$fs/vol
-log_must $ZFS create -V 10M $vol
+log_must zfs create -V 10M $vol
 
 # Verify the parent filesystem does not affect volume
-log_must $ZFS set quota=25M $fs
-log_must $ZFS set refreservation=10M $vol
+log_must zfs set quota=25M $fs
+log_must zfs set refreservation=10M $vol
 avail=$(get_prop mountpoint $vol)
-log_mustnot $ZFS set refreservation=$avail $vol
+log_mustnot zfs set refreservation=$avail $vol
 
 # Verify it is affected by volsize
-log_must $ZFS set volsize=15M $vol
-log_must $ZFS set refreservation=15M $vol
-log_mustnot $ZFS set refreservation=16M $vol
+log_must zfs set volsize=15M $vol
+log_must zfs set refreservation=15M $vol
+log_mustnot zfs set refreservation=16M $vol
 
 log_pass "Volume refreservation is limited by volsize"
diff --git a/usr/src/test/zfs-tests/tests/functional/rename_dirs/rename_dirs_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rename_dirs/rename_dirs_001_pos.ksh
index f84a2b657f..b02e67cc06 100644
--- a/usr/src/test/zfs-tests/tests/functional/rename_dirs/rename_dirs_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rename_dirs/rename_dirs_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,24 +48,24 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $RM -rf $TESTDIR/*
+	log_must rm -rf $TESTDIR/*
 }
 
 log_assert "ZFS can handle race directory rename operation."
 
 log_onexit cleanup
 
-$CD $TESTDIR
-$MKDIR -p 1/2/3/4/5 a/b/c/d/e
+cd $TESTDIR
+mkdir -p 1/2/3/4/5 a/b/c/d/e
 
 $RENAME_DIRS &
 
-$SLEEP 500
+sleep 500
 typeset -i retval=1
-$PGREP $RENAME_DIRS >/dev/null 2>&1
+pgrep $RENAME_DIRS >/dev/null 2>&1
 retval=$?
 if (( $retval == 0 )); then
-	$PKILL -9 $RENAME_DIRS >/dev/null 2>&1
+	pkill -9 $RENAME_DIRS >/dev/null 2>&1
 fi
 
 log_pass "ZFS handle race directory rename operation as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh
index 11b6eb3c47..f49cd12d5f 100644
--- a/usr/src/test/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function cleanup
 	if [[ -n "$child_pids" ]]; then
 		for wait_pid in $child_pids
 		do
-		        $KILL $wait_pid
+		        kill $wait_pid
 		done
 	fi
 
@@ -58,7 +58,7 @@ function cleanup
 		destroy_pool $TESTPOOL1
 	fi
 
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Replacing a disk during I/O completes."
@@ -94,41 +94,41 @@ function replace_test
 
 	typeset i=0
 	while [[ $i -lt $iters ]]; do
-		log_note "Invoking $FILE_TRUNC with: $options_display"
-		$FILE_TRUNC $options $TESTDIR/$TESTFILE.$i &
+		log_note "Invoking file_trunc with: $options_display"
+		file_trunc $options $TESTDIR/$TESTFILE.$i &
 		typeset pid=$!
 
-		$SLEEP 1
-		if ! $PS -p $pid > /dev/null 2>&1; then
-			log_fail "$FILE_TRUNC $options $TESTDIR/$TESTFILE.$i"
+		sleep 1
+		if ! ps -p $pid > /dev/null 2>&1; then
+			log_fail "file_trunc $options $TESTDIR/$TESTFILE.$i"
 		fi
 
 		child_pids="$child_pids $pid"
 		((i = i + 1))
 	done
 
-	log_must $ZPOOL replace $opt $TESTPOOL1 $disk1 $disk2
+	log_must zpool replace $opt $TESTPOOL1 $disk1 $disk2
 
-	$SLEEP 10
+	sleep 10
 
 	for wait_pid in $child_pids
 	do
-		$KILL $wait_pid
+		kill $wait_pid
 	done
 	child_pids=""
 
-        log_must $ZPOOL export $TESTPOOL1
-        log_must $ZPOOL import -d $TESTDIR $TESTPOOL1
-        log_must $ZFS umount $TESTPOOL1/$TESTFS1
-        log_must $ZDB -cdui $TESTPOOL1/$TESTFS1
-        log_must $ZFS mount $TESTPOOL1/$TESTFS1
+        log_must zpool export $TESTPOOL1
+        log_must zpool import -d $TESTDIR $TESTPOOL1
+        log_must zfs umount $TESTPOOL1/$TESTFS1
+        log_must zdb -cdui $TESTPOOL1/$TESTFS1
+        log_must zfs mount $TESTPOOL1/$TESTFS1
 
 }
 
 specials_list=""
 i=0
 while [[ $i != 2 ]]; do
-        $MKFILE $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
+        mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
         specials_list="$specials_list $TESTDIR/$TESTFILE1.$i"
 
         ((i = i + 1))
@@ -137,23 +137,23 @@ done
 #
 # Create a replacement disk special file.
 #
-$MKFILE $MINVDEVSIZE $TESTDIR/$REPLACEFILE
+mkfile $MINVDEVSIZE $TESTDIR/$REPLACEFILE
 
 for type in "" "raidz" "raidz1" "mirror"; do
 	for op in "" "-f"; do
 		create_pool $TESTPOOL1 $type $specials_list
-		log_must $ZFS create $TESTPOOL1/$TESTFS1
-		log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
+		log_must zfs create $TESTPOOL1/$TESTFS1
+		log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
 
 		replace_test "$opt" $TESTDIR/$TESTFILE1.1 $TESTDIR/$REPLACEFILE
 
-		$ZPOOL iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
+		zpool iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
 		if [[ $? -ne 0 ]]; then
 			log_fail "$REPLACEFILE is not present."
 		fi
 
 		destroy_pool $TESTPOOL1
-		log_must $RM -rf /$TESTPOOL1
+		log_must rm -rf /$TESTPOOL1
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/replacement/replacement_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/replacement/replacement_002_pos.ksh
index 19bbd3f129..2c55b9b8b0 100644
--- a/usr/src/test/zfs-tests/tests/functional/replacement/replacement_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/replacement/replacement_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function cleanup
 	if [[ -n "$child_pids" ]]; then
 		for wait_pid in $child_pids
 		do
-		        $KILL $wait_pid
+		        kill $wait_pid
 		done
 	fi
 
@@ -58,7 +58,7 @@ function cleanup
 		destroy_pool $TESTPOOL1
 	fi
 
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Replacing a disk during I/O completes."
@@ -94,41 +94,41 @@ function attach_test
 
 	typeset i=0
 	while [[ $i -lt $iters ]]; do
-		log_note "Invoking $FILE_TRUNC with: $options_display"
-		$FILE_TRUNC $options $TESTDIR/$TESTFILE.$i &
+		log_note "Invoking file_trunc with: $options_display"
+		file_trunc $options $TESTDIR/$TESTFILE.$i &
 		typeset pid=$!
 
-		$SLEEP 1
-		if ! $PS -p $pid > /dev/null 2>&1; then
-			log_fail "$FILE_TRUNC $options $TESTDIR/$TESTFILE.$i"
+		sleep 1
+		if ! ps -p $pid > /dev/null 2>&1; then
+			log_fail "file_trunc $options $TESTDIR/$TESTFILE.$i"
 		fi
 
 		child_pids="$child_pids $pid"
 		((i = i + 1))
 	done
 
-	log_must $ZPOOL attach $opt $TESTPOOL1 $disk1 $disk2
+	log_must zpool attach $opt $TESTPOOL1 $disk1 $disk2
 
-	$SLEEP 10
+	sleep 10
 
 	for wait_pid in $child_pids
 	do
-		$KILL $wait_pid
+		kill $wait_pid
 	done
 	child_pids=""
 
-        log_must $ZPOOL export $TESTPOOL1
-        log_must $ZPOOL import -d $TESTDIR $TESTPOOL1
-        log_must $ZFS umount $TESTPOOL1/$TESTFS1
-        log_must $ZDB -cdui $TESTPOOL1/$TESTFS1
-        log_must $ZFS mount $TESTPOOL1/$TESTFS1
+        log_must zpool export $TESTPOOL1
+        log_must zpool import -d $TESTDIR $TESTPOOL1
+        log_must zfs umount $TESTPOOL1/$TESTFS1
+        log_must zdb -cdui $TESTPOOL1/$TESTFS1
+        log_must zfs mount $TESTPOOL1/$TESTFS1
 
 }
 
 specials_list=""
 i=0
 while [[ $i != 2 ]]; do
-	$MKFILE $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
+	mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
 	specials_list="$specials_list $TESTDIR/$TESTFILE1.$i"
 
 	((i = i + 1))
@@ -137,16 +137,16 @@ done
 #
 # Create a replacement disk special file.
 #
-$MKFILE $MINVDEVSIZE $TESTDIR/$REPLACEFILE
+mkfile $MINVDEVSIZE $TESTDIR/$REPLACEFILE
 
 for op in "" "-f"; do
 	create_pool $TESTPOOL1 mirror $specials_list
-	log_must $ZFS create $TESTPOOL1/$TESTFS1
-	log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
+	log_must zfs create $TESTPOOL1/$TESTFS1
+	log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
 
 	attach_test "$opt" $TESTDIR/$TESTFILE1.1 $TESTDIR/$REPLACEFILE
 
-	$ZPOOL iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
+	zpool iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
 	if [[ $? -ne 0 ]]; then
 		log_fail "$REPLACEFILE is not present."
 	fi
@@ -159,13 +159,13 @@ log_note "Verify 'zpool attach' fails with non-mirrors."
 for type in "" "raidz" "raidz1"; do
 	for op in "" "-f"; do
 		create_pool $TESTPOOL1 $type $specials_list
-		log_must $ZFS create $TESTPOOL1/$TESTFS1
-		log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
+		log_must zfs create $TESTPOOL1/$TESTFS1
+		log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
 
-		log_mustnot $ZPOOL attach "$opt" $TESTDIR/$TESTFILE1.1 \
+		log_mustnot zpool attach "$opt" $TESTDIR/$TESTFILE1.1 \
 		    $TESTDIR/$REPLACEFILE
 
-		$ZPOOL iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
+		zpool iostat -v $TESTPOOL1 | grep "$TESTDIR/$REPLACEFILE"
 		if [[ $? -eq 0 ]]; then
 		        log_fail "$REPLACEFILE should not be present."
 		fi
diff --git a/usr/src/test/zfs-tests/tests/functional/replacement/replacement_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/replacement/replacement_003_pos.ksh
index 04fe2685a8..e143114eff 100644
--- a/usr/src/test/zfs-tests/tests/functional/replacement/replacement_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/replacement/replacement_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function cleanup
 	if [[ -n "$child_pids" ]]; then
 		for wait_pid in $child_pids
 		do
-		        $KILL $wait_pid
+		        kill $wait_pid
 		done
 	fi
 
@@ -58,7 +58,7 @@ function cleanup
 		destroy_pool $TESTPOOL1
 	fi
 
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Replacing a disk during I/O completes."
@@ -92,52 +92,52 @@ function detach_test
 
 	typeset i=0
 	while [[ $i -lt $iters ]]; do
-		log_note "Invoking $FILE_TRUNC with: $options_display"
-		$FILE_TRUNC $options $TESTDIR/$TESTFILE.$i &
+		log_note "Invoking file_trunc with: $options_display"
+		file_trunc $options $TESTDIR/$TESTFILE.$i &
 		typeset pid=$!
 
-		$SLEEP 1
-		if ! $PS -p $pid > /dev/null 2>&1; then
-			log_fail "$FILE_TRUNC $options $TESTDIR/$TESTFILE.$i"
+		sleep 1
+		if ! ps -p $pid > /dev/null 2>&1; then
+			log_fail "file_trunc $options $TESTDIR/$TESTFILE.$i"
 		fi
 
 		child_pids="$child_pids $pid"
 		((i = i + 1))
 	done
 
-	log_must $ZPOOL detach $TESTPOOL1 $disk1
+	log_must zpool detach $TESTPOOL1 $disk1
 
-	$SLEEP 10
+	sleep 10
 
 	for wait_pid in $child_pids
 	do
-		$KILL $wait_pid
+		kill $wait_pid
 	done
 	child_pids=""
 
-        log_must $ZPOOL export $TESTPOOL1
-        log_must $ZPOOL import -d $TESTDIR $TESTPOOL1
-        log_must $ZFS umount $TESTPOOL1/$TESTFS1
-        log_must $ZDB -cdui $TESTPOOL1/$TESTFS1
-        log_must $ZFS mount $TESTPOOL1/$TESTFS1
+        log_must zpool export $TESTPOOL1
+        log_must zpool import -d $TESTDIR $TESTPOOL1
+        log_must zfs umount $TESTPOOL1/$TESTFS1
+        log_must zdb -cdui $TESTPOOL1/$TESTFS1
+        log_must zfs mount $TESTPOOL1/$TESTFS1
 }
 
 specials_list=""
 i=0
 while [[ $i != 2 ]]; do
-	$MKFILE $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
+	mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
 	specials_list="$specials_list $TESTDIR/$TESTFILE1.$i"
 
 	((i = i + 1))
 done
 
 create_pool $TESTPOOL1 mirror $specials_list
-log_must $ZFS create $TESTPOOL1/$TESTFS1
-log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
+log_must zfs create $TESTPOOL1/$TESTFS1
+log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
 
 detach_test $TESTDIR/$TESTFILE1.1
 
-$ZPOOL iostat -v $TESTPOOL1 | grep "$TESTDIR/$TESTFILE1.1"
+zpool iostat -v $TESTPOOL1 | grep "$TESTDIR/$TESTFILE1.1"
 if [[ $? -eq 0 ]]; then
 	log_fail "$TESTFILE1.1 should no longer be present."
 fi
@@ -148,12 +148,12 @@ log_note "Verify 'zpool detach' fails with non-mirrors."
 
 for type in "" "raidz" "raidz1" ; do
 	create_pool $TESTPOOL1 $type $specials_list
-	log_must $ZFS create $TESTPOOL1/$TESTFS1
-	log_must $ZFS set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
+	log_must zfs create $TESTPOOL1/$TESTFS1
+	log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
 
-	log_mustnot $ZPOOL detach $TESTDIR/$TESTFILE1.1
+	log_mustnot zpool detach $TESTDIR/$TESTFILE1.1
 
-	$ZPOOL iostat -v $TESTPOOL1 | grep "$TESTDIR/$TESTFILE1.1"
+	zpool iostat -v $TESTPOOL1 | grep "$TESTDIR/$TESTFILE1.1"
 	if [[ $? -ne 0 ]]; then
 	        log_fail "$TESTFILE1.1 is not present."
 	fi
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib b/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib
index d0a9b384ec..e841dc74a0 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation.shlib
@@ -41,9 +41,9 @@ function zero_reservation
 	typeset resv_val
 	dataset=$1
 
-	log_must $ZFS set reservation=none $dataset
+	log_must zfs set reservation=none $dataset
 
-	resv_val=`$ZFS get -H reservation $dataset | awk '{print $3}'`
+	resv_val=`zfs get -H reservation $dataset | awk '{print $3}'`
 	if [[ $? -ne 0 ]]; then
 		log_fail "Unable to get reservation prop on $dataset"
 	elif [[ $resv_val != "none" ]]; then
@@ -51,7 +51,7 @@ function zero_reservation
 	fi
 
 
-	resv_val=`$ZFS get -pH reservation $dataset | awk '{print $3}'`
+	resv_val=`zfs get -pH reservation $dataset | awk '{print $3}'`
 	if [[ $? -ne 0 ]]; then
 		log_fail "Unable to get reservation prop on $dataset"
 	elif [[ $resv_val -ne 0 ]]; then
@@ -100,8 +100,8 @@ function create_multiple_fs # num_fs base_fs_name base_mnt_name
 	typeset MNT_NAME=$3
 
 	while  (($iter < $count)); do
-		log_must $ZFS create ${FS_NAME}$iter
-		log_must $ZFS set mountpoint=${MNT_NAME}$iter ${FS_NAME}$iter
+		log_must zfs create ${FS_NAME}$iter
+		log_must zfs set mountpoint=${MNT_NAME}$iter ${FS_NAME}$iter
 		((iter = iter + 1))
 	done
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_001_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_001_pos.sh
index f3ac0c8e5f..d0ef3a6126 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_001_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_001_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,7 +54,7 @@ verify_runnable "both"
 function cleanup
 {
 	for obj in $OBJ_LIST; do
-		datasetexists $obj && log_must $ZFS destroy -f $obj
+		datasetexists $obj && log_must zfs destroy -f $obj
 	done
 }
 
@@ -80,10 +80,10 @@ else
 	# setting a reservation upon it (i.e. the size of the volume)
 	# which we reset back to zero initially.
 	#
-	log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
-	log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
-	log_must $ZFS set refreservation=none $TESTPOOL/$TESTVOL
-	log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+	log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
+	log_must zfs set reservation=none $TESTPOOL/$TESTVOL
+	log_must zfs set refreservation=none $TESTPOOL/$TESTVOL
+	log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 fi
 
 
@@ -101,7 +101,7 @@ for obj in $TESTPOOL/$TESTFS $OBJ_LIST; do
 	[[ $obj == $TESTPOOL/$TESTVOL ]] && \
 	    ((resv_size_set = vol_set_size - RESV_DELTA))
 
-	log_must $ZFS set reservation=$resv_size_set $obj
+	log_must zfs set reservation=$resv_size_set $obj
 
 	resv_size_get=`get_prop reservation $obj`
 	if [[ $resv_size_set != $resv_size_get ]]; then
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_002_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_002_pos.sh
index 2f3a38b5ea..cdbd296e03 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_002_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_002_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,7 +54,7 @@ verify_runnable "both"
 function cleanup
 {
 	for obj in $OBJ_LIST; do
-		datasetexists $obj && log_must $ZFS destroy -f $obj
+		datasetexists $obj && log_must zfs destroy -f $obj
 	done
 
 	log_must zero_reservation $TESTPOOL/$TESTFS
@@ -77,9 +77,9 @@ else
 	((sparse_vol_set_size = space_avail * 4))
 	sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 
-	log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
-	log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
-	log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+	log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
+	log_must zfs set reservation=none $TESTPOOL/$TESTVOL
+	log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 fi
 
 for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
@@ -96,7 +96,7 @@ for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
 	    ((resv_size_set = vol_set_size + RESV_DELTA))
 
 	log_must zero_reservation $obj
-	log_mustnot $ZFS set reservation=$resv_size_set $obj
+	log_mustnot zfs set reservation=$resv_size_set $obj
 
 	resv_size_get=`get_prop reservation $obj`
 
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_003_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_003_pos.sh
index 10c6835cc8..d38f8221d5 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_003_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_003_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -59,7 +59,7 @@ function cleanup
 	log_must zero_reservation $TESTPOOL/$TESTFS
 
 	for obj in $OBJ_LIST; do
-	datasetexists $obj && log_must $ZFS destroy -f $obj
+	datasetexists $obj && log_must zfs destroy -f $obj
 	done
 }
 
@@ -96,7 +96,7 @@ function multiple_resv { #dataset
 
 		((resv_size_set = resv_size * i))
 
-		log_must $ZFS set reservation=$resv_size_set $dataset
+		log_must zfs set reservation=$resv_size_set $dataset
 
 		resv_size_get=`get_prop reservation $dataset`
 		if [[ $resv_size_set != $resv_size_get ]]; then
@@ -121,9 +121,9 @@ else
 	sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 
 
-	log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
-	log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
-	log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+	log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
+	log_must zfs set reservation=none $TESTPOOL/$TESTVOL
+	log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 fi
 
 for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_004_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_004_pos.sh
index 1280601e21..3cf00d0658 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_004_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_004_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,7 +56,7 @@ verify_runnable "both"
 function cleanup {
 
 	for obj in $OBJ_LIST; do
-		datasetexists $obj && log_must $ZFS destroy -f $obj
+		datasetexists $obj && log_must zfs destroy -f $obj
 	done
 }
 
@@ -64,7 +64,7 @@ log_assert "Verify space released when a dataset with reservation is destroyed"
 
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS2
+log_must zfs create $TESTPOOL/$TESTFS2
 
 space_avail=`get_prop available $TESTPOOL`
 
@@ -79,10 +79,10 @@ else
 	((sparse_vol_set_size = space_avail * 4))
 	sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 
-	log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
-	log_must $ZFS set refreservation=none $TESTPOOL/$TESTVOL
-	log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
-	log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+	log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
+	log_must zfs set refreservation=none $TESTPOOL/$TESTVOL
+	log_must zfs set reservation=none $TESTPOOL/$TESTVOL
+	log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 fi
 
 # re-calculate space available.
@@ -104,7 +104,7 @@ for obj in $OBJ_LIST ; do
 	[[ $obj == $TESTPOOL/$TESTVOL ]] && \
 	    ((resv_size_set = vol_set_size - RESV_DELTA))
 
-	log_must $ZFS set reservation=$resv_size_set $obj
+	log_must zfs set reservation=$resv_size_set $obj
 
 	resv_size_get=`get_prop reservation $obj`
 	if [[ $resv_size_set != $resv_size_get ]]; then
@@ -112,7 +112,7 @@ for obj in $OBJ_LIST ; do
 		"($resv_size_set != $resv_size_get)"
 	fi
 
-	log_must $ZFS destroy -f $obj
+	log_must zfs destroy -f $obj
 
 	new_space_avail=`get_prop available $TESTPOOL`
 	new_space_used=`get_prop used $TESTPOOL`
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_005_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_005_pos.sh
index 8a129a3151..28820677a6 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_005_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_005_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -59,7 +59,7 @@ log_assert "Verify space released when reservation on a dataset is set "\
 function cleanup
 {
 	for obj in $OBJ_LIST; do
-		datasetexists $obj && log_must $ZFS destroy -f $obj
+		datasetexists $obj && log_must zfs destroy -f $obj
 	done
 }
 
@@ -77,9 +77,9 @@ else
 	sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 
 
-	log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
-	log_must $ZFS set reservation=none $TESTPOOL/$TESTVOL
-	log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+	log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
+	log_must zfs set reservation=none $TESTPOOL/$TESTVOL
+	log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 fi
 
 space_avail=`get_prop available $TESTPOOL`
@@ -98,7 +98,7 @@ for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
 	[[ $obj == $TESTPOOL/$TESTVOL ]] && \
 	    ((resv_size_set = vol_set_size - RESV_DELTA))
 
-	log_must $ZFS set reservation=$resv_size_set $obj
+	log_must zfs set reservation=$resv_size_set $obj
 
 	resv_size_get=`get_prop reservation $obj`
 	if [[ $resv_size_set != $resv_size_get ]]; then
@@ -106,7 +106,7 @@ for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
 			"($resv_size_set != $resv_size_get)"
 	fi
 
-	log_must $ZFS set reservation=none $obj
+	log_must zfs set reservation=none $obj
 
 	new_space_avail=`get_prop available $TESTPOOL`
 	new_space_used=`get_prop used $TESTPOOL`
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_006_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_006_pos.sh
index a788c31624..b34461e4c1 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_006_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_006_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,8 +56,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must $RM -rf $TESTDIR/$TESTFILE1
-	log_must $ZFS set reservation=none $TESTPOOL/$TESTFS
+	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must rm -rf $TESTDIR/$TESTFILE1
+	log_must zfs set reservation=none $TESTPOOL/$TESTFS
 }
 
 log_onexit cleanup
@@ -66,7 +66,7 @@ log_assert "Verify can create files both inside and outside reserved areas"
 
 space_used=`get_prop used $TESTPOOL`
 
-log_must $ZFS set reservation=$RESV_SIZE $TESTPOOL/$TESTFS
+log_must zfs set reservation=$RESV_SIZE $TESTPOOL/$TESTFS
 
 #
 # Calculate how many writes of BLOCK_SIZE it would take to fill
@@ -75,7 +75,7 @@ log_must $ZFS set reservation=$RESV_SIZE $TESTPOOL/$TESTFS
 fill_size=`expr $RESV_SIZE + 20971520`
 write_count=`expr $fill_size / $BLOCK_SIZE`
 
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \
+log_must file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \
     -c $write_count -d 0
 
 log_pass "Able to create files inside and outside reserved area"
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_007_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_007_pos.sh
index c7b30ae132..2f4ff0132f 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_007_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_007_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,10 +56,10 @@ log_assert "Verify reservations on data sets doesn't affect other data sets " \
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTFS2 && \
-	    log_must $ZFS destroy -f $TESTPOOL/$TESTFS2
+	    log_must zfs destroy -f $TESTPOOL/$TESTFS2
 
 	datasetexists $TESTPOOL/$TESTFS1 && \
-	    log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+	    log_must zfs destroy -f $TESTPOOL/$TESTFS1
 }
 
 log_onexit cleanup
@@ -84,23 +84,23 @@ function create_resv_destroy { # args1 dataset1 args2 dataset2
 	args2=$3
 	dataset2=$4
 
-	log_must $ZFS create $args1 $dataset1
+	log_must zfs create $args1 $dataset1
 
-	log_must $ZFS set reservation=$RESV_SIZE $dataset1
+	log_must zfs set reservation=$RESV_SIZE $dataset1
 
 	avail_aft_dset1=`get_prop available $TESTPOOL`
 	used_aft_dset1=`get_prop used $TESTPOOL`
 
-	log_must $ZFS create $args2 $dataset2
+	log_must zfs create $args2 $dataset2
 
-	log_must $ZFS set reservation=$RESV_SIZE $dataset2
+	log_must zfs set reservation=$RESV_SIZE $dataset2
 
 	#
 	# After destroying the second dataset the space used and
 	# available totals should revert back to the values they
 	# had after creating the first dataset.
 	#
-	log_must $ZFS destroy -f $dataset2
+	log_must zfs destroy -f $dataset2
 
 	avail_dest_dset2=`get_prop available $TESTPOOL`
 	used_dest_dset2=`get_prop used $TESTPOOL`
@@ -112,7 +112,7 @@ function create_resv_destroy { # args1 dataset1 args2 dataset2
 	# After destroying the first dataset the space used and
 	# space available totals should revert back to the values
 	# they had when the pool was first created.
-	log_must $ZFS destroy -f $dataset1
+	log_must zfs destroy -f $dataset1
 
 	avail_dest_dset1=`get_prop available $TESTPOOL`
 	used_dest_dset1=`get_prop used $TESTPOOL`
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_008_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_008_pos.sh
index 9d2c456548..4461ad4c4b 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_008_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_008_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,9 +57,9 @@ function cleanup
 	typeset -i loop=0
 	while (($loop < $RESV_NUM_FS)); do
 		datasetexists $TESTPOOL/${TESTFS}$loop && \
-		    log_must $ZFS destroy -f $TESTPOOL/${TESTFS}$loop
+		    log_must zfs destroy -f $TESTPOOL/${TESTFS}$loop
 
-		[[ -d ${TESTDIR}$loop ]] && log_must $RM -r ${TESTDIR}$loop
+		[[ -d ${TESTDIR}$loop ]] && log_must rm -r ${TESTDIR}$loop
 
 		((loop = loop + 1))
 	done
@@ -92,7 +92,7 @@ resv_size_set=`expr $resv_space_avail / $num_resv_fs`
 #
 typeset -i num=1
 while (($num < $RESV_NUM_FS)); do
-	log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS$num
+	log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS$num
 	((num = num + 1))
 done
 
@@ -106,7 +106,7 @@ write_count=`expr $fill_size / $BLOCK_SIZE`
 num=0
 log_note "Writing to $TESTDIR$num/$TESTFILE1"
 
-$FILE_WRITE -o create -f $TESTDIR$num/$TESTFILE1 -b $BLOCK_SIZE \
+file_write -o create -f $TESTDIR$num/$TESTFILE1 -b $BLOCK_SIZE \
     -c $write_count -d 0
 ret=$?
 if (($ret != $ENOSPC)); then
@@ -116,9 +116,9 @@ fi
 # Remove the reservation on one of the other filesystems and verify
 # can write more data to the original non-reservation filesystem.
 num=1
-log_must $ZFS set reservation=none $TESTPOOL/${TESTFS}$num
+log_must zfs set reservation=none $TESTPOOL/${TESTFS}$num
 num=0
-log_must $FILE_WRITE -o create -f ${TESTDIR}$num/$TESTFILE2 -b $PAGESIZE \
+log_must file_write -o create -f ${TESTDIR}$num/$TESTFILE2 -b pagesize \
     -c 1000 -d 0
 
 log_pass "reducing reservation allows other datasets to use space"
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_009_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_009_pos.sh
index f75c85c7ba..f0bd070a0b 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_009_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_009_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,14 +56,14 @@ log_assert "Setting top level dataset reservation to 'none' allows more data "
 
 function cleanup
 {
-	log_must $RM -rf $TESTDIR/$TESTFILE1
-	log_must $RM -rf $TESTDIR/$TESTFILE2
-	log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+	log_must rm -rf $TESTDIR/$TESTFILE1
+	log_must rm -rf $TESTDIR/$TESTFILE2
+	log_must zfs destroy -f $TESTPOOL/$TESTFS1
 }
 
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS1
+log_must zfs create $TESTPOOL/$TESTFS1
 
 space_avail=`get_prop available $TESTPOOL`
 
@@ -75,7 +75,7 @@ space_avail=`get_prop available $TESTPOOL`
 #
 ((resv_size_set = space_avail - RESV_FREE_SPACE))
 
-log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS1
+log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS1
 
 space_avail_still=`get_prop available $TESTPOOL`
 
@@ -84,16 +84,16 @@ write_count=`expr $fill_size / $BLOCK_SIZE`
 
 # Now fill up the filesystem (which doesn't have a reservation set
 # and thus will use up whatever free space is left in the pool).
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \
+file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE \
         -c $write_count -d 0
 ret=$?
 if (($ret != $ENOSPC)); then
 	log_fail "Did not get ENOSPC as expected (got $ret)."
 fi
 
-log_must $ZFS set reservation=none $TESTPOOL/$TESTFS1
+log_must zfs set reservation=none $TESTPOOL/$TESTFS1
 
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $PAGESIZE \
+log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b pagesize \
     -c 1000 -d 0
 
 log_pass "Setting top level dataset reservation to 'none' allows more " \
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_010_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_010_pos.sh
index e47ad0e178..7b5af70c69 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_010_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_010_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,15 +57,15 @@ log_assert "Destroying top level filesystem with reservation allows more " \
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTFS1 && \
-	    log_must $ZFS destroy $TESTPOOL/$TESTFS1
+	    log_must zfs destroy $TESTPOOL/$TESTFS1
 
-	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must $RM -rf $TESTDIR/$TESTFILE1
-	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must $RM -rf $TESTDIR/$TESTFILE2
+	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must rm -rf $TESTDIR/$TESTFILE1
+	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must rm -rf $TESTDIR/$TESTFILE2
 }
 
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS1
+log_must zfs create $TESTPOOL/$TESTFS1
 
 space_avail=`get_prop available $TESTPOOL`
 
@@ -77,7 +77,7 @@ space_avail=`get_prop available $TESTPOOL`
 #
 ((resv_size_set = space_avail - RESV_FREE_SPACE))
 
-log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS1
+log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS1
 
 space_avail_still=`get_prop available $TESTPOOL`
 
@@ -86,15 +86,15 @@ write_count=`expr $fill_size / $BLOCK_SIZE`
 
 # Now fill up the filesystem (which doesn't have a reservation set
 # and thus will use up whatever free space is left in the pool).
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
+file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
 ret=$?
 if (($ret != $ENOSPC)); then
 	log_fail "Did not get ENOSPC as expected (got $ret)."
 fi
 
-log_must $ZFS destroy -f $TESTPOOL/$TESTFS1
+log_must zfs destroy -f $TESTPOOL/$TESTFS1
 
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $PAGESIZE \
+log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b pagesize \
     -c 1000 -d 0
 
 log_pass "Destroying top level filesystem with reservation allows more data " \
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_011_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_011_pos.sh
index b2c350400f..06ad20081c 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_011_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_011_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -61,11 +61,11 @@ space_avail=`get_prop available $TESTPOOL`
 
 ((resv_size_set = (space_avail - RESV_DELTA) / 2))
 
-fs_quota=`$ZFS get quota $TESTPOOL/$TESTFS`
+fs_quota=`zfs get quota $TESTPOOL/$TESTFS`
 
-log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS
+log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS
 
-new_fs_quota=`$ZFS get quota $TESTPOOL/$TESTFS`
+new_fs_quota=`zfs get quota $TESTPOOL/$TESTFS`
 
 if [[ $fs_quota != $new_fs_quota ]]; then
 	log_fail "Quota value on $TESTFS has changed " \
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_012_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_012_pos.sh
index 5ca3a51c9a..fb7617f6a9 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_012_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_012_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,27 +54,27 @@ log_assert "Verify reservations protect space"
 
 function cleanup
 {
-	log_must $ZFS destroy -f $TESTPOOL/$TESTFS2
+	log_must zfs destroy -f $TESTPOOL/$TESTFS2
 	log_must zero_reservation $TESTPOOL/$TESTFS
 
-	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must $RM -rf $TESTDIR/$TESTFILE2
-	[[ -d $TESTDIR2 ]] && log_must $RM -rf $TESTDIR2
+	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must rm -rf $TESTDIR/$TESTFILE2
+	[[ -d $TESTDIR2 ]] && log_must rm -rf $TESTDIR2
 }
 
 log_onexit cleanup
 
-log_must $ZFS create $TESTPOOL/$TESTFS2
-log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL/$TESTFS2
+log_must zfs create $TESTPOOL/$TESTFS2
+log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL/$TESTFS2
 
 space_avail=`get_prop available $TESTPOOL`
 
 ((resv_size_set = space_avail - RESV_FREE_SPACE))
 
-log_must $ZFS set reservation=$resv_size_set $TESTPOOL/$TESTFS
+log_must zfs set reservation=$resv_size_set $TESTPOOL/$TESTFS
 
 ((write_count = (RESV_FREE_SPACE + RESV_TOLERANCE) / BLOCK_SIZE))
 
-$FILE_WRITE -o create -f $TESTDIR2/$TESTFILE1 -b $BLOCK_SIZE -c $write_count \
+file_write -o create -f $TESTDIR2/$TESTFILE1 -b $BLOCK_SIZE -c $write_count \
     -d 0
 ret=$?
 if [[ $ret != $ENOSPC ]]; then
@@ -82,7 +82,7 @@ if [[ $ret != $ENOSPC ]]; then
 fi
 
 ((write_count = (RESV_FREE_SPACE - RESV_TOLERANCE) / BLOCK_SIZE))
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $BLOCK_SIZE -c \
+log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b $BLOCK_SIZE -c \
     $write_count -d 0
 
 log_pass "Reserved space preserved correctly"
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_013_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_013_pos.sh
index b72d852a8b..f6f3b0db7b 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_013_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_013_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -58,7 +58,7 @@ log_assert "Reservation properties preserved across exports and imports"
 function cleanup
 {
 	for obj in $OBJ_LIST; do
-                datasetexists $obj && log_must $ZFS destroy -f $obj
+                datasetexists $obj && log_must zfs destroy -f $obj
         done
 
 	log_must zero_reservation $TESTPOOL/$TESTFS
@@ -68,8 +68,8 @@ log_onexit cleanup
 OBJ_LIST="$TESTPOOL/$TESTFS1/$TESTFS2 $TESTPOOL/$TESTFS1 $TESTPOOL/$TESTVOL \
     $TESTPOOL/$TESTVOL2"
 
-log_must $ZFS create $TESTPOOL/$TESTFS1
-log_must $ZFS create $TESTPOOL/$TESTFS1/$TESTFS2
+log_must zfs create $TESTPOOL/$TESTFS1
+log_must zfs create $TESTPOOL/$TESTFS1/$TESTFS2
 
 space_avail=$(get_prop available $TESTPOOL)
 [[ $? -ne 0 ]] && \
@@ -83,16 +83,16 @@ sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 # When initially created, a regular volume's reservation property is set
 # equal to its size (unlike a sparse volume), so we don't need to set it
 # explictly later on
-log_must $ZFS create -V $resv_set $TESTPOOL/$TESTVOL
-log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+log_must zfs create -V $resv_set $TESTPOOL/$TESTVOL
+log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 
-log_must $ZFS set reservation=$resv_set $TESTPOOL/$TESTFS
-log_must $ZFS set reservation=$resv_set $TESTPOOL/$TESTFS1
-log_must $ZFS set reservation=$resv_set $TESTPOOL/$TESTFS1/$TESTFS2
-log_must $ZFS set reservation=$resv_set $TESTPOOL/$TESTVOL2
+log_must zfs set reservation=$resv_set $TESTPOOL/$TESTFS
+log_must zfs set reservation=$resv_set $TESTPOOL/$TESTFS1
+log_must zfs set reservation=$resv_set $TESTPOOL/$TESTFS1/$TESTFS2
+log_must zfs set reservation=$resv_set $TESTPOOL/$TESTVOL2
 
-log_must $ZPOOL export $TESTPOOL
-log_must $ZPOOL import $TESTPOOL
+log_must zpool export $TESTPOOL
+log_must zpool import $TESTPOOL
 
 for obj in $TESTPOOL/$TESTFS $OBJ_LIST; do
 
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_014_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_014_pos.sh
index 7ee7356725..30db7718e2 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_014_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_014_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,7 +54,7 @@ function cleanup
 	#
 	# Note we don't destroy $TESTFS as it's used by other tests
 	for obj in $OBJ_LIST ; do
-		datasetexists $obj && log_must $ZFS destroy -f $obj
+		datasetexists $obj && log_must zfs destroy -f $obj
 	done
 
 	log_must zero_reservation $TESTPOOL/$TESTFS
@@ -73,8 +73,8 @@ else
 	((sparse_vol_set_size = space_avail * 4))
 	sparse_vol_set_size=$(floor_volsize $sparse_vol_set_size)
 
-	log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
-	log_must $ZFS create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
+	log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
+	log_must zfs create -s -V $sparse_vol_set_size $TESTPOOL/$TESTVOL2
 fi
 
 for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
@@ -93,7 +93,7 @@ for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
 	# space in the pool, whichever is smaller.
 	#
 	if [[ $obj == $TESTPOOL/$TESTFS ]]; then
-		log_must $ZFS set quota=$quota_set_size $obj
+		log_must zfs set quota=$quota_set_size $obj
 		((resv_set_size = quota_set_size + RESV_SIZE))
 
 	elif [[ $obj == $TESTPOOL/$TESTVOL2 ]] ; then
@@ -107,7 +107,7 @@ for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
 
 	orig_quota=`get_prop quota $obj`
 
-	log_mustnot $ZFS set reservation=$resv_set_size $obj
+	log_mustnot zfs set reservation=$resv_set_size $obj
 	new_quota=`get_prop quota $obj`
 
 	if [[ $orig_quota != $new_quota ]]; then
@@ -116,7 +116,7 @@ for obj in $TESTPOOL/$TESTFS $OBJ_LIST ; do
 	fi
 
 	if [[ $obj == $TESTPOOL/$TESTFS ]]; then
-		log_must $ZFS set quota=none $obj
+		log_must zfs set quota=none $obj
 	fi
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_015_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_015_pos.sh
index 73ea904159..e66f15be42 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_015_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_015_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,10 +57,10 @@ log_assert "Setting volume reservation to 'none' allows more data to be " \
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTVOL && \
-	log_must $ZFS destroy $TESTPOOL/$TESTVOL
+	log_must zfs destroy $TESTPOOL/$TESTVOL
 
-	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must $RM -rf $TESTDIR/$TESTFILE1
-	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must $RM -rf $TESTDIR/$TESTFILE2
+	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must rm -rf $TESTDIR/$TESTFILE1
+	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must rm -rf $TESTDIR/$TESTFILE2
 }
 log_onexit cleanup
 
@@ -75,7 +75,7 @@ space_avail=$(largest_volsize_from_pool $TESTPOOL)
 ((resv_size_set = space_avail - RESV_FREE_SPACE))
 resv_size_set=$(floor_volsize $resv_size_set)
 
-log_must $ZFS create -V $resv_size_set $TESTPOOL/$TESTVOL
+log_must zfs create -V $resv_size_set $TESTPOOL/$TESTVOL
 
 space_avail_still=`get_prop available $TESTPOOL`
 
@@ -84,15 +84,15 @@ write_count=$((fill_size / BLOCK_SIZE))
 
 # Now fill up the filesystem (which doesn't have a reservation set
 # and thus will use up whatever free space is left in the pool).
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
+file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
 ret=$?
 if (($ret != $ENOSPC)); then
 	log_fail "Did not get ENOSPC as expected (got $ret)."
 fi
 
-log_must $ZFS set refreservation=none $TESTPOOL/$TESTVOL
+log_must zfs set refreservation=none $TESTPOOL/$TESTVOL
 
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $PAGESIZE \
+log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b pagesize \
     -c 1000 -d 0
 
 log_pass "Setting top level volume reservation to 'none' allows more " \
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_016_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_016_pos.sh
index ec47432b5f..85b5387887 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_016_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_016_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,10 +56,10 @@ log_assert "Destroying a regular volume with reservation allows more data to" \
 function cleanup
 {
 	datasetexists $TESTPOOL/$TESTVOL && \
-	    log_must $ZFS destroy $TESTPOOL/$TESTVOL
+	    log_must zfs destroy $TESTPOOL/$TESTVOL
 
-	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must $RM -rf $TESTDIR/$TESTFILE1
-	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must $RM -rf $TESTDIR/$TESTFILE2
+	[[ -e $TESTDIR/$TESTFILE1 ]] && log_must rm -rf $TESTDIR/$TESTFILE1
+	[[ -e $TESTDIR/$TESTFILE2 ]] && log_must rm -rf $TESTDIR/$TESTFILE2
 }
 log_onexit cleanup
 
@@ -75,7 +75,7 @@ vol_set_size=$(floor_volsize $vol_set_size)
 
 # Creating a regular volume implicitly sets its reservation
 # property to the same value.
-log_must $ZFS create -V $vol_set_size $TESTPOOL/$TESTVOL
+log_must zfs create -V $vol_set_size $TESTPOOL/$TESTVOL
 
 space_avail_still=$(get_prop available $TESTPOOL)
 fill_size=$((space_avail_still + $RESV_TOLERANCE))
@@ -83,15 +83,15 @@ write_count=$((fill_size / BLOCK_SIZE))
 
 # Now fill up the filesystem (which doesn't have a reservation set
 # and thus will use up whatever free space is left in the pool).
-$FILE_WRITE -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
+file_write -o create -f $TESTDIR/$TESTFILE1 -b $BLOCK_SIZE -c $write_count -d 0
 ret=$?
 if (($ret != $ENOSPC)); then
 	log_fail "Did not get ENOSPC as expected (got $ret)."
 fi
 
-log_must $ZFS destroy -f $TESTPOOL/$TESTVOL
+log_must zfs destroy -f $TESTPOOL/$TESTVOL
 
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE2 -b $PAGESIZE \
+log_must file_write -o create -f $TESTDIR/$TESTFILE2 -b pagesize \
     -c 1000 -d 0
 
 log_pass "Destroying volume with reservation allows more data to be written " \
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_017_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_017_pos.sh
index b1a4007b3c..1806ceae33 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_017_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_017_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,7 +55,7 @@ function cleanup
 	typeset vol
 
 	for vol in $regvol $sparsevol; do
-		datasetexists $vol &&  log_must $ZFS destroy $vol
+		datasetexists $vol &&  log_must zfs destroy $vol
 	done
 }
 log_onexit cleanup
@@ -67,8 +67,8 @@ log_onexit cleanup
 # Create a regular and sparse volume for testing.
 regvol=$TESTPOOL/$TESTVOL
 sparsevol=$TESTPOOL/$TESTVOL2
-log_must $ZFS create -V 64M $regvol
-log_must $ZFS create -s -V 64M $sparsevol
+log_must zfs create -V 64M $regvol
+log_must zfs create -s -V 64M $sparsevol
 
 typeset -i vsize=$(get_prop available $TESTPOOL)
 typeset -i iterate=10
@@ -83,8 +83,8 @@ while ((iterate > 1)); do
 	((randomblknum = 1 + RANDOM % blknum))
 	# Make sure volsize is a multiple of volume block size
 	((vsize = randomblknum * volblocksize))
-	log_must $ZFS set volsize=$vsize $regvol
-	log_must $ZFS set volsize=$vsize $sparsevol
+	log_must zfs set volsize=$vsize $regvol
+	log_must zfs set volsize=$vsize $sparsevol
 	vsize=$(volsize_to_reservation $regvol $vsize)
 	regreserv=$(get_prop refreservation $regvol)
 	sparsereserv=$(get_prop reservation $sparsevol)
diff --git a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_018_pos.sh b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_018_pos.sh
index 297c50ebc4..79e9f1bd8f 100644
--- a/usr/src/test/zfs-tests/tests/functional/reservation/reservation_018_pos.sh
+++ b/usr/src/test/zfs-tests/tests/functional/reservation/reservation_018_pos.sh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,8 +47,8 @@ verify_runnable "both"
 
 function cleanup
 {
-	datasetexists $fs_child && log_must $ZFS destroy $fs_child
-	log_must $ZFS set reservation=$reserv_val $fs
+	datasetexists $fs_child && log_must zfs destroy $fs_child
+	log_must zfs set reservation=$reserv_val $fs
 }
 
 log_onexit cleanup
@@ -62,9 +62,9 @@ space_avail=$(get_prop available $fs)
 reserv_val=$(get_prop reservation $fs)
 typeset -l reservsize=$space_avail
 ((reservsize = reservsize / 2))
-log_must $ZFS set reservation=$reservsize $fs
+log_must zfs set reservation=$reservsize $fs
 
-log_must $ZFS create $fs_child
+log_must zfs create $fs_child
 rsv_space=$(get_prop reservation $fs_child)
 [[ $rsv_space == $reservsize ]] && \
     log_fail "The reservation of child dataset inherits its value from parent."
diff --git a/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_002_neg.ksh
index 90f38baedb..7352d1d3ca 100644
--- a/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_002_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,16 +53,16 @@ typeset tmpfile="/tmp/mounted-datasets.$$"
 # damage done by the attempted pool destroy. The destroy itself should fail, but
 # some filesystems can become unmounted in the process, and aren't automatically
 # remounted.
-$MOUNT -p | $AWK '{if ($4 == "zfs") print $1" "$3}' > $tmpfile
+mount -p | awk '{if ($4 == "zfs") print $1" "$3}' > $tmpfile
 
-log_mustnot $ZPOOL destroy $rootpool
+log_mustnot zpool destroy $rootpool
 
 # Remount any filesystems that the destroy attempt unmounted.
 while read ds mntpt; do
-	mounted $ds || log_must $MOUNT -Fzfs $ds $mntpt
+	mounted $ds || log_must mount -Fzfs $ds $mntpt
 done < $tmpfile
-$RM -f $tmpfile
+rm -f $tmpfile
 
-log_mustnot $ZFS destroy $rootpool
+log_mustnot zfs destroy $rootpool
 
 log_pass "rootpool can not be destroyed"
diff --git a/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_003_neg.ksh
index b1c69bc68d..5fd8027f89 100644
--- a/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,10 +52,10 @@ log_assert "system related filesytems can not be renamed or destroyed"
 typeset rootpool=$(get_rootpool)
 typeset rootfs=$(get_rootfs)
 
-log_mustnot $ZFS rename $rootfs $rootpool/newfs
-log_mustnot $ZFS rename -f $rootfs $rootpool/newfs
+log_mustnot zfs rename $rootfs $rootpool/newfs
+log_mustnot zfs rename -f $rootfs $rootpool/newfs
 
-log_mustnot $ZFS destroy $rootfs
-log_mustnot $ZFS destroy -f $rootfs
+log_mustnot zfs destroy $rootfs
+log_mustnot zfs destroy -f $rootfs
 
 log_pass "system related filesystems can not be renamed or destroyed"
diff --git a/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_007_neg.ksh
index a676a67872..c7a7651610 100644
--- a/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rootpool/rootpool_007_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,7 +45,7 @@
 verify_runnable "global"
 
 function cleanup {
-	log_must $ZFS set compression=$orig_compress $rootfs
+	log_must zfs set compression=$orig_compress $rootfs
 }
 
 log_onexit cleanup
@@ -63,7 +63,7 @@ set -A gtype "gzip" "gzip-1" "gzip-2" "gzip-3" "gzip-4" "gzip-5" \
 
 typeset -i i=0
 while (( i < ${#gtype[@]} )); do
-	log_mustnot $ZFS set compression=${gtype[i]} $rootfs
+	log_mustnot zfs set compression=${gtype[i]} $rootfs
 	(( i += 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/cleanup.ksh
index b835b54cbc..a3141c74e4 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -36,10 +36,12 @@ verify_runnable "both"
 if is_global_zone ; then
 	destroy_pool $POOL
 	destroy_pool $POOL2
+	poolexists $POOL3 && destroy_pool $POOL3
 else
 	cleanup_pool $POOL
 	cleanup_pool $POOL2
+	poolexists $POOL3 && cleanup_pool $POOL3
 fi
-log_must $RM -rf $BACKDIR $TESTDIR
+log_must rm -rf $BACKDIR $TESTDIR
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend.cfg b/usr/src/test/zfs-tests/tests/functional/rsend/rsend.cfg
index 24304075f8..2c1654e089 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend.cfg
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend.cfg
@@ -24,14 +24,16 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 export BACKDIR=${TEST_BASE_DIR%%/}/backdir-rsend
 
-export DISK1=$($ECHO $DISKS | $AWK '{print $1}')
-export DISK2=$($ECHO $DISKS | $AWK '{print $2}')
+export DISK1=$(echo $DISKS | awk '{print $1}')
+export DISK2=$(echo $DISKS | awk '{print $2}')
+export DISK3=$(echo $DISKS | awk '{print $3}')
 
 export POOL=$TESTPOOL
 export POOL2=$TESTPOOL1
+export POOL3=$TESTPOOL2
 export FS=$TESTFS
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend.kshlib b/usr/src/test/zfs-tests/tests/functional/rsend/rsend.kshlib
index 88c8ccc480..da5b7cb3a4 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -66,22 +66,22 @@ function setup_test_model
 {
 	typeset pool=$1
 
-	log_must $ZFS create -p $pool/$FS/fs1/fs2
+	log_must zfs create -p $pool/$FS/fs1/fs2
 
-	log_must $ZFS snapshot $pool@psnap
-	log_must $ZFS clone $pool@psnap $pool/pclone
+	log_must zfs snapshot $pool@psnap
+	log_must zfs clone $pool@psnap $pool/pclone
 
 	if is_global_zone ; then
-		log_must $ZFS create -V 16M $pool/vol
-		log_must $ZFS create -V 16M $pool/$FS/vol
+		log_must zfs create -V 16M $pool/vol
+		log_must zfs create -V 16M $pool/$FS/vol
 
-		log_must $ZFS snapshot $pool/$FS/vol@vsnap
-		log_must $ZFS clone $pool/$FS/vol@vsnap $pool/$FS/vclone
+		log_must zfs snapshot $pool/$FS/vol@vsnap
+		log_must zfs clone $pool/$FS/vol@vsnap $pool/$FS/vclone
 	fi
 
 	log_must snapshot_tree $pool/$FS/fs1/fs2@fsnap
-	log_must $ZFS clone $pool/$FS/fs1/fs2@fsnap $pool/$FS/fs1/fclone
-	log_must $ZFS snapshot -r $pool@init
+	log_must zfs clone $pool/$FS/fs1/fs2@fsnap $pool/$FS/fs1/fclone
+	log_must zfs snapshot -r $pool@init
 
 	log_must snapshot_tree $pool@snapA
 	log_must snapshot_tree $pool@snapC
@@ -94,13 +94,13 @@ function setup_test_model
 	log_must snapshot_tree $pool/$FS/fs1/fclone@snapA
 
 	if is_global_zone ; then
-		log_must $ZFS snapshot $pool/vol@snapA
-		log_must $ZFS snapshot $pool/$FS/vol@snapB
-		log_must $ZFS snapshot $pool/$FS/vol@snapC
-		log_must $ZFS snapshot $pool/$FS/vclone@snapC
+		log_must zfs snapshot $pool/vol@snapA
+		log_must zfs snapshot $pool/$FS/vol@snapB
+		log_must zfs snapshot $pool/$FS/vol@snapC
+		log_must zfs snapshot $pool/$FS/vclone@snapC
 	fi
 
-	log_must $ZFS snapshot -r $pool@final
+	log_must zfs snapshot -r $pool@final
 
 	return 0
 }
@@ -113,16 +113,16 @@ function setup_test_model
 function cleanup_pool
 {
 	typeset pool=$1
-	log_must $RM -rf $BACKDIR/*
+	log_must rm -rf $BACKDIR/*
 
 	if is_global_zone ; then
-		log_must $ZFS destroy -Rf $pool
+		log_must zfs destroy -Rf $pool
 	else
-		typeset list=$($ZFS list -H -r -t filesystem,snapshot,volume -o name $pool)
+		typeset list=$(zfs list -H -r -t all -o name $pool)
 		for ds in $list ; do
 			if [[ $ds != $pool ]] ; then
 				if datasetexists $ds ; then
-					log_must $ZFS destroy -Rf $ds
+					log_must zfs destroy -Rf $ds
 				fi
 			fi
 		done
@@ -132,18 +132,24 @@ function cleanup_pool
 	if ! ismounted $pool ; then
 		# Make sure mountpoint directory is empty
 		if [[ -d $mntpnt ]]; then
-			log_must $RM -rf $mntpnt/*
+			log_must rm -rf $mntpnt/*
 		fi
 
-		log_must $ZFS mount $pool
+		log_must zfs mount $pool
 	fi
 	if [[ -d $mntpnt ]]; then
-		log_must $RM -rf $mntpnt/*
+		rm -rf $mntpnt/*
 	fi
 
 	return 0
 }
 
+function cleanup_pools
+{
+	cleanup_pool $POOL2
+	destroy_pool $POOL3
+}
+
 #
 # Detect if the given two filesystems have same sub-datasets
 #
@@ -155,16 +161,16 @@ function cmp_ds_subs
 	typeset src_fs=$1
 	typeset dst_fs=$2
 
-	$ZFS list -r -H -t filesystem,snapshot,volume -o name $src_fs > $BACKDIR/src1
-	$ZFS list -r -H -t filesystem,snapshot,volume -o name $dst_fs > $BACKDIR/dst1
+	zfs list -r -H -t all -o name $src_fs > $BACKDIR/src1
+	zfs list -r -H -t all -o name $dst_fs > $BACKDIR/dst1
 
-	eval $SED -e 's:^$src_fs:PREFIX:g' < $BACKDIR/src1 > $BACKDIR/src
-	eval $SED -e 's:^$dst_fs:PREFIX:g' < $BACKDIR/dst1 > $BACKDIR/dst
+	eval sed -e 's:^$src_fs:PREFIX:g' < $BACKDIR/src1 > $BACKDIR/src
+	eval sed -e 's:^$dst_fs:PREFIX:g' < $BACKDIR/dst1 > $BACKDIR/dst
 
-	$DIFF $BACKDIR/src $BACKDIR/dst
+	diff $BACKDIR/src $BACKDIR/dst
 	typeset -i ret=$?
 
-	$RM -f $BACKDIR/src $BACKDIR/dst $BACKDIR/src1 $BACKDIR/dst1
+	rm -f $BACKDIR/src $BACKDIR/dst $BACKDIR/src1 $BACKDIR/dst1
 
 	return $ret
 }
@@ -184,7 +190,7 @@ function cmp_ds_cont
 	srcdir=$(get_prop mountpoint $src_fs)
 	dstdir=$(get_prop mountpoint $dst_fs)
 
-	$DIFF -r $srcdir $dstdir > /dev/null 2>&1
+	diff -r $srcdir $dstdir > /dev/null 2>&1
 	return $?
 }
 
@@ -205,19 +211,19 @@ function cmp_ds_prop
 	    "sharenfs" "snapdir" "version" "volsize" "xattr" "zoned" \
 	    "mountpoint";
 	do
-		$ZFS get -H -o property,value,source $item $dtst1 >> \
+		zfs get -H -o property,value,source $item $dtst1 >> \
 		    $BACKDIR/dtst1
-		$ZFS get -H -o property,value,source $item $dtst2 >> \
+		zfs get -H -o property,value,source $item $dtst2 >> \
 		    $BACKDIR/dtst2
 	done
 
-	eval $SED -e 's:$dtst1:PREFIX:g' < $BACKDIR/dtst1 > $BACKDIR/dtst1
-	eval $SED -e 's:$dtst2:PREFIX:g' < $BACKDIR/dtst2 > $BACKDIR/dtst2
+	eval sed -e 's:$dtst1:PREFIX:g' < $BACKDIR/dtst1 > $BACKDIR/dtst1
+	eval sed -e 's:$dtst2:PREFIX:g' < $BACKDIR/dtst2 > $BACKDIR/dtst2
 
-	$DIFF $BACKDIR/dtst1 $BACKDIR/dtst2
+	diff $BACKDIR/dtst1 $BACKDIR/dtst2
 	typeset -i ret=$?
 
-	$RM -f $BACKDIR/dtst1 $BACKDIR/dtst2
+	rm -f $BACKDIR/dtst1 $BACKDIR/dtst2
 
 	return $ret
 
@@ -233,16 +239,16 @@ function random_tree
 	typeset dir=$1
 
 	if [[ -d $dir ]]; then
-		$RM -rf $dir
+		rm -rf $dir
 	fi
-	$MKDIR -p $dir
+	mkdir -p $dir
 	typeset -i ret=$?
 
 	typeset -i nl nd nf
 	((nl = RANDOM % 6 + 1))
 	((nd = RANDOM % 3 ))
 	((nf = RANDOM % 5 ))
-	$MKTREE -b $dir -l $nl -d $nd -f $nf
+	mktree -b $dir -l $nl -d $nd -f $nf
 	((ret |= $?))
 
 	return $ret
@@ -271,7 +277,7 @@ function snapshot_tree
 	fi
 
 	if ((ret == 0)) ; then
-		$ZFS snapshot $snap
+		zfs snapshot $snap
 		((ret |= $?))
 	fi
 
@@ -288,7 +294,7 @@ function destroy_tree
 	typeset -i ret=0
 	typeset snap
 	for snap in "$@" ; do
-		$ZFS destroy $snap
+		zfs destroy $snap
 		ret=$?
 
 		typeset ds=${snap%%@*}
@@ -298,7 +304,7 @@ function destroy_tree
 			((ret |= $?))
 
 			if ((ret != 0)); then
-				$RM -r $mntpnt/$snap
+				rm -r $mntpnt/$snap
 				((ret |= $?))
 			fi
 		fi
@@ -322,10 +328,9 @@ function getds_with_suffix
 	typeset ds=$1
 	typeset suffix=$2
 
-	typeset list=$($ZFS list -r -H -t filesystem,snapshot,volume -o name $ds \
-	    | $GREP "$suffix$")
+	typeset list=$(zfs list -r -H -t all -o name $ds | grep "$suffix$")
 
-	$ECHO $list
+	echo $list
 }
 
 #
@@ -335,18 +340,18 @@ function fs_inherit_prop
 {
 	typeset fs_prop
 	if is_global_zone ; then
-		fs_prop=$($ZFS inherit 2>&1 | \
-		    $AWK '$2=="YES" && $3=="YES" {print $1}')
+		fs_prop=$(zfs inherit 2>&1 | \
+		    awk '$2=="YES" && $3=="YES" {print $1}')
 		if ! is_te_enabled ; then
-		        fs_prop=$(echo $fs_prop | $GREP -v "mlslabel")
+		        fs_prop=$(echo $fs_prop | grep -v "mlslabel")
 		fi
 	else
-		fs_prop=$($ZFS inherit 2>&1 | \
-		    $AWK '$2=="YES" && $3=="YES" {print $1}'|
-		    $EGREP -v "devices|mlslabel|sharenfs|sharesmb|zoned")
+		fs_prop=$(zfs inherit 2>&1 | \
+		    awk '$2=="YES" && $3=="YES" {print $1}'|
+		    egrep -v "devices|mlslabel|sharenfs|sharesmb|zoned")
 	fi
 
-	$ECHO $fs_prop
+	echo $fs_prop
 }
 
 #
@@ -354,7 +359,7 @@ function fs_inherit_prop
 #
 function vol_inherit_prop
 {
-	$ECHO "checksum readonly"
+	echo "checksum readonly"
 }
 
 #
@@ -368,11 +373,11 @@ function get_dst_ds
 	#
 	# If the srcfs is not pool
 	#
-	if ! $ZPOOL list $srcfs > /dev/null 2>&1 ; then
+	if ! zpool list $srcfs > /dev/null 2>&1 ; then
 		eval dstfs="$dstfs/${srcfs#*/}"
 	fi
 
-	$ECHO $dstfs
+	echo $dstfs
 }
 
 #
@@ -391,13 +396,13 @@ function mk_files
 	fs=$4
 
 	for ((i=0; i<$nfiles; i=i+1)); do
-		$DD if=/dev/urandom \
+		dd if=/dev/urandom \
 		    of=/$fs/file-$maxsize-$((i+$file_id_offset)) \
 		    bs=$(($RANDOM * $RANDOM % $maxsize)) \
 		    count=1 >/dev/null 2>&1 || log_fail \
 		    "Failed to create /$fs/file-$maxsize-$((i+$file_id_offset))"
 	done
-	$ECHO Created $nfiles files of random sizes up to $maxsize bytes
+	echo Created $nfiles files of random sizes up to $maxsize bytes
 }
 
 #
@@ -416,9 +421,9 @@ function rm_files
 	fs=$4
 
 	for ((i=0; i<$nfiles; i=i+1)); do
-		$RM -f /$fs/file-$maxsize-$((i+$file_id_offset))
+		rm -f /$fs/file-$maxsize-$((i+$file_id_offset))
 	done
-	$ECHO Removed $nfiles files of random sizes up to $maxsize bytes
+	echo Removed $nfiles files of random sizes up to $maxsize bytes
 }
 
 #
@@ -430,17 +435,17 @@ function mess_file
 {
 	file=$1
 
-	filesize=$($STAT -c '%s' $file)
+	filesize=$(stat -c '%s' $file)
 	offset=$(($RANDOM * $RANDOM % $filesize))
 	if (($RANDOM % 7 <= 1)); then
 		#
 		# We corrupt 2 bytes to minimize the chance that we
 		# write the same value that's already there.
 		#
-		log_must eval "$DD if=/dev/random of=$file conv=notrunc " \
+		log_must eval "dd if=/dev/random of=$file conv=notrunc " \
 		    "bs=1 count=2 oseek=$offset >/dev/null 2>&1"
 	else
-		log_must $TRUNCATE -s $offset $file
+		log_must truncate -s $offset $file
 	fi
 }
 
@@ -457,12 +462,12 @@ function file_check
 
 	if [[ -d /$recvfs/.zfs/snapshot/a && -d \
 	    /$sendfs/.zfs/snapshot/a ]]; then
-		$DIFF -r /$recvfs/.zfs/snapshot/a /$sendfs/.zfs/snapshot/a
+		diff -r /$recvfs/.zfs/snapshot/a /$sendfs/.zfs/snapshot/a
 		[[ $? -eq 0 ]] || log_fail "Differences found in snap a"
 	fi
 	if [[ -d /$recvfs/.zfs/snapshot/b && -d \
 	    /$sendfs/.zfs/snapshot/b ]]; then
-		$DIFF -r /$recvfs/.zfs/snapshot/b /$sendfs/.zfs/snapshot/b
+		diff -r /$recvfs/.zfs/snapshot/b /$sendfs/.zfs/snapshot/b
 		[[ $? -eq 0 ]] || log_fail "Differences found in snap b"
 	fi
 }
@@ -485,67 +490,62 @@ function resume_test
 
 	for ((i=0; i<2; i=i+1)); do
 		mess_file /$streamfs/$stream_num
-		log_mustnot $ZFS recv -sv $recvfs </$streamfs/$stream_num
+		log_mustnot zfs recv -suv $recvfs </$streamfs/$stream_num
 		stream_num=$((stream_num+1))
 
-		token=$($ZFS get -Hp -o value receive_resume_token $recvfs)
-		log_must eval "$ZFS send -v -t $token >/$streamfs/$stream_num"
+		token=$(zfs get -Hp -o value receive_resume_token $recvfs)
+		log_must eval "zfs send -v -t $token >/$streamfs/$stream_num"
 		[[ -f /$streamfs/$stream_num ]] || \
 		    log_fail "NO FILE /$streamfs/$stream_num"
 	done
-	log_must $ZFS recv -sv $recvfs </$streamfs/$stream_num
+	log_must zfs recv -suv $recvfs </$streamfs/$stream_num
 }
 
 #
 # Setup filesystems for the resumable send/receive tests
 #
-# $1 The pool to set up with the "send" filesystems
-# $2 The pool for receive
+# $1 The "send" filesystem
+# $2 The "recv" filesystem
 #
 function test_fs_setup
 {
-	sendpool=$1
-	recvpool=$2
+	typeset sendfs=$1
+	typeset recvfs=$2
+	typeset sendpool=${sendfs%%/*}
+	typeset recvpool=${recvfs%%/*}
 
-	sendfs=$sendpool/sendfs
-	recvfs=$recvpool/recvfs
-	streamfs=$sendpool/stream
+	datasetexists $sendfs && log_must $ZFS destroy -r $sendpool
+	datasetexists $recvfs && log_must $ZFS destroy -r $recvpool
 
-	if datasetexists $recvfs; then
-		log_must $ZFS destroy -r $recvfs
-	fi
-	if datasetexists $sendfs; then
-		log_must $ZFS destroy -r $sendfs
-	fi
-	if $($ZFS create -o compress=lz4 $sendfs); then
+	if $(datasetexists $sendfs || zfs create -o compress=lz4 $sendfs); then
 		mk_files 1000 256 0 $sendfs &
 		mk_files 1000 131072 0 $sendfs &
 		mk_files 100 1048576 0 $sendfs &
 		mk_files 10 10485760 0 $sendfs &
 		mk_files 1 104857600 0 $sendfs &
-		log_must $WAIT
-		log_must $ZFS snapshot $sendfs@a
+		log_must wait
+		log_must zfs snapshot $sendfs@a
 
 		rm_files 200 256 0 $sendfs &
 		rm_files 200 131072 0 $sendfs &
 		rm_files 20 1048576 0 $sendfs &
 		rm_files 2 10485760 0 $sendfs &
-		log_must $WAIT
+		log_must wait
 
 		mk_files 400 256 0 $sendfs &
 		mk_files 400 131072 0 $sendfs &
 		mk_files 40 1048576 0 $sendfs &
 		mk_files 4 10485760 0 $sendfs &
-		log_must $WAIT
+		log_must wait
 
-		log_must $ZFS snapshot $sendfs@b
-		log_must eval "$ZFS send -v $sendfs@a >/$sendpool/initial.zsend"
-		log_must eval "$ZFS send -v -i @a $sendfs@b " \
+		log_must zfs snapshot $sendfs@b
+		log_must eval "zfs send -v $sendfs@a >/$sendpool/initial.zsend"
+		log_must eval "zfs send -v -i @a $sendfs@b " \
 		    ">/$sendpool/incremental.zsend"
 	fi
 
 	if datasetexists $streamfs; then
-		log_must $ZFS destroy -r $streamfs
+		log_must zfs destroy -r $streamfs
 	fi
-	log_must $ZFS create -o compress=lz4 $sendpool/stream
+	log_must zfs create -o compress=lz4 $sendpool/stream
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_001_pos.ksh
index 6087dd3ef0..3864d8a7d1 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -50,8 +50,8 @@ log_onexit cleanup_pool $POOL2
 #
 # Verify the entire pool and sub-ds can be backup and restored.
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 
 dstds=$(get_dst_ds $POOL $POOL2)
 log_must cmp_ds_subs $POOL $dstds
@@ -63,8 +63,8 @@ log_must cleanup_pool $POOL2
 #
 # Verify all the filesystem and sub-fs can be backup and restored.
 #
-log_must eval "$ZFS send -R $POOL/$FS@final > $BACKDIR/fs-final-R"
-log_must eval "$ZFS receive -d $POOL2 < $BACKDIR/fs-final-R"
+log_must eval "zfs send -R $POOL/$FS@final > $BACKDIR/fs-final-R"
+log_must eval "zfs receive -d $POOL2 < $BACKDIR/fs-final-R"
 
 dstds=$(get_dst_ds $POOL/$FS $POOL2)
 log_must cmp_ds_subs $POOL/$FS $dstds
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_002_pos.ksh
index 9a495d3529..f2c1e03937 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -50,17 +50,17 @@ log_onexit cleanup_pool $POOL2
 #
 # Duplicate POOL2
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-R"
 
 if is_global_zone ; then
 	#
 	# Verify send -I will backup all the incrementals in pool
 	#
-	log_must eval "$ZFS send -I $POOL2@init $POOL2@final > " \
+	log_must eval "zfs send -I $POOL2@init $POOL2@final > " \
 		"$BACKDIR/pool-init-final-I"
 	log_must destroy_tree $POOL2@final $POOL2@snapC $POOL2@snapA
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-init-final-I"
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-init-final-I"
 	log_must cmp_ds_subs $POOL $POOL2
 	log_must cmp_ds_cont $POOL $POOL2
 fi
@@ -70,9 +70,9 @@ dstds=$(get_dst_ds $POOL $POOL2)
 #
 # Verify send -I will backup all the incrementals in filesystem
 #
-log_must eval "$ZFS send -I @init $dstds/$FS@final > $BACKDIR/fs-init-final-I"
+log_must eval "zfs send -I @init $dstds/$FS@final > $BACKDIR/fs-init-final-I"
 log_must destroy_tree $dstds/$FS@final $dstds/$FS@snapC $dstds/$FS@snapB
-log_must eval "$ZFS receive -d -F $dstds < $BACKDIR/fs-init-final-I"
+log_must eval "zfs receive -d -F $dstds < $BACKDIR/fs-init-final-I"
 log_must cmp_ds_subs $POOL $dstds
 log_must cmp_ds_cont $POOL $dstds
 
@@ -81,11 +81,11 @@ if is_global_zone ; then
 	# Verify send -I will backup all the incrementals in volume
 	#
 	dataset=$POOL2/$FS/vol
-	log_must eval "$ZFS send -I @vsnap $dataset@final > " \
+	log_must eval "zfs send -I @vsnap $dataset@final > " \
 		"$BACKDIR/vol-vsnap-final-I"
 	log_must destroy_tree $dataset@final $dataset@snapC  \
 		$dataset@snapB $dataset@init
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/vol-vsnap-final-I"
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/vol-vsnap-final-I"
 	log_must cmp_ds_subs $POOL $POOL2
 	log_must cmp_ds_cont $POOL $POOL2
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_003_pos.ksh
index 85d789de5b..11d48ef0dc 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -50,17 +50,17 @@ log_onexit cleanup_pool $POOL2
 #
 # Duplicate POOL2
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-R"
 
 if is_global_zone ; then
 	#
 	# Verify send -I backup all incrementals from pool
 	#
-	log_must eval "$ZFS send -I $POOL2@psnap $POOL2/pclone@final > " \
+	log_must eval "zfs send -I $POOL2@psnap $POOL2/pclone@final > " \
 		"$BACKDIR/pool-clone-I"
-	log_must $ZFS destroy -rf $POOL2/pclone
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-clone-I"
+	log_must zfs destroy -rf $POOL2/pclone
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-clone-I"
 	log_must cmp_ds_subs $POOL $POOL2
 	log_must cmp_ds_cont $POOL $POOL2
 fi
@@ -71,10 +71,10 @@ dstds=$(get_dst_ds $POOL $POOL2)
 # Verify send -I backup all incrementals from filesystem
 #
 ds=$dstds/$FS/fs1
-log_must eval "$ZFS send -I $ds/fs2@fsnap $ds/fclone@final > " \
+log_must eval "zfs send -I $ds/fs2@fsnap $ds/fclone@final > " \
 	"$BACKDIR/fs-clone-I"
-log_must $ZFS destroy -rf $ds/fclone
-log_must eval "$ZFS receive -F $ds/fclone < $BACKDIR/fs-clone-I"
+log_must zfs destroy -rf $ds/fclone
+log_must eval "zfs receive -F $ds/fclone < $BACKDIR/fs-clone-I"
 
 log_must cmp_ds_subs $POOL $dstds
 log_must cmp_ds_cont $POOL $dstds
@@ -84,10 +84,10 @@ if is_global_zone ; then
 	# Verify send -I backup all incrementals from volume
 	#
 	ds=$POOL2/$FS
-	log_must eval "$ZFS send -I $ds/vol@vsnap $ds/vclone@final > " \
+	log_must eval "zfs send -I $ds/vol@vsnap $ds/vclone@final > " \
 		"$BACKDIR/vol-clone-I"
-	log_must $ZFS destroy -rf $ds/vclone
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/vol-clone-I"
+	log_must zfs destroy -rf $ds/vclone
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/vol-clone-I"
 	log_must cmp_ds_subs $POOL $POOL2
 	log_must cmp_ds_cont $POOL $POOL2
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_004_pos.ksh
index 18cdac379f..c0b36b2329 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -51,8 +51,8 @@ log_onexit cleanup_pool $POOL2
 #
 # Duplicate POOL2 for testing
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 
 if is_global_zone ; then
 	#
@@ -63,10 +63,10 @@ if is_global_zone ; then
 	interlist="$interlist $(getds_with_suffix $POOL2 @snapB)"
 	interlist="$interlist $(getds_with_suffix $POOL2 @snapA)"
 
-	log_must eval "$ZFS send -R -i @init $POOL2@final > " \
+	log_must eval "zfs send -R -i @init $POOL2@final > " \
 		"$BACKDIR/pool-init-final-iR"
 	log_must destroy_tree $interlist
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-init-final-iR"
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-init-final-iR"
 
 	# Get current datasets with suffix @final
 	dstlist=$(getds_with_suffix $POOL2 @final)
@@ -80,7 +80,7 @@ dstds=$(get_dst_ds $POOL $POOL2)
 #
 # Testing send -R -i backup from filesystem
 #
-log_must eval "$ZFS send -R -i @init $dstds/$FS@final > " \
+log_must eval "zfs send -R -i @init $dstds/$FS@final > " \
 	"$BACKDIR/fs-init-final-iR"
 
 srclist=$(getds_with_suffix $dstds/$FS @final)
@@ -89,9 +89,9 @@ interlist="$interlist $(getds_with_suffix $dstds/$FS @snapB)"
 interlist="$interlist $(getds_with_suffix $dstds/$FS @snapA)"
 log_must destroy_tree $interlist
 if is_global_zone ; then
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/fs-init-final-iR"
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/fs-init-final-iR"
 else
-	$ZFS receive -F -d $dstds/$FS < $BACKDIR/fs-init-final-iR
+	zfs receive -F -d $dstds/$FS < $BACKDIR/fs-init-final-iR
 fi
 
 dstlist=$(getds_with_suffix $dstds/$FS @final)
@@ -105,10 +105,10 @@ if is_global_zone ; then
 	# Testing send -R -i backup from volume
 	#
 	srclist=$(getds_with_suffix $POOL2/$FS/vol @final)
-	log_must eval "$ZFS send -R -i @init $POOL2/$FS/vol@final > " \
+	log_must eval "zfs send -R -i @init $POOL2/$FS/vol@final > " \
 		"$BACKDIR/vol-init-final-iR"
 	log_must destroy_tree $srclist
-	log_must eval "$ZFS receive -d $POOL2 < $BACKDIR/vol-init-final-iR"
+	log_must eval "zfs receive -d $POOL2 < $BACKDIR/vol-init-final-iR"
 
 	dstlist=$(getds_with_suffix $POOL2/$FS/vol @final)
 	if [[ $srclist != $dstlist ]]; then
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_005_pos.ksh
index 154072d70a..4d156690e3 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -51,21 +51,21 @@ log_onexit cleanup_pool $POOL2
 #
 # Duplicate POOL2 for testing
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 
 if is_global_zone ; then
 	#
 	# Testing send -R -I from pool
 	#
-	log_must eval "$ZFS send -R -I @init $POOL2@final > " \
+	log_must eval "zfs send -R -I @init $POOL2@final > " \
 		"$BACKDIR/pool-init-final-IR"
 	list=$(getds_with_suffix $POOL2 @snapA)
 	list="$list $(getds_with_suffix $POOL2 @snapB)"
 	list="$list $(getds_with_suffix $POOL2 @snapC)"
 	list="$list $(getds_with_suffix $POOL2 @final)"
 	log_must destroy_tree $list
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-init-final-IR"
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-init-final-IR"
 	log_must cmp_ds_cont $POOL $POOL2
 fi
 
@@ -73,7 +73,7 @@ dstds=$(get_dst_ds $POOL $POOL2)
 #
 # Testing send -R -I from filesystem
 #
-log_must eval "$ZFS send -R -I @init $dstds/$FS@final > " \
+log_must eval "zfs send -R -I @init $dstds/$FS@final > " \
 	"$BACKDIR/fs-init-final-IR"
 list=$(getds_with_suffix $dstds/$FS @snapA)
 list="$list $(getds_with_suffix $dstds/$FS @snapB)"
@@ -81,9 +81,9 @@ list="$list $(getds_with_suffix $dstds/$FS @snapC)"
 list="$list $(getds_with_suffix $dstds/$FS @final)"
 log_must destroy_tree $list
 if is_global_zone ; then
-	log_must eval "$ZFS receive -d -F $dstds < $BACKDIR/fs-init-final-IR"
+	log_must eval "zfs receive -d -F $dstds < $BACKDIR/fs-init-final-IR"
 else
-	$ZFS receive -d -F $dstds < $BACKDIR/fs-init-final-IR
+	zfs receive -d -F $dstds < $BACKDIR/fs-init-final-IR
 fi
 log_must cmp_ds_subs $POOL $dstds
 log_must cmp_ds_cont $POOL $dstds
@@ -93,10 +93,10 @@ if is_global_zone ; then
 	# Testing send -I -R for volume
 	#
 	vol=$POOL2/$FS/vol
-	log_must eval "$ZFS send -R -I @init $vol@final > " \
+	log_must eval "zfs send -R -I @init $vol@final > " \
 		"$BACKDIR/vol-init-final-IR"
 	log_must destroy_tree $vol@snapB $vol@snapC $vol@final
-	log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/vol-init-final-IR"
+	log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/vol-init-final-IR"
 	log_must cmp_ds_subs $POOL $POOL2
 	log_must cmp_ds_cont $POOL $POOL2
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_006_pos.ksh
index 78f3d26bcb..8c598f4ec2 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -64,7 +64,7 @@ log_onexit cleanup
 
 typeset -i i=0
 while ((i < ${#snaps[@]})); do
-	log_must $ZFS rename -r ${snaps[$i]} ${snaps[((i+1))]}
+	log_must zfs rename -r ${snaps[$i]} ${snaps[((i+1))]}
 
 	((i += 2))
 done
@@ -72,8 +72,8 @@ done
 #
 # Duplicate POOL2 for testing
 #
-log_must eval "$ZFS send -R $POOL@init > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@init > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 
 dstds=$(get_dst_ds $POOL $POOL2)
 log_must cmp_ds_subs $POOL $dstds
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh
index e08bd80bf8..29e9f18595 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -64,7 +64,7 @@ log_onexit cleanup
 
 typeset -i i=0
 while ((i < ${#dtst[@]})); do
-	log_must $ZFS rename ${dtst[$i]} ${dtst[((i+1))]}
+	log_must zfs rename ${dtst[$i]} ${dtst[((i+1))]}
 
 	((i += 2))
 done
@@ -72,15 +72,15 @@ done
 #
 # Verify zfs send -R should succeed
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 dstds=$(get_dst_ds $POOL $POOL2)
 log_must cmp_ds_subs $POOL $dstds
 
 #
 # Verify zfs send -R -I should succeed
 #
-log_must eval "$ZFS send -R -I @init $dstds@final > " \
+log_must eval "zfs send -R -I @init $dstds@final > " \
         "$BACKDIR/pool-init-final-IR"
 list=$(getds_with_suffix $dstds @snapA)
 list="$list $(getds_with_suffix $dstds @snapB)"
@@ -88,9 +88,9 @@ list="$list $(getds_with_suffix $dstds @snapC)"
 list="$list $(getds_with_suffix $dstds @final)"
 log_must destroy_tree $list
 if is_global_zone ; then
-	log_must eval "$ZFS receive -d -F $dstds < $BACKDIR/pool-init-final-IR"
+	log_must eval "zfs receive -d -F $dstds < $BACKDIR/pool-init-final-IR"
 else
-	$ZFS receive -d -F $dstds < $BACKDIR/pool-init-final-IR
+	zfs receive -d -F $dstds < $BACKDIR/pool-init-final-IR
 fi
 log_must cmp_ds_subs $POOL $dstds
 
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_008_pos.ksh
index de5543e7cc..2c231ec91c 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -60,7 +60,7 @@ function cleanup
 		origin=$(get_prop origin ${dtst[$i]})
 
 		if [[ $origin != "-" ]]; then
-			log_must $ZFS promote ${dtst[$i]}
+			log_must zfs promote ${dtst[$i]}
 		fi
 
 		((i += 2))
@@ -68,7 +68,7 @@ function cleanup
 
 	origin=$(get_prop origin $POOL2)
 	if [[ $origin != "-" ]]; then
-		log_must $ZFS promote $POOL2
+		log_must zfs promote $POOL2
 	fi
 	log_must cleanup_pool $POOL2
 }
@@ -78,7 +78,7 @@ log_onexit cleanup
 
 typeset -i i=0
 while ((i < ${#dtst[@]})); do
-	log_must $ZFS promote ${dtst[((i+1))]}
+	log_must zfs promote ${dtst[((i+1))]}
 
 	((i += 2))
 done
@@ -86,8 +86,8 @@ done
 #
 # Verify zfs send -R should succeed
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 
 dstds=$(get_dst_ds $POOL $POOL2)
 #
@@ -119,10 +119,10 @@ while ((i < ${#pair[@]})); do
 done
 
 # Verify the original filesystem can be promoted
-log_must $ZFS promote $dstds
+log_must zfs promote $dstds
 if is_global_zone ; then
-	log_must $ZFS promote $dstds/$FS/vol
+	log_must zfs promote $dstds/$FS/vol
 fi
-log_must $ZFS promote $dstds/$FS/fs1/fs2
+log_must zfs promote $dstds/$FS/fs1/fs2
 
 log_pass "Changes made by 'zfs promote' can be properly received."
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh
index c85d22d729..1578283fc7 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -48,30 +48,30 @@ verify_runnable "global"
 function cleanup
 {
 	if datasetexists bpool ; then
-		log_must $ZPOOL destroy -f bpool
+		log_must zpool destroy -f bpool
 	fi
 	if datasetexists spool ; then
-		log_must $ZPOOL destroy -f spool
+		log_must zpool destroy -f spool
 	fi
 }
 
 log_assert "Verify zfs receive can handle out of space correctly."
 log_onexit cleanup
 
-log_must $MKFILE $MINVDEVSIZE $TESTDIR/bfile
-log_must $MKFILE $SPA_MINDEVSIZE  $TESTDIR/sfile
+log_must mkfile $MINVDEVSIZE $TESTDIR/bfile
+log_must mkfile $SPA_MINDEVSIZE  $TESTDIR/sfile
 log_must zpool create bpool $TESTDIR/bfile
 log_must zpool create spool $TESTDIR/sfile
 
 #
 # Test out of space on sub-filesystem
 #
-log_must $ZFS create bpool/fs
-log_must $MKFILE 30M /bpool/fs/file
+log_must zfs create bpool/fs
+log_must mkfile 30M /bpool/fs/file
 
-log_must $ZFS snapshot bpool/fs@snap
-log_must eval "$ZFS send -R bpool/fs@snap > $BACKDIR/fs-R"
-log_mustnot eval "$ZFS receive -d -F spool < $BACKDIR/fs-R"
+log_must zfs snapshot bpool/fs@snap
+log_must eval "zfs send -R bpool/fs@snap > $BACKDIR/fs-R"
+log_mustnot eval "zfs receive -d -F spool < $BACKDIR/fs-R"
 
 log_must datasetnonexists spool/fs
 log_must ismounted spool
@@ -79,12 +79,12 @@ log_must ismounted spool
 #
 # Test out of space on top filesystem
 #
-log_must $MV /bpool/fs/file /bpool
-log_must $ZFS destroy -rf bpool/fs
+log_must mv /bpool/fs/file /bpool
+log_must zfs destroy -rf bpool/fs
 
-log_must $ZFS snapshot bpool@snap
-log_must eval "$ZFS send -R bpool@snap > $BACKDIR/bpool-R"
-log_mustnot eval "$ZFS receive -d -F spool < $BACKDIR/bpool-R"
+log_must zfs snapshot bpool@snap
+log_must eval "zfs send -R bpool@snap > $BACKDIR/bpool-R"
+log_mustnot eval "zfs receive -d -F spool < $BACKDIR/bpool-R"
 
 log_must datasetnonexists spool/fs
 log_must ismounted spool
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_010_pos.ksh
index 503a8c224e..e76f5c5c86 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_010_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -47,31 +47,31 @@ verify_runnable "both"
 log_assert "ZFS can handle stream with multiple identical (same GUID) snapshots"
 log_onexit cleanup_pool $POOL2
 
-log_must $ZFS create $POOL2/$FS
-log_must $ZFS snapshot $POOL2/$FS@snap
+log_must zfs create $POOL2/$FS
+log_must zfs snapshot $POOL2/$FS@snap
 
 #
 # First round restore the stream
 #
-log_must eval "$ZFS send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
-log_must eval "$ZFS receive -d -F $POOL2/$FS < $BACKDIR/fs-R"
+log_must eval "zfs send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
+log_must eval "zfs receive -d -F $POOL2/$FS < $BACKDIR/fs-R"
 
 #
 # In order to avoid 'zfs send -R' failed, create snapshot for
 # all the sub-systems
 #
-list=$($ZFS list -r -H -o name -t filesystem $POOL2/$FS)
+list=$(zfs list -r -H -o name -t filesystem $POOL2/$FS)
 for item in $list ; do
 	if datasetnonexists $item@snap ; then
-		log_must $ZFS snapshot $item@snap
+		log_must zfs snapshot $item@snap
 	fi
 done
 
 #
 # Second round restore the stream
 #
-log_must eval "$ZFS send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
+log_must eval "zfs send -R $POOL2/$FS@snap > $BACKDIR/fs-R"
 dstds=$(get_dst_ds $POOL2/$FS $POOL2/$FS)
-log_must eval "$ZFS receive -d -F $dstds < $BACKDIR/fs-R"
+log_must eval "zfs receive -d -F $dstds < $BACKDIR/fs-R"
 
 log_pass "ZFS can handle stream with multiple identical (same GUID) snapshots"
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh
index fa8aa3bd59..3b6cc29372 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -46,7 +46,7 @@ verify_runnable "both"
 function cleanup
 {
 	export __ZFS_POOL_RESTRICT="$POOL $POOL2"
-	log_must $ZFS unmount -a
+	log_must zfs unmount -a
 	unset __ZFS_POOL_RESTRICT
 	log_must cleanup_pool $POOL
 	log_must cleanup_pool $POOL2
@@ -62,7 +62,7 @@ log_onexit cleanup
 #
 for prop in $(fs_inherit_prop); do
 	value=$(get_prop $prop $POOL/$FS)
-	log_must $ZFS set $prop=$value $POOL/$FS
+	log_must zfs set $prop=$value $POOL/$FS
 done
 
 #
@@ -70,17 +70,17 @@ done
 #
 for ds in "$POOL/$FS/fs1" "$POOL/$FS/fs1/fs2" "$POOL/$FS/fs1/fclone" ; do
 	for prop in $(fs_inherit_prop) ; do
-		$ZFS inherit $prop $ds
+		zfs inherit $prop $ds
 		if (($? !=0 )); then
-			log_fail "$ZFS inherit $prop $ds"
+			log_fail "zfs inherit $prop $ds"
 		fi
 	done
 done
 if is_global_zone ; then
 	for prop in $(vol_inherit_prop) ; do
-		$ZFS inherit $prop $POOL/$FS/vol
+		zfs inherit $prop $POOL/$FS/vol
 		if (($? !=0 )); then
-			log_fail "$ZFS inherit $prop $POOL/$FS/vol"
+			log_fail "zfs inherit $prop $POOL/$FS/vol"
 		fi
 	done
 fi
@@ -89,9 +89,9 @@ fi
 # Verify datasets can be backup and restore correctly
 # Unmount $POOL/$FS to avoid two fs mount in the same mountpoint
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-R"
-log_must $ZFS unmount -f $POOL/$FS
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-R"
+log_must zfs unmount -f $POOL/$FS
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-R"
 
 dstds=$(get_dst_ds $POOL $POOL2)
 #
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
index 4a590fab48..af6f49dc25 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -51,7 +51,7 @@ function rand_set_prop
 	shift 2
 	typeset value=$(random_get $@)
 
-	log_must eval "$ZFS set $prop='$value' $dtst"
+	log_must eval "zfs set $prop='$value' $dtst"
 }
 
 function edited_prop
@@ -62,15 +62,15 @@ function edited_prop
 
 	case $behaviour in
 		"get")
-			typeset props=$($ZFS inherit 2>&1 | \
-				$AWK '$2=="YES" {print $1}' | \
-				$EGREP -v "^vol|\.\.\.$")
+			typeset props=$(zfs inherit 2>&1 | \
+				awk '$2=="YES" {print $1}' | \
+				egrep -v "^vol|\.\.\.$")
 			for item in $props ; do
 				if [[ $item == "mlslabel" ]] && \
 					! is_te_enabled ; then
 					continue
 				fi
-				$ZFS get -H -o property,value $item $ds >> \
+				zfs get -H -o property,value $item $ds >> \
 					$backfile
 				if (($? != 0)); then
 					log_fail "zfs get -H -o property,value"\
@@ -85,9 +85,9 @@ function edited_prop
 
 			typeset prop value
 			while read prop value ; do
-				eval $ZFS set $prop='$value' $ds
+				eval zfs set $prop='$value' $ds
 				if (($? != 0)); then
-					log_fail "$ZFS set $prop=$value $ds"
+					log_fail "zfs set $prop=$value $ds"
 				fi
 			done < $backfile
 			;;
@@ -106,17 +106,17 @@ function cleanup
 
 	typeset prop
 	for prop in $(fs_inherit_prop) ; do
-		log_must $ZFS inherit $prop $POOL
-		log_must $ZFS inherit $prop $POOL2
+		log_must zfs inherit $prop $POOL
+		log_must zfs inherit $prop $POOL2
 	done
 
 	#if is_shared $POOL; then
-	#	log_must $ZFS set sharenfs=off $POOL
+	#	log_must zfs set sharenfs=off $POOL
 	#fi
 	log_must setup_test_model $POOL
 
 	if [[ -d $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR/*
+		log_must rm -rf $TESTDIR/*
 	fi
 }
 
@@ -165,8 +165,8 @@ rand_set_prop $POOL sharenfs "on" "off" "rw"
 #
 # Duplicate POOL2 for testing
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 
 #
 # Define all the POOL/POOL2 datasets pair
@@ -188,7 +188,7 @@ while ((i < ${#pair[@]})); do
 done
 
 
-$ZPOOL upgrade -v | $GREP "Snapshot properties" > /dev/null 2>&1
+zpool upgrade -v | grep "Snapshot properties" > /dev/null 2>&1
 if (( $? == 0 )) ; then
 	i=0
 	while ((i < ${#pair[@]})); do
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_013_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_013_pos.ksh
index fefcfa7c39..80644ee209 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_013_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_013_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -63,20 +63,20 @@ cleanup
 #
 # Duplicate POOL2 for testing
 #
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -dF $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -dF $POOL2 < $BACKDIR/pool-final-R"
 
-log_must $ZFS destroy -Rf $POOL/$FS
-log_must $ZFS destroy -Rf $POOL/pclone
+log_must zfs destroy -Rf $POOL/$FS
+log_must zfs destroy -Rf $POOL/pclone
 
 if is_global_zone ; then
-	log_must $ZFS destroy -Rf $POOL/vol
+	log_must zfs destroy -Rf $POOL/vol
 fi
-log_must $ZFS snapshot -r $POOL@destroy
+log_must zfs snapshot -r $POOL@destroy
 
-log_must eval "$ZFS send -R -I @final $POOL@destroy > " \
+log_must eval "zfs send -R -I @final $POOL@destroy > " \
 	"$BACKDIR/pool-final-destroy-IR"
-log_must eval "$ZFS receive -dF $POOL2 < $BACKDIR/pool-final-destroy-IR"
+log_must eval "zfs receive -dF $POOL2 < $BACKDIR/pool-final-destroy-IR"
 
 dstds=$(get_dst_ds $POOL $POOL2)
 log_must cmp_ds_subs $POOL $dstds
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_014_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_014_pos.ksh
index cf8fc423f0..699e309e61 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_014_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_014_pos.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -33,10 +33,10 @@ verify_runnable "both"
 log_assert "zfs send will work on filesystems and volumes in a read-only pool."
 log_onexit cleanup_pool $POOL2
 
-log_must eval "$ZPOOL export $POOL"
-log_must eval "$ZPOOL import -o readonly=on $POOL"
-log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
-log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
+log_must eval "zpool export $POOL"
+log_must eval "zpool import -o readonly=on $POOL"
+log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
+log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 
 dstds=$(get_dst_ds $POOL $POOL2)
 log_must cmp_ds_subs $POOL $dstds
@@ -44,10 +44,10 @@ log_must cmp_ds_cont $POOL $dstds
 
 log_must cleanup_pool $POOL2
 
-log_must eval "$ZFS send -R $POOL/$FS@final > $BACKDIR/fs-final-R"
-log_must eval "$ZFS receive -d $POOL2 < $BACKDIR/fs-final-R"
-log_must eval "$ZPOOL export $POOL"
-log_must eval "$ZPOOL import $POOL"
+log_must eval "zfs send -R $POOL/$FS@final > $BACKDIR/fs-final-R"
+log_must eval "zfs receive -d $POOL2 < $BACKDIR/fs-final-R"
+log_must eval "zpool export $POOL"
+log_must eval "zpool import $POOL"
 
 dstds=$(get_dst_ds $POOL/$FS $POOL2)
 log_must cmp_ds_subs $POOL/$FS $dstds
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_019_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_019_pos.ksh
index c8550de98a..d6a5fa2b75 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_019_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_019_pos.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -30,22 +30,24 @@
 # 4. ZFS send to the stream state file again using the receive_resume_token
 # 5. ZFS receieve and verify the receive completes successfully
 # 6. Repeat steps on an incremental ZFS send
+# 7. Repeat the entire procedure for a dataset at the pool root
 #
 
 verify_runnable "both"
 
 log_assert "Verify resumability of a full and incremental ZFS send/receive " \
     "in the presence of a corrupted stream"
-log_onexit cleanup_pool $POOL2
+log_onexit cleanup_pools $POOL2 $POOL3
 
-sendfs=$POOL/sendfs
-recvfs=$POOL2/recvfs
-streamfs=$POOL/stream
+recvfs=$POOL3/recvfs
+streamfs=$POOL2/stream
 
-test_fs_setup $POOL $POOL2
-resume_test "$ZFS send -v $sendfs@a" $streamfs $recvfs
-resume_test "$ZFS send -v -i @a $sendfs@b" $streamfs $recvfs
-file_check $sendfs $recvfs
+for sendfs in $POOL2/sendfs $POOL2; do
+	test_fs_setup $sendfs $recvfs
+	resume_test "zfs send -v $sendfs@a" $streamfs $recvfs
+	resume_test "zfs send -v -i @a $sendfs@b" $streamfs $recvfs
+	file_check $sendfs $recvfs
+done
 
 log_pass "Verify resumability of a full and incremental ZFS send/receive " \
     "in the presence of a corrupted stream"
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_020_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_020_pos.ksh
index e4c13d78f4..1dcbdace8e 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_020_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_020_pos.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -41,8 +41,8 @@ sendfs=$POOL/sendfs
 recvfs=$POOL2/recvfs
 streamfs=$POOL/stream
 
-test_fs_setup $POOL $POOL2
-resume_test "$ZFS send -D -v $sendfs@a" $streamfs $recvfs
+test_fs_setup $sendfs $recvfs
+resume_test "zfs send -D -v $sendfs@a" $streamfs $recvfs
 file_check $sendfs $recvfs
 
 log_pass "Verify resumability of full ZFS send/receive with the -D " \
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh
index d7d952fded..8fb0abb7a5 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_021_pos.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -43,9 +43,9 @@ sendfs=$POOL/sendfs
 recvfs=$POOL2/recvfs
 streamfs=$POOL/stream
 
-test_fs_setup $POOL $POOL2
-resume_test "$ZFS send -v -e $sendfs@a" $streamfs $recvfs
-resume_test "$ZFS send -v -e -i @a $sendfs@b" $streamfs $recvfs
+test_fs_setup $sendfs $recvfs
+resume_test "zfs send -v -e $sendfs@a" $streamfs $recvfs
+resume_test "zfs send -v -e -i @a $sendfs@b" $streamfs $recvfs
 file_check $sendfs $recvfs
 
 log_pass "Verify resumability of a full and incremental ZFS send/receive " \
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh
index 9e377cb846..3fdb049422 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_022_pos.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,14 +46,14 @@ sendfs=$POOL/sendfs
 recvfs=$POOL2/recvfs
 streamfs=$POOL/stream
 
-test_fs_setup $POOL $POOL2
-log_must $ZFS bookmark $sendfs@a $sendfs#bm_a
-log_must $ZFS destroy $sendfs@a
-log_must $ZFS receive -v $recvfs </$POOL/initial.zsend
-resume_test "$ZFS send -i \#bm_a $sendfs@b" $streamfs $recvfs
-log_must $ZFS destroy -r -f $sendfs
-log_must $ZFS receive -v $sendfs </$POOL/initial.zsend
-log_must $ZFS receive -v $sendfs </$POOL/incremental.zsend
+test_fs_setup $sendfs $recvfs
+log_must zfs bookmark $sendfs@a $sendfs#bm_a
+log_must zfs destroy $sendfs@a
+log_must zfs receive -v $recvfs </$POOL/initial.zsend
+resume_test "zfs send -i \#bm_a $sendfs@b" $streamfs $recvfs
+log_must zfs destroy -r -f $sendfs
+log_must zfs receive -v $sendfs </$POOL/initial.zsend
+log_must zfs receive -v $sendfs </$POOL/incremental.zsend
 file_check $sendfs $recvfs
 
 log_pass "Verify resumability of an incremental ZFS send/receive with ZFS " \
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh
index e5e299a0e7..62fba64589 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/rsend_024_pos.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2014 by Delphix. All rights reserved.
+# Copyright (c) 2014, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -43,9 +43,9 @@ sendfs=$POOL/sendfs
 recvfs=$POOL2/recvfs
 streamfs=$POOL/stream
 
-test_fs_setup $POOL $POOL2
-log_must $ZFS unmount $sendfs
-resume_test "$ZFS send $sendfs" $streamfs $recvfs
+test_fs_setup $sendfs $recvfs
+log_must zfs unmount $sendfs
+resume_test "zfs send $sendfs" $streamfs $recvfs
 file_check $sendfs $recvfs
 
 log_pass "Verify resumability of a full ZFS send/receive with the source " \
diff --git a/usr/src/test/zfs-tests/tests/functional/rsend/setup.ksh b/usr/src/test/zfs-tests/tests/functional/rsend/setup.ksh
index 939356ad7e..7707b81604 100644
--- a/usr/src/test/zfs-tests/tests/functional/rsend/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/rsend/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -35,10 +35,11 @@ verify_runnable "both"
 verify_disk_count "$DISKS" 2
 
 if is_global_zone ; then
-	log_must $ZPOOL create $POOL $DISK1
-	log_must $ZPOOL create $POOL2 $DISK2
+	log_must zpool create $POOL $DISK1
+	log_must zpool create $POOL2 $DISK2
+	log_must zpool create $POOL3 $DISK3
 fi
-log_must $MKDIR $BACKDIR $TESTDIR
+log_must mkdir $BACKDIR $TESTDIR
 
 log_must setup_test_model $POOL
 
diff --git a/usr/src/test/zfs-tests/tests/functional/scrub_mirror/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/scrub_mirror/cleanup.ksh
index af46b0b2d8..c9d3bbd07a 100644
--- a/usr/src/test/zfs-tests/tests/functional/scrub_mirror/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/scrub_mirror/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -35,8 +35,8 @@
 
 verify_runnable "global"
 
-$DF -F zfs -h | $GREP "$TESTFS " >/dev/null
-[[ $? == 0 ]] && log_must $ZFS umount -f $TESTDIR
+df -F zfs -h | grep "$TESTFS " >/dev/null
+[[ $? == 0 ]] && log_must zfs umount -f $TESTDIR
 destroy_pool $TESTPOOL
 
 # recreate and destroy a zpool over the disks to restore the partitions to
diff --git a/usr/src/test/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_common.kshlib b/usr/src/test/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_common.kshlib
index 2864389da2..42a7865e0f 100644
--- a/usr/src/test/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/scrub_mirror/scrub_mirror_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 . $STF_SUITE/tests/functional/scrub_mirror/default.cfg
 
@@ -42,20 +42,20 @@ function overwrite_verify_mirror
 
 	while (( atfile < FILE_COUNT )); do
 		files[$atfile]=$TESTDIR/file.$atfile
-		log_must $FILE_WRITE -o create -f $TESTDIR/file.$atfile \
+		log_must file_write -o create -f $TESTDIR/file.$atfile \
 			-b $FILE_SIZE -c 1
-		cksums[$atfile]=$($CKSUM ${files[$atfile]})
+		cksums[$atfile]=$(cksum ${files[$atfile]})
 		(( atfile = atfile + 1 ))
 	done
 
 	# dd the affected side of the mirror
-	log_must $DD if=$OVERWRITING_DEVICE of=/dev/dsk/$AFFECTED_DEVICE \
+	log_must dd if=$OVERWRITING_DEVICE of=/dev/dsk/$AFFECTED_DEVICE \
 		seek=8 bs=$DD_BLOCK count=$(( DD_COUNT - 8 )) conv=notrunc
 
-	log_must $ZPOOL scrub $POOL
+	log_must zpool scrub $POOL
 
 	while is_pool_scrubbing $POOL; do
-		$SLEEP 2
+		sleep 2
 	done
 
 	atfile=0
@@ -63,11 +63,11 @@ function overwrite_verify_mirror
 	typeset -i failedcount=0
 	while (( atfile < FILE_COUNT )); do
 		files[$atfile]=$TESTDIR/file.$atfile
-		newcksum=$($CKSUM ${files[$atfile]})
+		newcksum=$(cksum ${files[$atfile]})
 		if [[ $newcksum != ${cksums[$atfile]} ]]; then
 			(( failedcount = failedcount + 1 ))
 		fi
-		$RM -f ${files[$atfile]}
+		rm -f ${files[$atfile]}
 		(( atfile = atfile + 1 ))
 	done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/slog/cleanup.ksh
index 6b192ca7bd..ba6006cec2 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -39,16 +39,16 @@ if ! verify_slog_support ; then
 fi
 
 if datasetexists $TESTPOOL ; then
-	log_must $ZPOOL destroy -f $TESTPOOL
+	log_must zpool destroy -f $TESTPOOL
 fi
 if datasetexists $TESTPOOL2 ; then
-	log_must $ZPOOL destroy -f $TESTPOOL2
+	log_must zpool destroy -f $TESTPOOL2
 fi
 if [[ -d $VDIR ]]; then
-	log_must $RM -rf $VDIR
+	log_must rm -rf $VDIR
 fi
 if [[ -d $VDIR2 ]]; then
-	log_must $RM -rf $VDIR2
+	log_must rm -rf $VDIR2
 fi
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/setup.ksh b/usr/src/test/zfs-tests/tests/functional/slog/setup.ksh
index c945344932..c5c1a82710 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -39,12 +39,12 @@ if ! verify_slog_support ; then
 fi
 
 if [[ -d $VDEV ]]; then
-	log_must $RM -rf $VDIR
+	log_must rm -rf $VDIR
 fi
 if [[ -d $VDEV2 ]]; then
-	log_must $RM -rf $VDIR2
+	log_must rm -rf $VDIR2
 fi
-log_must $MKDIR -p $VDIR $VDIR2
-log_must $MKFILE $MINVDEVSIZE $VDEV $SDEV $LDEV $VDEV2 $SDEV2 $LDEV2
+log_must mkdir -p $VDIR $VDIR2
+log_must mkfile $MINVDEVSIZE $VDEV $SDEV $LDEV $VDEV2 $SDEV2 $LDEV2
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog.kshlib b/usr/src/test/zfs-tests/tests/functional/slog/slog.kshlib
index 5360200d15..a6d82f28d8 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -34,10 +34,10 @@
 function cleanup
 {
 	if datasetexists $TESTPOOL ; then
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 	fi
 	if datasetexists $TESTPOOL2 ; then
-		log_must $ZPOOL destroy -f $TESTPOOL2
+		log_must zpool destroy -f $TESTPOOL2
 	fi
 }
 
@@ -51,17 +51,17 @@ function display_status
 	typeset pool=$1
 
 	typeset -i ret=0
-	$ZPOOL status -xv $pool > /dev/null 2>&1
+	zpool status -xv $pool > /dev/null 2>&1
 	ret=$?
 
-	$ZPOOL iostat > /dev/null 2>&1
+	zpool iostat > /dev/null 2>&1
 	((ret |= $?))
 
 	typeset mntpnt=$(get_prop mountpoint $pool)
-	$DD if=/dev/random of=$mntpnt/testfile.$$ &
+	dd if=/dev/random of=$mntpnt/testfile.$$ &
 	typeset pid=$!
 
-	$ZPOOL iostat -v 1 3 > /dev/null
+	zpool iostat -v 1 3 > /dev/null
 	((ret |= $?))
 
 	kill -9 $pid
@@ -94,7 +94,7 @@ function verify_slog_device
 	#
 	# mirror:/disks/d ONLINE mirror:/disks/e ONLINE stripe:/disks/f ONLINE
 	#
-	set -A dev_stat_tab $($ZPOOL status -v $pool | $NAWK 'BEGIN {start=0} \
+	set -A dev_stat_tab $(zpool status -v $pool | nawk 'BEGIN {start=0} \
 				/\tlogs/ {start=1}
 				/\tmirror/ || /\tspares/ || /^$/ {start=0}
 				(start==1) && /\t  (\/|[a-zA-Z])/ \
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_001_pos.ksh
index c6adaa4c30..3d3daf5f9c 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -52,7 +52,7 @@ do
 	do
 		for logtype in "" "mirror"
 		do
-			log_must $ZPOOL create $TESTPOOL $type $VDEV \
+			log_must zpool create $TESTPOOL $type $VDEV \
 				$spare $SDEV log $logtype $LDEV
 			log_must display_status $TESTPOOL
 
@@ -60,7 +60,7 @@ do
 			log_must verify_slog_device \
 				$TESTPOOL $ldev 'ONLINE' $logtype
 
-			log_must $ZPOOL destroy -f $TESTPOOL
+			log_must zpool destroy -f $TESTPOOL
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_002_pos.ksh
index 9062772c1d..b056f19cdb 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -53,13 +53,13 @@ do
 	do
 		for logtype in "" "mirror"
 		do
-			log_must $ZPOOL create $TESTPOOL $type $VDEV $spare $SDEV
-			log_must $ZPOOL add $TESTPOOL log $logtype $LDEV
+			log_must zpool create $TESTPOOL $type $VDEV $spare $SDEV
+			log_must zpool add $TESTPOOL log $logtype $LDEV
 			log_must display_status $TESTPOOL
 			typeset ldev=$(random_get $LDEV)
 			log_must verify_slog_device \
 				$TESTPOOL $ldev 'ONLINE' $logtype
-			log_must $ZPOOL destroy -f $TESTPOOL
+			log_must zpool destroy -f $TESTPOOL
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_003_pos.ksh
index 5a28066da1..c647b8f54b 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -55,9 +55,9 @@ do
 		do
 			for newtype in "" "mirror"
 			do
-				log_must $ZPOOL create $TESTPOOL $type $VDEV \
+				log_must zpool create $TESTPOOL $type $VDEV \
 					$spare $SDEV log $logtype $LDEV
-				log_must $ZPOOL add $TESTPOOL \
+				log_must zpool add $TESTPOOL \
 					log $newtype $LDEV2
 
 				log_must display_status $TESTPOOL
@@ -65,7 +65,7 @@ do
 				log_must verify_slog_device \
 					$TESTPOOL $ldev 'ONLINE' $newtype
 
-				log_must $ZPOOL destroy -f $TESTPOOL
+				log_must zpool destroy -f $TESTPOOL
 			done
 		done
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_004_pos.ksh
index 83806d03bb..4b0b3439a2 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -53,19 +53,19 @@ do
 	do
 		for logtype in "" "mirror"
 		do
-			log_must $ZPOOL create $TESTPOOL $type $VDEV \
+			log_must zpool create $TESTPOOL $type $VDEV \
 				$spare $SDEV log $logtype $LDEV
 
 			ldev=$(random_get $LDEV)
 			typeset ldev2=$(random_get $LDEV2)
-			log_must $ZPOOL attach $TESTPOOL $ldev $ldev2
+			log_must zpool attach $TESTPOOL $ldev $ldev2
 			log_must display_status $TESTPOOL
 			log_must verify_slog_device \
 				$TESTPOOL $ldev 'ONLINE' 'mirror'
 			log_must verify_slog_device \
 				$TESTPOOL $ldev2 'ONLINE' 'mirror'
 
-			log_must $ZPOOL destroy -f $TESTPOOL
+			log_must zpool destroy -f $TESTPOOL
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_005_pos.ksh
index f40fc5aace..cbbb948691 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -51,14 +51,14 @@ for type in "" "mirror" "raidz" "raidz2"
 do
 	for spare in "" "spare"
 	do
-		log_must $ZPOOL create $TESTPOOL $type $VDEV $spare $SDEV \
+		log_must zpool create $TESTPOOL $type $VDEV $spare $SDEV \
 			log mirror $LDEV mirror $LDEV2
 		ldev=$(random_get $LDEV $LDEV2)
-		log_must $ZPOOL detach $TESTPOOL $ldev
+		log_must zpool detach $TESTPOOL $ldev
 		log_must display_status $TESTPOOL
 		log_mustnot verify_slog_device $TESTPOOL $ldev 'ONLINE' 'mirror'
 
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_006_pos.ksh
index b93f64ab7e..53e8c67ca0 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -53,18 +53,18 @@ do
 	do
 		for logtype in "" "mirror"
 		do
-			log_must $ZPOOL create $TESTPOOL $type $VDEV \
+			log_must zpool create $TESTPOOL $type $VDEV \
 				$spare $SDEV log $logtype $LDEV
 			sdev=$(random_get $LDEV)
 			tdev=$(random_get $LDEV2)
-			log_must $ZPOOL replace $TESTPOOL $sdev $tdev
+			log_must zpool replace $TESTPOOL $sdev $tdev
 			log_must display_status $TESTPOOL
 			# sleep 15 to make sure replacement completely.
-			log_must $SLEEP 15
+			log_must sleep 15
 			log_must verify_slog_device \
 				$TESTPOOL $tdev 'ONLINE' $logtype
 
-			log_must $ZPOOL destroy -f $TESTPOOL
+			log_must zpool destroy -f $TESTPOOL
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_007_pos.ksh
index c643301402..4926fb7b31 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -59,7 +59,7 @@ do
 			# Create pool which devices resider in different
 			# directory
 			#
-			log_must $ZPOOL create $TESTPOOL $type $VDEV \
+			log_must zpool create $TESTPOOL $type $VDEV \
 				$spare $SDEV log $logtype $LDEV $LDEV2
 			ldev=$(random_get $LDEV $LDEV2)
 			log_must verify_slog_device \
@@ -68,8 +68,8 @@ do
 			#
 			# Nomal export/import operating
 			#
-			log_must $ZPOOL export $TESTPOOL
-			log_must $ZPOOL import -d $VDIR -d $VDIR2 $TESTPOOL
+			log_must zpool export $TESTPOOL
+			log_must zpool import -d $VDIR -d $VDIR2 $TESTPOOL
 			log_must display_status $TESTPOOL
 			ldev=$(random_get $LDEV $LDEV2)
 			log_must verify_slog_device \
@@ -78,14 +78,14 @@ do
 			#
 			# Destroy the pool and import again
 			#
-			log_must $ZPOOL destroy $TESTPOOL
-			log_must $ZPOOL import -Df -d $VDIR -d $VDIR2 $TESTPOOL
+			log_must zpool destroy $TESTPOOL
+			log_must zpool import -Df -d $VDIR -d $VDIR2 $TESTPOOL
 			log_must display_status $TESTPOOL
 			ldev=$(random_get $LDEV $LDEV2)
 			log_must verify_slog_device \
 				$TESTPOOL $ldev 'ONLINE' $logtype
 
-			log_must $ZPOOL destroy -f $TESTPOOL
+			log_must zpool destroy -f $TESTPOOL
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_008_neg.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_008_neg.ksh
index b9243567a5..587e0e3212 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_008_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_008_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -51,7 +51,7 @@ do
 	do
 		for logtype in "raidz" "raidz1" "raidz2"
 		do
-			log_mustnot $ZPOOL create $TESTPOOL $type $VDEV \
+			log_mustnot zpool create $TESTPOOL $type $VDEV \
 				$spare $SDEV log $logtype $LDEV $LDEV2
 			ldev=$(random_get $LDEV $LDEV2)
 			log_mustnot verify_slog_device \
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_009_neg.ksh
index 9b195bd64c..e7091f17b7 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_009_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -53,15 +53,15 @@ do
 		for logtype in "raidz" "raidz1" "raidz2"
 		do
 			log=$(random_get_with_non "log")
-			log_must $ZPOOL create $TESTPOOL $type $VDEV \
+			log_must zpool create $TESTPOOL $type $VDEV \
 				$spare $SDEV $log $LDEV
 
-			log_mustnot $ZPOOL add $TESTPOOL log $logtype $LDEV2
+			log_mustnot zpool add $TESTPOOL log $logtype $LDEV2
 			ldev=$(random_get $LDEV2)
 			log_mustnot verify_slog_device \
 				$TESTPOOL $ldev 'ONLINE' $logtype
 
-			log_must $ZPOOL destroy $TESTPOOL
+			log_must zpool destroy $TESTPOOL
 		done
 	done
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_010_neg.ksh
index a5e79f0731..8fe248ffbc 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_010_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -47,17 +47,17 @@ verify_runnable "global"
 log_assert "Slog device can not be replaced with spare device."
 log_onexit cleanup
 
-log_must $ZPOOL create $TESTPOOL $VDEV spare $SDEV log $LDEV
+log_must zpool create $TESTPOOL $VDEV spare $SDEV log $LDEV
 sdev=$(random_get $SDEV)
 ldev=$(random_get $LDEV)
-log_mustnot $ZPOOL replace $TESTPOOL $ldev $sdev
+log_mustnot zpool replace $TESTPOOL $ldev $sdev
 log_mustnot verify_slog_device $TESTPOOL $sdev 'ONLINE'
 log_must verify_slog_device $TESTPOOL $ldev 'ONLINE'
 
-log_must $ZPOOL create $TESTPOOL2 $VDEV2 spare $SDEV2
+log_must zpool create $TESTPOOL2 $VDEV2 spare $SDEV2
 sdev2=$(random_get $SDEV2)
-log_mustnot $ZPOOL replace $TESTPOOL $ldev $sdev2
-log_mustnot $ZPOOL replace -f $TESTPOOL $ldev $sdev2
+log_mustnot zpool replace $TESTPOOL $ldev $sdev2
+log_mustnot zpool replace -f $TESTPOOL $ldev $sdev2
 log_mustnot verify_slog_device $TESTPOOL $sdev2 'ONLINE'
 log_must verify_slog_device $TESTPOOL $ldev 'ONLINE'
 
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_011_neg.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_011_neg.ksh
index d2fd334337..2dad200b31 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_011_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_011_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -51,19 +51,19 @@ for type in "" "mirror" "raidz" "raidz2"
 do
 	for spare in "" "spare"
 	do
-		log_must $ZPOOL create $TESTPOOL $type $VDEV $spare $SDEV \
+		log_must zpool create $TESTPOOL $type $VDEV $spare $SDEV \
 			log mirror $LDEV mirror $LDEV2
 
 		ldev=$(random_get $LDEV $LDEV2)
-		log_must $ZPOOL offline $TESTPOOL $ldev
+		log_must zpool offline $TESTPOOL $ldev
 		log_must display_status $TESTPOOL
 		log_must verify_slog_device $TESTPOOL $ldev 'OFFLINE' 'mirror'
 
-		log_must $ZPOOL online $TESTPOOL $ldev
+		log_must zpool online $TESTPOOL $ldev
 		log_must display_status $TESTPOOL
 		log_must verify_slog_device $TESTPOOL $ldev 'ONLINE' 'mirror'
 
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_012_neg.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_012_neg.ksh
index b982ffa112..758563f23b 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_012_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_012_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -50,23 +50,23 @@ for type in "" "mirror" "raidz" "raidz2"
 do
 	for spare in "" "spare"
 	do
-		log_must $ZPOOL create $TESTPOOL $type $VDEV $spare $SDEV \
+		log_must zpool create $TESTPOOL $type $VDEV $spare $SDEV \
 			log mirror $LDEV
 
 		mntpnt=$(get_prop mountpoint $TESTPOOL)
 		#
 		# Create file in pool to trigger writting in slog devices
 		#
-		log_must $DD if=/dev/random of=$mntpnt/testfile.$$ count=100
+		log_must dd if=/dev/random of=$mntpnt/testfile.$$ count=100
 
 		ldev=$(random_get $LDEV)
-		log_must $MKFILE $MINVDEVSIZE $ldev
-		log_must $ZPOOL scrub $TESTPOOL
+		log_must mkfile $MINVDEVSIZE $ldev
+		log_must zpool scrub $TESTPOOL
 
 		log_must display_status $TESTPOOL
 		log_must verify_slog_device $TESTPOOL $ldev 'UNAVAIL' 'mirror'
 
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_013_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_013_pos.ksh
index 18970752e2..1ebb34fdda 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_013_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_013_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -48,10 +48,10 @@ function cleanup_testenv
 {
 	cleanup
 	if datasetexists $TESTPOOL2 ; then
-		log_must $ZPOOL destroy -f $TESTPOOL2
+		log_must zpool destroy -f $TESTPOOL2
 	fi
 	if [[ -n $lofidev ]]; then
-		$LOFIADM -d $lofidev
+		lofiadm -d $lofidev
 	fi
 }
 
@@ -61,21 +61,21 @@ verify_disk_count "$DISKS" 2
 log_onexit cleanup_testenv
 
 dsk1=${DISKS%% *}
-log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1}
+log_must zpool create $TESTPOOL ${DISKS#$dsk1}
 
 # Add nomal disk
-log_must $ZPOOL add $TESTPOOL log $dsk1
+log_must zpool add $TESTPOOL log $dsk1
 log_must verify_slog_device $TESTPOOL $dsk1 'ONLINE'
 # Add nomal file
-log_must $ZPOOL add $TESTPOOL log $LDEV
+log_must zpool add $TESTPOOL log $LDEV
 ldev=$(random_get $LDEV)
 log_must verify_slog_device $TESTPOOL $ldev 'ONLINE'
 
 # Add lofi device
 lofidev=${LDEV2%% *}
-log_must $LOFIADM -a $lofidev
-lofidev=$($LOFIADM $lofidev)
-log_must $ZPOOL add $TESTPOOL log $lofidev
+log_must lofiadm -a $lofidev
+lofidev=$(lofiadm $lofidev)
+log_must zpool add $TESTPOOL log $lofidev
 log_must verify_slog_device $TESTPOOL $lofidev 'ONLINE'
 
 log_pass "Verify slog device can be disk, file, lofi device or any device " \
@@ -83,10 +83,10 @@ log_pass "Verify slog device can be disk, file, lofi device or any device " \
 
 # Add file which reside in the itself
 mntpnt=$(get_prop mountpoint $TESTPOOL)
-log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev
-log_must $ZPOOL add $TESTPOOL $mntpnt/vdev
+log_must mkfile $MINVDEVSIZE $mntpnt/vdev
+log_must zpool add $TESTPOOL $mntpnt/vdev
 
 # Add ZFS volume
 vol=$TESTPOOL/vol
-log_must $ZPOOL create -V $MINVDEVSIZE $vol
-log_must $ZPOOL add $TESTPOOL /dev/zvol/dsk/$vol
+log_must zpool create -V $MINVDEVSIZE $vol
+log_must zpool add $TESTPOOL /dev/zvol/dsk/$vol
diff --git a/usr/src/test/zfs-tests/tests/functional/slog/slog_014_pos.ksh b/usr/src/test/zfs-tests/tests/functional/slog/slog_014_pos.ksh
index d2444c9751..b9dbc6c97e 100644
--- a/usr/src/test/zfs-tests/tests/functional/slog/slog_014_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/slog/slog_014_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/slog/slog.kshlib
@@ -49,31 +49,31 @@ for type in "mirror" "raidz" "raidz2"
 do
 	for spare in "" "spare"
 	do
-		log_must $ZPOOL create $TESTPOOL $type $VDEV $spare $SDEV \
+		log_must zpool create $TESTPOOL $type $VDEV $spare $SDEV \
 			log $LDEV
 
 		# Corrupt a pool device to make the pool DEGRADED
-		$DD if=/dev/urandom of=/$TESTPOOL/filler bs=1024k count=50
+		dd if=/dev/urandom of=/$TESTPOOL/filler bs=1024k count=50
 		# The oseek value below is to skip past the vdev label.
-		log_must $DD if=/dev/urandom of=$VDIR/a bs=1024k oseek=4 \
+		log_must dd if=/dev/urandom of=$VDIR/a bs=1024k oseek=4 \
 		    conv=notrunc count=50
-		log_must $ZPOOL scrub $TESTPOOL
+		log_must zpool scrub $TESTPOOL
 		log_must display_status $TESTPOOL
-		log_must $ZPOOL status $TESTPOOL 2>&1 >/dev/null
+		log_must zpool status $TESTPOOL 2>&1 >/dev/null
 
-		$ZPOOL status -v $TESTPOOL | \
-			$GREP "state: DEGRADED" 2>&1 >/dev/null
+		zpool status -v $TESTPOOL | \
+			grep "state: DEGRADED" 2>&1 >/dev/null
 		if (( $? != 0 )); then
 			log_fail "pool $TESTPOOL status should be DEGRADED"
 		fi
 
-		$ZPOOL status -v $TESTPOOL | $GREP logs | \
-			$GREP "DEGRADED" 2>&1 >/dev/null
+		zpool status -v $TESTPOOL | grep logs | \
+			grep "DEGRADED" 2>&1 >/dev/null
 		if (( $? == 0 )); then
 			log_fail "log device should display correct status"
 		fi
 
-		log_must $ZPOOL destroy -f $TESTPOOL
+		log_must zpool destroy -f $TESTPOOL
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh
index 241cdbbd46..23b77c0aa2 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -62,8 +62,8 @@ set -A args "$SNAPFS" "$SNAPDIR" "$TESTPOOL/$TESTCLONE" "$TESTDIR.0" \
 function setup_all
 {
 	create_pool $TESTPOOL1 /dev/zvol/dsk/$TESTPOOL/$TESTVOL
-	log_must $ZFS create $TESTPOOL1/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL1/$TESTFS
+	log_must zfs create $TESTPOOL1/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL1/$TESTFS
 
 	return 0
 }
@@ -75,24 +75,24 @@ function cleanup_all
 	i=0
 	while (( i < ${#args[*]} )); do
 		snapexists ${args[i]} && \
-			log_must $ZFS destroy -Rf ${args[i]}
+			log_must zfs destroy -Rf ${args[i]}
 
 		[[ -d ${args[i+3]} ]] && \
-			log_must $RM -rf ${args[i+3]}
+			log_must rm -rf ${args[i+3]}
 
 		[[ -d ${args[i+1]} ]] && \
-			log_must $RM -rf ${args[i+1]}
+			log_must rm -rf ${args[i+1]}
 
 		(( i = i + 4 ))
 	done
 
 	datasetexists $TESTPOOL1/$TESTFS  && \
-		log_must $ZFS destroy -f $TESTPOOL1/$TESTFS
+		log_must zfs destroy -f $TESTPOOL1/$TESTFS
 
 	destroy_pool $TESTPOOL1
 
 	[[ -d $TESTDIR2 ]] && \
-		log_must $RM -rf $TESTDIR2
+		log_must rm -rf $TESTDIR2
 
 	return 0
 }
@@ -104,7 +104,7 @@ log_onexit cleanup_all
 setup_all
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 typeset -i i=0
@@ -113,7 +113,7 @@ for mtpt in $TESTDIR $TESTDIR2 ; do
 	log_note "Populate the $mtpt directory (prior to snapshot)"
 	typeset -i j=1
 	while [[ $j -le $COUNT ]]; do
-		log_must $FILE_WRITE -o create -f $mtpt/before_file$j \
+		log_must file_write -o create -f $mtpt/before_file$j \
 			-b $BLOCKSZ -c $NUM_WRITES -d $j
 
 		(( j = j + 1 ))
@@ -124,33 +124,33 @@ while (( i < ${#args[*]} )); do
 	#
 	# Take a snapshot of the test file system.
 	#
-	log_must $ZFS snapshot ${args[i]}
+	log_must zfs snapshot ${args[i]}
 
 	#
 	# Clone a new file system from the snapshot
 	#
-	log_must $ZFS clone ${args[i]} ${args[i+2]}
+	log_must zfs clone ${args[i]} ${args[i+2]}
 	if [[ -n ${args[i+3]} ]] ; then
-		log_must $ZFS set mountpoint=${args[i+3]} ${args[i+2]}
+		log_must zfs set mountpoint=${args[i+3]} ${args[i+2]}
 
-		FILE_COUNT=`$LS -Al ${args[i+3]} | $GREP -v "total" \
-		    | $GREP -v "\.zfs" | wc -l`
+		FILE_COUNT=`ls -Al ${args[i+3]} | grep -v "total" \
+		    | grep -v "\.zfs" | wc -l`
 		if [[ $FILE_COUNT -ne $COUNT ]]; then
-			$LS -Al ${args[i+3]}
+			ls -Al ${args[i+3]}
 			log_fail "AFTER: ${args[i+3]} contains $FILE_COUNT files(s)."
 		fi
 
 		log_note "Verify the ${args[i+3]} directory is writable"
 		j=1
 		while [[ $j -le $COUNT ]]; do
-			log_must $FILE_WRITE -o create -f ${args[i+3]}/after_file$j \
+			log_must file_write -o create -f ${args[i+3]}/after_file$j \
 			-b $BLOCKSZ -c $NUM_WRITES -d $j
 			(( j = j + 1 ))
 		done
 
-		FILE_COUNT=`$LS -Al ${args[i+3]}/after* | $GREP -v "total" | wc -l`
+		FILE_COUNT=`ls -Al ${args[i+3]}/after* | grep -v "total" | wc -l`
 		if [[ $FILE_COUNT -ne $COUNT ]]; then
-			$LS -Al ${args[i+3]}
+			ls -Al ${args[i+3]}
 			log_fail "${args[i+3]} contains $FILE_COUNT after* files(s)."
 		fi
 	fi
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_001_pos.ksh
index e5df02d456..8894c3a652 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,10 +53,10 @@ function cleanup
 {
 	snapexists $SNAPFS
 	[[ $? -eq 0 ]] && \
-		log_must $ZFS destroy $SNAPFS
+		log_must zfs destroy $SNAPFS
 
 	[[ -e $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 }
 
 log_assert "Verify that a rollback to a previous snapshot succeeds."
@@ -64,31 +64,31 @@ log_assert "Verify that a rollback to a previous snapshot succeeds."
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
 log_note "Populate the $TESTDIR directory (prior to snapshot)"
 typeset -i i=1
 while [[ $i -le $COUNT ]]; do
-	log_must $FILE_WRITE -o create -f $TESTDIR/before_file$i \
+	log_must file_write -o create -f $TESTDIR/before_file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
 
 	(( i = i + 1 ))
 done
 
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
-FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total" | wc -l`
 if [[ $FILE_COUNT -ne $COUNT ]]; then
-        $LS -Al $SNAPDIR
+        ls -Al $SNAPDIR
         log_fail "AFTER: $SNAPFS contains $FILE_COUNT files(s)."
 fi
 
 log_note "Populate the $TESTDIR directory (post snapshot)"
 typeset -i i=1
 while [[ $i -le $COUNT ]]; do
-        log_must $FILE_WRITE -o create -f $TESTDIR/after_file$i \
+        log_must file_write -o create -f $TESTDIR/after_file$i \
            -b $BLOCKSZ -c $NUM_WRITES -d $i
 
         (( i = i + 1 ))
@@ -97,18 +97,18 @@ done
 #
 # Now rollback to latest snapshot
 #
-log_must $ZFS rollback $SNAPFS
+log_must zfs rollback $SNAPFS
 
-FILE_COUNT=`$LS -Al $TESTDIR/after* 2> /dev/null | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $TESTDIR/after* 2> /dev/null | grep -v "total" | wc -l`
 if [[ $FILE_COUNT -ne 0 ]]; then
-        $LS -Al $TESTDIR
+        ls -Al $TESTDIR
         log_fail "$TESTDIR contains $FILE_COUNT after* files(s)."
 fi
 
-FILE_COUNT=`$LS -Al $TESTDIR/before* 2> /dev/null \
-    | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $TESTDIR/before* 2> /dev/null \
+    | grep -v "total" | wc -l`
 if [[ $FILE_COUNT -ne $COUNT ]]; then
-	$LS -Al $TESTDIR
+	ls -Al $TESTDIR
 	log_fail "$TESTDIR contains $FILE_COUNT before* files(s)."
 fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_002_pos.ksh
index 76b8c84520..c424a69f0a 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,14 +53,14 @@ function cleanup
 {
 	snapexists $SNAPFS.1
 	[[ $? -eq 0 ]] && \
-		log_must $ZFS destroy $SNAPFS.1
+		log_must zfs destroy $SNAPFS.1
 
 	snapexists $SNAPFS
 	[[ $? -eq 0 ]] && \
-		log_must $ZFS destroy $SNAPFS
+		log_must zfs destroy $SNAPFS
 
 	[[ -e $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 }
 
 log_assert "Verify rollback is with respect to latest snapshot."
@@ -68,65 +68,65 @@ log_assert "Verify rollback is with respect to latest snapshot."
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
 log_note "Populate the $TESTDIR directory (prior to first snapshot)"
 typeset -i i=1
 while [[ $i -le $COUNT ]]; do
-	log_must $FILE_WRITE -o create -f $TESTDIR/original_file$i \
+	log_must file_write -o create -f $TESTDIR/original_file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
 
 	(( i = i + 1 ))
 done
 
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
-FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total" | wc -l`
 if [[ $FILE_COUNT -ne $COUNT ]]; then
-        $LS -Al $SNAPDIR
+        ls -Al $SNAPDIR
         log_fail "AFTER: $SNAPFS contains $FILE_COUNT files(s)."
 fi
 
 log_note "Populate the $TESTDIR directory (prior to second snapshot)"
 typeset -i i=1
 while [[ $i -le $COUNT ]]; do
-        log_must $FILE_WRITE -o create -f $TESTDIR/afterfirst_file$i \
+        log_must file_write -o create -f $TESTDIR/afterfirst_file$i \
            -b $BLOCKSZ -c $NUM_WRITES -d $i
 
         (( i = i + 1 ))
 done
 
-log_must $ZFS snapshot $SNAPFS.1
+log_must zfs snapshot $SNAPFS.1
 
 log_note "Populate the $TESTDIR directory (Post second snapshot)"
 typeset -i i=1
 while [[ $i -le $COUNT ]]; do
-        log_must $FILE_WRITE -o create -f $TESTDIR/aftersecond_file$i \
+        log_must file_write -o create -f $TESTDIR/aftersecond_file$i \
            -b $BLOCKSZ -c $NUM_WRITES -d $i
 
         (( i = i + 1 ))
 done
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/original_file* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/original_file* > /dev/null 2>&1
 
 #
 # Now rollback to latest snapshot
 #
-log_must $ZFS rollback $SNAPFS.1
+log_must zfs rollback $SNAPFS.1
 
-FILE_COUNT=`$LS -Al $TESTDIR/aftersecond* 2> /dev/null \
-    | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $TESTDIR/aftersecond* 2> /dev/null \
+    | grep -v "total" | wc -l`
 if [[ $FILE_COUNT -ne 0 ]]; then
-        $LS -Al $TESTDIR
+        ls -Al $TESTDIR
         log_fail "$TESTDIR contains $FILE_COUNT aftersecond* files(s)."
 fi
 
-FILE_COUNT=`$LS -Al $TESTDIR/original* $TESTDIR/afterfirst*| $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $TESTDIR/original* $TESTDIR/afterfirst*| grep -v "total" | wc -l`
 if [[ $FILE_COUNT -ne 20 ]]; then
-        $LS -Al $TESTDIR
+        ls -Al $TESTDIR
         log_fail "$TESTDIR contains $FILE_COUNT original* files(s)."
 fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh
index 4c9ef68518..9b1e400db5 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,53 +54,53 @@ function cleanup
 	typeset fs=""
 
 	export __ZFS_POOL_RESTRICT="$TESTPOOL"
-	log_must $ZFS mount -a
+	log_must zfs mount -a
 	unset __ZFS_POOL_RESTRICT
 
 	for snap in "$SNAPPOOL.1" "$SNAPPOOL"
 	do
 		snapexists $snap
 		[[ $? -eq 0 ]] && \
-			log_must $ZFS destroy $snap
+			log_must zfs destroy $snap
 	done
 
 	for fs in "$TESTPOOL/$TESTFILE/$TESTFILE.1" "$TESTPOOL/$TESTFILE"
 	do
 		datasetexists $fs
 		[[ $? -eq 0 ]] && \
-			log_must $ZFS destroy -r $fs
+			log_must zfs destroy -r $fs
 	done
 
 	[[ -e /$TESTPOOL ]] && \
-		log_must $RM -rf $TESTPOOL/*
+		log_must rm -rf $TESTPOOL/*
 }
 
 log_assert "Verify rollback succeeds when there are nested file systems."
 
 log_onexit cleanup
 
-log_must $ZFS snapshot $SNAPPOOL
-log_must $ZFS rollback $SNAPPOOL
-log_mustnot $ZFS snapshot $SNAPPOOL
+log_must zfs snapshot $SNAPPOOL
+log_must zfs rollback $SNAPPOOL
+log_mustnot zfs snapshot $SNAPPOOL
 
-log_must $TOUCH /$TESTPOOL/$TESTFILE
+log_must touch /$TESTPOOL/$TESTFILE
 
-log_must $ZFS rollback $SNAPPOOL
-log_must $ZFS create $TESTPOOL/$TESTFILE
+log_must zfs rollback $SNAPPOOL
+log_must zfs create $TESTPOOL/$TESTFILE
 
-log_must $ZFS rollback $SNAPPOOL
+log_must zfs rollback $SNAPPOOL
 
 log_note "Verify rollback of multiple nested file systems succeeds."
-log_must $ZFS snapshot $TESTPOOL/$TESTFILE@$TESTSNAP
-log_must $ZFS snapshot $SNAPPOOL.1
+log_must zfs snapshot $TESTPOOL/$TESTFILE@$TESTSNAP
+log_must zfs snapshot $SNAPPOOL.1
 
 export __ZFS_POOL_RESTRICT="$TESTPOOL"
-log_must $ZFS unmount -a
-log_must $ZFS mount -a
+log_must zfs unmount -a
+log_must zfs mount -a
 unset __ZFS_POOL_RESTRICT
 
-log_must $TOUCH /$TESTPOOL/$TESTFILE/$TESTFILE.1
+log_must touch /$TESTPOOL/$TESTFILE/$TESTFILE.1
 
-log_must $ZFS rollback $SNAPPOOL.1
+log_must zfs rollback $SNAPPOOL.1
 
 log_pass "Rollbacks succeed when nested file systems are present."
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_001_pos.ksh
index 832ca1e8a8..8b8c118d9d 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,15 +52,15 @@ function cleanup
 {
 	snapexists $SNAPFS
 	if [[ $? -eq 0 ]]; then
-		log_must $ZFS destroy $SNAPFS
+		log_must zfs destroy $SNAPFS
 	fi
 
 	if [[ -e $SNAPDIR ]]; then
-		log_must $RM -rf $SNAPDIR > /dev/null 2>&1
+		log_must rm -rf $SNAPDIR > /dev/null 2>&1
 	fi
 
 	if [[ -e $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 	fi
 }
 
@@ -69,21 +69,21 @@ log_assert "Verify a file system snapshot is identical to original."
 log_onexit cleanup
 
 log_note "Create a file in the zfs filesystem..."
-log_must $FILE_WRITE -o create -f $TESTDIR/$TESTFILE -b $BLOCKSZ \
+log_must file_write -o create -f $TESTDIR/$TESTFILE -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
 log_note "Sum the file, save for later comparison..."
-FILE_SUM=`$SUM -r $TESTDIR/$TESTFILE | $AWK  '{ print $1 }'`
+FILE_SUM=`sum -r $TESTDIR/$TESTFILE | awk  '{ print $1 }'`
 log_note "FILE_SUM = $FILE_SUM"
 
 log_note "Create a snapshot and mount it..."
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
 log_note "Append to the original file..."
-log_must $FILE_WRITE -o append -f $TESTDIR/$TESTFILE -b $BLOCKSZ \
+log_must file_write -o append -f $TESTDIR/$TESTFILE -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
-SNAP_FILE_SUM=`$SUM -r $SNAPDIR/$TESTFILE | $AWK '{ print $1 }'`
+SNAP_FILE_SUM=`sum -r $SNAPDIR/$TESTFILE | awk '{ print $1 }'`
 if [[ $SNAP_FILE_SUM -ne $FILE_SUM ]]; then
 	log_fail "Sums do not match, aborting!! ($SNAP_FILE_SUM != $FILE_SUM)"
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh
index 040f3acf69..611c4154a0 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,19 +57,19 @@ function cleanup
 
         snapexists $SNAPFS
         if [[ $? -eq 0 ]]; then
-                log_must $ZFS destroy $SNAPFS
+                log_must zfs destroy $SNAPFS
         fi
 
         if [[ -e $SNAPDIR ]]; then
-                log_must $RM -rf $SNAPDIR > /dev/null 2>&1
+                log_must rm -rf $SNAPDIR > /dev/null 2>&1
         fi
 
         if [[ -e $TESTDIR ]]; then
-                log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+                log_must rm -rf $TESTDIR/* > /dev/null 2>&1
         fi
 
 	if [[ -e /tmp/zfs_snapshot2.$$ ]]; then
-		log_must $RM -rf /tmp/zfs_snapshot2.$$ > /dev/null 2>&1
+		log_must rm -rf /tmp/zfs_snapshot2.$$ > /dev/null 2>&1
 	fi
 
 }
@@ -83,13 +83,13 @@ typeset -i COUNT=21
 typeset OP=create
 
 [[ -n $TESTDIR ]] && \
-    $RM -rf $TESTDIR/* > /dev/null 2>&1
+    rm -rf $TESTDIR/* > /dev/null 2>&1
 
 log_note "Create files in the zfs filesystem..."
 
 typeset i=1
 while [ $i -lt $COUNT ]; do
-	log_must $FILE_WRITE -o $OP -f $TESTDIR/file$i \
+	log_must file_write -o $OP -f $TESTDIR/file$i \
 	    -b $BLOCKSZ -c $NUM_WRITES -d $DATA
 
 	(( i = i + 1 ))
@@ -98,35 +98,35 @@ done
 log_note "Create a tarball from $TESTDIR contents..."
 CWD=$PWD
 cd $TESTDIR || log_fail "Could not cd $TESTDIR"
-log_must $TAR cf $TESTDIR/tarball.original.tar file*
+log_must tar cf $TESTDIR/tarball.original.tar file*
 cd $CWD || log_fail "Could not cd $CWD"
 
 log_note "Create a snapshot and mount it..."
-log_must $ZFS snapshot $SNAPFS
+log_must zfs snapshot $SNAPFS
 
 log_note "Remove all of the original files..."
-log_must $RM -f $TESTDIR/file* > /dev/null 2>&1
+log_must rm -f $TESTDIR/file* > /dev/null 2>&1
 
 log_note "Create tarball of snapshot..."
 CWD=$PWD
 cd $SNAPDIR || log_fail "Could not cd $SNAPDIR"
-log_must $TAR cf $TESTDIR/tarball.snapshot.tar file*
+log_must tar cf $TESTDIR/tarball.snapshot.tar file*
 cd $CWD || log_fail "Could not cd $CWD"
 
-log_must $MKDIR $TESTDIR/original
-log_must $MKDIR $TESTDIR/snapshot
+log_must mkdir $TESTDIR/original
+log_must mkdir $TESTDIR/snapshot
 
 CWD=$PWD
 cd $TESTDIR/original || log_fail "Could not cd $TESTDIR/original"
-log_must $TAR xf $TESTDIR/tarball.original.tar
+log_must tar xf $TESTDIR/tarball.original.tar
 
 cd $TESTDIR/snapshot || log_fail "Could not cd $TESTDIR/snapshot"
-log_must $TAR xf $TESTDIR/tarball.snapshot.tar
+log_must tar xf $TESTDIR/tarball.snapshot.tar
 
 cd $CWD || log_fail "Could not cd $CWD"
 
-$DIRCMP $TESTDIR/original $TESTDIR/snapshot > /tmp/zfs_snapshot2.$$
-$GREP different /tmp/zfs_snapshot2.$$ >/dev/null 2>&1
+dircmp $TESTDIR/original $TESTDIR/snapshot > /tmp/zfs_snapshot2.$$
+grep different /tmp/zfs_snapshot2.$$ >/dev/null 2>&1
 if [[ $? -ne 1 ]]; then
 	log_fail "Directory structures differ."
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_003_pos.ksh
index f30629f26b..054b58cd55 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,18 +51,18 @@ function cleanup
 	while [ $i -lt $COUNT ]; do
 		snapexists $SNAPFS.$i
 		if [[ $? -eq 0 ]]; then
-			log_must $ZFS destroy $SNAPFS.$i
+			log_must zfs destroy $SNAPFS.$i
 		fi
 
 		if [[ -e $SNAPDIR.$i ]]; then
-			log_must $RM -rf $SNAPDIR.$i > /dev/null 2>&1
+			log_must rm -rf $SNAPDIR.$i > /dev/null 2>&1
 		fi
 
 		(( i = i + 1 ))
 	done
 
 	if [[ -e $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 	fi
 }
 
@@ -71,30 +71,30 @@ log_assert "Verify many snapshots of a file system can be taken."
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
 log_note "Create some files in the $TESTDIR directory..."
 typeset -i i=1
 while [[ $i -lt $COUNT ]]; do
-	log_must $FILE_WRITE -o create -f $TESTDIR/file$i \
+	log_must file_write -o create -f $TESTDIR/file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
-	log_must $ZFS snapshot $SNAPFS.$i
+	log_must zfs snapshot $SNAPFS.$i
 
 	(( i = i + 1 ))
 done
 
 log_note "Remove all of the original files"
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/file* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/file* > /dev/null 2>&1
 
 i=1
 while [[ $i -lt $COUNT ]]; do
-	FILECOUNT=`$LS $SNAPDIR.$i/file* | wc -l`
+	FILECOUNT=`ls $SNAPDIR.$i/file* | wc -l`
 	typeset j=1
 	while [ $j -lt $FILECOUNT ]; do
-		log_must $FILE_CHECK $SNAPDIR.$i/file$j $j
+		log_must file_check $SNAPDIR.$i/file$j $j
 		(( j = j + 1 ))
 	done
 	(( i = i + 1 ))
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_004_pos.ksh
index e1040070ce..9d3b3de1ad 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,10 +50,10 @@ function cleanup
 {
 	snapexists $SNAPFS
 	[[ $? -eq 0 ]] && \
-		log_must $ZFS destroy $SNAPFS
+		log_must zfs destroy $SNAPFS
 
 	[[ -e $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 }
 
 log_assert "Verify that a snapshot of an empty file system remains empty."
@@ -61,12 +61,12 @@ log_assert "Verify that a snapshot of an empty file system remains empty."
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
-log_must $ZFS snapshot $SNAPFS
-FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total 0" | wc -l`
+log_must zfs snapshot $SNAPFS
+FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total 0" | wc -l`
 if [[ $FILE_COUNT -ne 0 ]]; then
-	$LS $SNAPDIR
+	ls $SNAPDIR
 	log_fail "BEFORE: $SNAPDIR contains $FILE_COUNT files(s)."
 fi
 
@@ -75,15 +75,15 @@ typeset -i COUNT=10
 log_note "Populate the $TESTDIR directory"
 typeset -i i=1
 while [[ $i -lt $COUNT ]]; do
-	log_must $FILE_WRITE -o create -f $TESTDIR/file$i \
+	log_must file_write -o create -f $TESTDIR/file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
 
 	(( i = i + 1 ))
 done
 
-FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total 0" | wc -l`
+FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total 0" | wc -l`
 if [[ $FILE_COUNT -ne 0 ]]; then
-        $LS $SNAPDIR
+        ls $SNAPDIR
         log_fail "AFTER: $SNAPDIR contains $FILE_COUNT files(s)."
 fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_005_pos.ksh
index 8c73639d44..c1917dff12 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,15 +51,15 @@ function cleanup
 {
 	snapexists $SNAPCTR
 	if [[ $? -eq 0 ]]; then
-		log_must $ZFS destroy $SNAPCTR
+		log_must zfs destroy $SNAPCTR
 	fi
 
 	if [[ -e $SNAPDIR1 ]]; then
-		log_must $RM -rf $SNAPDIR1 > /dev/null 2>&1
+		log_must rm -rf $SNAPDIR1 > /dev/null 2>&1
 	fi
 
 	if [[ -e $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 	fi
 }
 
@@ -68,21 +68,21 @@ log_assert "Verify that a snapshot of a dataset is identical to " \
 log_onexit cleanup
 
 log_note "Create a file in the zfs filesystem..."
-log_must $FILE_WRITE -o create -f $TESTDIR1/$TESTFILE -b $BLOCKSZ \
+log_must file_write -o create -f $TESTDIR1/$TESTFILE -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
 log_note "Sum the file, save for later comparison..."
-FILE_SUM=`$SUM -r $TESTDIR1/$TESTFILE | $AWK  '{ print $1 }'`
+FILE_SUM=`sum -r $TESTDIR1/$TESTFILE | awk  '{ print $1 }'`
 log_note "FILE_SUM = $FILE_SUM"
 
 log_note "Create a snapshot and mount it..."
-log_must $ZFS snapshot $SNAPCTR
+log_must zfs snapshot $SNAPCTR
 
 log_note "Append to the original file..."
-log_must $FILE_WRITE -o append -f $TESTDIR1/$TESTFILE -b $BLOCKSZ \
+log_must file_write -o append -f $TESTDIR1/$TESTFILE -b $BLOCKSZ \
     -c $NUM_WRITES -d $DATA
 
-SNAP_FILE_SUM=`$SUM -r $SNAPDIR1/$TESTFILE | $AWK '{ print $1 }'`
+SNAP_FILE_SUM=`sum -r $SNAPDIR1/$TESTFILE | awk '{ print $1 }'`
 if [[ $SNAP_FILE_SUM -ne $FILE_SUM ]]; then
 	log_fail "Sums do not match, aborting!! ($SNAP_FILE_SUM != $FILE_SUM)"
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh
index cc2c6edcc3..6269e4a8b5 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,19 +56,19 @@ function cleanup
 
         snapexists $SNAPCTR
         if [[ $? -eq 0 ]]; then
-                log_must $ZFS destroy $SNAPCTR
+                log_must zfs destroy $SNAPCTR
         fi
 
         if [[ -e $SNAPDIR1 ]]; then
-                log_must $RM -rf $SNAPDIR1 > /dev/null 2>&1
+                log_must rm -rf $SNAPDIR1 > /dev/null 2>&1
         fi
 
         if [[ -e $TESTDIR1 ]]; then
-                log_must $RM -rf $TESTDIR1/* > /dev/null 2>&1
+                log_must rm -rf $TESTDIR1/* > /dev/null 2>&1
         fi
 
 	if [[ -e /tmp/zfs_snapshot2.$$ ]]; then
-		log_must $RM -rf /tmp/zfs_snapshot2.$$ > /dev/null 2>&1
+		log_must rm -rf /tmp/zfs_snapshot2.$$ > /dev/null 2>&1
 	fi
 
 }
@@ -81,13 +81,13 @@ log_onexit cleanup
 typeset -i COUNT=21
 typeset OP=create
 
-[[ -n $TESTDIR1 ]] && $RM -rf $TESTDIR1/* > /dev/null 2>&1
+[[ -n $TESTDIR1 ]] && rm -rf $TESTDIR1/* > /dev/null 2>&1
 
 log_note "Create files in the zfs dataset ..."
 
 typeset i=1
 while [ $i -lt $COUNT ]; do
-	log_must $FILE_WRITE -o $OP -f $TESTDIR1/file$i \
+	log_must file_write -o $OP -f $TESTDIR1/file$i \
 	    -b $BLOCKSZ -c $NUM_WRITES -d $DATA
 
 	(( i = i + 1 ))
@@ -96,35 +96,35 @@ done
 log_note "Create a tarball from $TESTDIR1 contents..."
 CWD=$PWD
 cd $TESTDIR1 || log_fail "Could not cd $TESTDIR1"
-log_must $TAR cf $TESTDIR1/tarball.original.tar file*
+log_must tar cf $TESTDIR1/tarball.original.tar file*
 cd $CWD || log_fail "Could not cd $CWD"
 
 log_note "Create a snapshot and mount it..."
-log_must $ZFS snapshot $SNAPCTR
+log_must zfs snapshot $SNAPCTR
 
 log_note "Remove all of the original files..."
-log_must $RM -f $TESTDIR1/file* > /dev/null 2>&1
+log_must rm -f $TESTDIR1/file* > /dev/null 2>&1
 
 log_note "Create tarball of snapshot..."
 CWD=$PWD
 cd $SNAPDIR1 || log_fail "Could not cd $SNAPDIR1"
-log_must $TAR cf $TESTDIR1/tarball.snapshot.tar file*
+log_must tar cf $TESTDIR1/tarball.snapshot.tar file*
 cd $CWD || log_fail "Could not cd $CWD"
 
-log_must $MKDIR $TESTDIR1/original
-log_must $MKDIR $TESTDIR1/snapshot
+log_must mkdir $TESTDIR1/original
+log_must mkdir $TESTDIR1/snapshot
 
 CWD=$PWD
 cd $TESTDIR1/original || log_fail "Could not cd $TESTDIR1/original"
-log_must $TAR xf $TESTDIR1/tarball.original.tar
+log_must tar xf $TESTDIR1/tarball.original.tar
 
 cd $TESTDIR1/snapshot || log_fail "Could not cd $TESTDIR1/snapshot"
-log_must $TAR xf $TESTDIR1/tarball.snapshot.tar
+log_must tar xf $TESTDIR1/tarball.snapshot.tar
 
 cd $CWD || log_fail "Could not cd $CWD"
 
-$DIRCMP $TESTDIR1/original $TESTDIR1/snapshot > /tmp/zfs_snapshot2.$$
-$GREP different /tmp/zfs_snapshot2.$$ >/dev/null 2>&1
+dircmp $TESTDIR1/original $TESTDIR1/snapshot > /tmp/zfs_snapshot2.$$
+grep different /tmp/zfs_snapshot2.$$ >/dev/null 2>&1
 if [[ $? -ne 1 ]]; then
 	log_fail "Directory structures differ."
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_007_pos.ksh
index 5ee9f5d3a7..7ed1fdb6e7 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,22 +51,22 @@ function cleanup
 	while [ $i -lt $COUNT ]; do
 		snapexists $SNAPCTR.$i
 		if [[ $? -eq 0 ]]; then
-			log_must $ZFS destroy $SNAPCTR.$i
+			log_must zfs destroy $SNAPCTR.$i
 		fi
 
 		if [[ -e $SNAPDIR.$i ]]; then
-			log_must $RM -rf $SNAPDIR1.$i > /dev/null 2>&1
+			log_must rm -rf $SNAPDIR1.$i > /dev/null 2>&1
 		fi
 
 		(( i = i + 1 ))
 	done
 
 	if [[ -e $SNAPDIR1 ]]; then
-		log_must $RM -rf $SNAPDIR1 > /dev/null 2>&1
+		log_must rm -rf $SNAPDIR1 > /dev/null 2>&1
 	fi
 
 	if [[ -e $TESTDIR ]]; then
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 	fi
 }
 
@@ -75,30 +75,30 @@ log_assert "Verify that many snapshots can be made on a zfs dataset."
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
 log_note "Create some files in the $TESTDIR directory..."
 typeset -i i=1
 while [[ $i -lt $COUNT ]]; do
-	log_must $FILE_WRITE -o create -f $TESTDIR1/file$i \
+	log_must file_write -o create -f $TESTDIR1/file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
-	log_must $ZFS snapshot $SNAPCTR.$i
+	log_must zfs snapshot $SNAPCTR.$i
 
 	(( i = i + 1 ))
 done
 
 log_note "Remove all of the original files"
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR1/file* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR1/file* > /dev/null 2>&1
 
 i=1
 while [[ $i -lt $COUNT ]]; do
-	FILECOUNT=`$LS $SNAPDIR1.$i/file* | wc -l`
+	FILECOUNT=`ls $SNAPDIR1.$i/file* | wc -l`
 	typeset j=1
 	while [ $j -lt $FILECOUNT ]; do
-		log_must $FILE_CHECK $SNAPDIR1.$i/file$j $j
+		log_must file_check $SNAPDIR1.$i/file$j $j
 		(( j = j + 1 ))
 	done
 	(( i = i + 1 ))
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_008_pos.ksh
index 3610491b05..d0ed5da95c 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,13 +50,13 @@ function cleanup
 	while [[ $i -lt $COUNT ]]; do
 		snapexists $SNAPFS.$i
 		[[ $? -eq 0 ]] && \
-			log_must $ZFS destroy $SNAPFS.$i
+			log_must zfs destroy $SNAPFS.$i
 
 		(( i = i + 1 ))
 	done
 
 	[[ -e $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 }
 
 log_assert "Verify that destroying snapshots returns space to the pool."
@@ -64,7 +64,7 @@ log_assert "Verify that destroying snapshots returns space to the pool."
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
@@ -73,17 +73,17 @@ orig_size=`get_prop available $TESTPOOL`
 log_note "Populate the $TESTDIR directory"
 typeset -i i=1
 while [[ $i -lt $COUNT ]]; do
-	log_must $FILE_WRITE -o create -f $TESTDIR/file$i \
+	log_must file_write -o create -f $TESTDIR/file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
 
-	log_must $ZFS snapshot $SNAPFS.$i
+	log_must zfs snapshot $SNAPFS.$i
 	(( i = i + 1 ))
 done
 
 typeset -i i=1
 while [[ $i -lt $COUNT ]]; do
 	log_must rm -rf $TESTDIR/file$i > /dev/null 2>&1
-	log_must $ZFS destroy $SNAPFS.$i
+	log_must zfs destroy $SNAPFS.$i
 
 	(( i = i + 1 ))
 done
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_009_pos.ksh
index dfc75d821d..9266691247 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,7 +53,7 @@ function cleanup
 
 	for ds in $ctr/$TESTVOL1 $ctr/$TESTCLONE; do
 		datasetexists $ds && \
-			log_must $ZFS destroy -f $ds
+			log_must zfs destroy -f $ds
 	done
 
 	for snap in $ctr/$TESTFS1@$TESTSNAP1 \
@@ -61,7 +61,7 @@ function cleanup
 		$snapctrclone $snapctrfs
 	do
 		snapexists $snap && \
-			log_must $ZFS destroy -rf $snap
+			log_must zfs destroy -rf $snap
 	done
 
 }
@@ -82,15 +82,15 @@ snapctrclone=$ctrclone@$TESTSNAP
 snapctrfs=$SNAPCTR
 
 #preparation for testing
-log_must $ZFS snapshot $ctrfs@$TESTSNAP1
-log_must $ZFS clone $ctrfs@$TESTSNAP1 $ctrclone
+log_must zfs snapshot $ctrfs@$TESTSNAP1
+log_must zfs clone $ctrfs@$TESTSNAP1 $ctrclone
 if is_global_zone; then
-	log_must $ZFS create -V $VOLSIZE $ctrvol
+	log_must zfs create -V $VOLSIZE $ctrvol
 else
-	log_must $ZFS create $ctrvol
+	log_must zfs create $ctrvol
 fi
 
-log_must $ZFS snapshot -r $snappool
+log_must zfs snapshot -r $snappool
 
 #verify the snapshot -r results
 for snap in $snappool $snapfs $snapvol $snapctr $snapctrvol \
@@ -102,7 +102,7 @@ done
 
 log_note "Verify that destroy -r can destroy the snapshot tree."
 
-log_must $ZFS destroy -r $snappool
+log_must zfs destroy -r $snappool
 for snap in $snappool $snapfs $snapvol $snapctr $snapctrvol \
 		$snapctrclone $snapctrfs
 do
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_010_pos.ksh
index cb9ff880e0..e0849493db 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_010_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,14 +50,14 @@ function cleanup
 	typeset snap
 
 	datasetexists $ctrvol && \
-		log_must $ZFS destroy -f $ctrvol
+		log_must zfs destroy -f $ctrvol
 
 	for snap in $ctrfs@$TESTSNAP1 \
 		$snappool $snapvol $snapctr $snapctrvol \
 		$snapctrclone $snapctrfs
 	do
 		snapexists $snap && \
-			log_must $ZFS destroy -rf $snap
+			log_must zfs destroy -rf $snap
 	done
 
 }
@@ -77,17 +77,17 @@ snapctrclone=$ctr/$TESTCLONE@$TESTSNAP
 snapctrfs=$SNAPCTR
 
 #preparation for testing
-log_must $ZFS snapshot $ctrfs@$TESTSNAP1
+log_must zfs snapshot $ctrfs@$TESTSNAP1
 if is_global_zone; then
-	log_must $ZFS create -V $VOLSIZE $ctrvol
+	log_must zfs create -V $VOLSIZE $ctrvol
 else
-	log_must $ZFS create $ctrvol
+	log_must zfs create $ctrvol
 fi
 
-log_must $ZFS snapshot -r $snappool
+log_must zfs snapshot -r $snappool
 
 #select the $TESTCTR as destroy point, $TESTCTR is a child of $TESTPOOL
-log_must $ZFS destroy -r $snapctr
+log_must zfs destroy -r $snapctr
 for snap in $snapctr $snapctrvol $snapctrclone $snapctrfs; do
 	snapexists $snap && \
 		log_fail "The snapshot $snap is not destroyed correctly."
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_011_pos.ksh
index 9774035a5e..44e5943bcd 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_011_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,41 +52,41 @@ verify_runnable "both"
 function cleanup
 {
 	snapexists $SNAPPOOL && \
-		log_must $ZFS destroy -r $SNAPPOOL
+		log_must zfs destroy -r $SNAPPOOL
 
 	[[ -e $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 }
 
 log_assert "Verify that rollback to a snapshot created by snapshot -r succeeds."
 log_onexit cleanup
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
 log_note "Populate the $TESTDIR directory (prior to snapshot)"
 typeset -i i=0
 while (( i < COUNT )); do
-	log_must $FILE_WRITE -o create -f $TESTDIR/before_file$i \
+	log_must file_write -o create -f $TESTDIR/before_file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
 
 	(( i = i + 1 ))
 done
 
-log_must $ZFS snapshot -r $SNAPPOOL
+log_must zfs snapshot -r $SNAPPOOL
 
-FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total" | wc -l`
 if (( FILE_COUNT != COUNT )); then
-        $LS -Al $SNAPDIR
+        ls -Al $SNAPDIR
         log_fail "AFTER: $SNAPFS contains $FILE_COUNT files(s)."
 fi
 
 log_note "Populate the $TESTDIR directory (post snapshot)"
 typeset -i i=0
 while (( i < COUNT )); do
-        log_must $FILE_WRITE -o create -f $TESTDIR/after_file$i \
+        log_must file_write -o create -f $TESTDIR/after_file$i \
            -b $BLOCKSZ -c $NUM_WRITES -d $i
 
         (( i = i + 1 ))
@@ -95,18 +95,18 @@ done
 #
 # Now rollback to latest snapshot
 #
-log_must $ZFS rollback $SNAPFS
+log_must zfs rollback $SNAPFS
 
-FILE_COUNT=`$LS -Al $TESTDIR/after* 2> /dev/null | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $TESTDIR/after* 2> /dev/null | grep -v "total" | wc -l`
 if (( FILE_COUNT != 0 )); then
-        $LS -Al $TESTDIR
+        ls -Al $TESTDIR
         log_fail "$TESTDIR contains $FILE_COUNT after* files(s)."
 fi
 
-FILE_COUNT=`$LS -Al $TESTDIR/before* 2> /dev/null \
-    | $GREP -v "total" | wc -l`
+FILE_COUNT=`ls -Al $TESTDIR/before* 2> /dev/null \
+    | grep -v "total" | wc -l`
 if (( FILE_COUNT != $COUNT )); then
-	$LS -Al $TESTDIR
+	ls -Al $TESTDIR
 	log_fail "$TESTDIR contains $FILE_COUNT before* files(s)."
 fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_012_pos.ksh
index 6f75861fd9..c5717e4526 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_012_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,16 +54,16 @@ verify_runnable "both"
 function cleanup
 {
 	if datasetexists $clone1; then
-		log_must $ZFS promote $ctrfs
-		log_must $ZFS destroy $clone1
+		log_must zfs promote $ctrfs
+		log_must zfs destroy $clone1
 	fi
 
 	snapexists $snapctr && \
-		log_must $ZFS destroy -r $snapctr
+		log_must zfs destroy -r $snapctr
 
 	if snapexists $clone@$TESTSNAP1; then
-		log_must $ZFS promote $ctrfs
-		log_must $ZFS destroy -rR $ctrfs@$TESTSNAP1
+		log_must zfs promote $ctrfs
+		log_must zfs destroy -rR $ctrfs@$TESTSNAP1
 	fi
 }
 
@@ -82,17 +82,17 @@ snapctrclone1=$clone1@$TESTSNAP
 snapctrfs=$SNAPCTR
 
 #preparation for testing
-log_must $ZFS snapshot $ctrfs@$TESTSNAP1
-log_must $ZFS clone $ctrfs@$TESTSNAP1 $clone
-log_must $ZFS promote $clone
+log_must zfs snapshot $ctrfs@$TESTSNAP1
+log_must zfs clone $ctrfs@$TESTSNAP1 $clone
+log_must zfs promote $clone
 
-log_must $ZFS snapshot -r $snapctr
+log_must zfs snapshot -r $snapctr
 
 ! snapexists $snapctrclone && \
 	log_fail "'snapshot -r' fails to create $snapctrclone for $ctr/$TESTCLONE."
 
-log_must $ZFS clone $snapctrfs $clone1
-log_must $ZFS promote $clone1
+log_must zfs clone $snapctrfs $clone1
+log_must zfs promote $clone1
 
 #verify the origin value is correct.
 orig_value=$(get_prop origin $ctrfs)
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_013_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_013_pos.ksh
index 65315ee2ce..31aedb2245 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_013_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_013_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,13 +49,13 @@ verify_runnable "both"
 function cleanup
 {
 	datasetexists $ctrfs && \
-		$ZFS destroy -r $ctrfs
+		zfs destroy -r $ctrfs
 
 	snapexists $snappool && \
-		log_must $ZFS destroy -r $snappool
+		log_must zfs destroy -r $snappool
 
 	[[ -e $TESTDIR ]] && \
-		log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 }
 
 log_assert "Verify snapshots from 'snapshot -r' can be used for zfs send/recv"
@@ -71,28 +71,28 @@ fsdir=/$ctrfs
 snapdir=$fsdir/.zfs/snapshot/$TESTSNAP
 
 [[ -n $TESTDIR ]] && \
-    log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
+    log_must rm -rf $TESTDIR/* > /dev/null 2>&1
 
 typeset -i COUNT=10
 
 log_note "Populate the $TESTDIR directory (prior to snapshot)"
 typeset -i i=0
 while (( i < COUNT )); do
-	log_must $FILE_WRITE -o create -f $TESTDIR/file$i \
+	log_must file_write -o create -f $TESTDIR/file$i \
 	   -b $BLOCKSZ -c $NUM_WRITES -d $i
 
 	(( i = i + 1 ))
 done
 
-log_must $ZFS snapshot -r $snappool
+log_must zfs snapshot -r $snappool
 
-$ZFS send $snapfs | $ZFS receive $ctrfs >/dev/null 2>&1
+zfs send $snapfs | zfs receive $ctrfs >/dev/null 2>&1
 if ! datasetexists $ctrfs || ! snapexists $snapctrfs; then
 	log_fail "zfs send/receive fails with snapshot $snapfs."
 fi
 
 for dir in $fsdir $snapdir; do
-	FILE_COUNT=`$LS -Al $dir | $GREP -v "total" | wc -l`
+	FILE_COUNT=`ls -Al $dir | grep -v "total" | wc -l`
 	(( FILE_COUNT != COUNT )) && log_fail "Got $FILE_COUNT expected $COUNT"
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh
index 39a8ff3a1b..3579fbebb4 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,30 +49,30 @@ verify_runnable "both"
 function cleanup
 {
 	[[ -e $TESTDIR1 ]] && \
-		log_must $RM -rf $TESTDIR1/* > /dev/null 2>&1
+		log_must rm -rf $TESTDIR1/* > /dev/null 2>&1
 
 	snapexists $SNAPCTR && \
-		log_must $ZFS destroy $SNAPCTR
+		log_must zfs destroy $SNAPCTR
 
 	datasetexists $TESTPOOL/$TESTCTR/$TESTFS1 && \
-		log_must $ZFS set quota=none $TESTPOOL/$TESTCTR/$TESTFS1
+		log_must zfs set quota=none $TESTPOOL/$TESTCTR/$TESTFS1
 
 }
 
 log_assert "Verify creating/destroying snapshots do things clean"
 log_onexit cleanup
 
-log_must $ZFS set quota=$FSQUOTA $TESTPOOL/$TESTCTR/$TESTFS1
-log_must $MKFILE $FILESIZE $TESTDIR1/$TESTFILE
+log_must zfs set quota=$FSQUOTA $TESTPOOL/$TESTCTR/$TESTFS1
+log_must mkfile $FILESIZE $TESTDIR1/$TESTFILE
 
-log_must $ZFS snapshot $SNAPCTR
-log_must $ZFS destroy $SNAPCTR
+log_must zfs snapshot $SNAPCTR
+log_must zfs destroy $SNAPCTR
 
 log_note "Make the quota of filesystem is reached"
-log_mustnot $MKFILE $FILESIZE1 $TESTDIR1/$TESTFILE1
+log_mustnot mkfile $FILESIZE1 $TESTDIR1/$TESTFILE1
 
 log_note "Verify removing the first file should succeed after the snapshot is \
 	removed"
-log_must $RM $TESTDIR1/$TESTFILE
+log_must rm $TESTDIR1/$TESTFILE
 
 log_pass "Verify creating/destroying snapshots do things clean"
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_015_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_015_pos.ksh
index cf819ddb9b..1091bcb13e 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_015_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_015_pos.ksh
@@ -27,7 +27,7 @@
 
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,13 +54,13 @@ function cleanup
 	typeset -i i=0
 	while ((i < snap_cnt)); do
 		typeset snap=$fs@snap.$i
-		datasetexists $snap && log_must $ZFS destroy -f $snap
+		datasetexists $snap && log_must zfs destroy -f $snap
 
 		((i += 1))
 	done
 }
 
-$ZFS 2>&1 | $GREP "allow" > /dev/null
+zfs 2>&1 | grep "allow" > /dev/null
 (($? != 0)) && log_unsupported
 
 log_assert "Verify snapshot can be created via mkdir in .zfs/snapshot."
@@ -73,10 +73,10 @@ snapdir=$mntpnt/.zfs
 set -A ro_dirs "$snapdir" "$snapdir/snap" "$snapdir/snapshot"
 for dir in ${ro_dirs[@]}; do
 	if [[ -d $dir ]]; then
-		log_mustnot $RM -rf $dir
-		log_mustnot $TOUCH $dir/testfile
+		log_mustnot rm -rf $dir
+		log_mustnot touch $dir/testfile
 	else
-		log_mustnot $MKDIR $dir
+		log_mustnot mkdir $dir
 	fi
 done
 
@@ -85,8 +85,8 @@ typeset -i snap_cnt=5
 typeset -i cnt=0
 while ((cnt < snap_cnt)); do
 	testfile=$mntpnt/testfile.$cnt
-	log_must $MKFILE 1M $testfile
-	log_must $MKDIR $snapdir/snapshot/snap.$cnt
+	log_must mkfile 1M $testfile
+	log_must mkdir $snapdir/snapshot/snap.$cnt
 	if ! datasetexists $fs@snap.$cnt ; then
 		log_fail "ERROR: $fs@snap.$cnt should exists."
 	fi
@@ -96,7 +96,7 @@ done
 
 # Verify rollback to previous snapshot succeed.
 ((cnt = RANDOM % snap_cnt))
-log_must $ZFS rollback -r $fs@snap.$cnt
+log_must zfs rollback -r $fs@snap.$cnt
 
 typeset -i i=0
 while ((i < snap_cnt)); do
@@ -115,7 +115,7 @@ while ((i < snap_cnt)); do
 done
 
 # Verify remove directory in snapdir can destroy snapshot.
-log_must $RMDIR $snapdir/snapshot/snap.$cnt
+log_must rmdir $snapdir/snapshot/snap.$cnt
 log_mustnot datasetexists $fs@snap.$cnt
 
 log_pass "Verify snapshot can be created via mkdir in .zfs/snapshot passed."
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_016_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_016_pos.ksh
index 9d957c70e9..66bf648331 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_016_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_016_pos.ksh
@@ -27,7 +27,7 @@
 
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,19 +48,19 @@ verify_runnable "both"
 function cleanup
 {
 	datasetexists $SNAPFS && \
-		log_must $ZFS destroy -Rf $SNAPFS
+		log_must zfs destroy -Rf $SNAPFS
 	datasetexists $TESTPOOL/$TESTFS@snap_a && \
-		log_must $ZFS destroy -Rf $TESTPOOL/$TESTFS@snap_a
+		log_must zfs destroy -Rf $TESTPOOL/$TESTFS@snap_a
 	datasetexists $TESTPOOL/$TESTCLONE@snap_a && \
-		log_must $ZFS destroy -Rf $TESTPOOL/$TESTCLONE@snap_a
+		log_must zfs destroy -Rf $TESTPOOL/$TESTCLONE@snap_a
 
 	datasetexists $TESTPOOL/$TESTCLONE && \
-		log_must $ZFS destroy $TESTPOOL/$TESTCLONE
+		log_must zfs destroy $TESTPOOL/$TESTCLONE
 	datasetexists $TESTPOOL/$TESTFS && \
-		log_must $ZFS destroy $TESTPOOL/$TESTFS
+		log_must zfs destroy $TESTPOOL/$TESTFS
 
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 log_assert "Verify renamed snapshots via mv can be destroyed."
@@ -68,34 +68,34 @@ log_onexit cleanup
 
 # scenario 1
 
-log_must $ZFS snapshot $SNAPFS
-log_must $MV $TESTDIR/$SNAPROOT/$TESTSNAP $TESTDIR/$SNAPROOT/snap_a
+log_must zfs snapshot $SNAPFS
+log_must mv $TESTDIR/$SNAPROOT/$TESTSNAP $TESTDIR/$SNAPROOT/snap_a
 
 datasetexists $TESTPOOL/$TESTFS@snap_a || \
 	log_fail "rename snapshot via mv in .zfs/snapshot fails."
-log_must $ZFS destroy $TESTPOOL/$TESTFS@snap_a
+log_must zfs destroy $TESTPOOL/$TESTFS@snap_a
 
 # scenario 2
 
-log_must $ZFS snapshot $SNAPFS
-log_must $ZFS clone $SNAPFS $TESTPOOL/$TESTCLONE
-log_must $MV $TESTDIR/$SNAPROOT/$TESTSNAP $TESTDIR/$SNAPROOT/snap_a
+log_must zfs snapshot $SNAPFS
+log_must zfs clone $SNAPFS $TESTPOOL/$TESTCLONE
+log_must mv $TESTDIR/$SNAPROOT/$TESTSNAP $TESTDIR/$SNAPROOT/snap_a
 
 datasetexists $TESTPOOL/$TESTFS@snap_a || \
         log_fail "rename snapshot via mv in .zfs/snapshot fails."
-log_must $ZFS promote $TESTPOOL/$TESTCLONE
+log_must zfs promote $TESTPOOL/$TESTCLONE
 # promote back to $TESTPOOL/$TESTFS for scenario 3
-log_must $ZFS promote $TESTPOOL/$TESTFS
-log_must $ZFS destroy $TESTPOOL/$TESTCLONE
-log_must $ZFS destroy $TESTPOOL/$TESTFS@snap_a
+log_must zfs promote $TESTPOOL/$TESTFS
+log_must zfs destroy $TESTPOOL/$TESTCLONE
+log_must zfs destroy $TESTPOOL/$TESTFS@snap_a
 
 # scenario 3
 
-log_must $ZFS snapshot $SNAPFS
-log_must $ZFS clone $SNAPFS $TESTPOOL/$TESTCLONE
-log_must $ZFS rename $SNAPFS $TESTPOOL/$TESTFS@snap_a
-log_must $ZFS promote $TESTPOOL/$TESTCLONE
-log_must $ZFS destroy $TESTPOOL/$TESTFS
-log_must $ZFS destroy $TESTPOOL/$TESTCLONE@snap_a
+log_must zfs snapshot $SNAPFS
+log_must zfs clone $SNAPFS $TESTPOOL/$TESTCLONE
+log_must zfs rename $SNAPFS $TESTPOOL/$TESTFS@snap_a
+log_must zfs promote $TESTPOOL/$TESTCLONE
+log_must zfs destroy $TESTPOOL/$TESTFS
+log_must zfs destroy $TESTPOOL/$TESTCLONE@snap_a
 
 log_pass "Verify renamed snapshots via mv can be destroyed."
diff --git a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_017_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_017_pos.ksh
index e8a74341c0..4b4696323a 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_017_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_017_pos.ksh
@@ -27,7 +27,7 @@
 
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -57,11 +57,11 @@ function cleanup
 	cd $SAVED_DIR
 
 	if datasetexists $TESTPOOL/$TESTFS ; then
-		log_must $ZFS destroy -Rf $TESTPOOL/$TESTFS
+		log_must zfs destroy -Rf $TESTPOOL/$TESTFS
 	fi
 
-	log_must $ZFS create $TESTPOOL/$TESTFS
-	log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
+	log_must zfs create $TESTPOOL/$TESTFS
+	log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
 }
 
 function verify_structure {
@@ -145,33 +145,33 @@ SAVED_DIR=$PWD
 # ./dir1/dir2/file6
 
 cd $TESTDIR
-$MKFILE 10m file1
-$MKFILE 20m file2
-$MKDIR dir1
+mkfile 10m file1
+mkfile 20m file2
+mkdir dir1
 cd dir1
-$MKFILE 10m file3
-$MKFILE 20m file4
-$MKDIR dir2
+mkfile 10m file3
+mkfile 20m file4
+mkdir dir2
 cd dir2
-$MKFILE 10m file5
-$MKFILE 20m file6
+mkfile 10m file5
+mkfile 20m file6
 
 # Now walk the directory structure verifying it
 cd $TESTDIR
 verify_structure
 
 # Take snapshots
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap_a
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap_b
+log_must zfs snapshot $TESTPOOL/$TESTFS@snap_a
+log_must zfs snapshot $TESTPOOL/$TESTFS@snap_b
 
 # Change the filesystem structure by renaming files in the original structure
 # The snapshot file structure should not change
 cd $TESTDIR
-log_must $MV file2 file99
+log_must mv file2 file99
 cd dir1
-log_must $MV file4 file99
+log_must mv file4 file99
 cd dir2
-log_must $MV file6 file99
+log_must mv file6 file99
 
 # verify the top level snapshot directories
 verify_dir $TESTDIR/.zfs
diff --git a/usr/src/test/zfs-tests/tests/functional/snapused/snapused.kshlib b/usr/src/test/zfs-tests/tests/functional/snapused/snapused.kshlib
index 5e3a765321..d7d05bfeef 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapused/snapused.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/snapused/snapused.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -55,7 +55,7 @@ function _check_used # dataset
 function check_used # dataset
 {
 	typeset dataset=$1
-	for child in $($ZFS list -rH -t filesystem,volume -o name $dataset)
+	for child in $(zfs list -rH -t filesystem,volume -o name $dataset)
 	do
 		_check_used $child
 	done
@@ -66,7 +66,7 @@ function check_usedbychildren # dataset
 	typeset dataset=$1
 	typeset -i usedbychildren_sum=0
 	typeset -i parent_usedbychildren=0
-	for child in $($ZFS list -rH -t filesystem,volume -o name $dataset)
+	for child in $(zfs list -rH -t filesystem,volume -o name $dataset)
 	do
 		if [[ "$(get_prop type $child)" == "snapshot" ]]; then
 			continue
@@ -120,7 +120,7 @@ function _check_usedbydataset # dataset
 function check_usedbydataset # dataset
 {
 	typeset dataset=$1
-	for child in $($ZFS list -rH -t filesystem,volume -o name $dataset)
+	for child in $(zfs list -rH -t filesystem,volume -o name $dataset)
 	do
 		_check_usedbydataset $child
 	done
@@ -146,7 +146,7 @@ function _check_usedbyrefreservation # dataset
 function check_usedbyrefreservation # dataset
 {
 	typeset dataset=$1
-	for child in $($ZFS list -rH -t filesystem,volume -o name $dataset)
+	for child in $(zfs list -rH -t filesystem,volume -o name $dataset)
 	do
 		_check_usedbyrefreservation $child
 	done
@@ -157,7 +157,7 @@ function check_usedbysnapshots # dataset
 	typeset dataset=$1
 	typeset -i usedbysnapshots_sum=0
 	typeset -i parent_usedbysnapshots=0
-	for child in $($ZFS list -rH -t filesystem,volume,snapshot -o name $dataset)
+	for child in $(zfs list -rH -t filesystem,volume,snapshot -o name $dataset)
 	do
 		# parent
 		if [[ "$child" == "$dataset" ]]; then
diff --git a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_001_pos.ksh
index 3182dedb17..302ba40c38 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,13 +51,13 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rR $USEDTEST
+	log_must zfs destroy -rR $USEDTEST
 }
 
 log_assert "Verify used is correct."
 log_onexit cleanup
 
-log_must $ZFS create $USEDTEST
+log_must zfs create $USEDTEST
 check_used $USEDTEST
 
 typeset -i i=0
@@ -67,21 +67,21 @@ while ((i < 5)); do
 	((r_size=(i+1)*16))
 
 	#usedbyrefreservation
-	log_must $ZFS set refreservation="$r_size"M $USEDTEST
+	log_must zfs set refreservation="$r_size"M $USEDTEST
 
 	#usedbydataset
-	log_must $MKFILE 16M $mntpnt/file$i
+	log_must mkfile 16M $mntpnt/file$i
 
 	#usedbychildren
-	log_must $ZFS create $USEDTEST/fs$i
-	log_must $MKFILE 16M $mntpnt/fs$i/file$i
+	log_must zfs create $USEDTEST/fs$i
+	log_must mkfile 16M $mntpnt/fs$i/file$i
 
 	if is_global_zone; then
-		log_must $ZFS create -V 16M $USEDTEST/vol$i
+		log_must zfs create -V 16M $USEDTEST/vol$i
 	fi
 
 	#usedbysnapshots
-	log_must $ZFS snapshot -r $USEDTEST@snap$i
+	log_must zfs snapshot -r $USEDTEST@snap$i
 
 	check_used $USEDTEST
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_002_pos.ksh
index db6ac3dcb0..96d2df6c65 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,13 +49,13 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rR $USEDTEST
+	log_must zfs destroy -rR $USEDTEST
 }
 
 log_assert "Verify usedbychildren is correct."
 log_onexit cleanup
 
-log_must $ZFS create $USEDTEST
+log_must zfs create $USEDTEST
 check_usedbychildren $USEDTEST
 
 typeset -i i=0
@@ -64,15 +64,15 @@ mntpnt=$(get_prop mountpoint $USEDTEST)
 while ((i < 5)); do
 	((r_size=(i+1)*16))
 
-	log_must $ZFS create $USEDTEST/fs$i
-	log_must $ZFS set reservation="$r_size"M $USEDTEST/fs$i
-	log_must $MKFILE 48M $mntpnt/fs$i/file$i
+	log_must zfs create $USEDTEST/fs$i
+	log_must zfs set reservation="$r_size"M $USEDTEST/fs$i
+	log_must mkfile 48M $mntpnt/fs$i/file$i
 
 	if is_global_zone; then
-		log_must $ZFS create -V 32M $USEDTEST/vol$i
+		log_must zfs create -V 32M $USEDTEST/vol$i
 	fi
 
-	log_must $ZFS snapshot -r $USEDTEST@snap$i
+	log_must zfs snapshot -r $USEDTEST@snap$i
 
 	check_usedbychildren $USEDTEST
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_003_pos.ksh
index 9dee1f3c40..d4726ff40c 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,13 +48,13 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rR $USEDTEST
+	log_must zfs destroy -rR $USEDTEST
 }
 
 log_assert "Verify usedbydataset is correct."
 log_onexit cleanup
 
-log_must $ZFS create $USEDTEST
+log_must zfs create $USEDTEST
 check_usedbydataset $USEDTEST
 
 typeset -i i=0
@@ -63,16 +63,16 @@ mntpnt=$(get_prop mountpoint $USEDTEST)
 while ((i < 5)); do
 	((r_size=(i+1)*16))
 
-	log_must $MKFILE 16M $mntpnt/file$i
-	log_must $MKFILE "$r_size"M $mntpnt/file_var$i
-	log_must $ZFS snapshot -r $USEDTEST@snap$i
+	log_must mkfile 16M $mntpnt/file$i
+	log_must mkfile "$r_size"M $mntpnt/file_var$i
+	log_must zfs snapshot -r $USEDTEST@snap$i
 
-	log_must $ZFS clone $USEDTEST@snap$i $USEDTEST/cln$i
-	log_must $ZFS set is:cloned=yes $USEDTEST/cln$i
+	log_must zfs clone $USEDTEST@snap$i $USEDTEST/cln$i
+	log_must zfs set is:cloned=yes $USEDTEST/cln$i
 
 	mntpnt_cln=$(get_prop mountpoint $USEDTEST/cln$i)
-	log_must $MKFILE 16M $mntpnt_cln/file_cln$i
-	log_must $MKFILE "$r_size"M $mntpnt_cln/file_cln_var$i
+	log_must mkfile 16M $mntpnt_cln/file_cln$i
+	log_must mkfile "$r_size"M $mntpnt_cln/file_cln_var$i
 
 	check_usedbydataset $USEDTEST
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh
index 2cc4cade04..64ca3e2b35 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -53,13 +53,13 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rR $USEDTEST
+	log_must zfs destroy -rR $USEDTEST
 }
 
 log_assert "Verify usedbyrefreservation is correct."
 log_onexit cleanup
 
-log_must $ZFS create $USEDTEST
+log_must zfs create $USEDTEST
 check_usedbyrefreservation $USEDTEST
 
 typeset -i i=0
@@ -67,25 +67,25 @@ typeset -i r_size=0
 mntpnt=$(get_prop mountpoint $USEDTEST)
 while ((i < 5)); do
 	((r_size=(i+1)*16))
-	log_must $ZFS set refreservation="$r_size"M $USEDTEST
+	log_must zfs set refreservation="$r_size"M $USEDTEST
 
-	log_must $MKFILE 16M $mntpnt/file$i
+	log_must mkfile 16M $mntpnt/file$i
 
-	log_must $ZFS create $USEDTEST/fs$i
-	log_must $ZFS set refreservation="$r_size"M $USEDTEST/fs$i
-	log_must $MKFILE 16M $mntpnt/fs$i/file$i
+	log_must zfs create $USEDTEST/fs$i
+	log_must zfs set refreservation="$r_size"M $USEDTEST/fs$i
+	log_must mkfile 16M $mntpnt/fs$i/file$i
 
 	if is_global_zone; then
-		log_must $ZFS create -V 16M $USEDTEST/vol$i
+		log_must zfs create -V 16M $USEDTEST/vol$i
 	fi
 
-	log_must $ZFS snapshot -r $USEDTEST@snap$i
+	log_must zfs snapshot -r $USEDTEST@snap$i
 
-	log_must $ZFS clone $USEDTEST@snap$i $USEDTEST/cln$i
+	log_must zfs clone $USEDTEST@snap$i $USEDTEST/cln$i
 
 	mntpnt_cln=$(get_prop mountpoint $USEDTEST/cln$i)
-	log_must $ZFS set refreservation="$r_size"M $USEDTEST/cln$i
-	log_must $MKFILE 16M $mntpnt_cln/file_cln$i
+	log_must zfs set refreservation="$r_size"M $USEDTEST/cln$i
+	log_must mkfile 16M $mntpnt_cln/file_cln$i
 
 	check_usedbyrefreservation $USEDTEST
 
diff --git a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_005_pos.ksh
index f4099c84ef..ac5224caf6 100644
--- a/usr/src/test/zfs-tests/tests/functional/snapused/snapused_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/snapused/snapused_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,13 +47,13 @@ verify_runnable "both"
 
 function cleanup
 {
-	log_must $ZFS destroy -rR $USEDTEST
+	log_must zfs destroy -rR $USEDTEST
 }
 
 log_assert "Verify usedbysnapshots is correct."
 log_onexit cleanup
 
-log_must $ZFS create $USEDTEST
+log_must zfs create $USEDTEST
 check_usedbysnapshots $USEDTEST
 
 typeset -i i=0
@@ -62,9 +62,9 @@ mntpnt=$(get_prop mountpoint $USEDTEST)
 while ((i < 5)); do
 	((r_size=(i+1)*16))
 
-	log_must $MKFILE "$r_size"M $mntpnt/file$i
+	log_must mkfile "$r_size"M $mntpnt/file$i
 
-	log_must $ZFS snapshot $USEDTEST@snap$i
+	log_must zfs snapshot $USEDTEST@snap$i
 	check_usedbysnapshots $USEDTEST
 
         ((i = i + 1))
diff --git a/usr/src/test/zfs-tests/tests/functional/sparse/sparse_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/sparse/sparse_001_pos.ksh
index 2c70e495c7..0360f12c7b 100644
--- a/usr/src/test/zfs-tests/tests/functional/sparse/sparse_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/sparse/sparse_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Ensure random blocks are read back correctly"
@@ -71,8 +71,8 @@ options="$options -r "
 
 [[ -n "$options" ]] && options_display=$options
 
-log_note "Invoking $FILE_TRUNC with: $options_display"
-log_must $FILE_TRUNC $options $TESTDIR/$TESTFILE
+log_note "Invoking file_trunc with: $options_display"
+log_must file_trunc $options $TESTDIR/$TESTFILE
 
 typeset dir=$(get_device_dir $DISKS)
 verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir"
diff --git a/usr/src/test/zfs-tests/tests/functional/threadsappend/threadsappend_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/threadsappend/threadsappend_001_pos.ksh
index 635dcdb627..d9aef16c0f 100644
--- a/usr/src/test/zfs-tests/tests/functional/threadsappend/threadsappend_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/threadsappend/threadsappend_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -60,7 +60,7 @@ TESTFILE='testfile-threadsappend'
 # This test should be run on a multi-processor system because otherwise the FS
 # will not be concurrently used by the threads
 #
-NCPUS=`$PSRINFO | $WC -l`
+NCPUS=`psrinfo | wc -l`
 if [[ -z $NCPUS || $NCPUS -le 1 ]]; then
 	 log_fail "This test should be executed on a multi-processor system."
 fi
@@ -74,7 +74,7 @@ log_must $THREADSAPPEND ${TESTDIR}/${TESTFILE}
 #
 # Check the size of the resulting file
 #
-SIZE=`$LS -l ${TESTDIR}/${TESTFILE} | $AWK '{print $5}'`
+SIZE=`ls -l ${TESTDIR}/${TESTFILE} | awk '{print $5}'`
 if [[ $SIZE -ne $FILE_SIZE ]]; then
 	log_fail "'The length of ${TESTDIR}/${TESTFILE}' doesnt equal 1310720."
 fi
diff --git a/usr/src/test/zfs-tests/tests/functional/truncate/truncate_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/truncate/truncate_001_pos.ksh
index b3aaa3afed..ccbe43ff87 100644
--- a/usr/src/test/zfs-tests/tests/functional/truncate/truncate_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/truncate/truncate_001_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/truncate/truncate.cfg
 . $STF_SUITE/include/libtest.shlib
 
@@ -44,7 +48,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
 }
 
 log_assert "Ensure file with random blocks is truncated properly"
@@ -66,8 +70,8 @@ log_onexit cleanup
 
 [[ -n "$options" ]] && options_display=$options
 
-log_note "Invoking $FILE_TRUNC with: $options_display"
-log_must $FILE_TRUNC $options $TESTDIR/$TESTFILE
+log_note "Invoking file_trunc with: $options_display"
+log_must file_trunc $options $TESTDIR/$TESTFILE
 
 typeset dir=$(get_device_dir $DISKS)
 verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir"
diff --git a/usr/src/test/zfs-tests/tests/functional/truncate/truncate_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/truncate/truncate_002_pos.ksh
index 4849dff509..b2c5f0598a 100644
--- a/usr/src/test/zfs-tests/tests/functional/truncate/truncate_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/truncate/truncate_002_pos.ksh
@@ -25,6 +25,10 @@
 # Use is subject to license terms.
 #
 
+#
+# Copyright (c) 2016 by Delphix. All rights reserved.
+#
+
 . $STF_SUITE/tests/functional/truncate/truncate.cfg
 . $STF_SUITE/include/libtest.shlib
 
@@ -42,21 +46,21 @@ verify_runnable "both"
 
 function cleanup
 {
-	[[ -e $TESTDIR ]] && log_must $RM -rf $TESTDIR/*
-	[[ -f $srcfile ]] && $RM -f $srcfile
+	[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
+	[[ -f $srcfile ]] && rm -f $srcfile
 }
 
 log_assert "Ensure zeroed file gets written correctly during a sync operation"
 
 srcfile="/tmp/cosmo.$$"
-log_must $DD if=/dev/urandom of=$srcfile bs=1024k count=1
+log_must dd if=/dev/urandom of=$srcfile bs=1024k count=1
 
 log_onexit cleanup
-log_must $CP $srcfile $TESTDIR/$TESTFILE
-log_must $CP /dev/null $TESTDIR/$TESTFILE
-log_must $SYNC
+log_must cp $srcfile $TESTDIR/$TESTFILE
+log_must cp /dev/null $TESTDIR/$TESTFILE
+log_must sync
 if [[ -s $TESTDIR/$TESTFILE ]]; then
-	log_note "$($LS -l $TESTDIR/$TESTFILE)"
+	log_note "$(ls -l $TESTDIR/$TESTFILE)"
 	log_fail "testfile not truncated"
 fi
 
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/cleanup.ksh
index ffd2f32228..d9960cbac8 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -36,6 +36,6 @@ log_must cleanup_quota
 log_must clean_user_group
 
 typeset mntp=$(get_prop mountpoint $QFS)
-log_must $CHMOD 0755 $mntp
+log_must chmod 0755 $mntp
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_001_pos.ksh
index 41f6d18c59..deee59e3d7 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@
 function cleanup
 {
 	if datasetexists $snap_fs; then
-		log_must $ZFS destroy $snap_fs
+		log_must zfs destroy $snap_fs
 	fi
 
 	log_must cleanup_quota
@@ -63,17 +63,17 @@ set -A params -- "-n" "-H" "-p" "-o type,name,used,quota" \
 
 typeset snap_fs=$QFS@snap
 
-log_must $ZFS set groupquota@$QGROUP=500m $QFS
+log_must zfs set groupquota@$QGROUP=500m $QFS
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE 50m $QFILE
+log_must user_run $QUSER1 mkfile 50m $QFILE
 
-$SYNC
+sync
 
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
 for param in "${params[@]}"; do
-	log_must eval "$ZFS groupspace $param $QFS >/dev/null 2>&1"
-	log_must eval "$ZFS groupspace $param $snap_fs >/dev/null 2>&1"
+	log_must eval "zfs groupspace $param $QFS >/dev/null 2>&1"
+	log_must eval "zfs groupspace $param $snap_fs >/dev/null 2>&1"
 done
 
 log_pass "Check the zfs groupspace with all possible parameters"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_002_pos.ksh
index 48d298c25a..bcf7a99631 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/groupspace_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@
 function cleanup
 {
 	if datasetexists $snapfs; then
-		log_must $ZFS destroy $snapfs
+		log_must zfs destroy $snapfs
 	fi
 	log_must cleanup_quota
 }
@@ -55,25 +55,25 @@ log_onexit cleanup
 
 log_assert "Check the zfs groupspace used and quota"
 
-log_must $ZFS set groupquota@$QGROUP=500m $QFS
+log_must zfs set groupquota@$QGROUP=500m $QFS
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE 100m $QFILE
+log_must user_run $QUSER1 mkfile 100m $QFILE
 
-$SYNC
+sync
 
 typeset snapfs=$QFS@snap
 
-log_must $ZFS snapshot $snapfs
+log_must zfs snapshot $snapfs
 
-log_must eval "$ZFS groupspace $QFS >/dev/null 2>&1"
-log_must eval "$ZFS groupspace $snapfs >/dev/null 2>&1"
+log_must eval "zfs groupspace $QFS >/dev/null 2>&1"
+log_must eval "zfs groupspace $snapfs >/dev/null 2>&1"
 
 for fs in "$QFS" "$snapfs"; do
 	log_note "check the quota size in zfs groupspace $fs"
-	log_must eval "$ZFS groupspace $fs | $GREP $QGROUP | $GREP 500M"
+	log_must eval "zfs groupspace $fs | grep $QGROUP | grep 500M"
 
 	log_note "check the user used size in zfs groupspace $fs"
-	log_must eval "$ZFS groupspace $fs | $GREP $QGROUP | $GREP 100M"
+	log_must eval "zfs groupspace $fs | grep $QGROUP | grep 100M"
 done
 
 log_pass "Check the zfs groupspace used and quota pass as expect"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_001_pos.ksh
index 98dfc4f98a..65ba2e0e62 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
@@ -56,18 +56,18 @@ log_assert "If write operation overwrite {user|group}quota size, it will fail"
 
 mkmount_writable $QFS
 log_note "Check the userquota@$QUSER1"
-log_must $ZFS set userquota@$QUSER1=$UQUOTA_SIZE $QFS
-log_must user_run $QUSER1 $MKFILE $UQUOTA_SIZE $QFILE
-$SYNC
-log_mustnot user_run $QUSER1 $MKFILE 1 $OFILE
+log_must zfs set userquota@$QUSER1=$UQUOTA_SIZE $QFS
+log_must user_run $QUSER1 mkfile $UQUOTA_SIZE $QFILE
+sync
+log_mustnot user_run $QUSER1 mkfile 1 $OFILE
 cleanup_quota
 
 log_note "Check the groupquota@$QGROUP"
-log_must $ZFS set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
+log_must zfs set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE $GQUOTA_SIZE $QFILE
-$SYNC
-log_mustnot user_run $QUSER1 $MKFILE 1 $OFILE
+log_must user_run $QUSER1 mkfile $GQUOTA_SIZE $QFILE
+sync
+log_mustnot user_run $QUSER1 mkfile 1 $OFILE
 
 cleanup_quota
 
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_002_pos.ksh
index dfbce81ccc..888cf95f32 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,11 +46,11 @@ verify_runnable "global"
 function cleanup
 {
 	if poolexists $TESTPOOL1; then
-		log_must $ZPOOL destroy $TESTPOOL1
+		log_must zpool destroy $TESTPOOL1
 	fi
 
 	if [[ -f $pool_vdev ]]; then
-		$RM -f $pool_vdev
+		rm -f $pool_vdev
 	fi
 }
 
@@ -61,25 +61,25 @@ log_assert \
 
 typeset pool_vdev=/var/tmp/pool_dev.$$
 
-log_must $MKFILE 500m $pool_vdev
+log_must mkfile 500m $pool_vdev
 
 if poolexists $TESTPOOL1; then
-	$ZPOOL destroy $TESTPOOL1
+	zpool destroy $TESTPOOL1
 fi
 
-log_must $ZPOOL create -O userquota@$QUSER1=$UQUOTA_SIZE \
+log_must zpool create -O userquota@$QUSER1=$UQUOTA_SIZE \
 	-O groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1 $pool_vdev
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL1 > /dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL1 "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $TESTPOOL1 "$GQUOTA_SIZE"
 
-log_must $ZFS create -o userquota@$QUSER1=$UQUOTA_SIZE \
+log_must zfs create -o userquota@$QUSER1=$UQUOTA_SIZE \
 	-o groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL1/fs
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL1 > /dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL1/fs "$UQUOTA_SIZE"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_003_pos.ksh
index 45c7542c5e..07a2bcf482 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,10 +52,10 @@ log_onexit cleanup
 log_assert "Check the basic function of set/get userquota and groupquota on fs"
 
 log_note "Check the set|get userquota@$QUSER1 and groupquota@QGROUP"
-log_must $ZFS set userquota@$QUSER1=$UQUOTA_SIZE $QFS
+log_must zfs set userquota@$QUSER1=$UQUOTA_SIZE $QFS
 log_must check_quota "userquota@$QUSER1" $QFS "$UQUOTA_SIZE"
 
-log_must $ZFS set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
+log_must zfs set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
 log_must check_quota "groupquota@$QGROUP" $QFS "$GQUOTA_SIZE"
 
 log_pass "Check the basic function of set/get userquota on fs passed as expect"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_004_pos.ksh
index e17e641308..ce5ed720cc 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -61,8 +61,8 @@ if [[ $group_used != 0 ]]; then
 fi
 
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE 100m $QFILE
-$SYNC
+log_must user_run $QUSER1 mkfile 100m $QFILE
+sync
 
 user_used=$(get_value "userused@$QUSER1" $QFS)
 group_used=$(get_value "groupused@$QGROUP" $QFS)
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_005_neg.ksh
index 2fb043d499..a47c882175 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,7 +45,7 @@
 function cleanup
 {
 	if datasetexists $snap_fs; then
-		log_must $ZFS destroy $snap_fs
+		log_must zfs destroy $snap_fs
 	fi
 
 	log_must cleanup_quota
@@ -56,39 +56,39 @@ log_onexit cleanup
 log_assert "Check the invalid parameter of zfs set user|group quota"
 typeset snap_fs=$QFS@snap
 
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
 set -A no_users "mms1234" "ss@#" "root-122"
 for user in "${no_users[@]}"; do
-	log_mustnot $ID $user
-	log_mustnot $ZFS set userquota@$user=100m $QFS
+	log_mustnot id $user
+	log_mustnot zfs set userquota@$user=100m $QFS
 done
 
 log_note "can set all numberic id even that id is not existed"
-log_must $ZFS set userquota@12345678=100m $QFS
-log_mustnot $ZFS set userquota@12345678=100m $snap_fs
+log_must zfs set userquota@12345678=100m $QFS
+log_mustnot zfs set userquota@12345678=100m $snap_fs
 
 set -A sizes "100mfsd" "m0.12m" "GGM" "-1234-m" "123m-m"
 
 for size in "${sizes[@]}"; do
 	log_note "can not set user quota with invalid size parameter"
-	log_mustnot $ZFS set userquota@root=$size $QFS
+	log_mustnot zfs set userquota@root=$size $QFS
 done
 
 log_note "can not set user quota to snapshot $snap_fs"
-log_mustnot $ZFS set userquota@root=100m $snap_fs
+log_mustnot zfs set userquota@root=100m $snap_fs
 
 
 set -A no_groups "aidsf@dfsd@" "123223-dsfds#sdfsd" "mss_#ss" "@@@@"
 for group in "${no_groups[@]}"; do
-	log_mustnot eval "$GREP $group /etc/group"
-	log_mustnot $ZFS set groupquota@$group=100m $QFS
+	log_mustnot eval "grep $group /etc/group"
+	log_mustnot zfs set groupquota@$group=100m $QFS
 done
 
 log_note "can not set group quota with invalid size parameter"
-log_mustnot $ZFS set groupquota@root=100msfsd $QFS
+log_mustnot zfs set groupquota@root=100msfsd $QFS
 
 log_note "can not set group quota to snapshot $snap_fs"
-log_mustnot $ZFS set groupquota@root=100m $snap_fs
+log_mustnot zfs set groupquota@root=100m $snap_fs
 
 log_pass "Check the invalid parameter of zfs set user|group quota pas as expect"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_006_pos.ksh
index df84c24a19..4bcf9977fd 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,7 +45,7 @@
 function cleanup
 {
 	if datasetexists $snap_fs; then
-		log_must $ZFS destroy $snap_fs
+		log_must zfs destroy $snap_fs
 	fi
 
 	log_must cleanup_quota
@@ -56,20 +56,20 @@ log_onexit cleanup
 log_assert "Check the invalid parameter of zfs get user|group quota"
 typeset snap_fs=$QFS@snap
 
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
 set -A no_users "mms1234" "ss@#" "root-122" "1234"
 for user in "${no_users[@]}"; do
-	log_mustnot eval "$ID $user >/dev/null 2>&1"
-	log_must eval "$ZFS get userquota@$user $QFS >/dev/null 2>&1"
-	log_must eval "$ZFS get userquota@$user $snap_fs >/dev/null 2>&1"
+	log_mustnot eval "id $user >/dev/null 2>&1"
+	log_must eval "zfs get userquota@$user $QFS >/dev/null 2>&1"
+	log_must eval "zfs get userquota@$user $snap_fs >/dev/null 2>&1"
 done
 
 set -A no_groups "aidsf@dfsd@" "123223-dsfds#sdfsd" "mss_#ss" "1234"
 for group in "${no_groups[@]}"; do
-	log_mustnot eval "$GROUPDEL $group > /dev/null 2>&1"
-	log_must eval "$ZFS get groupquota@$group $QFS >/dev/null 2>&1"
-	log_must eval "$ZFS get groupquota@$group $snap_fs >/dev/null 2>&1"
+	log_mustnot eval "groupdel $group > /dev/null 2>&1"
+	log_must eval "zfs get groupquota@$group $QFS >/dev/null 2>&1"
+	log_must eval "zfs get groupquota@$group $snap_fs >/dev/null 2>&1"
 done
 
 log_pass "Check the invalid parameter of zfs get user|group quota pass as expect"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_007_pos.ksh
index b727f2d859..847c74002c 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,30 +46,30 @@
 function cleanup
 {
 	log_must cleanup_quota
-	log_must $ZFS set quota=none $QFS
+	log_must zfs set quota=none $QFS
 }
 
 log_onexit cleanup
 
 log_assert "Check set user|group quota to larger than the quota size of a fs"
 
-log_must $ZFS set quota=200m $QFS
-log_must $ZFS set userquota@$QUSER1=500m $QFS
-log_must $ZFS set groupquota@$QGROUP=600m $QFS
+log_must zfs set quota=200m $QFS
+log_must zfs set userquota@$QUSER1=500m $QFS
+log_must zfs set groupquota@$QGROUP=600m $QFS
 
-log_must $ZFS get userquota@$QUSER1 $QFS
-log_must $ZFS get groupquota@$QGROUP $QFS
+log_must zfs get userquota@$QUSER1 $QFS
+log_must zfs get groupquota@$QGROUP $QFS
 
 log_note "write some data to the $QFS"
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE 100m $QFILE
-$SYNC
+log_must user_run $QUSER1 mkfile 100m $QFILE
+sync
 
 log_note "set user|group quota at a smaller size than it current usage"
-log_must $ZFS set userquota@$QUSER1=90m $QFS
-log_must $ZFS set groupquota@$QGROUP=90m $QFS
+log_must zfs set userquota@$QUSER1=90m $QFS
+log_must zfs set groupquota@$QGROUP=90m $QFS
 
-log_must $ZFS get userquota@$QUSER1 $QFS
-log_must $ZFS get groupquota@$QGROUP $QFS
+log_must zfs get userquota@$QUSER1 $QFS
+log_must zfs get groupquota@$QGROUP $QFS
 
 log_pass "set user|group quota to larger than quota size of a fs pass as expect"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_008_pos.ksh
index bb6afe3fdc..41f34dcabf 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -51,10 +51,10 @@ log_onexit cleanup
 
 log_assert "Check zfs get all will not print out user|group quota"
 
-log_must $ZFS set userquota@$QUSER1=50m $QFS
-log_must $ZFS set groupquota@$QGROUP=100m $QFS
+log_must zfs set userquota@$QUSER1=50m $QFS
+log_must zfs set groupquota@$QGROUP=100m $QFS
 
-log_mustnot $ZFS get all $QFS | $GREP userquota
-log_mustnot $ZFS get all $QFS | $GREP groupquota
+log_mustnot zfs get all $QFS | grep userquota
+log_mustnot zfs get all $QFS | grep groupquota
 
 log_pass "zfs get all will not print out user|group quota"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_009_pos.ksh
index 6bf6146b22..9b5de149f7 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@
 function cleanup
 {
 	if datasetexists $snap_fs; then
-		log_must $ZFS destroy $snap_fs
+		log_must zfs destroy $snap_fs
 	fi
 
 	log_must cleanup_quota
@@ -62,25 +62,25 @@ log_assert "Check the snapshot's user|group quota"
 typeset snap_fs=$QFS@snap
 
 
-log_must $ZFS set userquota@$QUSER1=$UQUOTA_SIZE $QFS
+log_must zfs set userquota@$QUSER1=$UQUOTA_SIZE $QFS
 log_must check_quota "userquota@$QUSER1" $QFS "$UQUOTA_SIZE"
 
-log_must $ZFS set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
+log_must zfs set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
 log_must check_quota "groupquota@$QGROUP" $QFS "$GQUOTA_SIZE"
 
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
 log_note "check the snapshot $snap_fs user|group quota"
 log_must check_quota "userquota@$QUSER1" $snap_fs "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $snap_fs "$GQUOTA_SIZE"
 
 log_note  "set userquota and groupquota to $snap_fs which will fail"
-log_mustnot $ZFS set userquota@$QUSER1=$SNAP_QUOTA $snap_fs
-log_mustnot $ZFS set groupquota@$QGROUP=$SNAP_QUOTA $snap_fs
+log_mustnot zfs set userquota@$QUSER1=$SNAP_QUOTA $snap_fs
+log_mustnot zfs set groupquota@$QGROUP=$SNAP_QUOTA $snap_fs
 
 log_note "change the parent's userquota and groupquota"
-log_must $ZFS set userquota@$QUSER1=$TEST_QUOTA $QFS
-log_must $ZFS set groupquota@$QGROUP=$TEST_QUOTA $QFS
+log_must zfs set userquota@$QUSER1=$TEST_QUOTA $QFS
+log_must zfs set groupquota@$QGROUP=$TEST_QUOTA $QFS
 
 log_must check_quota "userquota@$QUSER1" $QFS $TEST_QUOTA
 log_must check_quota "groupquota@$QGROUP" $QFS $TEST_QUOTA
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_010_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_010_pos.ksh
index fa08fb06f0..09cb833551 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_010_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_010_pos.ksh
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,24 +52,24 @@ log_onexit cleanup
 log_assert "overwrite any of the {user|group}quota size, it will fail"
 
 log_note "overwrite to $QFS to make it exceed userquota"
-log_must $ZFS set userquota@$QUSER1=$UQUOTA_SIZE $QFS
-log_must $ZFS set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
+log_must zfs set userquota@$QUSER1=$UQUOTA_SIZE $QFS
+log_must zfs set groupquota@$QGROUP=$GQUOTA_SIZE $QFS
 
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE $UQUOTA_SIZE $QFILE
-$SYNC
+log_must user_run $QUSER1 mkfile $UQUOTA_SIZE $QFILE
+sync
 
-log_must eval "$ZFS get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
-log_must eval "$ZFS get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
+log_must eval "zfs get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
+log_must eval "zfs get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
 
-log_mustnot user_run $QUSER1 $MKFILE 1 $OFILE
+log_mustnot user_run $QUSER1 mkfile 1 $OFILE
 
-log_must $RM -f $QFILE
+log_must rm -f $QFILE
 
 log_note "overwrite to $QFS to make it exceed userquota"
-log_mustnot user_run $QUSER1 $MKFILE $GQUOTA_SIZE $QFILE
+log_mustnot user_run $QUSER1 mkfile $GQUOTA_SIZE $QFILE
 
-log_must eval "$ZFS get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
-log_must eval "$ZFS get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
+log_must eval "zfs get -p userused@$QUSER1 $QFS >/dev/null 2>&1"
+log_must eval "zfs get -p groupused@$GROUPUSED $QFS >/dev/null 2>&1"
 
 log_pass "overwrite any of the {user|group}quota size, it fail as expect"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_011_pos.ksh
index 3ca55feeae..c1b1154bfd 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_011_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function cleanup
 {
 	for ds in $TESTPOOL/fs $TESTPOOL/fs-rename $TESTPOOL/fs-clone; do
 		if datasetexists $ds; then
-			log_must $ZFS destroy -rRf $ds
+			log_must zfs destroy -rRf $ds
 		fi
 	done
 }
@@ -62,11 +62,11 @@ log_assert \
 
 cleanup
 
-log_must $ZFS create -o userquota@$QUSER1=$UQUOTA_SIZE \
+log_must zfs create -o userquota@$QUSER1=$UQUOTA_SIZE \
 	-o groupquota@$QGROUP=$GQUOTA_SIZE $TESTPOOL/fs
 
-log_must $ZFS snapshot $TESTPOOL/fs@snap
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must zfs snapshot $TESTPOOL/fs@snap
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL >/dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL/fs@snap "$UQUOTA_SIZE"
@@ -74,50 +74,50 @@ log_must check_quota "groupquota@$QGROUP" $TESTPOOL/fs@snap "$GQUOTA_SIZE"
 
 
 log_note "clone fs gets its parent's userquota/groupquota initially"
-log_must $ZFS clone  -o userquota@$QUSER1=$UQUOTA_SIZE \
+log_must zfs clone  -o userquota@$QUSER1=$UQUOTA_SIZE \
 		-o groupquota@$QGROUP=$GQUOTA_SIZE \
 		$TESTPOOL/fs@snap $TESTPOOL/fs-clone
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL >/dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL/fs-clone "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $TESTPOOL/fs-clone "$GQUOTA_SIZE"
 
-log_must eval "$ZFS list -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL/fs-clone >/dev/null 2>&1"
 
 log_note "zfs promote can not change the previously set user|group quota"
-log_must $ZFS promote $TESTPOOL/fs-clone
+log_must zfs promote $TESTPOOL/fs-clone
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL >/dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL/fs-clone "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $TESTPOOL/fs-clone "$GQUOTA_SIZE"
 
 log_note "zfs send receive can not change the previously set user|group quota"
-log_must $ZFS send $TESTPOOL/fs-clone@snap | $ZFS receive $TESTPOOL/fs-rev
+log_must zfs send $TESTPOOL/fs-clone@snap | zfs receive $TESTPOOL/fs-rev
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL >/dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL/fs-rev "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $TESTPOOL/fs-rev "$GQUOTA_SIZE"
 
 log_note "zfs rename can not change the previously set user|group quota"
-log_must $ZFS rename $TESTPOOL/fs-rev $TESTPOOL/fs-rename
+log_must zfs rename $TESTPOOL/fs-rev $TESTPOOL/fs-rename
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL  >/dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL/fs-rename "$UQUOTA_SIZE"
 log_must check_quota "groupquota@$QGROUP" $TESTPOOL/fs-rename "$GQUOTA_SIZE"
 
 log_note "zfs upgrade can not change the previously set user|group quota"
-log_must $ZFS upgrade $TESTPOOL/fs-rename
+log_must zfs upgrade $TESTPOOL/fs-rename
 
-log_must eval "$ZFS list -r -o userquota@$QUSER1,groupquota@$QGROUP \
+log_must eval "zfs list -r -o userquota@$QUSER1,groupquota@$QGROUP \
 	$TESTPOOL >/dev/null 2>&1"
 
 log_must check_quota "userquota@$QUSER1" $TESTPOOL/fs-rename "$UQUOTA_SIZE"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_012_neg.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_012_neg.ksh
index bd368227dc..8ba3c9f47e 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_012_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_012_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,7 +47,7 @@ function cleanup
 	cleanup_quota
 
 	if datasetexists $snap_fs; then
-		log_must $ZFS destroy $snap_fs
+		log_must zfs destroy $snap_fs
 	fi
 }
 
@@ -57,10 +57,10 @@ typeset snap_fs=$QFS@snap
 log_assert "Check  set userquota and groupquota on snapshot"
 
 log_note "Check can not set user|group quuota on snapshot"
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
-log_mustnot $ZFS set userquota@$QUSER1=$UQUOTA_SIZE $snap_fs
+log_mustnot zfs set userquota@$QUSER1=$UQUOTA_SIZE $snap_fs
 
-log_mustnot $ZFS set groupquota@$QGROUP=$GQUOTA_SIZE $snap_fs
+log_mustnot zfs set groupquota@$QGROUP=$GQUOTA_SIZE $snap_fs
 
 log_pass "Check  set userquota and groupquota on snapshot"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_common.kshlib b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_common.kshlib
index 771919602e..c38308c4d1 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userquota_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userquota_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -37,15 +37,15 @@
 function cleanup_quota
 {
 	if datasetexists $QFS; then
-		log_must $ZFS set userquota@$QUSER1=none $QFS
-		log_must $ZFS set userquota@$QUSER2=none $QFS
-		log_must $ZFS set groupquota@$QGROUP=none $QFS
+		log_must zfs set userquota@$QUSER1=none $QFS
+		log_must zfs set userquota@$QUSER2=none $QFS
+		log_must zfs set groupquota@$QGROUP=none $QFS
 		recovery_writable $QFS
 	fi
 
-	[[ -f $QFILE ]] && log_must $RM -f $QFILE
-	[[ -f $OFILE ]] && log_must $RM -f $OFILE
-	$SYNC
+	[[ -f $QFILE ]] && log_must rm -f $QFILE
+	[[ -f $OFILE ]] && log_must rm -f $OFILE
+	sync
 
 	 return 0
 }
@@ -71,7 +71,7 @@ function mkmount_writable
 {
 	typeset fs=$1
 	typeset mntp=$(get_prop mountpoint $fs)
-	log_must $CHMOD 0777 $mntp
+	log_must chmod 0777 $mntp
 }
 
 #
@@ -81,7 +81,7 @@ function recovery_writable
 {
 	typeset fs=$1
 	typeset mntp=$(get_prop mountpoint $fs)
-	log_must $CHMOD 0755 $mntp
+	log_must chmod 0755 $mntp
 }
 
 #
@@ -108,13 +108,13 @@ function get_value # property dataset
         typeset prop=$1
         typeset dataset=$2
 
-        prop_val=$($ZFS get -H -o value $prop $dataset 2>/dev/null)
+        prop_val=$(zfs get -H -o value $prop $dataset 2>/dev/null)
         if [[ $? -ne 0 ]]; then
                 log_note "Unable to get $prop property for dataset " \
                 "$dataset"
                 return 1
         fi
 
-        $ECHO $prop_val
+        echo $prop_val
         return 0
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userspace_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userspace_001_pos.ksh
index bdbec23f9f..c62efa685c 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userspace_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userspace_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@
 function cleanup
 {
 	if datasetexists $snap_fs; then
-		log_must $ZFS destroy $snap_fs
+		log_must zfs destroy $snap_fs
 	fi
 
 	log_must cleanup_quota
@@ -63,16 +63,16 @@ set -A params -- "-n" "-H" "-p" "-o type,name,used,quota" \
 
 typeset snap_fs=$QFS@snap
 
-log_must $ZFS set userquota@$QUSER1=100m $QFS
+log_must zfs set userquota@$QUSER1=100m $QFS
 mkmount_writable $QFS
-log_must user_run $QUSER1 $MKFILE 50m $QFILE
-$SYNC
+log_must user_run $QUSER1 mkfile 50m $QFILE
+sync
 
-log_must $ZFS snapshot $snap_fs
+log_must zfs snapshot $snap_fs
 
 for param in "${params[@]}"; do
-	log_must eval "$ZFS userspace $param $QFS >/dev/null 2>&1"
-	log_must eval "$ZFS userspace $param $snap_fs >/dev/null 2>&1"
+	log_must eval "zfs userspace $param $QFS >/dev/null 2>&1"
+	log_must eval "zfs userspace $param $snap_fs >/dev/null 2>&1"
 done
 
 log_pass "zfs userspace with all possible parameters pass as expect"
diff --git a/usr/src/test/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh
index 580be5f34b..b6f8425179 100644
--- a/usr/src/test/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/userquota/userspace_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@
 function cleanup
 {
 	if datasetexists $snapfs; then
-		log_must $ZFS destroy $snapfs
+		log_must zfs destroy $snapfs
 	fi
 
 	log_must cleanup_quota
@@ -56,26 +56,26 @@ log_onexit cleanup
 
 log_assert "Check the zfs userspace used and quota"
 
-log_must $ZFS set userquota@$QUSER1=100m $QFS
+log_must zfs set userquota@$QUSER1=100m $QFS
 
 mkmount_writable $QFS
 
-log_must user_run $QUSER1 $MKFILE 50m $QFILE
-$SYNC
+log_must user_run $QUSER1 mkfile 50m $QFILE
+sync
 
 typeset snapfs=$QFS@snap
 
-log_must $ZFS snapshot $snapfs
+log_must zfs snapshot $snapfs
 
-log_must eval "$ZFS userspace $QFS >/dev/null 2>&1"
-log_must eval "$ZFS userspace $snapfs >/dev/null 2>&1"
+log_must eval "zfs userspace $QFS >/dev/null 2>&1"
+log_must eval "zfs userspace $snapfs >/dev/null 2>&1"
 
 for fs in "$QFS" "$snapfs"; do
 	log_note "check the quota size in zfs userspace $fs"
-	log_must eval "$ZFS userspace $fs | $GREP $QUSER1 | $GREP 100M"
+	log_must eval "zfs userspace $fs | grep $QUSER1 | grep 100M"
 
 	log_note "check the user used size in zfs userspace $fs"
-	log_must eval "$ZFS userspace $fs | $GREP $QUSER1 | $GREP 50.0M"
+	log_must eval "zfs userspace $fs | grep $QUSER1 | grep 50.0M"
 done
 
 log_pass "Check the zfs userspace used and quota"
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test.kshlib b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test.kshlib
index d0f9a23a04..471e2c9620 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 . $STF_SUITE/tests/functional/utils_test/utils_test.cfg
 
@@ -43,7 +43,7 @@ function populate_dir # num_files
 
 	typeset -i filenum=0
 	while (( filenum < num_files )); do
-		log_must $FILE_WRITE -o create -c $WRITE_COUNT \
+		log_must file_write -o create -c $WRITE_COUNT \
 		    -f $TESTDIR/$TESTFILE.$filenum -b $BLOCKSZ -d $DATA
 		(( filenum = filenum + 1 ))
 	done
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh
index 166388b564..68e714a89f 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -55,8 +55,8 @@ log_assert "Ensure that the clri(1M) utility fails on a ZFS file system."
 
 populate_dir $NUM_FILES
 
-inode=`$LS -i $TESTDIR/$TESTFILE.0 | $AWK '{print $1}'`
-log_mustnot $CLRI /dev/rdsk/$DISK $inode
-log_mustnot $CLRI -F zfs /dev/rdsk/$DISK $inode
+inode=`ls -i $TESTDIR/$TESTFILE.0 | awk '{print $1}'`
+log_mustnot clri /dev/rdsk/$DISK $inode
+log_mustnot clri -F zfs /dev/rdsk/$DISK $inode
 
 log_pass "clri(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh
index fe417e69d4..81c7ab1bad 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,9 +48,9 @@ function cleanup
 {
 	ismounted $TESTPOOL/$TESTFS
 	(( $? != 0 )) && \
-		log_must $ZFS mount $TESTPOOL/$TESTFS
+		log_must zfs mount $TESTPOOL/$TESTFS
 
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -59,8 +59,8 @@ log_assert "Ensure that the labelit(1M) utility fails on a ZFS file system."
 
 populate_dir $NUM_FILES
 
-log_must $ZFS unmount $TESTDIR
+log_must zfs unmount $TESTDIR
 
-log_mustnot $LABELIT /dev/rdsk/${DISK}s0 mfiles ${DISK}s0
+log_mustnot labelit /dev/rdsk/${DISK}s0 mfiles ${DISK}s0
 
 log_pass "labelit(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh
index c7c90a1274..3678d76332 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -54,10 +54,10 @@ log_onexit cleanup
 log_assert "Ensure that the fsdb(1M) utility fails on a ZFS file system."
 
 populate_dir $NUM_FILES
-inode_num=`$LS -li $TESTDIR/$TESTFILE.0 | $AWK '{print $1}'`
+inode_num=`ls -li $TESTDIR/$TESTFILE.0 | awk '{print $1}'`
 [[ -z $inode_num ]] && \
     log_fail "Failed to determine inode of file: $TESTDIR/$TESTFILE.0"
 
-log_mustnot $ECHO ":inode $inode_num" | $FSDB /dev/rdsk/${DISK}s0
+log_mustnot echo ":inode $inode_num" | fsdb /dev/rdsk/${DISK}s0
 
 log_pass "fsdb(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh
index 9a2d17b3d4..74241a1e57 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,15 +46,15 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
 
 log_assert "Ensure that the quotaon(1M) utility fails on a ZFS file system."
 
-log_must $ZFS set quota=1099511627776 $TESTPOOL/$TESTFS
-log_must $TOUCH $TESTDIR/quotas
-log_mustnot $QUOTAON /dev/dsk/${DISK}s0
+log_must zfs set quota=1099511627776 $TESTPOOL/$TESTFS
+log_must touch $TESTDIR/quotas
+log_mustnot quotaon /dev/dsk/${DISK}s0
 
 log_pass "quotaon(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh
index 2453150e76..775105a904 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -55,6 +55,6 @@ log_assert "Ensure that the ff(1M) utility fails on a ZFS file system."
 
 populate_dir $NUM_FILES
 
-log_mustnot $FF -F zfs /dev/rdsk/${DISK}s0
+log_mustnot ff -F zfs /dev/rdsk/${DISK}s0
 
 log_pass "ff(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh
index b664f91c93..9c610f74c3 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,9 +48,9 @@ function cleanup
 {
 	ismounted $TESTPOOL/$TESTFS
 	(( $? != 0 )) && \
-		log_must $ZFS mount $TESTPOOL/$TESTFS
+		log_must zfs mount $TESTPOOL/$TESTFS
 
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -59,8 +59,8 @@ log_assert "Ensure that the fsirand(1M) utility fails on a ZFS file system."
 
 populate_dir $NUM_FILES
 
-log_must $ZFS unmount $TESTDIR
+log_must zfs unmount $TESTDIR
 
-log_mustnot $FSIRAND /dev/rdsk/${DISK}s0
+log_mustnot fsirand /dev/rdsk/${DISK}s0
 
 log_pass "fsirand(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh
index 25195fc161..ecb37900c7 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,9 +48,9 @@ function cleanup
 {
 	ismounted $TESTPOOL/$TESTFS
 	(( $? != 0 )) && \
-		log_must $ZFS mount $TESTPOOL/$TESTFS
+		log_must zfs mount $TESTPOOL/$TESTFS
 
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -59,12 +59,12 @@ log_assert "Ensure that the fstyp(1M) utility succeeds on a ZFS file system."
 
 populate_dir $NUM_FILES
 
-log_must $ZFS unmount $TESTDIR
+log_must zfs unmount $TESTDIR
 
 if ! $(is_physical_device $DISK); then
-	log_must $FSTYP $DISK
+	log_must fstyp $DISK
 else
-	log_must $FSTYP /dev/rdsk/${DISK}s0
+	log_must fstyp /dev/rdsk/${DISK}s0
 fi
 
 log_pass "fstyp(1M) returned successfully."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh
index ed116ce840..c736265110 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_008_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,9 +48,9 @@ function cleanup
 {
 	ismounted $TESTPOOL/$TESTFS
 	(( $? != 0 )) && \
-		log_must $ZFS mount $TESTPOOL/$TESTFS
+		log_must zfs mount $TESTPOOL/$TESTFS
 
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -59,8 +59,8 @@ log_assert "Ensure that the ncheck(1M) utility fails on a ZFS file system."
 
 populate_dir $NUM_FILES
 
-log_must $ZFS unmount $TESTDIR
+log_must zfs unmount $TESTDIR
 
-log_mustnot $NCHECK /dev/rdsk/${DISK}s0
+log_mustnot ncheck /dev/rdsk/${DISK}s0
 
 log_pass "ncheck(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh
index c40ecc6bd6..b7dc013ab5 100644
--- a/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/utils_test/utils_test_009_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_onexit cleanup
@@ -55,6 +55,6 @@ log_assert "Ensure that the tunefs(1M) utility fails on a ZFS file system."
 
 populate_dir $NUM_FILES
 
-log_mustnot $TUNEFS -m 80 /dev/dsk/${DISK}s0
+log_mustnot tunefs -m 80 /dev/dsk/${DISK}s0
 
 log_pass "tunefs(1M) returned an error as expected."
diff --git a/usr/src/test/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib b/usr/src/test/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib
index f783eefee3..aae2ab40ce 100644
--- a/usr/src/test/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/vdev_zaps/vdev_zaps.kshlib
@@ -14,7 +14,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 function get_conf_section # regex conf
@@ -104,7 +104,7 @@ function cleanup
                 log_must zpool destroy -f $TESTPOOL
         fi
         if [[ -e $conf ]]; then
-                log_must $RM -f "$conf"
+                log_must rm -f "$conf"
         fi
         if [[ -e $POOL2 ]]; then
                 log_must zpool destroy -f $POOL2
diff --git a/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh
index dc5854bd92..60da382cad 100644
--- a/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,11 +47,11 @@ verify_runnable "both"
 
 function cleanup
 {
-	for file in `$FIND $TESTDIR -type f`; do
-		$CAT /dev/null > $file
+	for file in `find $TESTDIR -type f`; do
+		cat /dev/null > $file
 	done
-	log_must $SYNC
-	log_must $RM -rf $TESTDIR/*
+	log_must sync
+	log_must rm -rf $TESTDIR/*
 }
 
 typeset -i retval=0
diff --git a/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh
index bc4aff07f8..dcb793e1f3 100644
--- a/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/write_dirs/write_dirs_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -47,11 +47,11 @@ verify_runnable "both"
 
 function cleanup
 {
-	for file in `$FIND $TESTDIR -type f`; do
-		$CAT /dev/null > $file
+	for file in `find $TESTDIR -type f`; do
+		cat /dev/null > $file
 	done
-	log_must $SYNC
-	log_must $RM -rf $TESTDIR/*
+	log_must sync
+	log_must rm -rf $TESTDIR/*
 }
 
 typeset -i retval=0
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/cleanup.ksh
index b52c07d3d8..10cd733d21 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/cleanup.ksh
@@ -24,22 +24,22 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
-ZFS_USER=$($CAT /tmp/zfs-xattr-test-user.txt)
-$RM /tmp/zfs-xattr-test-user.txt
+ZFS_USER=$(cat /tmp/zfs-xattr-test-user.txt)
+rm /tmp/zfs-xattr-test-user.txt
 
-USES_NIS=$($CAT /tmp/zfs-xattr-test-nis.txt)
-$RM /tmp/zfs-xattr-test-nis.txt
+USES_NIS=$(cat /tmp/zfs-xattr-test-nis.txt)
+rm /tmp/zfs-xattr-test-nis.txt
 
 del_user $ZFS_USER
 
 if [ "${USES_NIS}" == "true" ]
 then
-    $SVCADM enable svc:/network/nis/client:default
+    svcadm enable svc:/network/nis/client:default
 fi
 
 default_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/setup.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/setup.ksh
index d359eb049c..ac82c59191 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/setup.ksh
@@ -24,18 +24,18 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 # if we're running NIS, turn it off until we clean up
 # (it can cause useradd to take a long time, hitting our TIMEOUT)
-USES_NIS=FALSE
-$SVCS svc:/network/nis/client:default | $GREP online > /dev/null
+USES_NIS=false
+svcs svc:/network/nis/client:default | grep online > /dev/null
 if [ $? -eq 0 ]
 then
-	$SVCADM disable -t svc:/network/nis/client:default
+	svcadm disable -t svc:/network/nis/client:default
 	USES_NIS=true
 fi
 
@@ -45,7 +45,7 @@ ZFS_GROUP=staff
 while [ -z "${FOUND}" ]
 do
 	COUNT=0
-	USER_EXISTS=$( $GREP $ZFS_USER /etc/passwd )
+	USER_EXISTS=$( grep $ZFS_USER /etc/passwd )
 	if [ ! -z "${USER_EXISTS}" ]
 	then
 		ZFS_USER="${ZFS_USER}${COUNT}"
@@ -57,8 +57,8 @@ done
 
 log_must add_user $ZFS_GROUP $ZFS_USER
 
-$ECHO $ZFS_USER > /tmp/zfs-xattr-test-user.txt
-$ECHO $USES_NIS > /tmp/zfs-xattr-test-nis.txt
+echo $ZFS_USER > /tmp/zfs-xattr-test-user.txt
+echo $USES_NIS > /tmp/zfs-xattr-test-nis.txt
 
 DISK=${DISKS%% *}
 default_setup $DISK
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_001_pos.ksh
index 1bc7e5c755..adb5132f28 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_001_pos.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,14 +48,14 @@ function cleanup {
 
 	if [ -f $TESTDIR/myfile.$$ ]
 	then
-		log_must $RM $TESTDIR/myfile.$$
+		log_must rm $TESTDIR/myfile.$$
 	fi
 }
 
 log_assert "Create/read/write/append of xattrs works"
 log_onexit cleanup
 
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 verify_write_xattr $TESTDIR/myfile.$$ passwd
 delete_xattr $TESTDIR/myfile.$$ passwd
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_002_neg.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_002_neg.ksh
index cd57b3594b..99212a0110 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_002_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_002_neg.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -42,7 +42,7 @@
 
 function cleanup {
 
-	log_must $RM $TESTDIR/myfile.$$
+	log_must rm $TESTDIR/myfile.$$
 
 }
 
@@ -50,7 +50,7 @@ log_assert "A read of a non-existent xattr fails"
 log_onexit cleanup
 
 # create a file
-log_must $TOUCH $TESTDIR/myfile.$$
-log_mustnot eval "$CAT $TESTDIR/myfile.$$ not-here.txt > /dev/null 2>&1"
+log_must touch $TESTDIR/myfile.$$
+log_mustnot eval "cat $TESTDIR/myfile.$$ not-here.txt > /dev/null 2>&1"
 
 log_pass "A read of a non-existent xattr fails"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_003_neg.ksh
index 90d78604b4..28fae8e657 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_003_neg.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,18 +45,18 @@
 
 function cleanup {
 
-	log_must $RM $TESTDIR/myfile.$$
+	log_must rm $TESTDIR/myfile.$$
 
 }
 
 log_assert "read/write xattr on a file with no permissions fails"
 log_onexit cleanup
 
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
-log_must $CHMOD 000 $TESTDIR/myfile.$$
-log_mustnot $SU $ZFS_USER -c "$RUNAT $TESTDIR/myfile.$$ $CAT passwd"
-log_mustnot $SU $ZFS_USER -c "$RUNAT $TESTDIR/myfile.$$ $CP /etc/passwd ."
+log_must chmod 000 $TESTDIR/myfile.$$
+log_mustnot su $ZFS_USER -c "runat $TESTDIR/myfile.$$ cat passwd"
+log_mustnot su $ZFS_USER -c "runat $TESTDIR/myfile.$$ cp /etc/passwd ."
 
 log_pass "read/write xattr on a file with no permissions fails"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_004_pos.ksh
index a056cad46b..2234336e7b 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_004_pos.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,8 +52,8 @@ function cleanup {
 
 	if [ $( ismounted /tmp/ufs.$$ ufs ) ]
 	then
-		log_must $UMOUNT /tmp/ufs.$$
-		log_must $RM -rf /tmp/ufs.$$
+		log_must umount /tmp/ufs.$$
+		log_must rm -rf /tmp/ufs.$$
 	fi
 }
 
@@ -61,26 +61,26 @@ log_assert "Files from ufs,tmpfs with xattrs copied to zfs retain xattr info."
 log_onexit cleanup
 
 # Create a UFS file system that we can work in
-log_must $ZFS create -V128m $TESTPOOL/$TESTFS/zvol
-log_must eval "$ECHO y | $NEWFS /dev/zvol/dsk/$TESTPOOL/$TESTFS/zvol > /dev/null 2>&1"
+log_must zfs create -V128m $TESTPOOL/$TESTFS/zvol
+log_must eval "echo y | newfs /dev/zvol/dsk/$TESTPOOL/$TESTFS/zvol > /dev/null 2>&1"
 
-log_must $MKDIR /tmp/ufs.$$
-log_must $MOUNT /dev/zvol/dsk/$TESTPOOL/$TESTFS/zvol /tmp/ufs.$$
+log_must mkdir /tmp/ufs.$$
+log_must mount /dev/zvol/dsk/$TESTPOOL/$TESTFS/zvol /tmp/ufs.$$
 
 # Create files in ufs and tmpfs, and set some xattrs on them.
-log_must $TOUCH /tmp/ufs.$$/ufs-file.$$
-log_must $TOUCH /tmp/tmpfs-file.$$
+log_must touch /tmp/ufs.$$/ufs-file.$$
+log_must touch /tmp/tmpfs-file.$$
 
-log_must $RUNAT /tmp/ufs.$$/ufs-file.$$ $CP /etc/passwd .
-log_must $RUNAT /tmp/tmpfs-file.$$ $CP /etc/group .
+log_must runat /tmp/ufs.$$/ufs-file.$$ cp /etc/passwd .
+log_must runat /tmp/tmpfs-file.$$ cp /etc/group .
 
 # copy those files to ZFS
-log_must $CP -@ /tmp/ufs.$$/ufs-file.$$ $TESTDIR
-log_must $CP -@ /tmp/tmpfs-file.$$ $TESTDIR
+log_must cp -@ /tmp/ufs.$$/ufs-file.$$ $TESTDIR
+log_must cp -@ /tmp/tmpfs-file.$$ $TESTDIR
 
 # ensure the xattr information has been copied correctly
-log_must $RUNAT $TESTDIR/ufs-file.$$ $DIFF passwd /etc/passwd
-log_must $RUNAT $TESTDIR/tmpfs-file.$$ $DIFF group /etc/group
+log_must runat $TESTDIR/ufs-file.$$ diff passwd /etc/passwd
+log_must runat $TESTDIR/tmpfs-file.$$ diff group /etc/group
 
-log_must $UMOUNT /tmp/ufs.$$
+log_must umount /tmp/ufs.$$
 log_pass "Files from ufs,tmpfs with xattrs copied to zfs retain xattr info."
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_005_pos.ksh
index f7be58e819..e5fbe6f18b 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_005_pos.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -44,22 +44,22 @@
 
 function cleanup {
 
-	log_must $ZFS destroy $TESTPOOL/$TESTFS/clone
-	log_must $ZFS destroy $TESTPOOL/$TESTFS@snapshot1
-	log_must $RM $TESTDIR/myfile.$$
+	log_must zfs destroy $TESTPOOL/$TESTFS/clone
+	log_must zfs destroy $TESTPOOL/$TESTFS@snapshot1
+	log_must rm $TESTDIR/myfile.$$
 }
 
 log_assert "read/write/create/delete xattr on a clone filesystem"
 log_onexit cleanup
 
 # create a file, and an xattr on it
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 # snapshot & clone the filesystem
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snapshot1
-log_must $ZFS clone $TESTPOOL/$TESTFS@snapshot1 $TESTPOOL/$TESTFS/clone
-log_must $ZFS set mountpoint=$TESTDIR/clone $TESTPOOL/$TESTFS/clone
+log_must zfs snapshot $TESTPOOL/$TESTFS@snapshot1
+log_must zfs clone $TESTPOOL/$TESTFS@snapshot1 $TESTPOOL/$TESTFS/clone
+log_must zfs set mountpoint=$TESTDIR/clone $TESTPOOL/$TESTFS/clone
 
 # check for the xattrs on the clone
 verify_xattr $TESTDIR/clone/myfile.$$ passwd /etc/passwd
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_006_pos.ksh
index 24915fda25..56f29c88d8 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_006_pos.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -42,8 +42,8 @@
 
 function cleanup {
 
-	log_must $ZFS destroy $TESTPOOL/$TESTFS@snap
-	log_must $RM $TESTDIR/myfile.$$
+	log_must zfs destroy $TESTPOOL/$TESTFS@snap
+	log_must rm $TESTDIR/myfile.$$
 
 }
 
@@ -51,11 +51,11 @@ log_assert "read xattr on a snapshot"
 log_onexit cleanup
 
 # create a file, and an xattr on it
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 # snapshot the filesystem
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap
+log_must zfs snapshot $TESTPOOL/$TESTFS@snap
 
 # check for the xattr on the snapshot
 verify_xattr $TESTDIR/.zfs/snapshot/snap/myfile.$$ passwd /etc/passwd
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh
index bef602012e..6b3feeafc0 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_007_neg.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,11 +46,11 @@
 #
 
 function cleanup {
-	log_must $ZFS destroy $TESTPOOL/$TESTFS@snap
-	log_must $RM $TESTDIR/myfile2.$$
-	log_must $RM $TESTDIR/myfile.$$
-	log_must $RM /tmp/output.$$
-	[[ -e /tmp/expected_output.$$ ]]  && log_must $RM  \
+	log_must zfs destroy $TESTPOOL/$TESTFS@snap
+	log_must rm $TESTDIR/myfile2.$$
+	log_must rm $TESTDIR/myfile.$$
+	log_must rm /tmp/output.$$
+	[[ -e /tmp/expected_output.$$ ]]  && log_must rm  \
 	/tmp/expected_output.$$
 
 }
@@ -59,23 +59,23 @@ log_assert "create/write xattr on a snapshot fails"
 log_onexit cleanup
 
 # create a file, and an xattr on it
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 # create another file that doesn't have an xattr
-log_must $TOUCH $TESTDIR/myfile2.$$
+log_must touch $TESTDIR/myfile2.$$
 
 # snapshot the filesystem
-log_must $ZFS snapshot $TESTPOOL/$TESTFS@snap
+log_must zfs snapshot $TESTPOOL/$TESTFS@snap
 
 # we shouldn't be able to alter the first file's xattr
-log_mustnot eval " $RUNAT $TESTDIR/.zfs/snapshot/snap/myfile.$$ \
-    $CP /etc/passwd .  >/tmp/output.$$  2>&1"
-log_must $GREP  -i  Read-only  /tmp/output.$$
+log_mustnot eval " runat $TESTDIR/.zfs/snapshot/snap/myfile.$$ \
+    cp /etc/passwd .  >/tmp/output.$$  2>&1"
+log_must grep  -i  Read-only  /tmp/output.$$
 
-log_must eval "$RUNAT $TESTDIR/.zfs/snapshot/snap/myfile2.$$  \
-    $LS >/tmp/output.$$  2>&1"
+log_must eval "runat $TESTDIR/.zfs/snapshot/snap/myfile2.$$  \
+    ls >/tmp/output.$$  2>&1"
 create_expected_output  /tmp/expected_output.$$ SUNWattr_ro SUNWattr_rw
-log_must $DIFF /tmp/output.$$ /tmp/expected_output.$$
+log_must diff /tmp/output.$$ /tmp/expected_output.$$
 
 log_pass "create/write xattr on a snapshot fails"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_008_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_008_pos.ksh
index 40cc4a08eb..20319967c2 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_008_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_008_pos.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,7 +45,7 @@ function cleanup {
 
 	for file in /tmp/output.$$ /tmp/expected-output.$$ \
 		$TESTDIR/myfile.$$ ; do
-		log_must $RM -f $file
+		log_must rm -f $file
 	done
 }
 
@@ -53,28 +53,28 @@ log_assert "special . and .. dirs work as expected for xattrs"
 log_onexit cleanup
 
 # create a file, and an xattr on it
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 # listing the directory .
-log_must eval "$RUNAT $TESTDIR/myfile.$$ $LS  . > /tmp/output.$$"
+log_must eval "runat $TESTDIR/myfile.$$ ls  . > /tmp/output.$$"
 create_expected_output  /tmp/expected-output.$$  \
     SUNWattr_ro  SUNWattr_rw  passwd
-log_must $DIFF /tmp/output.$$ /tmp/expected-output.$$
+log_must diff /tmp/output.$$ /tmp/expected-output.$$
 # list the directory . long form
-log_must eval "$RUNAT $TESTDIR/myfile.$$ $LS -a . > /tmp/output.$$"
+log_must eval "runat $TESTDIR/myfile.$$ ls -a . > /tmp/output.$$"
 create_expected_output  /tmp/expected-output.$$ . ..  \
     SUNWattr_ro  SUNWattr_rw  passwd
-log_must $DIFF /tmp/output.$$ /tmp/expected-output.$$
+log_must diff /tmp/output.$$ /tmp/expected-output.$$
 
 # list the directory .. expecting one file
-OUTPUT=$($RUNAT $TESTDIR/myfile.$$ $LS ..)
+OUTPUT=$(runat $TESTDIR/myfile.$$ ls ..)
 if [ "$OUTPUT" != ".." ]
 then
 	log_fail "Listing the .. directory doesn't show \"..\" as expected."
 fi
 
 # verify we can't list ../
-log_mustnot eval "$RUNAT $TESTDIR/myfile.$$ $LS ../ > /dev/null 2>&1"
+log_mustnot eval "runat $TESTDIR/myfile.$$ ls ../ > /dev/null 2>&1"
 
 log_pass "special . and .. dirs work as expected for xattrs"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_009_neg.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_009_neg.ksh
index 40b361710e..6a953cf841 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_009_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_009_neg.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -42,7 +42,7 @@
 
 function cleanup {
 
-	log_must $RM $TESTDIR/myfile.$$
+	log_must rm $TESTDIR/myfile.$$
 
 }
 
@@ -50,13 +50,13 @@ log_assert "links between xattr and normal file namespace fail"
 log_onexit cleanup
 
 # create a file, and an xattr on it
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 # Try to create a soft link from the xattr namespace to the default namespace
-log_mustnot $RUNAT $TESTDIR/myfile.$$ $LN -s /etc/passwd foo
+log_mustnot runat $TESTDIR/myfile.$$ $LN -s /etc/passwd foo
 
 # Try to create a hard link from the xattr namespace to the default namespace
-log_mustnot $RUNAT $TESTDIR/myfile.$$ $LN /etc/passwd foo
+log_mustnot runat $TESTDIR/myfile.$$ $LN /etc/passwd foo
 
 log_pass "links between xattr and normal file namespace fail"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_010_neg.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_010_neg.ksh
index e3e23a428f..43502bfff2 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_010_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_010_neg.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -43,24 +43,24 @@
 
 function cleanup {
 
-	log_must $RM $TESTDIR/myfile.$$
+	log_must rm $TESTDIR/myfile.$$
 }
 
 log_assert "mkdir, mknod fail"
 log_onexit cleanup
 
 # create a file, and an xattr on it
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 # Try to create directory in the xattr namespace
-log_mustnot $RUNAT $TESTDIR/myfile.$$ $MKDIR foo
+log_mustnot runat $TESTDIR/myfile.$$ mkdir foo
 
 # Try to create a range of different filetypes in the xattr namespace
-log_mustnot $RUNAT $TESTDIR/myfile.$$ $MKNOD block b 888 888
+log_mustnot runat $TESTDIR/myfile.$$ mknod block b 888 888
 
-log_mustnot $RUNAT $TESTDIR/myfile.$$ $MKNOD char c
+log_mustnot runat $TESTDIR/myfile.$$ mknod char c
 
-log_mustnot $RUNAT $TESTDIR/myfile.$$ $MKNOD fifo p
+log_mustnot runat $TESTDIR/myfile.$$ mknod fifo p
 
 log_pass "mkdir, mknod fail"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_011_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_011_pos.ksh
index e3a8d26922..12f067489f 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_011_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_011_pos.ksh
@@ -24,11 +24,11 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,7 +48,7 @@
 
 function cleanup {
 
-	log_must $RM $TESTDIR/myfile.$$
+	log_must rm $TESTDIR/myfile.$$
 }
 
 log_assert "Basic applications work with xattrs: cpio cp find mv pax tar"
@@ -56,7 +56,7 @@ log_onexit cleanup
 
 # Create a file, and set an xattr on it. This file is used in several of the
 # test scenarios below.
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 
@@ -67,127 +67,127 @@ create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 
 log_note "Checking cpio"
-log_must $TOUCH $TESTDIR/cpio.$$
+log_must touch $TESTDIR/cpio.$$
 create_xattr $TESTDIR/cpio.$$ passwd /etc/passwd
-$ECHO $TESTDIR/cpio.$$ | $CPIO -o@ > /tmp/xattr.$$.cpio
-$ECHO $TESTDIR/cpio.$$ | $CPIO -o > /tmp/noxattr.$$.cpio
+echo $TESTDIR/cpio.$$ | cpio -o@ > /tmp/xattr.$$.cpio
+echo $TESTDIR/cpio.$$ | cpio -o > /tmp/noxattr.$$.cpio
 
 # we should have no xattr here
-log_must $CPIO -iu < /tmp/xattr.$$.cpio
-log_mustnot eval "$RUNAT $TESTDIR/cpio.$$ $CAT passwd > /dev/null 2>&1"
+log_must cpio -iu < /tmp/xattr.$$.cpio
+log_mustnot eval "runat $TESTDIR/cpio.$$ cat passwd > /dev/null 2>&1"
 
 # we should have an xattr here
-log_must $CPIO -iu@ < /tmp/xattr.$$.cpio
-log_must eval "$RUNAT $TESTDIR/cpio.$$ $CAT passwd > /dev/null 2>&1"
+log_must cpio -iu@ < /tmp/xattr.$$.cpio
+log_must eval "runat $TESTDIR/cpio.$$ cat passwd > /dev/null 2>&1"
 
 # we should have no xattr here
-log_must $CPIO -iu < /tmp/noxattr.$$.cpio
-log_mustnot eval "$RUNAT $TESTDIR/cpio.$$ $CAT passwd > /dev/null 2>&1"
+log_must cpio -iu < /tmp/noxattr.$$.cpio
+log_mustnot eval "runat $TESTDIR/cpio.$$ cat passwd > /dev/null 2>&1"
 
 # we should have no xattr here
-log_must $CPIO -iu@ < /tmp/noxattr.$$.cpio
-log_mustnot eval "$RUNAT $TESTDIR/cpio.$$ $CAT passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/cpio.$$ /tmp/xattr.$$.cpio /tmp/noxattr.$$.cpio
+log_must cpio -iu@ < /tmp/noxattr.$$.cpio
+log_mustnot eval "runat $TESTDIR/cpio.$$ cat passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/cpio.$$ /tmp/xattr.$$.cpio /tmp/noxattr.$$.cpio
 
 
 
 log_note "Checking cp"
 # check that with the right flag, the xattr is preserved
-log_must $CP -@ $TESTDIR/myfile.$$ $TESTDIR/myfile2.$$
+log_must cp -@ $TESTDIR/myfile.$$ $TESTDIR/myfile2.$$
 compare_xattrs $TESTDIR/myfile.$$ $TESTDIR/myfile2.$$ passwd
-log_must $RM $TESTDIR/myfile2.$$
+log_must rm $TESTDIR/myfile2.$$
 
 # without the right flag, there should be no xattr
-log_must $CP $TESTDIR/myfile.$$ $TESTDIR/myfile2.$$
-log_mustnot eval "$RUNAT $TESTDIR/myfile2.$$ $LS passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/myfile2.$$
+log_must cp $TESTDIR/myfile.$$ $TESTDIR/myfile2.$$
+log_mustnot eval "runat $TESTDIR/myfile2.$$ ls passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/myfile2.$$
 
 
 
 log_note "Checking find"
 # create a file without xattrs, and check that find -xattr only finds
 # our test file that has an xattr.
-log_must $MKDIR $TESTDIR/noxattrs
-log_must $TOUCH $TESTDIR/noxattrs/no-xattr
+log_must mkdir $TESTDIR/noxattrs
+log_must touch $TESTDIR/noxattrs/no-xattr
 
-$FIND $TESTDIR -xattr | $GREP myfile.$$
+find $TESTDIR -xattr | grep myfile.$$
 [[ $? -ne 0 ]] && \
 	log_fail "find -xattr didn't find our file that had an xattr."
-$FIND $TESTDIR -xattr | $GREP no-xattr
+find $TESTDIR -xattr | grep no-xattr
 [[ $? -eq 0 ]] && \
 	log_fail "find -xattr found a file that didn't have an xattr."
-log_must $RM -rf $TESTDIR/noxattrs
+log_must rm -rf $TESTDIR/noxattrs
 
 
 
 log_note "Checking mv"
 # mv doesn't have any flags to preserve/ommit xattrs - they're
 # always moved.
-log_must $TOUCH $TESTDIR/mvfile.$$
+log_must touch $TESTDIR/mvfile.$$
 create_xattr $TESTDIR/mvfile.$$ passwd /etc/passwd
-log_must $MV $TESTDIR/mvfile.$$ $TESTDIR/mvfile2.$$
+log_must mv $TESTDIR/mvfile.$$ $TESTDIR/mvfile2.$$
 verify_xattr $TESTDIR/mvfile2.$$ passwd /etc/passwd
-log_must $RM $TESTDIR/mvfile2.$$
+log_must rm $TESTDIR/mvfile2.$$
 
 
 log_note "Checking pax"
-log_must $TOUCH $TESTDIR/pax.$$
+log_must touch $TESTDIR/pax.$$
 create_xattr $TESTDIR/pax.$$ passwd /etc/passwd
-log_must $PAX -w -f $TESTDIR/noxattr.pax $TESTDIR/pax.$$
-log_must $PAX -w@ -f $TESTDIR/xattr.pax $TESTDIR/pax.$$
-log_must $RM $TESTDIR/pax.$$
+log_must pax -w -f $TESTDIR/noxattr.pax $TESTDIR/pax.$$
+log_must pax -w@ -f $TESTDIR/xattr.pax $TESTDIR/pax.$$
+log_must rm $TESTDIR/pax.$$
 
 # we should have no xattr here
-log_must $PAX -r -f $TESTDIR/noxattr.pax
-log_mustnot eval "$RUNAT $TESTDIR/pax.$$ $CAT passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/pax.$$
+log_must pax -r -f $TESTDIR/noxattr.pax
+log_mustnot eval "runat $TESTDIR/pax.$$ cat passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/pax.$$
 
 # we should have no xattr here
-log_must $PAX -r@ -f $TESTDIR/noxattr.pax
-log_mustnot eval "$RUNAT $TESTDIR/pax.$$ $CAT passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/pax.$$
+log_must pax -r@ -f $TESTDIR/noxattr.pax
+log_mustnot eval "runat $TESTDIR/pax.$$ cat passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/pax.$$
 
 
 # we should have an xattr here
-log_must $PAX -r@ -f $TESTDIR/xattr.pax
+log_must pax -r@ -f $TESTDIR/xattr.pax
 verify_xattr $TESTDIR/pax.$$ passwd /etc/passwd
-log_must $RM $TESTDIR/pax.$$
+log_must rm $TESTDIR/pax.$$
 
 # we should have no xattr here
-log_must $PAX -r -f $TESTDIR/xattr.pax $TESTDIR
-log_mustnot eval "$RUNAT $TESTDIR/pax.$$ $CAT passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/pax.$$ $TESTDIR/noxattr.pax $TESTDIR/xattr.pax
+log_must pax -r -f $TESTDIR/xattr.pax $TESTDIR
+log_mustnot eval "runat $TESTDIR/pax.$$ cat passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/pax.$$ $TESTDIR/noxattr.pax $TESTDIR/xattr.pax
 
 
 log_note "Checking tar"
-log_must $TOUCH $TESTDIR/tar.$$
+log_must touch $TESTDIR/tar.$$
 create_xattr $TESTDIR/tar.$$ passwd /etc/passwd
 
 log_must cd $TESTDIR
 
-log_must $TAR cf noxattr.tar tar.$$
-log_must $TAR c@f xattr.tar tar.$$
-log_must $RM $TESTDIR/tar.$$
+log_must tar cf noxattr.tar tar.$$
+log_must tar c@f xattr.tar tar.$$
+log_must rm $TESTDIR/tar.$$
 
 # we should have no xattr here
-log_must $TAR xf xattr.tar
-log_mustnot eval "$RUNAT $TESTDIR/tar.$$ $CAT passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/tar.$$
+log_must tar xf xattr.tar
+log_mustnot eval "runat $TESTDIR/tar.$$ cat passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/tar.$$
 
 # we should have an xattr here
-log_must $TAR x@f xattr.tar
+log_must tar x@f xattr.tar
 verify_xattr tar.$$ passwd /etc/passwd
-log_must $RM $TESTDIR/tar.$$
+log_must rm $TESTDIR/tar.$$
 
 # we should have no xattr here
-log_must $TAR xf $TESTDIR/noxattr.tar
-log_mustnot eval "$RUNAT $TESTDIR/tar.$$ $CAT passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/tar.$$
+log_must tar xf $TESTDIR/noxattr.tar
+log_mustnot eval "runat $TESTDIR/tar.$$ cat passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/tar.$$
 
 # we should have no xattr here
-log_must $TAR x@f $TESTDIR/noxattr.tar
-log_mustnot eval "$RUNAT $TESTDIR/tar.$$ $CAT passwd > /dev/null 2>&1"
-log_must $RM $TESTDIR/tar.$$ $TESTDIR/noxattr.tar $TESTDIR/xattr.tar
+log_must tar x@f $TESTDIR/noxattr.tar
+log_mustnot eval "runat $TESTDIR/tar.$$ cat passwd > /dev/null 2>&1"
+log_must rm $TESTDIR/tar.$$ $TESTDIR/noxattr.tar $TESTDIR/xattr.tar
 
 
 log_assert "Basic applications work with xattrs: cpio cp find mv pax tar"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_012_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_012_pos.ksh
index 477e155a36..26d6bd7dd7 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_012_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_012_pos.ksh
@@ -24,11 +24,11 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,18 +46,18 @@
 #
 
 function cleanup {
-	log_must $RM $TESTDIR/myfile.$$
+	log_must rm $TESTDIR/myfile.$$
 }
 
 function get_pool_size {
 	poolname=$1
-	psize=$($ZPOOL list -H -o allocated $poolname)
+	psize=$(zpool list -H -o allocated $poolname)
 	if [[ $psize == *[mM] ]]
 	then
-		returnvalue=$($ECHO $psize | $SED -e 's/m//g' -e 's/M//g')
+		returnvalue=$(echo $psize | sed -e 's/m//g' -e 's/M//g')
 		returnvalue=$((returnvalue * 1024))
 	else
-		returnvalue=$($ECHO $psize | $SED -e 's/k//g' -e 's/K//g')
+		returnvalue=$(echo $psize | sed -e 's/k//g' -e 's/K//g')
 	fi
 	echo $returnvalue
 }
@@ -65,7 +65,7 @@ function get_pool_size {
 log_assert "xattr file sizes count towards normal disk usage"
 log_onexit cleanup
 
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 
 POOL_SIZE=0
 NEW_POOL_SIZE=0
@@ -77,12 +77,12 @@ then
 	POOL_SIZE=$(get_pool_size $TESTPOOL)
 fi
 
-FS_SIZE=$($ZFS get -p -H -o value used $TESTPOOL/$TESTFS)
+FS_SIZE=$(zfs get -p -H -o value used $TESTPOOL/$TESTFS)
 
-log_must $RUNAT $TESTDIR/myfile.$$ $MKFILE 200m xattr
+log_must runat $TESTDIR/myfile.$$ mkfile 200m xattr
 
 #Make sure the newly created file is counted into zpool usage
-log_must $SYNC
+log_must sync
 
 # now check to see if our pool disk usage has increased
 if is_global_zone
@@ -95,7 +95,7 @@ then
 fi
 
 # also make sure our filesystem usage has increased
-NEW_FS_SIZE=$($ZFS get -p -H -o value used $TESTPOOL/$TESTFS)
+NEW_FS_SIZE=$(zfs get -p -H -o value used $TESTPOOL/$TESTFS)
 (($NEW_FS_SIZE <= $FS_SIZE)) && \
     log_fail "The new filesystem size $NEW_FS_SIZE was less \
     than or equal to the old filesystem size $FS_SIZE."
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_013_pos.ksh b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_013_pos.ksh
index 4e9e12ecc9..50b8ffbfac 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_013_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_013_pos.ksh
@@ -24,7 +24,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,44 +45,44 @@
 
 function cleanup {
 
-	log_must $RM $TESTDIR/myfile.$$
+	log_must rm $TESTDIR/myfile.$$
 }
 
 
 log_assert "The noxattr mount option functions as expected"
 log_onexit cleanup
 
-$ZFS set 2>&1 | $GREP xattr > /dev/null
+zfs set 2>&1 | grep xattr > /dev/null
 if [ $? -ne 0 ]
 then
 	log_unsupported "noxattr mount option not supported on this release."
 fi
 
-log_must $TOUCH $TESTDIR/myfile.$$
+log_must touch $TESTDIR/myfile.$$
 create_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
-log_must $UMOUNT $TESTDIR
-log_must $ZFS mount -o noxattr $TESTPOOL/$TESTFS
+log_must umount $TESTDIR
+log_must zfs mount -o noxattr $TESTPOOL/$TESTFS
 
 # check that we can't perform xattr operations
-log_mustnot eval "$RUNAT $TESTDIR/myfile.$$ $CAT passwd > /dev/null 2>&1"
-log_mustnot eval "$RUNAT $TESTDIR/myfile.$$ $RM passwd > /dev/null 2>&1"
-log_mustnot eval "$RUNAT $TESTDIR/myfile.$$ $CP /etc/passwd . > /dev/null 2>&1"
+log_mustnot eval "runat $TESTDIR/myfile.$$ cat passwd > /dev/null 2>&1"
+log_mustnot eval "runat $TESTDIR/myfile.$$ rm passwd > /dev/null 2>&1"
+log_mustnot eval "runat $TESTDIR/myfile.$$ cp /etc/passwd . > /dev/null 2>&1"
 
-log_must $TOUCH $TESTDIR/new.$$
-log_mustnot eval "$RUNAT $TESTDIR/new.$$ $CP /etc/passwd . > /dev/null 2>&1"
-log_mustnot eval "$RUNAT $TESTDIR/new.$$ $RM passwd > /dev/null 2>&1"
+log_must touch $TESTDIR/new.$$
+log_mustnot eval "runat $TESTDIR/new.$$ cp /etc/passwd . > /dev/null 2>&1"
+log_mustnot eval "runat $TESTDIR/new.$$ rm passwd > /dev/null 2>&1"
 
 # now mount the filesystem again as normal
-log_must $UMOUNT $TESTDIR
-log_must $ZFS mount $TESTPOOL/$TESTFS
+log_must umount $TESTDIR
+log_must zfs mount $TESTPOOL/$TESTFS
 
 # we should still have an xattr on the first file
 verify_xattr $TESTDIR/myfile.$$ passwd /etc/passwd
 
 # there should be no xattr on the file we created while the fs was mounted
 # -o noxattr
-log_mustnot eval "$RUNAT $TESTDIR/new.$$ $CAT passwd > /dev/null 2>&1"
+log_mustnot eval "runat $TESTDIR/new.$$ cat passwd > /dev/null 2>&1"
 create_xattr $TESTDIR/new.$$ passwd /etc/passwd
 
 log_pass "The noxattr mount option functions as expected"
diff --git a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_common.kshlib b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_common.kshlib
index d6509a55a8..5671009340 100644
--- a/usr/src/test/zfs-tests/tests/functional/xattr/xattr_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/xattr/xattr_common.kshlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -39,9 +39,9 @@ function create_xattr { # filename xattr_name xattr_contents
 	typeset XATTR_CONTENTS=$3
 
 	# read any empty xattr on that file
-	log_must $RUNAT $FILE $LS
+	log_must runat $FILE ls
 	# create the xattr
-	log_must $RUNAT $FILE $CP $XATTR_CONTENTS $XATTR_NAME
+	log_must runat $FILE cp $XATTR_CONTENTS $XATTR_NAME
 
 	verify_xattr $FILE $XATTR_NAME $XATTR_CONTENTS
 }
@@ -53,11 +53,11 @@ function compare_xattrs { # filename1 filename2 xattr_name
 	typeset FILE2=$2
 	typeset XATTR_NAME=$3
 
-	$RUNAT $FILE1 $CAT $XATTR_NAME > /tmp/file1.$$
-	$RUNAT $FILE2 $CAT $XATTR_NAME > /tmp/file2.$$
+	runat $FILE1 cat $XATTR_NAME > /tmp/file1.$$
+	runat $FILE2 cat $XATTR_NAME > /tmp/file2.$$
 
-	log_must $DIFF /tmp/file1.$$ /tmp/file2.$$
-	log_must $RM /tmp/file1.$$ /tmp/file2.$$
+	log_must diff /tmp/file1.$$ /tmp/file2.$$
+	log_must rm /tmp/file1.$$ /tmp/file2.$$
 }
 
 function verify_xattr { # filename xattr_name xattr_contents
@@ -66,9 +66,9 @@ function verify_xattr { # filename xattr_name xattr_contents
 	typeset XATTR_CONTENTS=$3
 
 	# read the xattr, writing it to a temp file
-	log_must eval "$RUNAT $FILE $CAT $XATTR_NAME > /tmp/$XATTR_NAME.$$ 2>&1"
-	log_must $DIFF $XATTR_CONTENTS /tmp/$XATTR_NAME.$$
-	$RM /tmp/$XATTR_NAME.$$
+	log_must eval "runat $FILE cat $XATTR_NAME > /tmp/$XATTR_NAME.$$ 2>&1"
+	log_must diff $XATTR_CONTENTS /tmp/$XATTR_NAME.$$
+	rm /tmp/$XATTR_NAME.$$
 }
 
 function delete_xattr { # filename xattr_name
@@ -76,8 +76,8 @@ function delete_xattr { # filename xattr_name
         typeset XATTR_NAME=$2
 
         # delete the xattr
-        log_must $RUNAT $FILE $RM $XATTR_NAME
-        log_mustnot eval "$RUNAT $FILE $LS $XATTR_NAME > /dev/null 2>&1"
+        log_must runat $FILE rm $XATTR_NAME
+        log_mustnot eval "runat $FILE ls $XATTR_NAME > /dev/null 2>&1"
 }
 
 # not sure about this : really this should be testing write/append
@@ -85,11 +85,11 @@ function verify_write_xattr { # filename xattr_name
         typeset FILE=$1
         typeset XATTR_NAME=$2
 
-        log_must eval "$RUNAT $FILE $DD if=/etc/passwd of=$XATTR_NAME"
-        log_must eval "$RUNAT $FILE $CAT $XATTR_NAME > /tmp/$XATTR_NAME.$$ 2>&1"
-        log_must $DD if=/etc/passwd of=/tmp/passwd_dd.$$
-        log_must $DIFF /tmp/passwd_dd.$$ /tmp/$XATTR_NAME.$$
-        log_must $RM /tmp/passwd_dd.$$ /tmp/$XATTR_NAME.$$
+        log_must eval "runat $FILE dd if=/etc/passwd of=$XATTR_NAME"
+        log_must eval "runat $FILE cat $XATTR_NAME > /tmp/$XATTR_NAME.$$ 2>&1"
+        log_must dd if=/etc/passwd of=/tmp/passwd_dd.$$
+        log_must diff /tmp/passwd_dd.$$ /tmp/$XATTR_NAME.$$
+        log_must rm /tmp/passwd_dd.$$ /tmp/$XATTR_NAME.$$
 }
 
 # this function is to create the expected output
@@ -97,11 +97,11 @@ function create_expected_output  { # expected_output_file  contents_of_the_outpu
    typeset FILE=$1
    shift
    if [[ -f $FILE ]]; then
-      log_must $RM $FILE
+      log_must rm $FILE
    fi
 
    for line in $@
    do
-      log_must eval "$ECHO $line >> $FILE"
+      log_must eval "echo $line >> $FILE"
    done
  }
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/cleanup.ksh
index ee2c4510d7..58b162a6a2 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -35,9 +35,9 @@
 verify_runnable "global"
 
 ismounted $TESTDIR ufs
-(( $? == 0 )) && log_must $UMOUNT -f $TESTDIR
+(( $? == 0 )) && log_must umount -f $TESTDIR
 
-[[ -e $TESTDIR ]] && $RM -rf $TESTDIR
+[[ -e $TESTDIR ]] && rm -rf $TESTDIR
 
 default_zvol_cleanup
 
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh
index 4a5045487d..2fc112ad1b 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -36,10 +36,10 @@ verify_runnable "global"
 
 default_zvol_setup $DISK $VOLSIZE
 
-$ECHO "y" | $NEWFS -v /dev/zvol/rdsk/$TESTPOOL/$TESTVOL >/dev/null 2>&1
+echo "y" | newfs -v /dev/zvol/rdsk/$TESTPOOL/$TESTVOL >/dev/null 2>&1
 (( $? != 0 )) && log_fail "Unable to newfs(1M) $TESTPOOL/$TESTVOL"
 
-log_must $MKDIR $TESTDIR
-log_must $MOUNT /dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR
+log_must mkdir $TESTDIR
+log_must mount /dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR
 
 log_pass
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh
index d0b645bd73..9f63de0515 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -49,7 +49,7 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf $TESTDIR/*
+	rm -rf $TESTDIR/*
 }
 
 log_assert "A zvol volume will return ENOSPC when the underlying pool " \
@@ -64,7 +64,7 @@ BLOCKSZ=$(( 1024 * 1024 ))
 NUM_WRITES=40
 
 while (( 1 )); do
-        $FILE_WRITE -o create -f $TESTDIR/testfile$$.$fn \
+        file_write -o create -f $TESTDIR/testfile$$.$fn \
             -b $BLOCKSZ -c $NUM_WRITES
         retval=$?
         if (( $retval != 0 )); then
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_001_pos.ksh
index 21c98090d3..c1fea38332 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -56,7 +56,7 @@ log_assert "Executing well-formed 'zfs list' commands should return success"
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_must eval "$ZFS ${args[i]} > /dev/null"
+	log_must eval "zfs ${args[i]} > /dev/null"
 	((i = i + 1))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_002_pos.ksh
index b928f72ee4..01ec2855c9 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -45,7 +45,7 @@ verify_runnable "global"
 function cleanup
 {
 	datasetexists $TESTPOOL/$LONGVOLNAME && \
-		$ZFS destroy $TESTPOOL/$LONGVOLNAME
+		zfs destroy $TESTPOOL/$LONGVOLNAME
 }
 
 log_onexit cleanup
@@ -54,7 +54,7 @@ log_assert "Creating a volume a 50 letter name should work."
 
 LONGVOLNAME="volumename50charslong_0123456789012345678901234567"
 
-log_must $ZFS create -V $VOLSIZE $TESTPOOL/$LONGVOLNAME
+log_must zfs create -V $VOLSIZE $TESTPOOL/$LONGVOLNAME
 
 datasetexists $TESTPOOL/$LONGVOLNAME || \
 	log_fail "Couldn't find long volume name"
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_003_neg.ksh
index d1ba6bf417..2708693b9c 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_cli/zvol_cli_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -52,7 +52,7 @@ log_assert "Try each ZFS volume sub-command without parameters to make sure" \
 
 typeset -i i=0
 while (( $i < ${#args[*]} )); do
-	log_mustnot $ZFS ${args[i]}
+	log_mustnot zfs ${args[i]}
 	(( i = i + 1 ))
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_common.shlib b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_common.shlib
index 6756190533..67b7c432cb 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_common.shlib
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_common.shlib
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,7 +46,7 @@ function default_zvol_setup # disk_device volume_size
 
         create_pool $TESTPOOL "$disk"
 
-        log_must $ZFS create -V $size $TESTPOOL/$TESTVOL
+        log_must zfs create -V $size $TESTPOOL/$TESTVOL
 }
 
 #
@@ -56,7 +56,7 @@ function default_zvol_setup # disk_device volume_size
 function default_zvol_cleanup
 {
         if datasetexists $TESTPOOL/$TESTVOL ; then
-		log_must $ZFS destroy $TESTPOOL/$TESTVOL
+		log_must zfs destroy $TESTPOOL/$TESTVOL
 	fi
 
         destroy_pool $TESTPOOL
@@ -64,7 +64,7 @@ function default_zvol_cleanup
 
 function get_dumpdevice
 {
-	typeset ret=$($DUMPADM | $GREP "Dump device:" | $AWK '{print $3}')
+	typeset ret=$(dumpadm | grep "Dump device:" | awk '{print $3}')
 	echo $ret
 }
 
@@ -77,15 +77,15 @@ function set_dumpsize
 		return 1
 	fi
 
-	log_must $ZFS set volsize=64m $volume
+	log_must zfs set volsize=64m $volume
 
-	output=$($DUMPADM -d /dev/zvol/dsk/$volume 2>&1 | \
-			$TAIL -1 | $AWK '{print $3}')
+	output=$(dumpadm -d /dev/zvol/dsk/$volume 2>&1 | \
+			tail -1 | awk '{print $3}')
 
 	if [[ -n $output ]]; then
 		(( output = output / 1024 / 1024 ))
 		(( output = output + output / 5 ))
-		log_must $ZFS set volsize=${output}m $volume
+		log_must zfs set volsize=${output}m $volume
 	fi
 	return 0
 }
@@ -101,13 +101,13 @@ function safe_dumpadm
 	if [[ $device == "/dev/zvol/dsk/"* ]] ; then
 		typeset volume=${device#/dev/zvol/dsk/}
 		set_dumpsize $volume
-		log_must $DUMPADM -d $device
+		log_must dumpadm -d $device
 	else
-		log_must $SWAPADD
+		log_must swapadd
 		if ! is_swap_inuse $device ; then
-			log_must $SWAP -a $device
+			log_must swap -a $device
 		fi
-		log_must $DUMPADM -d swap
+		log_must dumpadm -d swap
 	fi
 }
 
@@ -120,7 +120,7 @@ function is_zvol_dumpified
 		return 1
 	fi
 
-	$ZDB -dddd $volume 2 | $GREP "dumpsize" > /dev/null 2>&1
+	zdb -dddd $volume 2 | grep "dumpsize" > /dev/null 2>&1
 	return $?
 }
 
@@ -133,6 +133,6 @@ function is_swap_inuse
 		return 1
 	fi
 
-	$SWAP -l | $GREP -w $device > /dev/null 2>&1
+	swap -l | grep -w $device > /dev/null 2>&1
 	return $?
 }
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh
index 2702285d84..1a37b7b152 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_001_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -45,7 +45,7 @@
 
 verify_runnable "global"
 
-volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL)
+volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL)
 
 function cleanup
 {
@@ -54,7 +54,7 @@ function cleanup
 	if [[ $dumpdev != $savedumpdev ]] ; then
 		safe_dumpadm $savedumpdev
 	fi
-	$ZFS set volsize=$volsize $TESTPOOL/$TESTVOL
+	zfs set volsize=$volsize $TESTPOOL/$TESTVOL
 }
 
 log_assert "Verify that a ZFS volume can act as dump device."
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh
index e08e840706..ed34b2f275 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -44,18 +44,18 @@
 
 verify_runnable "global"
 
-volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL)
+volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL)
 
 function cleanup
 {
 	snapexists $TESTPOOL/$TESTVOL@snap && \
-		$ZFS destroy $TESTPOOL/$TESTVOL@snap
+		zfs destroy $TESTPOOL/$TESTVOL@snap
 
 	ismounted $TESTDIR ufs
-	(( $? == 0 )) && log_must $UMOUNT $TESTDIR
+	(( $? == 0 )) && log_must umount $TESTDIR
 
-	[[ -e $TESTDIR ]] && $RM -rf $TESTDIR
-	$ZFS set volsize=$volsize $TESTPOOL/$TESTVOL
+	[[ -e $TESTDIR ]] && rm -rf $TESTDIR
+	zfs set volsize=$volsize $TESTPOOL/$TESTVOL
 }
 
 log_assert "Verify that ZFS volume snapshot could be fscked"
@@ -65,19 +65,19 @@ TESTVOL='testvol'
 BLOCKSZ=$(( 1024 * 1024 ))
 NUM_WRITES=40
 
-log_must $ZFS set volsize=128m $TESTPOOL/$TESTVOL
+log_must zfs set volsize=128m $TESTPOOL/$TESTVOL
 
-$ECHO "y" | $NEWFS -v /dev/zvol/rdsk/$TESTPOOL/$TESTVOL >/dev/null 2>&1
+echo "y" | newfs -v /dev/zvol/rdsk/$TESTPOOL/$TESTVOL >/dev/null 2>&1
 (( $? != 0 )) && log_fail "Unable to newfs(1M) $TESTPOOL/$TESTVOL"
 
-log_must $MKDIR $TESTDIR
-log_must $MOUNT /dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR
+log_must mkdir $TESTDIR
+log_must mount /dev/zvol/dsk/$TESTPOOL/$TESTVOL $TESTDIR
 
 typeset -i fn=0
 typeset -i retval=0
 
 while (( 1 )); do
-        $FILE_WRITE -o create -f $TESTDIR/testfile$$.$fn \
+        file_write -o create -f $TESTDIR/testfile$$.$fn \
             -b $BLOCKSZ -c $NUM_WRITES
         retval=$?
         if (( $retval != 0 )); then
@@ -87,8 +87,8 @@ while (( 1 )); do
         (( fn = fn + 1 ))
 done
 
-log_must $LOCKFS -f $TESTDIR
-log_must $ZFS snapshot $TESTPOOL/$TESTVOL@snap
+log_must lockfs -f $TESTDIR
+log_must zfs snapshot $TESTPOOL/$TESTVOL@snap
 
 $FSCK -n /dev/zvol/rdsk/$TESTPOOL/$TESTVOL@snap >/dev/null 2>&1
 retval=$?
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh
index f98153dfda..8871496497 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_003_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -46,7 +46,7 @@
 
 verify_runnable "global"
 
-volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL)
+volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL)
 
 function cleanup
 {
@@ -58,7 +58,7 @@ function cleanup
 	if poolexists $TESTPOOL1 ; then
 		destroy_pool $TESTPOOL1
 	fi
-	$ZFS set volsize=$volsize $TESTPOOL/$TESTVOL
+	zfs set volsize=$volsize $TESTPOOL/$TESTVOL
 }
 
 log_assert "Verify zpool creation and newfs on dump zvol is denied."
@@ -70,11 +70,11 @@ savedumpdev=$(get_dumpdevice)
 safe_dumpadm $voldev
 
 unset NOINUSE_CHECK
-$ECHO "y" | $NEWFS -v $voldev > /dev/null 2>&1
+echo "y" | newfs -v $voldev > /dev/null 2>&1
 if (( $? == 0 )) ; then
 	log_fail "newfs on dump zvol succeeded unexpectedly"
 fi
 
-log_mustnot $ZPOOL create $TESTPOOL1 $voldev
+log_mustnot zpool create $TESTPOOL1 $voldev
 
 log_pass "Verify zpool creation and newfs on dump zvol is denied."
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh
index 0291c642de..683ad84ead 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -45,7 +45,7 @@
 
 verify_runnable "global"
 
-volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL)
+volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL)
 
 function cleanup
 {
@@ -54,35 +54,35 @@ function cleanup
 		safe_dumpadm $savedumpdev
 	fi
 
-	$SWAP -l | $GREP -w $voldev > /dev/null 2>&1
+	swap -l | grep -w $voldev > /dev/null 2>&1
         if (( $? == 0 ));  then
-		log_must $SWAP -d $voldev
+		log_must swap -d $voldev
 	fi
 
 	typeset snap
 	for snap in snap0 snap1 ; do
 		if datasetexists $TESTPOOL/$TESTVOL@$snap ; then
-			log_must $ZFS destroy $TESTPOOL/$TESTVOL@$snap
+			log_must zfs destroy $TESTPOOL/$TESTVOL@$snap
 		fi
 	done
-	$ZFS set volsize=$volsize $TESTPOOL/$TESTVOL
+	zfs set volsize=$volsize $TESTPOOL/$TESTVOL
 }
 
 function verify_snapshot
 {
 	typeset volume=$1
 
-	log_must $ZFS snapshot $volume@snap0
-	log_must $ZFS snapshot $volume@snap1
+	log_must zfs snapshot $volume@snap0
+	log_must zfs snapshot $volume@snap1
 	log_must datasetexists $volume@snap0 $volume@snap1
 
-	log_must $ZFS destroy $volume@snap1
-	log_must $ZFS snapshot $volume@snap1
+	log_must zfs destroy $volume@snap1
+	log_must zfs snapshot $volume@snap1
 
-	log_mustnot $ZFS rollback -r $volume@snap0
+	log_mustnot zfs rollback -r $volume@snap0
 	log_must datasetexists $volume@snap0
 
-	log_must $ZFS destroy -r $volume@snap0
+	log_must zfs destroy -r $volume@snap0
 }
 
 log_assert "Verify the ability to take snapshots of zvols used as dump or swap."
@@ -102,12 +102,12 @@ log_mustnot is_zvol_dumpified $TESTPOOL/$TESTVOL
 
 # create snapshot over swap zvol
 
-log_must $SWAP -a $voldev
+log_must swap -a $voldev
 log_mustnot is_zvol_dumpified $TESTPOOL/$TESTVOL
 
 verify_snapshot $TESTPOOL/$TESTVOL
 
-log_must $SWAP -d $voldev
+log_must swap -d $voldev
 log_mustnot is_zvol_dumpified $TESTPOOL/$TESTVOL
 
 log_pass "Creating snapshots from dump/swap zvols succeeds."
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh
index f7ea601f10..5dff5b8c04 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_005_neg.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -45,20 +45,20 @@
 
 verify_runnable "global"
 
-volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL)
+volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL)
 
 function cleanup
 {
-	$SWAP -l | $GREP $voldev > /dev/null 2>&1
+	swap -l | grep $voldev > /dev/null 2>&1
 	if (( $? == 0 )) ; then
-		log_must $SWAP -d $voldev
+		log_must swap -d $voldev
 	fi
 
 	typeset dumpdev=$(get_dumpdevice)
 	if [[ $dumpdev != $savedumpdev ]] ; then
 		safe_dumpadm $savedumpdev
 	fi
-	$ZFS set volsize=$volsize $TESTPOOL/$TESTVOL
+	zfs set volsize=$volsize $TESTPOOL/$TESTVOL
 }
 
 log_assert "Verify a device cannot be dump and swap at the same time."
@@ -68,12 +68,12 @@ voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL
 savedumpdev=$(get_dumpdevice)
 
 # If device in swap list, it cannot be dump device
-log_must $SWAP -a $voldev
-log_mustnot $DUMPADM -d $voldev
-log_must $SWAP -d $voldev
+log_must swap -a $voldev
+log_mustnot dumpadm -d $voldev
+log_must swap -d $voldev
 
 # If device has dedicated as dump device, it cannot add into swap list
 safe_dumpadm $voldev
-log_mustnot $SWAP -a $voldev
+log_mustnot swap -a $voldev
 
 log_pass "A device cannot be dump and swap at the same time."
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh
index a7aab5815f..d3596c7d8f 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 # Copyright 2016 Nexenta Systems, Inc.
 #
 
@@ -45,7 +45,7 @@
 
 verify_runnable "global"
 
-volsize=$($ZFS get -H -o value volsize $TESTPOOL/$TESTVOL)
+volsize=$(zfs get -H -o value volsize $TESTPOOL/$TESTVOL)
 
 function cleanup
 {
@@ -53,7 +53,7 @@ function cleanup
 	if [[ $dumpdev != $savedumpdev ]] ; then
 		safe_dumpadm $savedumpdev
 	fi
-	$ZFS set volsize=$volsize $TESTPOOL/$TESTVOL
+	zfs set volsize=$volsize $TESTPOOL/$TESTVOL
 }
 
 log_assert "zfs volume as dumpdevice should have 128k volblocksize"
@@ -62,12 +62,12 @@ log_onexit cleanup
 voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL
 savedumpdev=$(get_dumpdevice)
 
-typeset oblksize=$($ZFS get -H -o value volblocksize $TESTPOOL/$TESTVOL)
+typeset oblksize=$(zfs get -H -o value volblocksize $TESTPOOL/$TESTVOL)
 log_note "original $TESTPOOL/$TESTVOL volblocksize=$oblksize"
 
 safe_dumpadm $voldev
 
-typeset blksize=$($ZFS get -H -o value volblocksize $TESTPOOL/$TESTVOL)
+typeset blksize=$(zfs get -H -o value volblocksize $TESTPOOL/$TESTVOL)
 
 if [[ $blksize != "128K" ]]; then
 	log_fail "ZFS volume $TESTPOOL/$TESTVOL volblocksize=$blksize"
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/cleanup.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/cleanup.ksh
index 54ac2b7873..a705857498 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/cleanup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/cleanup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -35,17 +35,17 @@
 
 verify_runnable "global"
 
-log_must $SWAPADD
+log_must swapadd
 for swapdev in $SAVESWAPDEVS
 do
 	if ! is_swap_inuse $swapdev ; then
-		log_must $SWAP -a $swapdev >/dev/null 2>&1
+		log_must swap -a $swapdev >/dev/null 2>&1
 	fi
 done
 
 voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL
 if is_swap_inuse $voldev ; then
-	log_must $SWAP -d $voldev
+	log_must swap -d $voldev
 fi
 
 default_zvol_cleanup
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/setup.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/setup.ksh
index 71126f5cb4..828fb8c408 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/setup.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/setup.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -36,11 +36,11 @@
 verify_runnable "global"
 
 # Restart fmd to lower the chances of swap -d failing with ENOMEM.
-log_must $SVCADM restart svc:/system/fmd:default
+log_must svcadm restart svc:/system/fmd:default
 
 for i in $SAVESWAPDEVS ; do
 	log_note "Executing: swap -d $i"
-	$SWAP -d $i >/dev/null 2>&1
+	swap -d $i >/dev/null 2>&1
 	if [[ $? != 0 ]]; then
 		log_untested "Unable to delete swap device $i because of" \
 				"insufficient RAM"
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap.cfg b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap.cfg
index abc31a9e82..12d12723ac 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap.cfg
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap.cfg
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/zvol/zvol.cfg
@@ -33,7 +33,7 @@
 #
 # Remember swap devices
 #
-SAVESWAPDEVS=$($SWAP -l | $NAWK '(NR != 1) {print $1}')
+SAVESWAPDEVS=$(swap -l | nawk '(NR != 1) {print $1}')
 
 export BLOCKSZ=$(( 1024 * 1024 ))
 export NUM_WRITES=40
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_001_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_001_pos.ksh
index 7fc484f798..78abc5824f 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_001_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_001_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,10 +48,10 @@ verify_runnable "global"
 
 function cleanup
 {
-	$RM -rf /tmp/$TESTFILE
+	rm -rf /tmp/$TESTFILE
 
 	if is_swap_inuse $voldev ; then
-		log_must $SWAP -d $voldev
+		log_must swap -d $voldev
 	fi
 }
 
@@ -61,16 +61,16 @@ log_onexit cleanup
 
 voldev=/dev/zvol/dsk/$TESTPOOL/$TESTVOL
 log_note "Add zvol volume as swap space"
-log_must $SWAP -a $voldev
+log_must swap -a $voldev
 
 log_note "Create a file under /tmp"
-log_must $FILE_WRITE -o create -f /tmp/$TESTFILE \
+log_must file_write -o create -f /tmp/$TESTFILE \
     -b $BLOCKSZ -c $NUM_WRITES -d $DATA
 
 [[ ! -f /tmp/$TESTFILE ]] &&
     log_fail "Unable to create file under /tmp"
 
-filesize=`$LS -l /tmp/$TESTFILE | $AWK '{print $5}'`
+filesize=`ls -l /tmp/$TESTFILE | awk '{print $5}'`
 tf_size=$(( BLOCKSZ * NUM_WRITES ))
 (( $tf_size != $filesize )) &&
     log_fail "testfile is ($filesize bytes), expected ($tf_size bytes)"
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh
index be9b05f067..a4c82f59d1 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,7 +48,7 @@ log_assert "Using a zvol as swap space, fill /tmp to 80%."
 
 vol=$TESTPOOL/$TESTVOL
 swapdev=/dev/zvol/dsk/$vol
-log_must $SWAP -a $swapdev
+log_must swap -a $swapdev
 
 # Get 80% of the number of 512 blocks in the zvol
 typeset -i count blks volsize=$(get_prop volsize $vol)
@@ -57,8 +57,8 @@ typeset -i count blks volsize=$(get_prop volsize $vol)
 ((count = blks / 2048))
 
 log_note "Fill 80% of swap"
-log_must $DD if=/dev/urandom of=/tmp/$TESTFILE bs=1048576 count=$count
-log_must $RM -f /tmp/$TESTFILE
-log_must $SWAP -d $swapdev
+log_must dd if=/dev/urandom of=/tmp/$TESTFILE bs=1048576 count=$count
+log_must rm -f /tmp/$TESTFILE
+log_must swap -d $swapdev
 
 log_pass "Using a zvol as swap space, fill /tmp to 80%."
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh
index 4a07d1a0c3..e6fb727d92 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -48,16 +48,16 @@ verify_runnable "global"
 
 function cleanup
 {
-	[[ -f /tmp/$TESTFILE ]] && log_must $RM -f /tmp/$TESTFILE
-	[[ -f $NEW_VFSTAB_FILE ]] && log_must $RM -f $NEW_VFSTAB_FILE
+	[[ -f /tmp/$TESTFILE ]] && log_must rm -f /tmp/$TESTFILE
+	[[ -f $NEW_VFSTAB_FILE ]] && log_must rm -f $NEW_VFSTAB_FILE
 	[[ -f $PREV_VFSTAB_FILE ]] && \
-	    log_must $MV $PREV_VFSTAB_FILE $VFSTAB_FILE
-	[[ -f $PREV_VFSTAB_FILE ]] && $RM -f $PREV_VFSTAB_FILE
+	    log_must mv $PREV_VFSTAB_FILE $VFSTAB_FILE
+	[[ -f $PREV_VFSTAB_FILE ]] && rm -f $PREV_VFSTAB_FILE
 
-	log_must $SWAPADD $VFSTAB_FILE
+	log_must swapadd $VFSTAB_FILE
 
         if is_swap_inuse $voldev ; then
-		log_must $SWAP -d $voldev
+		log_must swap -d $voldev
 	fi
 
 }
@@ -72,23 +72,23 @@ VFSTAB_FILE=/etc/vfstab
 NEW_VFSTAB_FILE=/var/tmp/zvol_vfstab.$$
 PREV_VFSTAB_FILE=/var/tmp/zvol_vfstab.PREV.$$
 
-[[ -f $NEW_VFSTAB_FILE ]] && $CP /dev/null $NEW_VFSTAB_FILE
+[[ -f $NEW_VFSTAB_FILE ]] && cp /dev/null $NEW_VFSTAB_FILE
 
-$AWK '{if ($4 != "swap") print $1}' /etc/vfstab > $NEW_VFSTAB_FILE
-$ECHO "$voldev\t-\t-\tswap\t-\tno\t-"  >> $NEW_VFSTAB_FILE
+awk '{if ($4 != "swap") print $1}' /etc/vfstab > $NEW_VFSTAB_FILE
+echo "$voldev\t-\t-\tswap\t-\tno\t-"  >> $NEW_VFSTAB_FILE
 
 # Copy off the original vfstab, and run swapadd on the newly constructed one.
-log_must $CP $VFSTAB_FILE $PREV_VFSTAB_FILE
-log_must $CP $NEW_VFSTAB_FILE $VFSTAB_FILE
-log_must $SWAPADD $VFSTAB_FILE
+log_must cp $VFSTAB_FILE $PREV_VFSTAB_FILE
+log_must cp $NEW_VFSTAB_FILE $VFSTAB_FILE
+log_must swapadd $VFSTAB_FILE
 
-log_must $FILE_WRITE -o create -f /tmp/$TESTFILE \
+log_must file_write -o create -f /tmp/$TESTFILE \
     -b $BLOCKSZ -c $NUM_WRITES -d $DATA
 
 [[ ! -f /tmp/$TESTFILE ]] &&
     log_fail "Unable to create file under /tmp"
 
-filesize=`$LS -l /tmp/$TESTFILE | $AWK '{print $5}'`
+filesize=`ls -l /tmp/$TESTFILE | awk '{print $5}'`
 tf_size=$((BLOCKSZ * NUM_WRITES))
 (($tf_size != $filesize)) && \
     log_fail "testfile is ($filesize bytes), expected ($tf_size bytes)"
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_004_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_004_pos.ksh
index 500a6576b6..d00adf31c3 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_004_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_004_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -46,8 +46,8 @@ verify_runnable "global"
 
 function cleanup
 {
-	is_swap_inuse $swapname && log_must $SWAP -d $swapname
-	datasetexists $vol && log_must $ZFS destroy $vol
+	is_swap_inuse $swapname && log_must swap -d $swapname
+	datasetexists $vol && log_must zfs destroy $vol
 }
 
 log_assert "For an added swap zvol, (2G <= volsize <= 16G)"
@@ -61,14 +61,14 @@ for vbs in 8192 16384 32768 65536 131072; do
 		swapname="/dev/zvol/dsk/$vol"
 
 		# Create a sparse volume to test larger sizes
-		log_must $ZFS create -s -b $vbs -V $volsize $vol
-		log_must $SWAP -a $swapname
+		log_must zfs create -s -b $vbs -V $volsize $vol
+		log_must swap -a $swapname
 
 		new_volsize=$(get_prop volsize $vol)
 		[[ $volsize -eq $new_volsize ]] || log_fail "$volsize $new_volsize"
 
-		log_must $SWAP -d $swapname
-		log_must $ZFS destroy $vol
+		log_must swap -d $swapname
+		log_must zfs destroy $vol
 	done
 done
 
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh
index 51a72f19b3..8d5b848af8 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -54,16 +54,16 @@ typeset -i pageblocks volblocks max_swaplow
 # Both swaplow and swaplen are the desired length of
 # the swap area in 512-byte blocks.
 #
-((pageblocks = $($PAGESIZE) / 512))
+((pageblocks = $(pagesize) / 512))
 ((volblocks = $(get_prop volsize $vol) / 512))
 ((max_swaplow = (volblocks - (pageblocks * 2))))
 
 for i in {0..10}; do
-	swaplow=$($SHUF -n 1 -i ${pageblocks}-${max_swaplow})
+	swaplow=$(shuf -n 1 -i ${pageblocks}-${max_swaplow})
 	((maxlen = max_swaplow - swaplow))
-	swaplen=$($SHUF -n 1 -i ${pageblocks}-${maxlen})
-	log_must $SWAP -a $swapname $swaplow $swaplen
-	log_must $SWAP -d $swapname $swaplow
+	swaplen=$(shuf -n 1 -i ${pageblocks}-${maxlen})
+	log_must swap -a $swapname $swaplow $swaplen
+	log_must swap -d $swapname $swaplow
 done
 
 log_pass $assertion
diff --git a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh
index d9d271f089..774a17ae08 100644
--- a/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh
+++ b/usr/src/test/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -50,7 +50,7 @@ function cleanup
 	typeset -i i=0
 
 	while ((count > 0)); do
-		log_must $SWAP -d $swapname ${swap_opt[$i]}
+		log_must swap -d $swapname ${swap_opt[$i]}
 
 		((i += 2))
 		((count -= 1))
@@ -67,7 +67,7 @@ typeset -x NOINUSE_CHECK=1
 
 typeset vol=$TESTPOOL/$TESTVOL
 typeset -i pageblocks volblocks
-((pageblocks = $($PAGESIZE) / 512))
+((pageblocks = $(pagesize) / 512))
 ((volblocks = $(get_prop volsize $vol) / 512))
 
 log_note "Verify volume can be add as several segments."
@@ -87,11 +87,11 @@ swapname=/dev/zvol/dsk/$vol
 typeset -i i=0 count=0
 
 if is_swap_inuse $swapname ; then
-	log_must $SWAP -d $swapname
+	log_must swap -d $swapname
 fi
 
 while ((i < ${#swap_opt[@]})); do
-	log_must $SWAP -a $swapname ${swap_opt[$i]} ${swap_opt[((i+1))]}
+	log_must swap -a $swapname ${swap_opt[$i]} ${swap_opt[((i+1))]}
 
 	((i += 2))
 	((count += 1))
@@ -100,7 +100,7 @@ done
 log_note "Verify overlapping swap volume are not allowed"
 i=0
 while ((i < ${#swap_opt[@]})); do
-	log_mustnot $SWAP -a $swapname ${swap_opt[$i]}
+	log_mustnot swap -a $swapname ${swap_opt[$i]}
 
 	((i += 2))
 done
diff --git a/usr/src/test/zfs-tests/tests/perf/perf.shlib b/usr/src/test/zfs-tests/tests/perf/perf.shlib
index 2b4d043349..e5323d39e6 100644
--- a/usr/src/test/zfs-tests/tests/perf/perf.shlib
+++ b/usr/src/test/zfs-tests/tests/perf/perf.shlib
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -65,14 +65,14 @@ function do_fio_run
 
 				if $do_recreate; then
 					recreate_perfpool
-					log_must $ZFS create $PERF_FS_OPTS \
+					log_must zfs create $PERF_FS_OPTS \
 					    $TESTFS
 				fi
 
 				if $clear_cache; then
 					# Clear the ARC
-					$ZPOOL export $PERFPOOL
-					$ZPOOL import $PERFPOOL
+					zpool export $PERFPOOL
+					zpool import $PERFPOOL
 				fi
 
 				export RUNTIME=$PERF_RUNTIME
@@ -80,13 +80,13 @@ function do_fio_run
 				export NUMJOBS=$threads
 				export SYNC_TYPE=$sync
 				export BLOCKSIZE=$iosize
-				$SYNC
+				sync
 
 				# Start the data collection
 				do_collect_scripts $threads $sync $iosize
 
 				# Start the load
-				log_must $FIO $FIO_SCRIPTS/$script
+				log_must fio $FIO_SCRIPTS/$script
 			done
 		done
 	done
@@ -114,17 +114,17 @@ function do_collect_scripts
 	typeset oIFS=$IFS
 	IFS=','
 	for item in $PERF_COLLECT_SCRIPTS; do
-		collect_scripts+=($($ECHO $item | $SED 's/^ *//g'))
+		collect_scripts+=($(echo $item | sed 's/^ *//g'))
 	done
 	IFS=$oIFS
 
 	typeset idx=0
 	while [[ $idx -lt "${#collect_scripts[@]}" ]]; do
-		typeset logbase="$(get_perf_output_dir)/$($BASENAME \
+		typeset logbase="$(get_perf_output_dir)/$(basename \
 		    $SUDO_COMMAND)"
 		typeset outfile="$logbase.${collect_scripts[$idx + 1]}.$suffix"
 
-		$TIMEOUT $PERF_RUNTIME ${collect_scripts[$idx]} >$outfile 2>&1 &
+		timeout $PERF_RUNTIME ${collect_scripts[$idx]} >$outfile 2>&1 &
 		((idx += 2))
 	done
 
@@ -137,9 +137,9 @@ function do_collect_scripts
 function get_perf_output_dir
 {
 	typeset dir="$(pwd)/perf_data"
-	[[ -d $dir ]] || $MKDIR -p $dir
+	[[ -d $dir ]] || mkdir -p $dir
 
-	$ECHO $dir
+	echo $dir
 }
 
 #
@@ -157,7 +157,7 @@ function recreate_perfpool
 	if [[ -n $PERFPOOL_CREATE_CMD ]]; then
 		log_must $PERFPOOL_CREATE_CMD
 	else
-		log_must eval "$ZPOOL create -f $PERFPOOL $DISKS"
+		log_must eval "zpool create -f $PERFPOOL $DISKS"
 	fi
 }
 
@@ -179,23 +179,23 @@ function get_system_config
 	typeset config=$PERF_DATA_DIR/$1
 
 	echo "{" >>$config
-	$DTRACE -qn 'BEGIN{
+	dtrace -qn 'BEGIN{
 	    printf("  \"ncpus\": %d,\n", `ncpus);
 	    printf("  \"physmem\": %u,\n", `physmem * `_pagesize);
 	    printf("  \"c_max\": %u,\n", `arc_stats.arcstat_c_max.value.ui64);
 	    printf("  \"kmem_flags\": \"0x%x\",", `kmem_flags);
 	    exit(0)}' >>$config
-	$ECHO "  \"hostname\": \"$($UNAME -n)\"," >>$config
-	$ECHO "  \"kernel version\": \"$($UNAME -v)\"," >>$config
-	$IOSTAT -En | $AWK 'BEGIN {
+	echo "  \"hostname\": \"$(uname -n)\"," >>$config
+	echo "  \"kernel version\": \"$(uname -v)\"," >>$config
+	iostat -En | awk 'BEGIN {
 	    printf("  \"disks\": {\n"); first = 1}
 	    /^c/ {disk = $1}
 	    /^Size: [^0]/ {size = $2;
 	    if (first != 1) {printf(",\n")} else {first = 0}
 	    printf("    \"%s\": \"%s\"", disk, size)}
 	    END {printf("\n  },\n")}' >>$config
-	$SED -n 's/^set \(.*\)[ ]=[ ]\(.*\)/\1=\2/p' /etc/system | \
-	    $AWK -F= 'BEGIN {printf("  \"system\": {\n"); first = 1}
+	sed -n 's/^set \(.*\)[ ]=[ ]\(.*\)/\1=\2/p' /etc/system | \
+	    awk -F= 'BEGIN {printf("  \"system\": {\n"); first = 1}
 	    {if (first != 1) {printf(",\n")} else {first = 0};
 	    printf("    \"%s\": %s", $1, $2)}
 	    END {printf("\n  }\n")}' >>$config
@@ -204,12 +204,12 @@ function get_system_config
 
 function num_jobs_by_cpu
 {
-	typeset ncpu=$($PSRINFO | $WC -l)
+	typeset ncpu=$(psrinfo | wc -l)
 	typeset num_jobs=$ncpu
 
-	[[ $ncpu -gt 8 ]] && num_jobs=$($ECHO "$ncpu * 3 / 4" | $BC)
+	[[ $ncpu -gt 8 ]] && num_jobs=$(echo "$ncpu * 3 / 4" | bc)
 
-	$ECHO $num_jobs
+	echo $num_jobs
 }
 
 function pool_to_lun_list
@@ -218,16 +218,16 @@ function pool_to_lun_list
 	typeset ctd ctds devname lun
 	typeset lun_list=':'
 
-	ctds=$($ZPOOL list -v $pool | $AWK '/c[0-9]*t[0-9a-fA-F]*d[0-9]*/ \
+	ctds=$(zpool list -v $pool | awk '/c[0-9]*t[0-9a-fA-F]*d[0-9]*/ \
 	    {print $1}')
 
 	for ctd in $ctds; do
 		# Get the device name as it appears in /etc/path_to_inst
-		devname=$($READLINK -f /dev/dsk/${ctd}s0 | $SED -n \
+		devname=$(readlink -f /dev/dsk/${ctd}s0 | sed -n \
 		    's/\/devices\([^:]*\):.*/\1/p')
 		# Add a string composed of the driver name and instance
 		# number to the list for comparison with dev_statname.
-		lun=$($SED 's/"//g' /etc/path_to_inst | $GREP $devname | $AWK \
+		lun=$(sed 's/"//g' /etc/path_to_inst | grep $devname | awk \
 		    '{print $3$2}')
 		lun_list="$lun_list$lun:"
 	done
diff --git a/usr/src/test/zfs-tests/tests/perf/regression/random_reads.ksh b/usr/src/test/zfs-tests/tests/perf/regression/random_reads.ksh
index 2395b89183..abf05ca719 100644
--- a/usr/src/test/zfs-tests/tests/perf/regression/random_reads.ksh
+++ b/usr/src/test/zfs-tests/tests/perf/regression/random_reads.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -31,7 +31,7 @@
 
 function cleanup
 {
-	log_must $ZFS destroy $TESTFS
+	log_must zfs destroy $TESTFS
 }
 
 log_assert "Measure IO stats during random read load"
@@ -39,7 +39,7 @@ log_onexit cleanup
 
 export TESTFS=$PERFPOOL/testfs
 recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+log_must zfs create $PERF_FS_OPTS $TESTFS
 
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
 export TOTAL_SIZE=$(($(get_prop avail $TESTFS) * 3 / 2))
@@ -64,14 +64,14 @@ fi
 # of the available files.
 export NUMJOBS=$(get_max $PERF_NTHREADS)
 export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS))
-log_must $FIO $FIO_SCRIPTS/mkfiles.fio
+log_must fio $FIO_SCRIPTS/mkfiles.fio
 
 # Set up the scripts and output files that will log performance data.
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-    "$VMSTAT 1" "vmstat" "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+    "vmstat 1" "vmstat" "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
 
 log_note "Random reads with $PERF_RUNTYPE settings"
-do_fio_run random_reads.fio $FALSE $TRUE
+do_fio_run random_reads.fio false true
 log_pass "Measure IO stats during random read load"
diff --git a/usr/src/test/zfs-tests/tests/perf/regression/random_readwrite.ksh b/usr/src/test/zfs-tests/tests/perf/regression/random_readwrite.ksh
index be87e43319..2422f9c658 100644
--- a/usr/src/test/zfs-tests/tests/perf/regression/random_readwrite.ksh
+++ b/usr/src/test/zfs-tests/tests/perf/regression/random_readwrite.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -31,7 +31,7 @@
 
 function cleanup
 {
-	log_must $ZFS destroy $TESTFS
+	log_must zfs destroy $TESTFS
 }
 
 log_assert "Measure IO stats during random read-write load"
@@ -39,7 +39,7 @@ log_onexit cleanup
 
 export TESTFS=$PERFPOOL/testfs
 recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+log_must zfs create $PERF_FS_OPTS $TESTFS
 
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
 export TOTAL_SIZE=$(($(get_prop avail $TESTFS) * 3 / 2))
@@ -64,14 +64,14 @@ fi
 # a subset of the available files.
 export NUMJOBS=$(get_max $PERF_NTHREADS)
 export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS))
-log_must $FIO $FIO_SCRIPTS/mkfiles.fio
+log_must fio $FIO_SCRIPTS/mkfiles.fio
 
 # Set up the scripts and output files that will log performance data.
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-    "$VMSTAT 1" "vmstat" "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+    "vmstat 1" "vmstat" "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
 
 log_note "Random reads and writes with $PERF_RUNTYPE settings"
-do_fio_run random_readwrite.fio $FALSE $TRUE
+do_fio_run random_readwrite.fio false true
 log_pass "Measure IO stats during random read and write load"
diff --git a/usr/src/test/zfs-tests/tests/perf/regression/random_writes.ksh b/usr/src/test/zfs-tests/tests/perf/regression/random_writes.ksh
index a4469c32a8..c48ae76140 100644
--- a/usr/src/test/zfs-tests/tests/perf/regression/random_writes.ksh
+++ b/usr/src/test/zfs-tests/tests/perf/regression/random_writes.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -30,7 +30,7 @@
 
 function cleanup
 {
-	log_must $ZFS destroy $TESTFS
+	log_must zfs destroy $TESTFS
 }
 
 log_assert "Measure IO stats during random write load"
@@ -38,7 +38,7 @@ log_onexit cleanup
 
 export TESTFS=$PERFPOOL/testfs
 recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+log_must zfs create $PERF_FS_OPTS $TESTFS
 
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
 export TOTAL_SIZE=$(($(get_prop avail $TESTFS) * 3 / 2))
@@ -62,8 +62,8 @@ fi
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-    "$VMSTAT 1" "vmstat" "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+    "vmstat 1" "vmstat" "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
 
 log_note "Random writes with $PERF_RUNTYPE settings"
-do_fio_run random_writes.fio $TRUE $FALSE
+do_fio_run random_writes.fio true false
 log_pass "Measure IO stats during random write load"
diff --git a/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads.ksh b/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads.ksh
index b04d06c939..60083c8673 100644
--- a/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads.ksh
+++ b/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -31,7 +31,7 @@
 
 function cleanup
 {
-	log_must $ZFS destroy $TESTFS
+	log_must zfs destroy $TESTFS
 }
 
 log_assert "Measure IO stats during sequential read load"
@@ -39,7 +39,7 @@ log_onexit cleanup
 
 export TESTFS=$PERFPOOL/testfs
 recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+log_must zfs create $PERF_FS_OPTS $TESTFS
 
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
 export TOTAL_SIZE=$(($(get_prop avail $TESTFS) * 3 / 2))
@@ -64,15 +64,15 @@ fi
 # of the available files.
 export NUMJOBS=$(get_max $PERF_NTHREADS)
 export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS))
-log_must $FIO $FIO_SCRIPTS/mkfiles.fio
+log_must fio $FIO_SCRIPTS/mkfiles.fio
 
 # Set up the scripts and output files that will log performance data.
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-    "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "$VMSTAT 1" "vmstat"
-    "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+    "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "vmstat 1" "vmstat"
+    "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
 
 log_note "Sequential reads with $PERF_RUNTYPE settings"
-do_fio_run sequential_reads.fio $FALSE $TRUE
+do_fio_run sequential_reads.fio false true
 log_pass "Measure IO stats during sequential read load"
diff --git a/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached.ksh b/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached.ksh
index 70cddd4eed..b4365c0871 100644
--- a/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached.ksh
+++ b/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -30,7 +30,7 @@
 
 function cleanup
 {
-	log_must $ZFS destroy $TESTFS
+	log_must zfs destroy $TESTFS
 }
 
 log_assert "Measure IO stats during sequential read load"
@@ -38,7 +38,7 @@ log_onexit cleanup
 
 export TESTFS=$PERFPOOL/testfs
 recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+log_must zfs create $PERF_FS_OPTS $TESTFS
 
 # Make sure the working set can be cached in the arc. Aim for 1/2 of arc.
 export TOTAL_SIZE=$(($(get_max_arc_size) / 2))
@@ -63,15 +63,15 @@ fi
 # of the available files.
 export NUMJOBS=$(get_max $PERF_NTHREADS)
 export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS))
-log_must $FIO $FIO_SCRIPTS/mkfiles.fio
+log_must fio $FIO_SCRIPTS/mkfiles.fio
 
 # Set up the scripts and output files that will log performance data.
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-    "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "$VMSTAT 1" "vmstat"
-    "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+    "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "vmstat 1" "vmstat"
+    "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
 
 log_note "Sequential cached reads with $PERF_RUNTYPE settings"
-do_fio_run sequential_reads.fio $FALSE $FALSE
+do_fio_run sequential_reads.fio false false
 log_pass "Measure IO stats during sequential cached read load"
diff --git a/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached_clone.ksh b/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached_clone.ksh
index c4790f1fc4..c656eb4643 100644
--- a/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached_clone.ksh
+++ b/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached_clone.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -36,7 +36,7 @@
 
 function cleanup
 {
-	log_must $ZFS destroy $TESTFS
+	log_must zfs destroy $TESTFS
 }
 
 log_assert "Measure IO stats during sequential read load"
@@ -44,7 +44,7 @@ log_onexit cleanup
 
 export TESTFS=$PERFPOOL/testfs
 recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+log_must zfs create $PERF_FS_OPTS $TESTFS
 
 # Make sure the working set can be cached in the arc. Aim for 1/2 of arc.
 export TOTAL_SIZE=$(($(get_max_arc_size) / 2))
@@ -69,7 +69,7 @@ fi
 # of the available files.
 export NUMJOBS=$(get_max $PERF_NTHREADS)
 export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS))
-log_must $FIO $FIO_SCRIPTS/mkfiles.fio
+log_must fio $FIO_SCRIPTS/mkfiles.fio
 
 log_note "Creating snapshot, $TESTSNAP, of $TESTFS"
 create_snapshot $TESTFS $TESTSNAP
@@ -85,9 +85,9 @@ export TESTFS=$PERFPOOL/$TESTCLONE
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-    "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "$VMSTAT 1" "vmstat"
-    "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+    "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "vmstat 1" "vmstat"
+    "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
 
 log_note "Sequential cached reads from $TESTFS with $PERF_RUNTYPE settings"
-do_fio_run sequential_reads.fio $FALSE $FALSE
+do_fio_run sequential_reads.fio false false
 log_pass "Measure IO stats during sequential cached read load"
diff --git a/usr/src/test/zfs-tests/tests/perf/regression/sequential_writes.ksh b/usr/src/test/zfs-tests/tests/perf/regression/sequential_writes.ksh
index 5e587e8641..e2f2cca0d2 100644
--- a/usr/src/test/zfs-tests/tests/perf/regression/sequential_writes.ksh
+++ b/usr/src/test/zfs-tests/tests/perf/regression/sequential_writes.ksh
@@ -12,7 +12,7 @@
 #
 
 #
-# Copyright (c) 2015 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
 #
 
 #
@@ -33,12 +33,12 @@ log_onexit cleanup
 
 function cleanup
 {
-	log_must $ZFS destroy $TESTFS
+	log_must zfs destroy $TESTFS
 }
 
 export TESTFS=$PERFPOOL/testfs
 recreate_perfpool
-log_must $ZFS create $PERF_FS_OPTS $TESTFS
+log_must zfs create $PERF_FS_OPTS $TESTFS
 
 # Aim to fill the pool to 50% capacity while accounting for a 3x compressratio.
 export TOTAL_SIZE=$(($(get_prop avail $TESTFS) * 3 / 2))
@@ -62,8 +62,8 @@ fi
 lun_list=$(pool_to_lun_list $PERFPOOL)
 log_note "Collecting backend IO stats with lun list $lun_list"
 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
-    "$VMSTAT 1" "vmstat" "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
+    "vmstat 1" "vmstat" "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
 
 log_note "Sequential writes with $PERF_RUNTYPE settings"
-do_fio_run sequential_writes.fio $TRUE $FALSE
+do_fio_run sequential_writes.fio true false
 log_pass "Measure IO stats during sequential write load"
diff --git a/usr/src/uts/common/brand/lx/os/lx_misc.c b/usr/src/uts/common/brand/lx/os/lx_misc.c
index e2043a9ab6..b8c9b52329 100644
--- a/usr/src/uts/common/brand/lx/os/lx_misc.c
+++ b/usr/src/uts/common/brand/lx/os/lx_misc.c
@@ -329,6 +329,13 @@ lx_freelwp(klwp_t *lwp)
 	}
 
 	/*
+	 * Discard the affinity mask.
+	 */
+	VERIFY(lwpd->br_affinitymask != NULL);
+	cpuset_free(lwpd->br_affinitymask);
+	lwpd->br_affinitymask = NULL;
+
+	/*
 	 * Ensure that lx_ptrace_exit() has been called to detach
 	 * ptrace(2) tracers and tracees.
 	 */
diff --git a/usr/src/uts/common/brand/lx/procfs/lx_proc.h b/usr/src/uts/common/brand/lx/procfs/lx_proc.h
index 37bae590a8..b4665a484a 100644
--- a/usr/src/uts/common/brand/lx/procfs/lx_proc.h
+++ b/usr/src/uts/common/brand/lx/procfs/lx_proc.h
@@ -341,6 +341,7 @@ typedef enum lxpr_zombok {
 extern proc_t *lxpr_lock(lxpr_node_t *, zombok_t);
 extern proc_t *lxpr_lock_pid(lxpr_node_t *, pid_t, zombok_t, kthread_t **);
 extern void lxpr_unlock(proc_t *);
+extern netstack_t *lxpr_netstack(lxpr_node_t *);
 extern void lxpr_fixpid(zone_t *, proc_t *, pid_t *, pid_t *);
 
 #ifdef	__cplusplus
diff --git a/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c b/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c
index 4658e95044..45ee361e26 100644
--- a/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c
+++ b/usr/src/uts/common/brand/lx/procfs/lx_prsubr.c
@@ -285,6 +285,19 @@ retry:
 	return (p);
 }
 
+netstack_t *
+lxpr_netstack(lxpr_node_t *lxpnp)
+{
+	netstack_t *ns;
+
+	ns = LXPTOZ(lxpnp)->zone_netstack;
+	ASSERT(ns != NULL);
+	if (ns->netstack_flags & (NSF_UNINIT | NSF_CLOSING))
+		return (NULL);
+
+	netstack_hold(ns);
+	return (ns);
+}
 
 /*
  * Lookup process from pid associated with lxpr_node and return with p_lock and
diff --git a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c
index 9b99a092ec..fb06882064 100644
--- a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c
+++ b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c
@@ -2535,7 +2535,8 @@ struct lxpr_ifstat {
 };
 
 static void *
-lxpr_kstat_read(kstat_t *kn, boolean_t byname, size_t *size, int *num)
+lxpr_kstat_read(kstat_t *kn, boolean_t byname, size_t *size, int *num,
+    zoneid_t zoneid)
 {
 	kstat_t *kp;
 	int i, nrec = 0;
@@ -2544,9 +2545,9 @@ lxpr_kstat_read(kstat_t *kn, boolean_t byname, size_t *size, int *num)
 
 	if (byname == B_TRUE) {
 		kp = kstat_hold_byname(kn->ks_module, kn->ks_instance,
-		    kn->ks_name, getzoneid());
+		    kn->ks_name, zoneid);
 	} else {
-		kp = kstat_hold_bykid(kn->ks_kid, getzoneid());
+		kp = kstat_hold_bykid(kn->ks_kid, zoneid);
 	}
 	if (kp == NULL) {
 		return (NULL);
@@ -2571,9 +2572,9 @@ lxpr_kstat_read(kstat_t *kn, boolean_t byname, size_t *size, int *num)
 		/* Check if bufsize still appropriate */
 		if (byname == B_TRUE) {
 			kp = kstat_hold_byname(kn->ks_module, kn->ks_instance,
-			    kn->ks_name, getzoneid());
+			    kn->ks_name, zoneid);
 		} else {
-			kp = kstat_hold_bykid(kn->ks_kid, getzoneid());
+			kp = kstat_hold_bykid(kn->ks_kid, zoneid);
 		}
 		if (kp == NULL || kp->ks_flags & KSTAT_FLAG_INVALID) {
 			if (kp != NULL) {
@@ -2611,7 +2612,7 @@ lxpr_kstat_read(kstat_t *kn, boolean_t byname, size_t *size, int *num)
 }
 
 static int
-lxpr_kstat_ifstat(kstat_t *kn, struct lxpr_ifstat *ifs)
+lxpr_kstat_ifstat(kstat_t *kn, struct lxpr_ifstat *ifs, zoneid_t zoneid)
 {
 	kstat_named_t *kp;
 	int i, num;
@@ -2622,7 +2623,7 @@ lxpr_kstat_ifstat(kstat_t *kn, struct lxpr_ifstat *ifs)
 	 * race against kstats being added/removed.
 	 */
 	bzero(ifs, sizeof (*ifs));
-	kp = (kstat_named_t *)lxpr_kstat_read(kn, B_TRUE, &size, &num);
+	kp = (kstat_named_t *)lxpr_kstat_read(kn, B_TRUE, &size, &num, zoneid);
 	if (kp == NULL)
 		return (-1);
 	for (i = 0; i < num; i++) {
@@ -2651,7 +2652,6 @@ lxpr_kstat_ifstat(kstat_t *kn, struct lxpr_ifstat *ifs)
 	return (0);
 }
 
-/* ARGSUSED */
 static void
 lxpr_read_net_dev(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
@@ -2660,6 +2660,7 @@ lxpr_read_net_dev(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	int i, nidx;
 	size_t sidx;
 	struct lxpr_ifstat ifs;
+	zoneid_t zoneid = LXPTOZ(lxpnp)->zone_id;
 
 	lxpr_uiobuf_printf(uiobuf, "Inter-|   Receive                   "
 	    "                             |  Transmit\n");
@@ -2668,14 +2669,14 @@ lxpr_read_net_dev(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	    " colls carrier compressed\n");
 
 	ks0.ks_kid = 0;
-	ksr = (kstat_t *)lxpr_kstat_read(&ks0, B_FALSE, &sidx, &nidx);
+	ksr = (kstat_t *)lxpr_kstat_read(&ks0, B_FALSE, &sidx, &nidx, zoneid);
 	if (ksr == NULL)
 		return;
 
 	for (i = 1; i < nidx; i++) {
 		if (strncmp(ksr[i].ks_module, "link", KSTAT_STRLEN) == 0 ||
 		    strncmp(ksr[i].ks_module, "lo", KSTAT_STRLEN) == 0) {
-			if (lxpr_kstat_ifstat(&ksr[i], &ifs) != 0)
+			if (lxpr_kstat_ifstat(&ksr[i], &ifs, zoneid) != 0)
 				continue;
 
 			/* Overwriting the name is ok in the local snapshot */
@@ -2726,7 +2727,7 @@ lxpr_read_net_if_inet6(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	ill_walk_context_t	ctx;
 	char ifname[LIFNAMSIZ], ip6out[33];
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return;
 	ipst = ns->netstack_ip;
@@ -2820,7 +2821,7 @@ lxpr_read_net_ipv6_route(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	netstack_t *ns;
 	ip_stack_t *ipst;
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return;
 	ipst = ns->netstack_ip;
@@ -2931,7 +2932,7 @@ lxpr_read_net_route(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	lxpr_uiobuf_printf(uiobuf, "Iface\tDestination\tGateway \tFlags\t"
 	    "RefCnt\tUse\tMetric\tMask\t\tMTU\tWindow\tIRTT\n");
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return;
 	ipst = ns->netstack_ip;
@@ -3016,14 +3017,15 @@ static lxpr_snmp_table_t *lxpr_net_snmptab[] = {
 
 static void
 lxpr_kstat_print_tab(lxpr_uiobuf_t *uiobuf, lxpr_snmp_table_t *table,
-    kstat_t *kn)
+    kstat_t *kn, zoneid_t zoneid)
 {
 	kstat_named_t *klist;
 	char upname[KSTAT_STRLEN], upfield[KSTAT_STRLEN];
 	int i, j, num;
 	size_t size;
 
-	klist = (kstat_named_t *)lxpr_kstat_read(kn, B_TRUE, &size, &num);
+	klist = (kstat_named_t *)lxpr_kstat_read(kn, B_TRUE, &size, &num,
+	    zoneid);
 	if (klist == NULL)
 		return;
 
@@ -3076,7 +3078,6 @@ lxpr_kstat_print_tab(lxpr_uiobuf_t *uiobuf, lxpr_snmp_table_t *table,
 	kmem_free(klist, size);
 }
 
-/* ARGSUSED */
 static void
 lxpr_read_net_snmp(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
@@ -3085,9 +3086,10 @@ lxpr_read_net_snmp(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	lxpr_snmp_table_t **table = lxpr_net_snmptab;
 	int i, t, nidx;
 	size_t sidx;
+	zoneid_t zoneid = LXPTOZ(lxpnp)->zone_id;
 
 	ks0.ks_kid = 0;
-	ksr = (kstat_t *)lxpr_kstat_read(&ks0, B_FALSE, &sidx, &nidx);
+	ksr = (kstat_t *)lxpr_kstat_read(&ks0, B_FALSE, &sidx, &nidx, zoneid);
 	if (ksr == NULL)
 		return;
 
@@ -3097,7 +3099,8 @@ lxpr_read_net_snmp(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 				continue;
 			if (strncmp(ksr[i].ks_name, table[t]->lst_proto,
 			    KSTAT_STRLEN) == 0) {
-				lxpr_kstat_print_tab(uiobuf, table[t], &ksr[i]);
+				lxpr_kstat_print_tab(uiobuf, table[t], &ksr[i],
+				    zoneid);
 				break;
 			}
 		}
@@ -3148,7 +3151,7 @@ lxpr_convert_tcp_state(int st)
 }
 
 static void
-lxpr_format_tcp(lxpr_uiobuf_t *uiobuf, ushort_t ipver)
+lxpr_format_tcp(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf, ushort_t ipver)
 {
 	int i, sl = 0;
 	connf_t *connfp;
@@ -3188,7 +3191,7 @@ lxpr_format_tcp(lxpr_uiobuf_t *uiobuf, ushort_t ipver)
 	 *  - timeout
 	 */
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return;
 	ipst = ns->netstack_ip;
@@ -3251,22 +3254,20 @@ lxpr_format_tcp(lxpr_uiobuf_t *uiobuf, ushort_t ipver)
 	netstack_rele(ns);
 }
 
-/* ARGSUSED */
 static void
 lxpr_read_net_tcp(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
-	lxpr_format_tcp(uiobuf, IPV4_VERSION);
+	lxpr_format_tcp(lxpnp, uiobuf, IPV4_VERSION);
 }
 
-/* ARGSUSED */
 static void
 lxpr_read_net_tcp6(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
-	lxpr_format_tcp(uiobuf, IPV6_VERSION);
+	lxpr_format_tcp(lxpnp, uiobuf, IPV6_VERSION);
 }
 
 static void
-lxpr_format_udp(lxpr_uiobuf_t *uiobuf, ushort_t ipver)
+lxpr_format_udp(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf, ushort_t ipver)
 {
 	int i, sl = 0;
 	connf_t *connfp;
@@ -3306,7 +3307,7 @@ lxpr_format_udp(lxpr_uiobuf_t *uiobuf, ushort_t ipver)
 	 *  - inode
 	 */
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return;
 	ipst = ns->netstack_ip;
@@ -3380,26 +3381,23 @@ lxpr_format_udp(lxpr_uiobuf_t *uiobuf, ushort_t ipver)
 	netstack_rele(ns);
 }
 
-/* ARGSUSED */
 static void
 lxpr_read_net_udp(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
-	lxpr_format_udp(uiobuf, IPV4_VERSION);
+	lxpr_format_udp(lxpnp, uiobuf, IPV4_VERSION);
 }
 
-/* ARGSUSED */
 static void
 lxpr_read_net_udp6(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
-	lxpr_format_udp(uiobuf, IPV6_VERSION);
+	lxpr_format_udp(lxpnp, uiobuf, IPV6_VERSION);
 }
 
-/* ARGSUSED */
 static void
 lxpr_read_net_unix(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
 	sonode_t *so;
-	zoneid_t zoneid = getzoneid();
+	zoneid_t zoneid = LXPTOZ(lxpnp)->zone_id;
 
 	lxpr_uiobuf_printf(uiobuf, "Num       RefCount Protocol Flags    Type "
 	    "St Inode Path\n");
@@ -3565,9 +3563,9 @@ lxpr_read_loadavg(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	 * includes the current CPU.
 	 */
 	if (pool_pset_enabled()) {
-		psetid_t psetid = zone_pset_get(curproc->p_zone);
+		psetid_t psetid = zone_pset_get(LXPTOZ(lxpnp));
 
-		ASSERT(curproc->p_zone != &zone0);
+		ASSERT(LXPTOZ(lxpnp) != &zone0);
 		cp = CPU->cpu_part;
 
 		nrunnable = cp->cp_nrunning + cp->cp_nrunnable;
@@ -3769,7 +3767,7 @@ lxpr_read_partitions(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	lxpr_uiobuf_printf(uiobuf, "major minor  #blocks  name\n\n");
 
-	lxzd = ztolxzd(curproc->p_zone);
+	lxzd = ztolxzd(LXPTOZ(lxpnp));
 	if (lxzd == NULL)
 		return;
 	ASSERT(lxzd->lxzd_vdisks != NULL);
@@ -3839,9 +3837,10 @@ lxpr_read_diskstats(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	 */
 	(void) strlcpy(kn.ks_module, "zone_vfs", sizeof (kn.ks_module));
 	(void) strlcpy(kn.ks_name, zone->zone_name, sizeof (kn.ks_name));
-	kn.ks_instance = getzoneid();
+	kn.ks_instance = zone->zone_id;
 
-	kip = (zone_vfs_kstat_t *)lxpr_kstat_read(&kn, B_TRUE, &size, &num);
+	kip = (zone_vfs_kstat_t *)lxpr_kstat_read(&kn, B_TRUE, &size, &num,
+	    zone->zone_id);
 	if (kip == NULL)
 		return;
 
@@ -4224,10 +4223,10 @@ lxpr_read_stat(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 static void
 lxpr_read_swaps(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
-	zone_t *zone = curzone;
+	zone_t *zone = LXPTOZ(lxpnp);
 	uint64_t totswap, usedswap;
 
-	if (zone == global_zone || zone->zone_max_swap_ctl == UINT64_MAX) {
+	if (zone->zone_max_swap_ctl == UINT64_MAX) {
 		totswap = (k_anoninfo.ani_max * PAGESIZE) >> 10;
 	} else {
 		mutex_enter(&zone->zone_mem_lock);
@@ -4255,11 +4254,12 @@ lxpr_read_swaps(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 static void
 lxpr_read_sys_fs_filemax(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
+	zone_t *zone = LXPTOZ(lxpnp);
 	uint64_t max_fh, proc_lim;
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_FS_FILEMAX);
-	proc_lim = (uint64_t)(curzone->zone_nprocs_ctl == INT_MAX ?
-	    maxpid : curzone->zone_nprocs_ctl);
+	proc_lim = (uint64_t)(zone->zone_nprocs_ctl == INT_MAX ?
+	    maxpid : zone->zone_nprocs_ctl);
 	max_fh = proc_lim * (uint64_t)rlim_fd_max;
 	lxpr_uiobuf_printf(uiobuf, "%llu\n", max_fh);
 }
@@ -4310,7 +4310,7 @@ lxpr_read_sys_kernel_caplcap(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 static void
 lxpr_read_sys_kernel_corepatt(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
-	zone_t *zone = curproc->p_zone;
+	zone_t *zone = LXPTOZ(lxpnp);
 	struct core_globals *cg;
 	refstr_t *rp;
 	corectl_path_t *ccp;
@@ -4367,7 +4367,7 @@ lxpr_read_sys_kernel_msgmni(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	mutex_enter(&curproc->p_lock);
 	val = rctl_enforced_value(rc_zone_msgmni,
-	    curproc->p_zone->zone_rctls, curproc);
+	    LXPTOZ(lxpnp)->zone_rctls, curproc);
 	mutex_exit(&curproc->p_lock);
 
 	lxpr_uiobuf_printf(uiobuf, "%u\n", (uint_t)val);
@@ -4385,21 +4385,18 @@ lxpr_read_sys_kernel_ngroups_max(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 static void
 lxpr_read_sys_kernel_osrel(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
-	lx_zone_data_t *br_data;
+	zone_t *zone = LXPTOZ(lxpnp);
+	lx_zone_data_t *lxzd = ztolxzd(zone);
 	char version[LX_KERN_VERSION_MAX];
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_KERNEL_OSREL);
-	br_data = ztolxzd(curproc->p_zone);
-	if (curproc->p_zone->zone_brand == &lx_brand) {
-		mutex_enter(&br_data->lxzd_lock);
-		(void) strlcpy(version, br_data->lxzd_kernel_version,
-		    sizeof (version));
-		mutex_exit(&br_data->lxzd_lock);
+	ASSERT(zone->zone_brand == &lx_brand);
+	ASSERT(lxzd != NULL);
 
-		lxpr_uiobuf_printf(uiobuf, "%s\n", version);
-	} else {
-		lxpr_uiobuf_printf(uiobuf, "\n");
-	}
+	mutex_enter(&lxzd->lxzd_lock);
+	(void) strlcpy(version, lxzd->lxzd_kernel_version, sizeof (version));
+	mutex_exit(&lxzd->lxzd_lock);
+	lxpr_uiobuf_printf(uiobuf, "%s\n", version);
 }
 
 /* ARGSUSED */
@@ -4428,19 +4425,16 @@ lxpr_read_sys_kernel_rand_bootid(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	 * appears to resemble a uuid but since it is not documented to be a
 	 * uuid, we don't worry about that.
 	 */
-	lx_zone_data_t *br_data;
+	zone_t *zone = LXPTOZ(lxpnp);
+	lx_zone_data_t *lxzd = ztolxzd(zone);
 	char bootid[LX_BOOTID_LEN];
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_KERNEL_RAND_BOOTID);
+	ASSERT(zone->zone_brand == &lx_brand);
+	ASSERT(lxzd != NULL);
 
-	if (curproc->p_zone->zone_brand != &lx_brand) {
-		lxpr_uiobuf_printf(uiobuf, "0\n");
-		return;
-	}
-
-	br_data = ztolxzd(curproc->p_zone);
-	mutex_enter(&br_data->lxzd_lock);
-	if (br_data->lxzd_bootid[0] == '\0') {
+	mutex_enter(&lxzd->lxzd_lock);
+	if (lxzd->lxzd_bootid[0] == '\0') {
 		int i;
 
 		for (i = 0; i < 5; i++) {
@@ -4460,17 +4454,16 @@ lxpr_read_sys_kernel_rand_bootid(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 				break;
 			}
 			if (i > 0)
-				(void) strlcat(br_data->lxzd_bootid, "-",
-				    sizeof (br_data->lxzd_bootid));
-			(void) strlcat(br_data->lxzd_bootid, s,
-			    sizeof (br_data->lxzd_bootid));
+				(void) strlcat(lxzd->lxzd_bootid, "-",
+				    sizeof (lxzd->lxzd_bootid));
+			(void) strlcat(lxzd->lxzd_bootid, s,
+			    sizeof (lxzd->lxzd_bootid));
 		}
 	}
-	(void) strlcpy(bootid, br_data->lxzd_bootid, sizeof (bootid));
-	mutex_exit(&br_data->lxzd_lock);
+	(void) strlcpy(bootid, lxzd->lxzd_bootid, sizeof (bootid));
+	mutex_exit(&lxzd->lxzd_lock);
 
 	lxpr_uiobuf_printf(uiobuf, "%s\n", bootid);
-
 }
 
 /* ARGSUSED */
@@ -4478,6 +4471,7 @@ static void
 lxpr_read_sys_kernel_sem(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
 	proc_t *pp = curproc;
+	zone_t *zone = LXPTOZ(lxpnp);
 	rctl_qty_t vmsl, vopm, vmni, vmns;
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_KERNEL_SEM);
@@ -4485,7 +4479,7 @@ lxpr_read_sys_kernel_sem(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	mutex_enter(&pp->p_lock);
 	vmsl = rctl_enforced_value(rc_process_semmsl, pp->p_rctls, pp);
 	vopm = rctl_enforced_value(rc_process_semopm, pp->p_rctls, pp);
-	vmni = rctl_enforced_value(rc_zone_semmni, pp->p_zone->zone_rctls, pp);
+	vmni = rctl_enforced_value(rc_zone_semmni, zone->zone_rctls, pp);
 	mutex_exit(&pp->p_lock);
 	vmns = vmsl * vmni;
 	if (vmns < vmsl || vmns < vmni) {
@@ -4507,12 +4501,12 @@ static void
 lxpr_read_sys_kernel_shmall(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
 	rctl_qty_t val;
+	zone_t *zone = LXPTOZ(lxpnp);
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_KERNEL_SHMALL);
 
 	mutex_enter(&curproc->p_lock);
-	val = rctl_enforced_value(rc_zone_shmmax,
-	    curproc->p_zone->zone_rctls, curproc);
+	val = rctl_enforced_value(rc_zone_shmmax, zone->zone_rctls, curproc);
 	mutex_exit(&curproc->p_lock);
 
 	/* value is in pages */
@@ -4524,12 +4518,12 @@ static void
 lxpr_read_sys_kernel_shmmax(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
 	rctl_qty_t val;
+	zone_t *zone = LXPTOZ(lxpnp);
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_KERNEL_SHMMAX);
 
 	mutex_enter(&curproc->p_lock);
-	val = rctl_enforced_value(rc_zone_shmmax,
-	    curproc->p_zone->zone_rctls, curproc);
+	val = rctl_enforced_value(rc_zone_shmmax, zone->zone_rctls, curproc);
 	mutex_exit(&curproc->p_lock);
 
 	if (val > FOURGB)
@@ -4543,12 +4537,12 @@ static void
 lxpr_read_sys_kernel_shmmni(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
 	rctl_qty_t val;
+	zone_t *zone = LXPTOZ(lxpnp);
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_KERNEL_SHMMNI);
 
 	mutex_enter(&curproc->p_lock);
-	val = rctl_enforced_value(rc_zone_shmmni,
-	    curproc->p_zone->zone_rctls, curproc);
+	val = rctl_enforced_value(rc_zone_shmmni, zone->zone_rctls, curproc);
 	mutex_exit(&curproc->p_lock);
 
 	if (val > FOURGB)
@@ -4562,7 +4556,7 @@ static void
 lxpr_read_sys_kernel_threads_max(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 {
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_KERNEL_THREADS_MAX);
-	lxpr_uiobuf_printf(uiobuf, "%d\n", curproc->p_zone->zone_nlwps_ctl);
+	lxpr_uiobuf_printf(uiobuf, "%d\n", LXPTOZ(lxpnp)->zone_nlwps_ctl);
 }
 
 /* ARGSUSED */
@@ -4574,7 +4568,7 @@ lxpr_read_sys_net_core_somaxc(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_CORE_SOMAXCON);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_printf(uiobuf, "%d\n", SOMAXCONN);
 		return;
@@ -4603,7 +4597,7 @@ lxpr_read_sys_net_ipv4_ip_lport_range(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_IP_LPORT_RANGE);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -4637,7 +4631,7 @@ lxpr_read_sys_net_ipv4_tcp_fin_to(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_FIN_TO);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -4671,7 +4665,7 @@ lxpr_read_sys_net_ipv4_tcp_ka_int(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_KA_INT);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -4702,7 +4696,7 @@ lxpr_read_sys_net_ipv4_tcp_ka_tim(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_KA_TIM);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -4731,7 +4725,7 @@ lxpr_read_sys_net_ipv4_tcp_max_syn_bl(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_MAX_SYN_BL);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -4765,7 +4759,7 @@ lxpr_read_sys_net_ipv4_tcp_rwmem(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_RMEM ||
 	    lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_WMEM);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -4803,7 +4797,7 @@ lxpr_read_sys_net_ipv4_tcp_sack(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_SACK);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -4836,7 +4830,7 @@ lxpr_read_sys_net_ipv4_tcp_winscale(lxpr_node_t *lxpnp, lxpr_uiobuf_t *uiobuf)
 
 	ASSERT(lxpnp->lxpr_type == LXPR_SYS_NET_IPV4_TCP_WINSCALE);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL) {
 		lxpr_uiobuf_seterr(uiobuf, ENXIO);
 		return;
@@ -6350,7 +6344,7 @@ lxpr_readdir_taskdir(lxpr_node_t *lxpnp, uio_t *uiop, int *eofp)
 			 * Convert pid to Linux default of 1 if we're the
 			 * zone's init.
 			 */
-			if (emul_tid == curproc->p_zone->zone_proc_initpid)
+			if (emul_tid == LXPTOZ(lxpnp)->zone_proc_initpid)
 				emul_tid = 1;
 		}
 
@@ -6681,7 +6675,7 @@ lxpr_write_tcp_property(lxpr_node_t *lxpnp, struct uio *uio,
 	if (val[0] == '\0') /* no input */
 		return (EINVAL);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return (EINVAL);
 
@@ -6811,7 +6805,7 @@ lxpr_write_sys_net_ipv4_ip_lport_range(lxpr_node_t *lxpnp, struct uio *uio,
 	if (low > high || high > 65535)
 		return (EINVAL);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return (EINVAL);
 
@@ -6906,7 +6900,7 @@ lxpr_write_sys_net_ipv4_tcp_rwmem(lxpr_node_t *lxpnp, struct uio *uio,
 	    def > ONEGB || max < 8192)
 		return (EINVAL);
 
-	ns = netstack_get_current();
+	ns = lxpr_netstack(lxpnp);
 	if (ns == NULL)
 		return (EINVAL);
 
@@ -6998,7 +6992,7 @@ static int
 lxpr_write_sys_kernel_corepatt(lxpr_node_t *lxpnp, struct uio *uio,
     struct cred *cr, caller_context_t *ct)
 {
-	zone_t *zone = curproc->p_zone;
+	zone_t *zone = LXPTOZ(lxpnp);
 	struct core_globals *cg;
 	refstr_t *rp, *nrp;
 	corectl_path_t *ccp;
diff --git a/usr/src/uts/common/brand/lx/sys/lx_brand.h b/usr/src/uts/common/brand/lx/sys/lx_brand.h
index 7a9357c367..959e84b0a0 100644
--- a/usr/src/uts/common/brand/lx/sys/lx_brand.h
+++ b/usr/src/uts/common/brand/lx/sys/lx_brand.h
@@ -260,7 +260,8 @@ typedef enum lx_proc_flags {
 	LX_PROC_STRICT_MODE	= 0x02,
 	/* internal flags */
 	LX_PROC_CHILD_DEATHSIG	= 0x04,
-	LX_PROC_AIO_USED	= 0x08
+	LX_PROC_AIO_USED	= 0x08,
+	LX_PROC_NO_DUMP		= 0x10	/* for lx_prctl LX_PR_[GS]ET_DUMPABLE */
 } lx_proc_flags_t;
 
 #define	LX_PROC_ALL	(LX_PROC_INSTALL_MODE | LX_PROC_STRICT_MODE)
diff --git a/usr/src/uts/common/brand/lx/syscall/lx_prctl.c b/usr/src/uts/common/brand/lx/syscall/lx_prctl.c
index ac125b9b2d..23257245f0 100644
--- a/usr/src/uts/common/brand/lx/syscall/lx_prctl.c
+++ b/usr/src/uts/common/brand/lx/syscall/lx_prctl.c
@@ -74,15 +74,34 @@ lx_prctl(int opt, uintptr_t data)
 
 	switch (opt) {
 	case LX_PR_GET_DUMPABLE: {
-		/* Indicate that process is always dumpable */
-		return (1);
+		/* Only track in brand data - could hook into SNOCD later */
+		lx_proc_data_t *lxpd;
+		int val;
+
+		mutex_enter(&curproc->p_lock);
+		VERIFY((lxpd = ptolxproc(curproc)) != NULL);
+		val = lxpd->l_flags & LX_PROC_NO_DUMP;
+		mutex_exit(&curproc->p_lock);
+
+		return (val == 0);
 	}
 
 	case LX_PR_SET_DUMPABLE: {
+		lx_proc_data_t *lxpd;
+
 		if (data != 0 && data != 1) {
 			return (set_errno(EINVAL));
 		}
-		/* Lie about altering process dumpability */
+
+		mutex_enter(&curproc->p_lock);
+		VERIFY((lxpd = ptolxproc(curproc)) != NULL);
+		if (data == 0) {
+			lxpd->l_flags |= LX_PROC_NO_DUMP;
+		} else {
+			lxpd->l_flags &= ~LX_PROC_NO_DUMP;
+		}
+		mutex_exit(&curproc->p_lock);
+
 		return (0);
 	}
 
diff --git a/usr/src/uts/common/fs/zfs/dbuf.c b/usr/src/uts/common/fs/zfs/dbuf.c
index 0edda3939c..71ae0c4434 100644
--- a/usr/src/uts/common/fs/zfs/dbuf.c
+++ b/usr/src/uts/common/fs/zfs/dbuf.c
@@ -54,7 +54,9 @@ static void dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx);
 
 #ifndef __lint
 extern inline void dmu_buf_init_user(dmu_buf_user_t *dbu,
-    dmu_buf_evict_func_t *evict_func, dmu_buf_t **clear_on_evict_dbufp);
+    dmu_buf_evict_func_t *evict_func_sync,
+    dmu_buf_evict_func_t *evict_func_async,
+    dmu_buf_t **clear_on_evict_dbufp);
 #endif /* ! __lint */
 
 /*
@@ -361,11 +363,24 @@ dbuf_evict_user(dmu_buf_impl_t *db)
 #endif
 
 	/*
-	 * Invoke the callback from a taskq to avoid lock order reversals
-	 * and limit stack depth.
+	 * There are two eviction callbacks - one that we call synchronously
+	 * and one that we invoke via a taskq.  The async one is useful for
+	 * avoiding lock order reversals and limiting stack depth.
+	 *
+	 * Note that if we have a sync callback but no async callback,
+	 * it's likely that the sync callback will free the structure
+	 * containing the dbu.  In that case we need to take care to not
+	 * dereference dbu after calling the sync evict func.
 	 */
-	taskq_dispatch_ent(dbu_evict_taskq, dbu->dbu_evict_func, dbu, 0,
-	    &dbu->dbu_tqent);
+	boolean_t has_async = (dbu->dbu_evict_func_async != NULL);
+
+	if (dbu->dbu_evict_func_sync != NULL)
+		dbu->dbu_evict_func_sync(dbu);
+
+	if (has_async) {
+		taskq_dispatch_ent(dbu_evict_taskq, dbu->dbu_evict_func_async,
+		    dbu, 0, &dbu->dbu_tqent);
+	}
 }
 
 boolean_t
diff --git a/usr/src/uts/common/fs/zfs/dnode.c b/usr/src/uts/common/fs/zfs/dnode.c
index 0f78646700..74ceb5732c 100644
--- a/usr/src/uts/common/fs/zfs/dnode.c
+++ b/usr/src/uts/common/fs/zfs/dnode.c
@@ -1009,7 +1009,7 @@ dnode_special_open(objset_t *os, dnode_phys_t *dnp, uint64_t object,
 }
 
 static void
-dnode_buf_pageout(void *dbu)
+dnode_buf_evict_async(void *dbu)
 {
 	dnode_children_t *children_dnodes = dbu;
 	int i;
@@ -1135,8 +1135,8 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag,
 		for (i = 0; i < epb; i++) {
 			zrl_init(&dnh[i].dnh_zrlock);
 		}
-		dmu_buf_init_user(&children_dnodes->dnc_dbu,
-		    dnode_buf_pageout, NULL);
+		dmu_buf_init_user(&children_dnodes->dnc_dbu, NULL,
+		    dnode_buf_evict_async, NULL);
 		winner = dmu_buf_set_user(&db->db, &children_dnodes->dnc_dbu);
 		if (winner != NULL) {
 
diff --git a/usr/src/uts/common/fs/zfs/dsl_dataset.c b/usr/src/uts/common/fs/zfs/dsl_dataset.c
index b143b3900a..bac325b3a1 100644
--- a/usr/src/uts/common/fs/zfs/dsl_dataset.c
+++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2014, Joyent, Inc. All rights reserved.
  * Copyright (c) 2014 RackTop Systems.
  * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
@@ -81,6 +81,8 @@ extern inline dsl_dataset_phys_t *dsl_dataset_phys(dsl_dataset_t *ds);
 
 extern int spa_asize_inflation;
 
+static zil_header_t zero_zil;
+
 /*
  * Figure out how much of this delta should be propogated to the dsl_dir
  * layer.  If there's a refreservation, that space has already been
@@ -125,6 +127,7 @@ dsl_dataset_block_born(dsl_dataset_t *ds, const blkptr_t *bp, dmu_tx_t *tx)
 		return;
 	}
 
+	ASSERT3U(bp->blk_birth, >, dsl_dataset_phys(ds)->ds_prev_snap_txg);
 	dmu_buf_will_dirty(ds->ds_dbuf, tx);
 	mutex_enter(&ds->ds_lock);
 	delta = parent_delta(ds, used);
@@ -269,16 +272,30 @@ dsl_dataset_block_freeable(dsl_dataset_t *ds, const blkptr_t *bp,
 	return (B_TRUE);
 }
 
+/*
+ * We have to release the fsid syncronously or we risk that a subsequent
+ * mount of the same dataset will fail to unique_insert the fsid.  This
+ * failure would manifest itself as the fsid of this dataset changing
+ * between mounts which makes NFS clients quite unhappy.
+ */
 static void
-dsl_dataset_evict(void *dbu)
+dsl_dataset_evict_sync(void *dbu)
 {
 	dsl_dataset_t *ds = dbu;
 
 	ASSERT(ds->ds_owner == NULL);
 
-	ds->ds_dbuf = NULL;
-
 	unique_remove(ds->ds_fsid_guid);
+}
+
+static void
+dsl_dataset_evict_async(void *dbu)
+{
+	dsl_dataset_t *ds = dbu;
+
+	ASSERT(ds->ds_owner == NULL);
+
+	ds->ds_dbuf = NULL;
 
 	if (ds->ds_objset != NULL)
 		dmu_objset_evict(ds->ds_objset);
@@ -514,7 +531,8 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
 			ds->ds_reserved = ds->ds_quota = 0;
 		}
 
-		dmu_buf_init_user(&ds->ds_dbu, dsl_dataset_evict, &ds->ds_dbuf);
+		dmu_buf_init_user(&ds->ds_dbu, dsl_dataset_evict_sync,
+		    dsl_dataset_evict_async, &ds->ds_dbuf);
 		if (err == 0)
 			winner = dmu_buf_set_user_ie(dbuf, &ds->ds_dbu);
 
@@ -537,6 +555,16 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
 		} else {
 			ds->ds_fsid_guid =
 			    unique_insert(dsl_dataset_phys(ds)->ds_fsid_guid);
+			if (ds->ds_fsid_guid !=
+			    dsl_dataset_phys(ds)->ds_fsid_guid) {
+				zfs_dbgmsg("ds_fsid_guid changed from "
+				    "%llx to %llx for pool %s dataset id %llu",
+				    (long long)
+				    dsl_dataset_phys(ds)->ds_fsid_guid,
+				    (long long)ds->ds_fsid_guid,
+				    spa_name(dp->dp_spa),
+				    dsobj);
+			}
 		}
 	}
 	ASSERT3P(ds->ds_dbuf, ==, dbuf);
@@ -889,8 +917,20 @@ dsl_dataset_zero_zil(dsl_dataset_t *ds, dmu_tx_t *tx)
 	objset_t *os;
 
 	VERIFY0(dmu_objset_from_ds(ds, &os));
-	bzero(&os->os_zil_header, sizeof (os->os_zil_header));
-	dsl_dataset_dirty(ds, tx);
+	if (bcmp(&os->os_zil_header, &zero_zil, sizeof (zero_zil)) != 0) {
+		dsl_pool_t *dp = ds->ds_dir->dd_pool;
+		zio_t *zio;
+
+		bzero(&os->os_zil_header, sizeof (os->os_zil_header));
+
+		zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
+		dsl_dataset_sync(ds, zio, tx);
+		VERIFY0(zio_wait(zio));
+
+		/* dsl_dataset_sync_done will drop this reference. */
+		dmu_buf_add_ref(ds->ds_dbuf, ds);
+		dsl_dataset_sync_done(ds, tx);
+	}
 }
 
 uint64_t
@@ -1030,8 +1070,10 @@ dsl_dataset_dirty(dsl_dataset_t *ds, dmu_tx_t *tx)
 	if (dsl_dataset_phys(ds)->ds_next_snap_obj != 0)
 		panic("dirtying snapshot!");
 
-	dp = ds->ds_dir->dd_pool;
+	/* Must not dirty a dataset in the same txg where it got snapshotted. */
+	ASSERT3U(tx->tx_txg, >, dsl_dataset_phys(ds)->ds_prev_snap_txg);
 
+	dp = ds->ds_dir->dd_pool;
 	if (txg_list_add(&dp->dp_dirty_datasets, ds, tx->tx_txg)) {
 		/* up the hold count until we can be written out */
 		dmu_buf_add_ref(ds->ds_dbuf, ds);
@@ -1286,8 +1328,6 @@ void
 dsl_dataset_snapshot_sync_impl(dsl_dataset_t *ds, const char *snapname,
     dmu_tx_t *tx)
 {
-	static zil_header_t zero_zil;
-
 	dsl_pool_t *dp = ds->ds_dir->dd_pool;
 	dmu_buf_t *dbuf;
 	dsl_dataset_phys_t *dsphys;
@@ -1306,6 +1346,10 @@ dsl_dataset_snapshot_sync_impl(dsl_dataset_t *ds, const char *snapname,
 	    bcmp(&os->os_phys->os_zil_header, &zero_zil,
 	    sizeof (zero_zil)) == 0);
 
+	/* Should not snapshot a dirty dataset. */
+	ASSERT(!txg_list_member(&ds->ds_dir->dd_pool->dp_dirty_datasets,
+	    ds, tx->tx_txg));
+
 	dsl_fs_ss_count_adjust(ds->ds_dir, 1, DD_FIELD_SNAPSHOT_COUNT, tx);
 
 	/*
@@ -1652,6 +1696,27 @@ dsl_dataset_sync(dsl_dataset_t *ds, zio_t *zio, dmu_tx_t *tx)
 	}
 }
 
+static int
+deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
+{
+	dsl_deadlist_t *dl = arg;
+	dsl_deadlist_insert(dl, bp, tx);
+	return (0);
+}
+
+void
+dsl_dataset_sync_done(dsl_dataset_t *ds, dmu_tx_t *tx)
+{
+	objset_t *os = ds->ds_objset;
+
+	bplist_iterate(&ds->ds_pending_deadlist,
+	    deadlist_enqueue_cb, &ds->ds_deadlist, tx);
+
+	ASSERT(!dmu_objset_is_dirty(os, dmu_tx_get_txg(tx)));
+
+	dmu_buf_rele(ds->ds_dbuf, ds);
+}
+
 static void
 get_clones_stat(dsl_dataset_t *ds, nvlist_t *nv)
 {
@@ -2151,6 +2216,18 @@ dsl_dataset_rollback_check(void *arg, dmu_tx_t *tx)
 		return (SET_ERROR(EINVAL));
 	}
 
+	/*
+	 * No rollback to a snapshot created in the current txg, because
+	 * the rollback may dirty the dataset and create blocks that are
+	 * not reachable from the rootbp while having a birth txg that
+	 * falls into the snapshot's range.
+	 */
+	if (dmu_tx_is_syncing(tx) &&
+	    dsl_dataset_phys(ds)->ds_prev_snap_txg >= tx->tx_txg) {
+		dsl_dataset_rele(ds, FTAG);
+		return (SET_ERROR(EAGAIN));
+	}
+
 	/* must not have any bookmarks after the most recent snapshot */
 	nvlist_t *proprequest = fnvlist_alloc();
 	fnvlist_add_boolean(proprequest, zfs_prop_to_name(ZFS_PROP_CREATETXG));
diff --git a/usr/src/uts/common/fs/zfs/dsl_dir.c b/usr/src/uts/common/fs/zfs/dsl_dir.c
index 27ef2838c9..60477b20eb 100644
--- a/usr/src/uts/common/fs/zfs/dsl_dir.c
+++ b/usr/src/uts/common/fs/zfs/dsl_dir.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2013 Martin Matuska. All rights reserved.
  * Copyright (c) 2014 Joyent, Inc. All rights reserved.
  * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
@@ -129,7 +129,7 @@ extern inline dsl_dir_phys_t *dsl_dir_phys(dsl_dir_t *dd);
 static uint64_t dsl_dir_space_towrite(dsl_dir_t *dd);
 
 static void
-dsl_dir_evict(void *dbu)
+dsl_dir_evict_async(void *dbu)
 {
 	dsl_dir_t *dd = dbu;
 	dsl_pool_t *dp = dd->dd_pool;
@@ -236,7 +236,8 @@ dsl_dir_hold_obj(dsl_pool_t *dp, uint64_t ddobj,
 			dmu_buf_rele(origin_bonus, FTAG);
 		}
 
-		dmu_buf_init_user(&dd->dd_dbu, dsl_dir_evict, &dd->dd_dbuf);
+		dmu_buf_init_user(&dd->dd_dbu, NULL, dsl_dir_evict_async,
+		    &dd->dd_dbuf);
 		winner = dmu_buf_set_user_ie(dbuf, &dd->dd_dbu);
 		if (winner != NULL) {
 			if (dd->dd_parent)
diff --git a/usr/src/uts/common/fs/zfs/dsl_pool.c b/usr/src/uts/common/fs/zfs/dsl_pool.c
index 995fc6aa48..0d44ba6ac6 100644
--- a/usr/src/uts/common/fs/zfs/dsl_pool.c
+++ b/usr/src/uts/common/fs/zfs/dsl_pool.c
@@ -425,14 +425,6 @@ dsl_pool_mos_diduse_space(dsl_pool_t *dp,
 	mutex_exit(&dp->dp_lock);
 }
 
-static int
-deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
-{
-	dsl_deadlist_t *dl = arg;
-	dsl_deadlist_insert(dl, bp, tx);
-	return (0);
-}
-
 static void
 dsl_pool_sync_mos(dsl_pool_t *dp, dmu_tx_t *tx)
 {
@@ -533,11 +525,7 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 	 *  - release hold from dsl_dataset_dirty()
 	 */
 	while ((ds = list_remove_head(&synced_datasets)) != NULL) {
-		objset_t *os = ds->ds_objset;
-		bplist_iterate(&ds->ds_pending_deadlist,
-		    deadlist_enqueue_cb, &ds->ds_deadlist, tx);
-		ASSERT(!dmu_objset_is_dirty(os, txg));
-		dmu_buf_rele(ds->ds_dbuf, ds);
+		dsl_dataset_sync_done(ds, tx);
 	}
 	while ((dd = txg_list_remove(&dp->dp_dirty_dirs, txg)) != NULL) {
 		dsl_dir_sync(dd, tx);
diff --git a/usr/src/uts/common/fs/zfs/sa.c b/usr/src/uts/common/fs/zfs/sa.c
index 3168b47304..2fc6acacf0 100644
--- a/usr/src/uts/common/fs/zfs/sa.c
+++ b/usr/src/uts/common/fs/zfs/sa.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright 2011 iXsystems, Inc
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
  * Copyright (c) 2015 Joyent, Inc.  All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
@@ -1300,7 +1300,7 @@ sa_build_index(sa_handle_t *hdl, sa_buf_type_t buftype)
 
 /*ARGSUSED*/
 static void
-sa_evict(void *dbu)
+sa_evict_sync(void *dbu)
 {
 	panic("evicting sa dbuf\n");
 }
@@ -1384,7 +1384,8 @@ sa_handle_get_from_db(objset_t *os, dmu_buf_t *db, void *userp,
 		sa_handle_t *winner = NULL;
 
 		handle = kmem_cache_alloc(sa_cache, KM_SLEEP);
-		handle->sa_dbu.dbu_evict_func = NULL;
+		handle->sa_dbu.dbu_evict_func_sync = NULL;
+		handle->sa_dbu.dbu_evict_func_async = NULL;
 		handle->sa_userp = userp;
 		handle->sa_bonus = db;
 		handle->sa_os = os;
@@ -1395,7 +1396,8 @@ sa_handle_get_from_db(objset_t *os, dmu_buf_t *db, void *userp,
 		error = sa_build_index(handle, SA_BONUS);
 
 		if (hdl_type == SA_HDL_SHARED) {
-			dmu_buf_init_user(&handle->sa_dbu, sa_evict, NULL);
+			dmu_buf_init_user(&handle->sa_dbu, sa_evict_sync, NULL,
+			    NULL);
 			winner = dmu_buf_set_user_ie(db, &handle->sa_dbu);
 		}
 
diff --git a/usr/src/uts/common/fs/zfs/sys/dmu.h b/usr/src/uts/common/fs/zfs/sys/dmu.h
index b45e8822e1..3e3c654448 100644
--- a/usr/src/uts/common/fs/zfs/sys/dmu.h
+++ b/usr/src/uts/common/fs/zfs/sys/dmu.h
@@ -537,8 +537,14 @@ typedef struct dmu_buf_user {
 	 */
 	taskq_ent_t	dbu_tqent;
 
-	/* This instance's eviction function pointer. */
-	dmu_buf_evict_func_t *dbu_evict_func;
+	/*
+	 * This instance's eviction function pointers.
+	 *
+	 * dbu_evict_func_sync is called synchronously and then
+	 * dbu_evict_func_async is executed asynchronously on a taskq.
+	 */
+	dmu_buf_evict_func_t *dbu_evict_func_sync;
+	dmu_buf_evict_func_t *dbu_evict_func_async;
 #ifdef ZFS_DEBUG
 	/*
 	 * Pointer to user's dbuf pointer.  NULL for clients that do
@@ -562,15 +568,19 @@ typedef struct dmu_buf_user {
 /* Very ugly, but it beats issuing suppression directives in many Makefiles. */
 extern void
 dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func,
-    dmu_buf_t **clear_on_evict_dbufp);
+    dmu_buf_evict_func_t *evict_func_async, dmu_buf_t **clear_on_evict_dbufp);
 #else /* __lint */
 inline void
-dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func,
-    dmu_buf_t **clear_on_evict_dbufp)
+dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func_sync,
+    dmu_buf_evict_func_t *evict_func_async, dmu_buf_t **clear_on_evict_dbufp)
 {
-	ASSERT(dbu->dbu_evict_func == NULL);
-	ASSERT(evict_func != NULL);
-	dbu->dbu_evict_func = evict_func;
+	ASSERT(dbu->dbu_evict_func_sync == NULL);
+	ASSERT(dbu->dbu_evict_func_async == NULL);
+
+	/* must have at least one evict func */
+	IMPLY(evict_func_sync == NULL, evict_func_async != NULL);
+	dbu->dbu_evict_func_sync = evict_func_sync;
+	dbu->dbu_evict_func_async = evict_func_async;
 #ifdef ZFS_DEBUG
 	dbu->dbu_clear_on_evict_dbufp = clear_on_evict_dbufp;
 #endif
diff --git a/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h b/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h
index 18466bb405..22c67b48a9 100644
--- a/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h
+++ b/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h
@@ -274,6 +274,7 @@ boolean_t dsl_dataset_modified_since_snap(dsl_dataset_t *ds,
     dsl_dataset_t *snap);
 
 void dsl_dataset_sync(dsl_dataset_t *os, zio_t *zio, dmu_tx_t *tx);
+void dsl_dataset_sync_done(dsl_dataset_t *os, dmu_tx_t *tx);
 
 void dsl_dataset_block_born(dsl_dataset_t *ds, const blkptr_t *bp,
     dmu_tx_t *tx);
diff --git a/usr/src/uts/common/fs/zfs/sys/zap_impl.h b/usr/src/uts/common/fs/zfs/sys/zap_impl.h
index 8cfa750424..3e73883a43 100644
--- a/usr/src/uts/common/fs/zfs/sys/zap_impl.h
+++ b/usr/src/uts/common/fs/zfs/sys/zap_impl.h
@@ -199,7 +199,7 @@ boolean_t zap_match(zap_name_t *zn, const char *matchname);
 int zap_lockdir(objset_t *os, uint64_t obj, dmu_tx_t *tx,
     krw_t lti, boolean_t fatreader, boolean_t adding, void *tag, zap_t **zapp);
 void zap_unlockdir(zap_t *zap, void *tag);
-void zap_evict(void *dbu);
+void zap_evict_sync(void *dbu);
 zap_name_t *zap_name_alloc(zap_t *zap, const char *key, matchtype_t mt);
 void zap_name_free(zap_name_t *zn);
 int zap_hashbits(zap_t *zap);
diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_vfsops.h b/usr/src/uts/common/fs/zfs/sys/zfs_vfsops.h
index b382d27bdf..3278171372 100644
--- a/usr/src/uts/common/fs/zfs/sys/zfs_vfsops.h
+++ b/usr/src/uts/common/fs/zfs/sys/zfs_vfsops.h
@@ -137,7 +137,7 @@ typedef struct zfid_long {
 extern uint_t zfs_fsyncer_key;
 
 extern int zfs_suspend_fs(zfsvfs_t *zfsvfs);
-extern int zfs_resume_fs(zfsvfs_t *zfsvfs, const char *osname);
+extern int zfs_resume_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds);
 extern int zfs_userspace_one(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
     const char *domain, uint64_t rid, uint64_t *valuep);
 extern int zfs_userspace_many(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
diff --git a/usr/src/uts/common/fs/zfs/zap.c b/usr/src/uts/common/fs/zfs/zap.c
index 6f02183d99..0caed0ad75 100644
--- a/usr/src/uts/common/fs/zfs/zap.c
+++ b/usr/src/uts/common/fs/zfs/zap.c
@@ -81,7 +81,8 @@ fzap_upgrade(zap_t *zap, dmu_tx_t *tx, zap_flags_t flags)
 	ASSERT(RW_WRITE_HELD(&zap->zap_rwlock));
 	zap->zap_ismicro = FALSE;
 
-	zap->zap_dbu.dbu_evict_func = zap_evict;
+	zap->zap_dbu.dbu_evict_func_sync = zap_evict_sync;
+	zap->zap_dbu.dbu_evict_func_async = NULL;
 
 	mutex_init(&zap->zap_f.zap_num_entries_mtx, 0, 0, 0);
 	zap->zap_f.zap_block_shift = highbit64(zap->zap_dbuf->db_size) - 1;
@@ -399,7 +400,7 @@ zap_allocate_blocks(zap_t *zap, int nblocks)
 }
 
 static void
-zap_leaf_pageout(void *dbu)
+zap_leaf_evict_sync(void *dbu)
 {
 	zap_leaf_t *l = dbu;
 
@@ -423,7 +424,7 @@ zap_create_leaf(zap_t *zap, dmu_tx_t *tx)
 	VERIFY(0 == dmu_buf_hold(zap->zap_objset, zap->zap_object,
 	    l->l_blkid << FZAP_BLOCK_SHIFT(zap), NULL, &l->l_dbuf,
 	    DMU_READ_NO_PREFETCH));
-	dmu_buf_init_user(&l->l_dbu, zap_leaf_pageout, &l->l_dbuf);
+	dmu_buf_init_user(&l->l_dbu, zap_leaf_evict_sync, NULL, &l->l_dbuf);
 	winner = dmu_buf_set_user(l->l_dbuf, &l->l_dbu);
 	ASSERT(winner == NULL);
 	dmu_buf_will_dirty(l->l_dbuf, tx);
@@ -470,13 +471,13 @@ zap_open_leaf(uint64_t blkid, dmu_buf_t *db)
 	l->l_bs = highbit64(db->db_size) - 1;
 	l->l_dbuf = db;
 
-	dmu_buf_init_user(&l->l_dbu, zap_leaf_pageout, &l->l_dbuf);
+	dmu_buf_init_user(&l->l_dbu, zap_leaf_evict_sync, NULL, &l->l_dbuf);
 	winner = dmu_buf_set_user(db, &l->l_dbu);
 
 	rw_exit(&l->l_rwlock);
 	if (winner != NULL) {
 		/* someone else set it first */
-		zap_leaf_pageout(&l->l_dbu);
+		zap_leaf_evict_sync(&l->l_dbu);
 		l = winner;
 	}
 
diff --git a/usr/src/uts/common/fs/zfs/zap_micro.c b/usr/src/uts/common/fs/zfs/zap_micro.c
index b2ba9708d8..ad223a08c9 100644
--- a/usr/src/uts/common/fs/zfs/zap_micro.c
+++ b/usr/src/uts/common/fs/zfs/zap_micro.c
@@ -397,7 +397,7 @@ mzap_open(objset_t *os, uint64_t obj, dmu_buf_t *db)
 	 * it, because zap_lockdir() checks zap_ismicro without the lock
 	 * held.
 	 */
-	dmu_buf_init_user(&zap->zap_dbu, zap_evict, &zap->zap_dbuf);
+	dmu_buf_init_user(&zap->zap_dbu, zap_evict_sync, NULL, &zap->zap_dbuf);
 	winner = dmu_buf_set_user(db, &zap->zap_dbu);
 
 	if (winner != NULL)
@@ -736,7 +736,7 @@ zap_destroy(objset_t *os, uint64_t zapobj, dmu_tx_t *tx)
 }
 
 void
-zap_evict(void *dbu)
+zap_evict_sync(void *dbu)
 {
 	zap_t *zap = dbu;
 
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
index 1948aa443b..823822e44c 100644
--- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c
+++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
@@ -3683,12 +3683,15 @@ zfs_ioc_rollback(const char *fsname, nvlist_t *args, nvlist_t *outnvl)
 	int error;
 
 	if (getzfsvfs(fsname, &zfsvfs) == 0) {
+		dsl_dataset_t *ds;
+
+		ds = dmu_objset_ds(zfsvfs->z_os);
 		error = zfs_suspend_fs(zfsvfs);
 		if (error == 0) {
 			int resume_err;
 
 			error = dsl_dataset_rollback(fsname, zfsvfs, outnvl);
-			resume_err = zfs_resume_fs(zfsvfs, fsname);
+			resume_err = zfs_resume_fs(zfsvfs, ds);
 			error = error ? error : resume_err;
 		}
 		VFS_RELE(zfsvfs->z_vfs);
@@ -4313,8 +4316,10 @@ zfs_ioc_recv(zfs_cmd_t *zc)
 
 		if (getzfsvfs(tofs, &zfsvfs) == 0) {
 			/* online recv */
+			dsl_dataset_t *ds;
 			int end_err;
 
+			ds = dmu_objset_ds(zfsvfs->z_os);
 			error = zfs_suspend_fs(zfsvfs);
 			/*
 			 * If the suspend fails, then the recv_end will
@@ -4322,7 +4327,7 @@ zfs_ioc_recv(zfs_cmd_t *zc)
 			 */
 			end_err = dmu_recv_end(&drc, zfsvfs);
 			if (error == 0)
-				error = zfs_resume_fs(zfsvfs, tofs);
+				error = zfs_resume_fs(zfsvfs, ds);
 			error = error ? error : end_err;
 			VFS_RELE(zfsvfs->z_vfs);
 		} else {
@@ -4846,11 +4851,14 @@ zfs_ioc_userspace_upgrade(zfs_cmd_t *zc)
 			 * objset needs to be closed & reopened (to grow the
 			 * objset_phys_t).  Suspend/resume the fs will do that.
 			 */
+			dsl_dataset_t *ds;
+
+			ds = dmu_objset_ds(zfsvfs->z_os);
 			error = zfs_suspend_fs(zfsvfs);
 			if (error == 0) {
 				dmu_objset_refresh_ownership(zfsvfs->z_os,
 				    zfsvfs);
-				error = zfs_resume_fs(zfsvfs, zc->zc_name);
+				error = zfs_resume_fs(zfsvfs, ds);
 			}
 		}
 		if (error == 0)
diff --git a/usr/src/uts/common/fs/zfs/zfs_vfsops.c b/usr/src/uts/common/fs/zfs/zfs_vfsops.c
index f069e3553e..9e0a8c0ed8 100644
--- a/usr/src/uts/common/fs/zfs/zfs_vfsops.c
+++ b/usr/src/uts/common/fs/zfs/zfs_vfsops.c
@@ -1020,13 +1020,6 @@ zfsvfs_setup(zfsvfs_t *zfsvfs, boolean_t mounting)
 	if (error)
 		return (error);
 
-	/*
-	 * Set the objset user_ptr to track its zfsvfs.
-	 */
-	mutex_enter(&zfsvfs->z_os->os_user_ptr_lock);
-	dmu_objset_set_user(zfsvfs->z_os, zfsvfs);
-	mutex_exit(&zfsvfs->z_os->os_user_ptr_lock);
-
 	zfsvfs->z_log = zil_open(zfsvfs->z_os, zfs_get_data);
 
 	/*
@@ -1087,6 +1080,13 @@ zfsvfs_setup(zfsvfs_t *zfsvfs, boolean_t mounting)
 		zfsvfs->z_vfs->vfs_flag |= readonly; /* restore readonly bit */
 	}
 
+	/*
+	 * Set the objset user_ptr to track its zfsvfs.
+	 */
+	mutex_enter(&zfsvfs->z_os->os_user_ptr_lock);
+	dmu_objset_set_user(zfsvfs->z_os, zfsvfs);
+	mutex_exit(&zfsvfs->z_os->os_user_ptr_lock);
+
 	return (0);
 }
 
@@ -2032,7 +2032,7 @@ zfs_suspend_fs(zfsvfs_t *zfsvfs)
  * zfsvfs, held, and long held on entry.
  */
 int
-zfs_resume_fs(zfsvfs_t *zfsvfs, const char *osname)
+zfs_resume_fs(zfsvfs_t *zfsvfs, dsl_dataset_t *ds)
 {
 	int err;
 	znode_t *zp;
@@ -2041,14 +2041,13 @@ zfs_resume_fs(zfsvfs_t *zfsvfs, const char *osname)
 	ASSERT(RW_WRITE_HELD(&zfsvfs->z_teardown_inactive_lock));
 
 	/*
-	 * We already own this, so just hold and rele it to update the
-	 * objset_t, as the one we had before may have been evicted.
+	 * We already own this, so just update the objset_t, as the one we
+	 * had before may have been evicted.
 	 */
 	objset_t *os;
-	VERIFY0(dmu_objset_hold(osname, zfsvfs, &os));
-	VERIFY3P(os->os_dsl_dataset->ds_owner, ==, zfsvfs);
-	VERIFY(dsl_dataset_long_held(os->os_dsl_dataset));
-	dmu_objset_rele(os, zfsvfs);
+	VERIFY3P(ds->ds_owner, ==, zfsvfs);
+	VERIFY(dsl_dataset_long_held(ds));
+	VERIFY0(dmu_objset_from_ds(ds, &os));
 
 	err = zfsvfs_init(zfsvfs, os);
 	if (err != 0)
diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c
index 535bc057b9..35ae5a8fd1 100644
--- a/usr/src/uts/common/fs/zfs/zvol.c
+++ b/usr/src/uts/common/fs/zfs/zvol.c
@@ -24,7 +24,7 @@
  * Portions Copyright 2010 Robert Milkowski
  *
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2014, Joyent, Inc. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
  */
@@ -154,6 +154,12 @@ int zvol_maxphys = DMU_MAX_ACCESS/2;
  */
 boolean_t zvol_unmap_enabled = B_TRUE;
 
+/*
+ * If true, unmaps requested as synchronous are executed synchronously,
+ * otherwise all unmaps are asynchronous.
+ */
+boolean_t zvol_unmap_sync_enabled = B_FALSE;
+
 extern int zfs_set_prop_nvlist(const char *, zprop_source_t,
     nvlist_t *, nvlist_t *);
 static int zvol_remove_zv(zvol_state_t *);
@@ -1912,26 +1918,21 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *cr, int *rvalp)
 
 		zfs_range_unlock(rl);
 
-		if (error == 0) {
-			/*
-			 * If the write-cache is disabled or 'sync' property
-			 * is set to 'always' then treat this as a synchronous
-			 * operation (i.e. commit to zil).
-			 */
-			if (!(zv->zv_flags & ZVOL_WCE) ||
-			    (zv->zv_objset->os_sync == ZFS_SYNC_ALWAYS))
-				zil_commit(zv->zv_zilog, ZVOL_OBJ);
-
-			/*
-			 * If the caller really wants synchronous writes, and
-			 * can't wait for them, don't return until the write
-			 * is done.
-			 */
-			if (df.df_flags & DF_WAIT_SYNC) {
-				txg_wait_synced(
-				    dmu_objset_pool(zv->zv_objset), 0);
-			}
+		/*
+		 * If the write-cache is disabled, 'sync' property
+		 * is set to 'always', or if the caller is asking for
+		 * a synchronous free, commit this operation to the zil.
+		 * This will sync any previous uncommitted writes to the
+		 * zvol object.
+		 * Can be overridden by the zvol_unmap_sync_enabled tunable.
+		 */
+		if ((error == 0) && zvol_unmap_sync_enabled &&
+		    (!(zv->zv_flags & ZVOL_WCE) ||
+		    (zv->zv_objset->os_sync == ZFS_SYNC_ALWAYS) ||
+		    (df.df_flags & DF_WAIT_SYNC))) {
+			zil_commit(zv->zv_zilog, ZVOL_OBJ);
 		}
+
 		return (error);
 	}
 
diff --git a/usr/src/uts/common/io/iwn/fw-iw/iwlwifi-6000g2a-5.ucode b/usr/src/uts/common/io/iwn/fw-iw/iwlwifi-6000g2a-5.ucode
deleted file mode 100644
index 24f7d146d0..0000000000
--- a/usr/src/uts/common/io/iwn/fw-iw/iwlwifi-6000g2a-5.ucode
+++ /dev/null
diff --git a/usr/src/uts/common/io/iwn/fw-iw/iwlwifi-6000g2a-6.ucode b/usr/src/uts/common/io/iwn/fw-iw/iwlwifi-6000g2a-6.ucode
new file mode 100644
index 0000000000..a1f2454df7
--- /dev/null
+++ b/usr/src/uts/common/io/iwn/fw-iw/iwlwifi-6000g2a-6.ucode
diff --git a/usr/src/uts/common/io/iwn/if_iwn.c b/usr/src/uts/common/io/iwn/if_iwn.c
index a4334cc19d..fc60627899 100644
--- a/usr/src/uts/common/io/iwn/if_iwn.c
+++ b/usr/src/uts/common/io/iwn/if_iwn.c
@@ -1321,7 +1321,7 @@ iwn5000_attach(struct iwn_softc *sc, uint16_t pid)
 			ops->config_bt_coex = iwn_config_bt_coex_adv1;
 		}
 		else
-			sc->fwname = "iwlwifi-6000g2a-5.ucode";
+			sc->fwname = "iwlwifi-6000g2a-6.ucode";
 
 		iwn_kstat_create(sc, "temp_offset",
 		    sizeof (struct iwn_ks_toff_6000),
diff --git a/usr/src/uts/common/io/scsi/targets/sd.c b/usr/src/uts/common/io/scsi/targets/sd.c
index dc5dc22e37..0e97d9125b 100644
--- a/usr/src/uts/common/io/scsi/targets/sd.c
+++ b/usr/src/uts/common/io/scsi/targets/sd.c
@@ -27,6 +27,7 @@
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 /*
  * Copyright 2011 cyril.galibern@opensvc.com
@@ -14175,15 +14176,21 @@ sd_initpkt_for_uscsi(struct buf *bp, struct scsi_pkt **pktpp)
 
 	/*
 	 * Allocate the scsi_pkt for the command.
+	 *
 	 * Note: If PKT_DMA_PARTIAL flag is set, scsi_vhci binds a path
 	 *	 during scsi_init_pkt time and will continue to use the
 	 *	 same path as long as the same scsi_pkt is used without
-	 *	 intervening scsi_dma_free(). Since uscsi command does
+	 *	 intervening scsi_dmafree(). Since uscsi command does
 	 *	 not call scsi_dmafree() before retry failed command, it
 	 *	 is necessary to make sure PKT_DMA_PARTIAL flag is NOT
 	 *	 set such that scsi_vhci can use other available path for
 	 *	 retry. Besides, ucsci command does not allow DMA breakup,
 	 *	 so there is no need to set PKT_DMA_PARTIAL flag.
+	 *
+	 *	 More fundamentally, we can't support breaking up this DMA into
+	 *	 multiple windows on x86. There is, in general, no guarantee
+	 *	 that arbitrary SCSI commands are idempotent, which is required
+	 *	 if we want to use multiple windows for a given command.
 	 */
 	if (uscmd->uscsi_rqlen > SENSE_LENGTH) {
 		pktp = scsi_init_pkt(SD_ADDRESS(un), NULL,
@@ -22408,6 +22415,7 @@ sdioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *cred_p, int *rval_p)
 		case MHIOCGRP_REGISTERANDIGNOREKEY:
 		case CDROMCLOSETRAY:
 		case USCSICMD:
+		case USCSIMAXXFER:
 			goto skip_ready_valid;
 		default:
 			break;
@@ -22844,6 +22852,23 @@ skip_ready_valid:
 		}
 		break;
 
+	case USCSIMAXXFER:
+		SD_TRACE(SD_LOG_IOCTL, un, "USCSIMAXXFER\n");
+		cr = ddi_get_cred();
+		if ((drv_priv(cred_p) != 0) && (drv_priv(cr) != 0)) {
+			err = EPERM;
+		} else {
+			const uscsi_xfer_t xfer = un->un_max_xfer_size;
+
+			if (ddi_copyout(&xfer, (void *)arg, sizeof (xfer),
+			    flag) != 0) {
+				err = EFAULT;
+			} else {
+				err = 0;
+			}
+		}
+		break;
+
 	case CDROMPAUSE:
 	case CDROMRESUME:
 		SD_TRACE(SD_LOG_IOCTL, un, "PAUSE-RESUME\n");
diff --git a/usr/src/uts/common/os/timer.c b/usr/src/uts/common/os/timer.c
index b25a6cbcf1..845b93da6e 100644
--- a/usr/src/uts/common/os/timer.c
+++ b/usr/src/uts/common/os/timer.c
@@ -25,11 +25,12 @@
  */
 
 /*
- * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 #include <sys/timer.h>
 #include <sys/systm.h>
+#include <sys/sysmacros.h>
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/debug.h>
@@ -81,6 +82,7 @@ timer_lock(proc_t *p, itimer_t *it)
  * waiters.  p_lock must be held on entry; it will not be dropped by
  * timer_unlock().
  */
+/* ARGSUSED */
 static void
 timer_unlock(proc_t *p, itimer_t *it)
 {
@@ -123,6 +125,7 @@ timer_delete_locked(proc_t *p, timer_t tid, itimer_t *it)
 		timer_lock(p, it);
 	}
 
+	ASSERT(p->p_itimer_sz > tid);
 	ASSERT(p->p_itimer[tid] == it);
 	p->p_itimer[tid] = NULL;
 
@@ -201,12 +204,14 @@ timer_grab(proc_t *p, timer_t tid)
 {
 	itimer_t **itp, *it;
 
-	if (tid >= timer_max || tid < 0)
+	if (tid < 0) {
 		return (NULL);
+	}
 
 	mutex_enter(&p->p_lock);
 
-	if ((itp = p->p_itimer) == NULL || (it = itp[tid]) == NULL) {
+	if ((itp = p->p_itimer) == NULL || tid >= p->p_itimer_sz ||
+	    (it = itp[tid]) == NULL) {
 		mutex_exit(&p->p_lock);
 		return (NULL);
 	}
@@ -258,6 +263,13 @@ clock_timer_init()
 {
 	clock_timer_cache = kmem_cache_create("timer_cache",
 	    sizeof (itimer_t), 0, NULL, NULL, NULL, NULL, NULL, 0);
+
+	/*
+	 * Push the timer_max limit up to at least 4 * NCPU.  Due to the way
+	 * NCPU is defined, proper initialization of the timer limit is
+	 * performed at runtime.
+	 */
+	timer_max = MAX(NCPU * 4, timer_max);
 }
 
 void
@@ -466,13 +478,115 @@ timer_fire(itimer_t *it)
 		mutex_exit(&p->p_lock);
 }
 
+/*
+ * Allocate an itimer_t and find and appropriate slot for it in p_itimer.
+ * Acquires p_lock and holds it on return, regardless of success.
+ */
+static itimer_t *
+timer_alloc(proc_t *p, timer_t *id)
+{
+	itimer_t *it, **itp = NULL;
+	uint_t i;
+
+	ASSERT(MUTEX_NOT_HELD(&p->p_lock));
+
+	it = kmem_cache_alloc(clock_timer_cache, KM_SLEEP);
+	bzero(it, sizeof (itimer_t));
+	mutex_init(&it->it_mutex, NULL, MUTEX_DEFAULT, NULL);
+
+	mutex_enter(&p->p_lock);
+retry:
+	if (p->p_itimer != NULL) {
+		for (i = 0; i < p->p_itimer_sz; i++) {
+			if (p->p_itimer[i] == NULL) {
+				itp = &(p->p_itimer[i]);
+				break;
+			}
+		}
+	}
+
+	/*
+	 * A suitable slot was not found.  If possible, allocate (or resize)
+	 * the p_itimer array and try again.
+	 */
+	if (itp == NULL) {
+		uint_t target_sz = _TIMER_ALLOC_INIT;
+		itimer_t **itp_new;
+
+		if (p->p_itimer != NULL) {
+			ASSERT(p->p_itimer_sz != 0);
+
+			target_sz = p->p_itimer_sz * 2;
+		}
+		/*
+		 * Protect against exceeding the max or overflow
+		 */
+		if (target_sz > timer_max || target_sz > INT_MAX ||
+		    target_sz < p->p_itimer_sz) {
+			kmem_cache_free(clock_timer_cache, it);
+			return (NULL);
+		}
+		mutex_exit(&p->p_lock);
+		itp_new = kmem_zalloc(target_sz * sizeof (itimer_t *),
+		    KM_SLEEP);
+		mutex_enter(&p->p_lock);
+		if (target_sz <= p->p_itimer_sz) {
+			/*
+			 * A racing thread performed the resize while we were
+			 * waiting outside p_lock.  Discard our now-useless
+			 * allocation and retry.
+			 */
+			kmem_free(itp_new, target_sz * sizeof (itimer_t *));
+			goto retry;
+		} else {
+			/*
+			 * Instantiate the larger allocation and select the
+			 * first fresh entry for use.
+			 */
+			if (p->p_itimer != NULL) {
+				uint_t old_sz;
+
+				old_sz = p->p_itimer_sz;
+				bcopy(p->p_itimer, itp_new,
+				    old_sz * sizeof (itimer_t *));
+				kmem_free(p->p_itimer,
+				    old_sz * sizeof (itimer_t *));
+
+				/*
+				 * Short circuit to use the first free entry in
+				 * the new allocation.  It's possible that
+				 * other lower-indexed timers were freed while
+				 * p_lock was dropped, but skipping over them
+				 * is not harmful at all.  In the common case,
+				 * we skip the need to walk over an array
+				 * filled with timers before arriving at the
+				 * slot we know is fresh from the allocation.
+				 */
+				i = old_sz;
+			} else {
+				/*
+				 * For processes lacking any existing timers,
+				 * we can simply select the first entry.
+				 */
+				i = 0;
+			}
+			p->p_itimer = itp_new;
+			p->p_itimer_sz = target_sz;
+		}
+	}
+
+	ASSERT(i <= INT_MAX);
+	*id = (timer_t)i;
+	return (it);
+}
+
 int
 timer_create(clockid_t clock, struct sigevent *evp, timer_t *tid)
 {
 	struct sigevent ev;
 	proc_t *p = curproc;
 	clock_backend_t *backend;
-	itimer_t *it, **itp;
+	itimer_t *it;
 	sigqueue_t *sigq;
 	cred_t *cr = CRED();
 	int error = 0;
@@ -547,51 +661,24 @@ timer_create(clockid_t clock, struct sigevent *evp, timer_t *tid)
 	}
 
 	/*
-	 * We'll allocate our timer and sigqueue now, before we grab p_lock.
-	 * If we can't find an empty slot, we'll free them before returning.
+	 * We'll allocate our sigqueue now, before we grab p_lock.
+	 * If we can't find an empty slot, we'll free it before returning.
 	 */
-	it = kmem_cache_alloc(clock_timer_cache, KM_SLEEP);
-	bzero(it, sizeof (itimer_t));
-	mutex_init(&it->it_mutex, NULL, MUTEX_DEFAULT, NULL);
 	sigq = kmem_zalloc(sizeof (sigqueue_t), KM_SLEEP);
 
-	mutex_enter(&p->p_lock);
-
 	/*
-	 * If this is this process' first timer, we need to attempt to allocate
-	 * an array of timerstr_t pointers.  We drop p_lock to perform the
-	 * allocation; if we return to discover that p_itimer is non-NULL,
-	 * we will free our allocation and drive on.
+	 * Allocate a timer and choose a slot for it. This acquires p_lock.
 	 */
-	if ((itp = p->p_itimer) == NULL) {
-		mutex_exit(&p->p_lock);
-		itp = kmem_zalloc(timer_max * sizeof (itimer_t *), KM_SLEEP);
-		mutex_enter(&p->p_lock);
-
-		if (p->p_itimer == NULL)
-			p->p_itimer = itp;
-		else {
-			kmem_free(itp, timer_max * sizeof (itimer_t *));
-			itp = p->p_itimer;
-		}
-	}
-
-	for (i = 0; i < timer_max && itp[i] != NULL; i++)
-		continue;
+	it = timer_alloc(p, &i);
+	ASSERT(MUTEX_HELD(&p->p_lock));
 
-	if (i == timer_max) {
-		/*
-		 * We couldn't find a slot.  Drop p_lock, free the preallocated
-		 * timer and sigqueue, and return an error.
-		 */
+	if (it == NULL) {
 		mutex_exit(&p->p_lock);
-		kmem_cache_free(clock_timer_cache, it);
 		kmem_free(sigq, sizeof (sigqueue_t));
-
 		return (set_errno(EAGAIN));
 	}
 
-	ASSERT(i < timer_max && itp[i] == NULL);
+	ASSERT(i < p->p_itimer_sz && p->p_itimer[i] == NULL);
 
 	/*
 	 * If we develop other notification mechanisms, this will need
@@ -613,8 +700,6 @@ timer_create(clockid_t clock, struct sigevent *evp, timer_t *tid)
 	it->it_sigq = sigq;
 	it->it_backend = backend;
 	it->it_lock = ITLK_LOCKED;
-	itp[i] = it;
-
 
 	if (ev.sigev_notify == SIGEV_THREAD ||
 	    ev.sigev_notify == SIGEV_PORT) {
@@ -645,7 +730,6 @@ timer_create(clockid_t clock, struct sigevent *evp, timer_t *tid)
 		    (port_source_t **)&it->it_portsrc, timer_close_port,
 		    (void *)it, NULL);
 		if (error) {
-			itp[i] = NULL;		/* clear slot */
 			mutex_exit(&p->p_lock);
 			kmem_cache_free(clock_timer_cache, it);
 			kmem_free(sigq, sizeof (sigqueue_t));
@@ -658,7 +742,6 @@ timer_create(clockid_t clock, struct sigevent *evp, timer_t *tid)
 		if (error) {
 			(void) port_dissociate_ksource(port, PORT_SOURCE_TIMER,
 			    (port_source_t *)it->it_portsrc);
-			itp[i] = NULL;		/* clear slot */
 			mutex_exit(&p->p_lock);
 			kmem_cache_free(clock_timer_cache, it);
 			kmem_free(sigq, sizeof (sigqueue_t));
@@ -675,6 +758,8 @@ timer_create(clockid_t clock, struct sigevent *evp, timer_t *tid)
 			it->it_flags |= IT_SIGNAL;
 	}
 
+	/* Populate the slot now that the timer is prepped. */
+	p->p_itimer[i] = it;
 	mutex_exit(&p->p_lock);
 
 	/*
@@ -832,7 +917,7 @@ timer_getoverrun(timer_t tid)
 void
 timer_lwpexit(void)
 {
-	timer_t i;
+	uint_t i;
 	proc_t *p = curproc;
 	klwp_t *lwp = ttolwp(curthread);
 	itimer_t *it, **itp;
@@ -842,7 +927,7 @@ timer_lwpexit(void)
 	if ((itp = p->p_itimer) == NULL)
 		return;
 
-	for (i = 0; i < timer_max; i++) {
+	for (i = 0; i < p->p_itimer_sz; i++) {
 		if ((it = itp[i]) == NULL)
 			continue;
 
@@ -876,7 +961,7 @@ timer_lwpexit(void)
 void
 timer_lwpbind()
 {
-	timer_t i;
+	uint_t i;
 	proc_t *p = curproc;
 	klwp_t *lwp = ttolwp(curthread);
 	itimer_t *it, **itp;
@@ -886,7 +971,7 @@ timer_lwpbind()
 	if ((itp = p->p_itimer) == NULL)
 		return;
 
-	for (i = 0; i < timer_max; i++) {
+	for (i = 0; i < p->p_itimer_sz; i++) {
 		if ((it = itp[i]) == NULL)
 			continue;
 
@@ -911,16 +996,19 @@ timer_lwpbind()
 void
 timer_exit(void)
 {
-	timer_t i;
+	uint_t i;
 	proc_t *p = curproc;
 
 	ASSERT(p->p_itimer != NULL);
+	ASSERT(p->p_itimer_sz != 0);
 
-	for (i = 0; i < timer_max; i++)
-		(void) timer_delete(i);
+	for (i = 0; i < p->p_itimer_sz; i++) {
+		(void) timer_delete((timer_t)i);
+	}
 
-	kmem_free(p->p_itimer, timer_max * sizeof (itimer_t *));
+	kmem_free(p->p_itimer, p->p_itimer_sz * sizeof (itimer_t *));
 	p->p_itimer = NULL;
+	p->p_itimer_sz = 0;
 }
 
 /*
diff --git a/usr/src/uts/common/sys/proc.h b/usr/src/uts/common/sys/proc.h
index 20d4cfdaa5..9f36a34ebd 100644
--- a/usr/src/uts/common/sys/proc.h
+++ b/usr/src/uts/common/sys/proc.h
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015 Joyent, Inc.  All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -307,6 +307,7 @@ typedef struct	proc {
 	size_t p_swrss;			/* resident set size before last swap */
 	struct aio	*p_aio;		/* pointer to async I/O struct */
 	struct itimer	**p_itimer;	/* interval timers */
+	uint_t		p_itimer_sz;	/* max allocated interval timers */
 	timeout_id_t	p_alarmid;	/* alarm's timeout id */
 	caddr_t		p_usrstack;	/* top of the process stack */
 	uint_t		p_stkprot;	/* stack memory protection */
diff --git a/usr/src/uts/common/sys/scsi/impl/spc3_types.h b/usr/src/uts/common/sys/scsi/impl/spc3_types.h
index 456a0e336b..4b687eb9c6 100644
--- a/usr/src/uts/common/sys/scsi/impl/spc3_types.h
+++ b/usr/src/uts/common/sys/scsi/impl/spc3_types.h
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 #ifndef	_SPC3_TYPES_H
@@ -812,6 +813,30 @@ typedef struct spc3_persistent_reserve_in_cdb {
 } spc3_persistent_reserve_in_cdb_t;
 
 /*
+ * SPC-3 6.15 READ BUFFER
+ */
+typedef struct spc3_read_buffer_cdb {
+	uint8_t rbc_opcode;
+	DECL_BITFIELD2(
+	    rbc_mode		:5,
+	    _reserved		:3);
+	uint8_t	rbc_bufferid;
+	uint8_t rbc_buffer_offset[3];
+	uint8_t rbc_allocation_len[3];
+	spc3_control_t rbc_control;
+} spc3_read_buffer_cdb_t;
+
+typedef enum spc3_read_buffer_mode {
+	SPC3_RB_MODE_COMB_HDR_DATA = 0x00,
+	SPC3_RB_MODE_VENDOR_SPECIFIC = 0x01,
+	SPC3_RB_MODE_DATA = 0x02,
+	SPC3_RB_MODE_DESCRIPTOR = 0x03,
+	SPC3_RB_MODE_ECHO_BUF = 0x0a,
+	SPC3_RB_MODE_ECHO_BUF_DESC = 0x0b,
+	SPC3_RB_MODE_ENABLE_EXPANDER_ECHO_BUF = 0x1a
+} spc3_read_buffer_mode_t;
+
+/*
  * SPC-3 6.16 READ MEDIA SERIAL NUMBER
  */
 typedef struct spc3_read_media_serial_number_cdb {
diff --git a/usr/src/uts/common/sys/scsi/impl/uscsi.h b/usr/src/uts/common/sys/scsi/impl/uscsi.h
index afce8ec081..f416b1bb5a 100644
--- a/usr/src/uts/common/sys/scsi/impl/uscsi.h
+++ b/usr/src/uts/common/sys/scsi/impl/uscsi.h
@@ -21,10 +21,12 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright 2016 Joyent, Inc.
  */
 
 /*
- * Defines for user SCSI commands					*
+ * Defines for user SCSI commands
  */
 
 #ifndef _SYS_SCSI_IMPL_USCSI_H
@@ -186,10 +188,16 @@ struct uscsi_rqs32	{
 #define	RQS_VALID	0x02	/* RQS data is valid */
 
 /*
+ * Structure for USCSIMAXXFER ioctls
+ */
+typedef uint64_t	uscsi_xfer_t;
+
+/*
  * User SCSI io control command
  */
 #define	USCSIIOC	(0x04 << 8)
 #define	USCSICMD	(USCSIIOC|201) 	/* user scsi command */
+#define	USCSIMAXXFER	(USCSIIOC|202)	/* get max transfer size */
 
 #ifdef	_KERNEL
 
diff --git a/usr/src/uts/common/sys/sysconfig.h b/usr/src/uts/common/sys/sysconfig.h
index 1bbcdcfe98..12ab07e2db 100644
--- a/usr/src/uts/common/sys/sysconfig.h
+++ b/usr/src/uts/common/sys/sysconfig.h
@@ -25,13 +25,12 @@
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2016 Joyent, Inc.
  */
 
 #ifndef _SYS_SYSCONFIG_H
 #define	_SYS_SYSCONFIG_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.5 */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -103,6 +102,8 @@ extern int	mach_sysconfig(int);
 
 #define	_CONFIG_EPHID_MAX	47	/* maximum ephemeral uid */
 
+#define	_CONFIG_NPROC_NCPU	48	/* NCPU (sometimes > NPROC_MAX) */
+
 #ifdef	__cplusplus
 }
 #endif
diff --git a/usr/src/uts/common/sys/timer.h b/usr/src/uts/common/sys/timer.h
index ec349c962f..688a381ecc 100644
--- a/usr/src/uts/common/sys/timer.h
+++ b/usr/src/uts/common/sys/timer.h
@@ -25,7 +25,7 @@
  */
 
 /*
- * Copyright (c) 2015, Joyent, Inc. All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 #ifndef	_SYS_TIMER_H
@@ -34,6 +34,7 @@
 #include <sys/types.h>
 #include <sys/proc.h>
 #include <sys/thread.h>
+#include <sys/param.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -42,7 +43,13 @@ extern "C" {
 #ifdef	_KERNEL
 
 #define	_TIMER_MAX	32
-extern	int	timer_max;		/* patchable via /etc/system */
+/*
+ * Max timers per process.  This is patchable via /etc/system and can be
+ * updated via kmdb.  Sticking to positive powers of 2 is recommended.
+ */
+extern	int	timer_max;
+
+#define	_TIMER_ALLOC_INIT	8	/* initial size for p_itimer array */
 
 /*
  * Bit values for the it_lock field.
diff --git a/usr/src/uts/common/syscall/sysconfig.c b/usr/src/uts/common/syscall/sysconfig.c
index 26ea859224..92daeed703 100644
--- a/usr/src/uts/common/syscall/sysconfig.c
+++ b/usr/src/uts/common/syscall/sysconfig.c
@@ -22,7 +22,7 @@
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- * Copyright 2012 Joyent, Inc.  All rights reserved.
+ * Copyright 2016 Joyent, Inc.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -112,6 +112,9 @@ sysconfig(int which)
 	case _CONFIG_NPROC_MAX:
 		return (max_ncpus);
 
+	case _CONFIG_NPROC_NCPU:
+		return (NCPU); /* Private sysconfig for direct NCPU access */
+
 	case _CONFIG_STACK_PROT:
 		return (curproc->p_stkprot & ~PROT_USER);
 
diff --git a/usr/src/uts/intel/io/vmxnet3s/README.txt b/usr/src/uts/intel/io/vmxnet3s/README.txt
index 7539907a63..79bf666a64 100644
--- a/usr/src/uts/intel/io/vmxnet3s/README.txt
+++ b/usr/src/uts/intel/io/vmxnet3s/README.txt
@@ -1,4 +1,6 @@
 #
+# CDDL HEADER START
+#
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
 # You may only use this file in accordance with the terms of version
@@ -8,24 +10,25 @@
 # source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
-
+# CDDL HEADER END
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
 #
 
 The vmxnet3s driver is a paravirtualized GLDv3 NIC driver designed to
-be used on VMware virtual machines version 7 and later.
-
-This version of the driver was initially based on the "stable-8.6.x" branch
-of the VMware open-vm-tools which can be obtained from:
+be used on VMware virtual machines version 7 and later.  This version
+of the driver is based on the "stable-10.0.x" branch of the VMware
+open-vm-tools which can be obtained from:
 
 https://github.com/vmware/open-vm-tools
 
-Current changes include:
+Changes from stable-10.0.x include:
 
-* cstyle and lint cleanup: the driver is lint clean with two categorical
+* add support for VLANs
+* enable building in the illumos gate
+* enable building with the Sun Studio compiler
+* lint cleanup: the driver is lint clean with two categorical
   exceptions for which warnings are disabled in the Makefile
 
-* added support for dladm mtu property
-* added support for VLANs
-* LSO fix contributed by Michael Tsymbalyuk <mtzaurus@gmail.com>
+The driver remains in the original C style to facilitate potential
+future synchronization with upstream.
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h b/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h
index c6250cdf09..039c0f2e11 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2014 VMware, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of the Common
  * Development and Distribution License (the "License") version 1.0
@@ -14,7 +14,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  */
 
 #ifndef	_VMXNET3_H_
@@ -127,6 +127,7 @@ typedef struct vmxnet3_softc_t {
 	boolean_t	devEnabled;
 	uint8_t		macaddr[6];
 	uint32_t	cur_mtu;
+	boolean_t	allow_jumbo;
 	link_state_t	linkState;
 	uint64_t	linkSpeed;
 	vmxnet3_dmabuf_t sharedData;
@@ -147,8 +148,8 @@ typedef struct vmxnet3_softc_t {
 	vmxnet3_rxqueue_t rxQueue;
 	kmutex_t	rxPoolLock;
 	vmxnet3_rxpool_t rxPool;
-	volatile uint32_t rxNumBufs;
 	uint32_t	rxMode;
+	boolean_t	alloc_ok;
 
 	vmxnet3_dmabuf_t mfTable;
 	kstat_t		*devKstats;
@@ -157,8 +158,10 @@ typedef struct vmxnet3_softc_t {
 	uint32_t	tx_pullup_failed;
 	uint32_t	tx_ring_full;
 	uint32_t	tx_error;
+	uint32_t	rx_num_bufs;
 	uint32_t	rx_alloc_buf;
 	uint32_t	rx_alloc_failed;
+	uint32_t	rx_pool_empty;
 } vmxnet3_softc_t;
 
 typedef struct vmxnet3_kstats_t {
@@ -166,8 +169,11 @@ typedef struct vmxnet3_kstats_t {
 	kstat_named_t	tx_pullup_needed;
 	kstat_named_t	tx_ring_full;
 	kstat_named_t	rx_alloc_buf;
+	kstat_named_t	rx_pool_empty;
+	kstat_named_t	rx_num_bufs;
 } vmxnet3_kstats_t;
 
+int	vmxnet3_dmaerr2errno(int);
 int	vmxnet3_alloc_dma_mem_1(vmxnet3_softc_t *dp, vmxnet3_dmabuf_t *dma,
 	    size_t size, boolean_t canSleep);
 int	vmxnet3_alloc_dma_mem_128(vmxnet3_softc_t *dp, vmxnet3_dmabuf_t *dma,
@@ -192,13 +198,14 @@ extern ddi_device_acc_attr_t vmxnet3_dev_attr;
 
 extern int vmxnet3s_debug;
 
-#define	VMXNET3_MODNAME "vmxnet3s"
+#define	VMXNET3_MODNAME	"vmxnet3s"
+#define	VMXNET3_DRIVER_VERSION_STRING	"1.1.0.0"
 
 /* Logging stuff */
 #define	VMXNET3_WARN(Device, ...) vmxnet3_log(CE_WARN, Device, __VA_ARGS__)
 
 #ifdef	DEBUG
-#define	VMXNET3_DEBUG(Device, Level, ...) {	 		\
+#define	VMXNET3_DEBUG(Device, Level, ...) {			\
 	if (Level <= vmxnet3s_debug) {				\
 		vmxnet3_log(CE_CONT, Device, "?" __VA_ARGS__);	\
 	}							\
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_defs.h b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_defs.h
index 8ef59990cf..4dfac84e77 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_defs.h
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_defs.h
@@ -31,7 +31,7 @@
 #define	VMXNET3_REG_UVRS	0x8	/* UPT Version Report Selection */
 #define	VMXNET3_REG_DSAL	0x10	/* Driver Shared Address Low */
 #define	VMXNET3_REG_DSAH	0x18	/* Driver Shared Address High */
-#define	VMXNET3_REG_CMD		0x20 	/* Command */
+#define	VMXNET3_REG_CMD		0x20	/* Command */
 #define	VMXNET3_REG_MACL	0x28	/* MAC Address Low */
 #define	VMXNET3_REG_MACH	0x30	/* MAC Address High */
 #define	VMXNET3_REG_ICR		0x38	/* Interrupt Cause Register */
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c
index 2b54baf799..612dc052f1 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2014 VMware, Inc. All rights reserved.
  *
  * The contents of this file are subject to the terms of the Common
  * Development and Distribution License (the "License") version 1.0
@@ -14,25 +14,31 @@
  */
 
 /*
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  */
 
 #include <vmxnet3.h>
 
-#define	BUILD_NUMBER_NUMERIC		20160330
-#define	BUILD_NUMBER_NUMERIC_STRING	"20160330"
+/*
+ * This driver is based on VMware's version 3227872, and contains additional
+ * enhancements (see README.txt).
+ */
+#define	BUILD_NUMBER_NUMERIC	3227872
+
+/*
+ * If we run out of rxPool buffers, only allocate if the MTU is <= PAGESIZE
+ * so that we don't have to incur the cost of allocating multiple contiguous
+ * pages (very slow) in interrupt context.
+ */
+#define	VMXNET3_ALLOC_OK(dp)	((dp)->cur_mtu <= PAGESIZE)
 
 /*
  * TODO:
  *    - Tx data ring
  *    - MAC_CAPAB_POLL support
- *    - JF support
  *    - Dynamic RX pool
  */
 
-/*
- * Forward declarations
- */
 static int vmxnet3_getstat(void *, uint_t, uint64_t *);
 static int vmxnet3_start(void *);
 static void vmxnet3_stop(void *);
@@ -41,9 +47,11 @@ static void vmxnet3_ioctl(void *arg, queue_t *wq, mblk_t *mp);
 static int vmxnet3_multicst(void *, boolean_t, const uint8_t *);
 static int vmxnet3_unicst(void *, const uint8_t *);
 static boolean_t vmxnet3_getcapab(void *, mac_capab_t, void *);
-static int vmxnet3_setmacprop(void *, const char *, mac_prop_id_t, uint_t,
+static int vmxnet3_get_prop(void *, const char *, mac_prop_id_t, uint_t,
+    void *);
+static int vmxnet3_set_prop(void *, const char *, mac_prop_id_t, uint_t,
     const void *);
-static void vmxnet3_macpropinfo(void *, const char *, mac_prop_id_t,
+static void vmxnet3_prop_info(void *, const char *, mac_prop_id_t,
     mac_prop_info_handle_t);
 
 int vmxnet3s_debug = 0;
@@ -60,8 +68,9 @@ static mac_callbacks_t vmxnet3_mac_callbacks = {
 	.mc_tx =	vmxnet3_tx,
 	.mc_ioctl =	vmxnet3_ioctl,
 	.mc_getcapab =	vmxnet3_getcapab,
-	.mc_setprop =	vmxnet3_setmacprop,
-	.mc_propinfo =	vmxnet3_macpropinfo
+	.mc_getprop =	vmxnet3_get_prop,
+	.mc_setprop =	vmxnet3_set_prop,
+	.mc_propinfo =	vmxnet3_prop_info
 };
 
 /* Tx DMA engine description */
@@ -83,15 +92,10 @@ static ddi_dma_attr_t vmxnet3_dma_attrs_tx = {
 /* --- */
 
 /*
- * vmxnet3_getstat --
+ * Fetch the statistics of a vmxnet3 device.
  *
- *    Fetch the statistics of a vmxnet3 device.
- *
- * Results:
- *    DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero on failure.
  */
 static int
 vmxnet3_getstat(void *data, uint_t stat, uint64_t *val)
@@ -103,7 +107,7 @@ vmxnet3_getstat(void *data, uint_t stat, uint64_t *val)
 	VMXNET3_DEBUG(dp, 3, "getstat(%u)\n", stat);
 
 	if (!dp->devEnabled) {
-		return (DDI_FAILURE);
+		return (EBUSY);
 	}
 
 	txStats = &VMXNET3_TQDESC(dp)->stats;
@@ -133,7 +137,7 @@ vmxnet3_getstat(void *data, uint_t stat, uint64_t *val)
 		/* nothing */
 		break;
 	default:
-		return (DDI_FAILURE);
+		return (ENOTSUP);
 	}
 
 	/*
@@ -193,39 +197,34 @@ vmxnet3_getstat(void *data, uint_t stat, uint64_t *val)
 		ASSERT(B_FALSE);
 	}
 
-	return (DDI_SUCCESS);
+	return (0);
 }
 
 /*
- * vmxnet3_prepare_drivershared --
- *
- *    Allocate and initialize the shared data structures
- *    of a vmxnet3 device.
- *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
+ * Allocate and initialize the shared data structures of a vmxnet3 device.
  *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on sucess, non-zero on failure.
  */
 static int
 vmxnet3_prepare_drivershared(vmxnet3_softc_t *dp)
 {
 	Vmxnet3_DriverShared *ds;
 	size_t allocSize = sizeof (Vmxnet3_DriverShared);
+	int err;
 
-	if (vmxnet3_alloc_dma_mem_1(dp, &dp->sharedData, allocSize,
-	    B_TRUE) != DDI_SUCCESS) {
-		return (DDI_FAILURE);
+	if ((err = vmxnet3_alloc_dma_mem_1(dp, &dp->sharedData, allocSize,
+	    B_TRUE)) != 0) {
+		return (err);
 	}
 	ds = VMXNET3_DS(dp);
 	(void) memset(ds, 0, allocSize);
 
 	allocSize = sizeof (Vmxnet3_TxQueueDesc) + sizeof (Vmxnet3_RxQueueDesc);
-	if (vmxnet3_alloc_dma_mem_128(dp, &dp->queueDescs, allocSize,
-	    B_TRUE) != DDI_SUCCESS) {
+	if ((err = vmxnet3_alloc_dma_mem_128(dp, &dp->queueDescs, allocSize,
+	    B_TRUE)) != 0) {
 		vmxnet3_free_dma_mem(&dp->sharedData);
-		return (DDI_FAILURE);
+		return (err);
 	}
 	(void) memset(dp->queueDescs.buf, 0, allocSize);
 
@@ -263,19 +262,11 @@ vmxnet3_prepare_drivershared(vmxnet3_softc_t *dp)
 	VMXNET3_BAR1_PUT32(dp, VMXNET3_REG_DSAH,
 	    VMXNET3_ADDR_HI(dp->sharedData.bufPA));
 
-	return (DDI_SUCCESS);
+	return (0);
 }
 
 /*
- * vmxnet3_destroy_drivershared --
- *
- *    Destroy the shared data structures of a vmxnet3 device.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Destroy the shared data structures of a vmxnet3 device.
  */
 static void
 vmxnet3_destroy_drivershared(vmxnet3_softc_t *dp)
@@ -288,43 +279,34 @@ vmxnet3_destroy_drivershared(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_alloc_cmdring --
+ * Allocate and initialize the command ring of a queue.
  *
- *    Allocate and initialize the command ring of a queue.
- *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero on error.
  */
 static int
 vmxnet3_alloc_cmdring(vmxnet3_softc_t *dp, vmxnet3_cmdring_t *cmdRing)
 {
 	size_t ringSize = cmdRing->size * sizeof (Vmxnet3_TxDesc);
+	int err;
 
-	if (vmxnet3_alloc_dma_mem_512(dp, &cmdRing->dma, ringSize,
-	    B_TRUE) != DDI_SUCCESS) {
-		return (DDI_FAILURE);
+	if ((err = vmxnet3_alloc_dma_mem_512(dp, &cmdRing->dma, ringSize,
+	    B_TRUE)) != 0) {
+		return (err);
 	}
 	(void) memset(cmdRing->dma.buf, 0, ringSize);
 	cmdRing->avail = cmdRing->size;
 	cmdRing->next2fill = 0;
 	cmdRing->gen = VMXNET3_INIT_GEN;
 
-	return (DDI_SUCCESS);
+	return (0);
 }
 
 /*
- * vmxnet3_alloc_compring --
+ * Allocate and initialize the completion ring of a queue.
  *
- *    Allocate and initialize the completion ring of a queue.
- *
- * Results:
+ * Returns:
  *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
  */
 static int
 vmxnet3_alloc_compring(vmxnet3_softc_t *dp, vmxnet3_compring_t *compRing)
@@ -343,27 +325,23 @@ vmxnet3_alloc_compring(vmxnet3_softc_t *dp, vmxnet3_compring_t *compRing)
 }
 
 /*
- * vmxnet3_prepare_txqueue --
+ * Initialize the tx queue of a vmxnet3 device.
  *
- *    Initialize the tx queue of a vmxnet3 device.
- *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero on failure.
  */
 static int
 vmxnet3_prepare_txqueue(vmxnet3_softc_t *dp)
 {
 	Vmxnet3_TxQueueDesc *tqdesc = VMXNET3_TQDESC(dp);
 	vmxnet3_txqueue_t *txq = &dp->txQueue;
+	int err;
 
 	ASSERT(!(txq->cmdRing.size & VMXNET3_RING_SIZE_MASK));
 	ASSERT(!(txq->compRing.size & VMXNET3_RING_SIZE_MASK));
 	ASSERT(!txq->cmdRing.dma.buf && !txq->compRing.dma.buf);
 
-	if (vmxnet3_alloc_cmdring(dp, &txq->cmdRing) != DDI_SUCCESS) {
+	if ((err = vmxnet3_alloc_cmdring(dp, &txq->cmdRing)) != 0) {
 		goto error;
 	}
 	tqdesc->conf.txRingBasePA = txq->cmdRing.dma.bufPA;
@@ -371,7 +349,7 @@ vmxnet3_prepare_txqueue(vmxnet3_softc_t *dp)
 	tqdesc->conf.dataRingBasePA = 0;
 	tqdesc->conf.dataRingSize = 0;
 
-	if (vmxnet3_alloc_compring(dp, &txq->compRing) != DDI_SUCCESS) {
+	if ((err = vmxnet3_alloc_compring(dp, &txq->compRing)) != 0) {
 		goto error_cmdring;
 	}
 	tqdesc->conf.compRingBasePA = txq->compRing.dma.bufPA;
@@ -381,11 +359,11 @@ vmxnet3_prepare_txqueue(vmxnet3_softc_t *dp)
 	    sizeof (vmxnet3_metatx_t), KM_SLEEP);
 	ASSERT(txq->metaRing);
 
-	if (vmxnet3_txqueue_init(dp, txq) != DDI_SUCCESS) {
+	if ((err = vmxnet3_txqueue_init(dp, txq)) != 0) {
 		goto error_mpring;
 	}
 
-	return (DDI_SUCCESS);
+	return (0);
 
 error_mpring:
 	kmem_free(txq->metaRing, txq->cmdRing.size * sizeof (vmxnet3_metatx_t));
@@ -393,31 +371,27 @@ error_mpring:
 error_cmdring:
 	vmxnet3_free_dma_mem(&txq->cmdRing.dma);
 error:
-	return (DDI_FAILURE);
+	return (err);
 }
 
 /*
- * vmxnet3_prepare_rxqueue --
+ * Initialize the rx queue of a vmxnet3 device.
  *
- *    Initialize the rx queue of a vmxnet3 device.
- *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero on failure.
  */
 static int
 vmxnet3_prepare_rxqueue(vmxnet3_softc_t *dp)
 {
 	Vmxnet3_RxQueueDesc *rqdesc = VMXNET3_RQDESC(dp);
 	vmxnet3_rxqueue_t *rxq = &dp->rxQueue;
+	int err = 0;
 
 	ASSERT(!(rxq->cmdRing.size & VMXNET3_RING_SIZE_MASK));
 	ASSERT(!(rxq->compRing.size & VMXNET3_RING_SIZE_MASK));
 	ASSERT(!rxq->cmdRing.dma.buf && !rxq->compRing.dma.buf);
 
-	if (vmxnet3_alloc_cmdring(dp, &rxq->cmdRing) != DDI_SUCCESS) {
+	if ((err = vmxnet3_alloc_cmdring(dp, &rxq->cmdRing)) != 0) {
 		goto error;
 	}
 	rqdesc->conf.rxRingBasePA[0] = rxq->cmdRing.dma.bufPA;
@@ -425,7 +399,7 @@ vmxnet3_prepare_rxqueue(vmxnet3_softc_t *dp)
 	rqdesc->conf.rxRingBasePA[1] = 0;
 	rqdesc->conf.rxRingSize[1] = 0;
 
-	if (vmxnet3_alloc_compring(dp, &rxq->compRing) != DDI_SUCCESS) {
+	if ((err = vmxnet3_alloc_compring(dp, &rxq->compRing)) != 0) {
 		goto error_cmdring;
 	}
 	rqdesc->conf.compRingBasePA = rxq->compRing.dma.bufPA;
@@ -435,11 +409,11 @@ vmxnet3_prepare_rxqueue(vmxnet3_softc_t *dp)
 	    sizeof (vmxnet3_bufdesc_t), KM_SLEEP);
 	ASSERT(rxq->bufRing);
 
-	if (vmxnet3_rxqueue_init(dp, rxq) != DDI_SUCCESS) {
+	if ((err = vmxnet3_rxqueue_init(dp, rxq)) != 0) {
 		goto error_bufring;
 	}
 
-	return (DDI_SUCCESS);
+	return (0);
 
 error_bufring:
 	kmem_free(rxq->bufRing, rxq->cmdRing.size * sizeof (vmxnet3_bufdesc_t));
@@ -447,19 +421,11 @@ error_bufring:
 error_cmdring:
 	vmxnet3_free_dma_mem(&rxq->cmdRing.dma);
 error:
-	return (DDI_FAILURE);
+	return (err);
 }
 
 /*
- * vmxnet3_destroy_txqueue --
- *
- *    Destroy the tx queue of a vmxnet3 device.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Destroy the tx queue of a vmxnet3 device.
  */
 static void
 vmxnet3_destroy_txqueue(vmxnet3_softc_t *dp)
@@ -478,15 +444,7 @@ vmxnet3_destroy_txqueue(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_destroy_rxqueue --
- *
- *    Destroy the rx queue of a vmxnet3 device.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Destroy the rx queue of a vmxnet3 device.
  */
 static void
 vmxnet3_destroy_rxqueue(vmxnet3_softc_t *dp)
@@ -505,15 +463,7 @@ vmxnet3_destroy_rxqueue(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_refresh_rxfilter --
- *
- *    Apply new RX filters settings to a vmxnet3 device.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Apply new RX filters settings to a vmxnet3 device.
  */
 static void
 vmxnet3_refresh_rxfilter(vmxnet3_softc_t *dp)
@@ -525,15 +475,7 @@ vmxnet3_refresh_rxfilter(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_refresh_linkstate --
- *
- *    Fetch the link state of a vmxnet3 device.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Fetch the link state of a vmxnet3 device.
  */
 static void
 vmxnet3_refresh_linkstate(vmxnet3_softc_t *dp)
@@ -552,16 +494,11 @@ vmxnet3_refresh_linkstate(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_start --
- *
- *    Start a vmxnet3 device: allocate and initialize the shared data
- *    structures and send a start command to the device.
+ * Start a vmxnet3 device: allocate and initialize the shared data
+ * structures and send a start command to the device.
  *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero error on failure.
  */
 static int
 vmxnet3_start(void *data)
@@ -571,14 +508,16 @@ vmxnet3_start(void *data)
 	Vmxnet3_RxQueueDesc *rqdesc;
 	int txQueueSize, rxQueueSize;
 	uint32_t ret32;
+	int err, dmaerr;
 
 	VMXNET3_DEBUG(dp, 1, "start()\n");
 
 	/*
 	 * Allocate vmxnet3's shared data and advertise its PA
 	 */
-	if (vmxnet3_prepare_drivershared(dp) != DDI_SUCCESS) {
-		VMXNET3_WARN(dp, "vmxnet3_prepare_drivershared() failed\n");
+	if ((err = vmxnet3_prepare_drivershared(dp)) != 0) {
+		VMXNET3_WARN(dp, "vmxnet3_prepare_drivershared() failed: %d",
+		    err);
 		goto error;
 	}
 	tqdesc = VMXNET3_TQDESC(dp);
@@ -593,12 +532,14 @@ vmxnet3_start(void *data)
 		dp->txQueue.cmdRing.size = txQueueSize;
 		dp->txQueue.compRing.size = txQueueSize;
 		dp->txQueue.sharedCtrl = &tqdesc->ctrl;
-		if (vmxnet3_prepare_txqueue(dp) != DDI_SUCCESS) {
-			VMXNET3_WARN(dp, "vmxnet3_prepare_txqueue() failed\n");
+		if ((err = vmxnet3_prepare_txqueue(dp)) != 0) {
+			VMXNET3_WARN(dp, "vmxnet3_prepare_txqueue() failed: %d",
+			    err);
 			goto error_shared_data;
 		}
 	} else {
 		VMXNET3_WARN(dp, "invalid tx ring size (%d)\n", txQueueSize);
+		err = EINVAL;
 		goto error_shared_data;
 	}
 
@@ -611,21 +552,24 @@ vmxnet3_start(void *data)
 		dp->rxQueue.cmdRing.size = rxQueueSize;
 		dp->rxQueue.compRing.size = rxQueueSize;
 		dp->rxQueue.sharedCtrl = &rqdesc->ctrl;
-		if (vmxnet3_prepare_rxqueue(dp) != DDI_SUCCESS) {
-			VMXNET3_WARN(dp, "vmxnet3_prepare_rxqueue() failed\n");
+		if ((err = vmxnet3_prepare_rxqueue(dp)) != 0) {
+			VMXNET3_WARN(dp, "vmxnet3_prepare_rxqueue() failed: %d",
+			    err);
 			goto error_tx_queue;
 		}
 	} else {
 		VMXNET3_WARN(dp, "invalid rx ring size (%d)\n", rxQueueSize);
+		err = EINVAL;
 		goto error_tx_queue;
 	}
 
 	/*
 	 * Allocate the Tx DMA handle
 	 */
-	if (ddi_dma_alloc_handle(dp->dip, &vmxnet3_dma_attrs_tx, DDI_DMA_SLEEP,
-	    NULL, &dp->txDmaHandle) != DDI_SUCCESS) {
-		VMXNET3_WARN(dp, "ddi_dma_alloc_handle() failed\n");
+	if ((dmaerr = ddi_dma_alloc_handle(dp->dip, &vmxnet3_dma_attrs_tx,
+	    DDI_DMA_SLEEP, NULL, &dp->txDmaHandle)) != DDI_SUCCESS) {
+		VMXNET3_WARN(dp, "ddi_dma_alloc_handle() failed: %d", dmaerr);
+		err = vmxnet3_dmaerr2errno(dmaerr);
 		goto error_rx_queue;
 	}
 
@@ -636,6 +580,7 @@ vmxnet3_start(void *data)
 	ret32 = VMXNET3_BAR1_GET32(dp, VMXNET3_REG_CMD);
 	if (ret32) {
 		VMXNET3_WARN(dp, "ACTIVATE_DEV failed: 0x%x\n", ret32);
+		err = ENXIO;
 		goto error_txhandle;
 	}
 	dp->devEnabled = B_TRUE;
@@ -660,7 +605,7 @@ vmxnet3_start(void *data)
 	 */
 	VMXNET3_BAR0_PUT32(dp, VMXNET3_REG_IMR, 0);
 
-	return (DDI_SUCCESS);
+	return (0);
 
 error_txhandle:
 	ddi_dma_free_handle(&dp->txDmaHandle);
@@ -671,20 +616,12 @@ error_tx_queue:
 error_shared_data:
 	vmxnet3_destroy_drivershared(dp);
 error:
-	return (DDI_FAILURE);
+	return (err);
 }
 
 /*
- * vmxnet3_stop --
- *
- *    Stop a vmxnet3 device: send a stop command to the device and
- *    de-allocate the shared data structures.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Stop a vmxnet3 device: send a stop command to the device and
+ * de-allocate the shared data structures.
  */
 static void
 vmxnet3_stop(void *data)
@@ -714,15 +651,7 @@ vmxnet3_stop(void *data)
 }
 
 /*
- * vmxnet3_setpromisc --
- *
- *    Set or unset promiscuous mode on a vmxnet3 device.
- *
- * Results:
- *    DDI_SUCCESS.
- *
- * Side effects:
- *    None.
+ * Set or unset promiscuous mode on a vmxnet3 device.
  */
 static int
 vmxnet3_setpromisc(void *data, boolean_t promisc)
@@ -739,26 +668,21 @@ vmxnet3_setpromisc(void *data, boolean_t promisc)
 
 	vmxnet3_refresh_rxfilter(dp);
 
-	return (DDI_SUCCESS);
+	return (0);
 }
 
 /*
- * vmxnet3_multicst --
+ * Add or remove a multicast address from/to a vmxnet3 device.
  *
- *    Add or remove a multicast address from/to a vmxnet3 device.
- *
- * Results:
- *    DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero on failure.
  */
 static int
 vmxnet3_multicst(void *data, boolean_t add, const uint8_t *macaddr)
 {
 	vmxnet3_softc_t *dp = data;
 	vmxnet3_dmabuf_t newMfTable;
-	int ret = DDI_SUCCESS;
+	int ret = 0;
 	uint16_t macIdx;
 	size_t allocSize;
 
@@ -799,7 +723,7 @@ vmxnet3_multicst(void *data, boolean_t add, const uint8_t *macaddr)
 	if (allocSize) {
 		ret = vmxnet3_alloc_dma_mem_1(dp, &newMfTable, allocSize,
 		    B_TRUE);
-		ASSERT(ret == DDI_SUCCESS);
+		ASSERT(ret == 0);
 		if (add) {
 			(void) memcpy(newMfTable.buf, dp->mfTable.buf,
 			    dp->mfTable.bufLen);
@@ -852,15 +776,10 @@ done:
 }
 
 /*
- * vmxnet3_unicst --
- *
- *    Set the mac address of a vmxnet3 device.
+ * Set the mac address of a vmxnet3 device.
  *
- * Results:
- *    DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0
  */
 static int
 vmxnet3_unicst(void *data, const uint8_t *macaddr)
@@ -878,25 +797,18 @@ vmxnet3_unicst(void *data, const uint8_t *macaddr)
 
 	(void) memcpy(dp->macaddr, macaddr, 6);
 
-	return (DDI_SUCCESS);
+	return (0);
 }
 
-
 /*
- * vmxnet3_change_mtu --
+ * Change the MTU as seen by the driver. This is only supported when
+ * the mac is stopped.
  *
- *    Change the MTU as seen by the driver. This is only supported when
- *    the mac is stopped.
- *
- * Results:
- *    EBUSY if the device is enabled.
- *    EINVAL for invalid MTU values.
- *    0 on success.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	EBUSY if the device is enabled.
+ *	EINVAL for invalid MTU values.
+ *	0 on success.
  */
-
 static int
 vmxnet3_change_mtu(vmxnet3_softc_t *dp, uint32_t new_mtu)
 {
@@ -914,9 +826,14 @@ vmxnet3_change_mtu(vmxnet3_softc_t *dp, uint32_t new_mtu)
 		VMXNET3_WARN(dp, "New MTU not in valid range [%d, %d].\n",
 		    VMXNET3_MIN_MTU, VMXNET3_MAX_MTU);
 		return (EINVAL);
+	} else if (new_mtu > ETHERMTU && !dp->allow_jumbo) {
+		VMXNET3_WARN(dp, "MTU cannot be greater than %d because "
+		    "accept-jumbo is not enabled.\n", ETHERMTU);
+		return (EINVAL);
 	}
 
 	dp->cur_mtu = new_mtu;
+	dp->alloc_ok = VMXNET3_ALLOC_OK(dp);
 
 	if ((ret = mac_maxsdu_update(dp->mac, new_mtu)) != 0)
 		VMXNET3_WARN(dp, "Unable to update mac with %d mtu: %d",
@@ -925,22 +842,80 @@ vmxnet3_change_mtu(vmxnet3_softc_t *dp, uint32_t new_mtu)
 	return (ret);
 }
 
+/* ARGSUSED */
+static int
+vmxnet3_get_prop(void *data, const char *prop_name, mac_prop_id_t prop_id,
+    uint_t prop_val_size, void *prop_val)
+{
+	vmxnet3_softc_t *dp = data;
+	int ret = 0;
+
+	switch (prop_id) {
+	case MAC_PROP_MTU:
+		ASSERT(prop_val_size >= sizeof (uint32_t));
+		bcopy(&dp->cur_mtu, prop_val, sizeof (uint32_t));
+		break;
+	default:
+		VMXNET3_WARN(dp, "vmxnet3_get_prop property %d not supported",
+		    prop_id);
+		ret = ENOTSUP;
+	}
+	return (ret);
+}
+
+/* ARGSUSED */
+static int
+vmxnet3_set_prop(void *data, const char *prop_name, mac_prop_id_t prop_id,
+    uint_t prop_val_size, const void *prop_val)
+{
+	vmxnet3_softc_t *dp = data;
+	int ret;
+
+	switch (prop_id) {
+	case MAC_PROP_MTU: {
+		uint32_t new_mtu;
+		ASSERT(prop_val_size >= sizeof (uint32_t));
+		bcopy(prop_val, &new_mtu, sizeof (new_mtu));
+		ret = vmxnet3_change_mtu(dp, new_mtu);
+		break;
+	}
+	default:
+		VMXNET3_WARN(dp, "vmxnet3_set_prop property %d not supported",
+		    prop_id);
+		ret = ENOTSUP;
+	}
+
+	return (ret);
+}
+
+/* ARGSUSED */
+static void
+vmxnet3_prop_info(void *data, const char *prop_name, mac_prop_id_t prop_id,
+    mac_prop_info_handle_t prop_handle)
+{
+	vmxnet3_softc_t *dp = data;
+
+	switch (prop_id) {
+	case MAC_PROP_MTU:
+		mac_prop_info_set_range_uint32(prop_handle, VMXNET3_MIN_MTU,
+		    VMXNET3_MAX_MTU);
+		break;
+	default:
+		VMXNET3_WARN(dp, "vmxnet3_prop_info: property %d not supported",
+		    prop_id);
+	}
+}
 
 /*
- * vmxnet3_ioctl --
- *
- *    DDI/DDK callback to handle IOCTL in driver. Currently it only handles
- *    ND_SET ioctl. Rest all are ignored. The ND_SET is used to set/reset
- *    accept-jumbo ndd parameted for the interface.
- *
- * Results:
- *    Nothing is returned directly. An ACK or NACK is conveyed to the calling
- *    function from the mblk which was used to call this function.
+ * DDI/DDK callback to handle IOCTL in driver. Currently it only handles
+ * ND_SET ioctl. Rest all are ignored. The ND_SET is used to set/reset
+ * accept-jumbo ndd parameted for the interface.
  *
  * Side effects:
- *    MTU can be changed and device can be reset.
+ *	MTU can be changed and device can be reset. An ACK or NACK is conveyed
+ *	to the calling function from the mblk which was used to call this
+ *	function.
  */
-
 static void
 vmxnet3_ioctl(void *arg, queue_t *wq, mblk_t *mp)
 {
@@ -1011,10 +986,12 @@ vmxnet3_ioctl(void *arg, queue_t *wq, mblk_t *mp)
 			if (data == 1) {
 				VMXNET3_DEBUG(dp, 2,
 				    "Accepting jumbo frames\n");
+				dp->allow_jumbo = B_TRUE;
 				ret = vmxnet3_change_mtu(dp, VMXNET3_MAX_MTU);
 			} else if (data == 0) {
 				VMXNET3_DEBUG(dp, 2,
 				    "Rejecting jumbo frames\n");
+				dp->allow_jumbo = B_FALSE;
 				ret = vmxnet3_change_mtu(dp, ETHERMTU);
 			} else {
 				VMXNET3_WARN(dp, "Invalid data value to be set,"
@@ -1041,17 +1018,11 @@ vmxnet3_ioctl(void *arg, queue_t *wq, mblk_t *mp)
 		miocnak(wq, mp, 0, EINVAL);
 }
 
-
 /*
- * vmxnet3_getcapab --
- *
- *    Get the capabilities of a vmxnet3 device.
+ * Get the capabilities of a vmxnet3 device.
  *
- * Results:
- *    B_TRUE or B_FALSE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	B_TRUE if the capability is supported, B_FALSE otherwise.
  */
 static boolean_t
 vmxnet3_getcapab(void *data, mac_capab_t capab, void *arg)
@@ -1060,21 +1031,21 @@ vmxnet3_getcapab(void *data, mac_capab_t capab, void *arg)
 	boolean_t ret;
 
 	switch (capab) {
-		case MAC_CAPAB_HCKSUM: {
-			uint32_t *txflags = arg;
-			*txflags = HCKSUM_INET_PARTIAL;
-			ret = B_TRUE;
-			break;
-		}
-		case MAC_CAPAB_LSO: {
-			mac_capab_lso_t *lso = arg;
-			lso->lso_flags = LSO_TX_BASIC_TCP_IPV4;
-			lso->lso_basic_tcp_ipv4.lso_max = IP_MAXPACKET;
-			ret = vmxnet3_getprop(dp, "EnableLSO", 0, 1, 1);
-			break;
-		}
-		default:
-			ret = B_FALSE;
+	case MAC_CAPAB_HCKSUM: {
+		uint32_t *txflags = arg;
+		*txflags = HCKSUM_INET_PARTIAL;
+		ret = B_TRUE;
+		break;
+	}
+	case MAC_CAPAB_LSO: {
+		mac_capab_lso_t *lso = arg;
+		lso->lso_flags = LSO_TX_BASIC_TCP_IPV4;
+		lso->lso_basic_tcp_ipv4.lso_max = IP_MAXPACKET;
+		ret = vmxnet3_getprop(dp, "EnableLSO", 0, 1, 1);
+		break;
+	}
+	default:
+		ret = B_FALSE;
 	}
 
 	VMXNET3_DEBUG(dp, 2, "getcapab(0x%x) -> %s\n", capab,
@@ -1084,73 +1055,10 @@ vmxnet3_getcapab(void *data, mac_capab_t capab, void *arg)
 }
 
 /*
- * vmxnet3_setmacprop --
- *
- *    Set a MAC property.
- *
- * Results:
- *    0 on success, errno otherwise.
+ * Reset a vmxnet3 device. Only to be used when the device is wedged.
  *
  * Side effects:
- *    None.
- */
-/* ARGSUSED */
-static int
-vmxnet3_setmacprop(void *data, const char *pr_name, mac_prop_id_t pr_num,
-    uint_t pr_valsize, const void *pr_val)
-{
-	vmxnet3_softc_t *dp = data;
-	int ret = 0;
-	uint32_t newmtu;
-
-	switch (pr_num) {
-		case MAC_PROP_MTU:
-			(void) memcpy(&newmtu, pr_val, sizeof (newmtu));
-			ret = vmxnet3_change_mtu(dp, newmtu);
-			break;
-		default:
-			ret = ENOTSUP;
-	}
-
-	return (ret);
-}
-
-/*
- * vmxnet3_macpropinfo --
- *
- *    Get MAC property information.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
- */
-/* ARGSUSED */
-static void
-vmxnet3_macpropinfo(void *data, const char *pr_name, mac_prop_id_t pr_num,
-    mac_prop_info_handle_t prh)
-{
-	switch (pr_num) {
-	case MAC_PROP_MTU:
-		mac_prop_info_set_range_uint32(prh, VMXNET3_MIN_MTU,
-		    VMXNET3_MAX_MTU);
-		break;
-	default:
-		break;
-	}
-}
-
-/*
- * vmxnet3_reset --
- *
- *    Reset a vmxnet3 device. Only to be used when the device is wedged.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    The device is reset.
+ *	The device is reset.
  */
 static void
 vmxnet3_reset(void *data)
@@ -1164,20 +1072,15 @@ vmxnet3_reset(void *data)
 	atomic_inc_32(&dp->reset_count);
 	vmxnet3_stop(dp);
 	VMXNET3_BAR1_PUT32(dp, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
-	if ((ret = vmxnet3_start(dp)) != DDI_SUCCESS)
+	if ((ret = vmxnet3_start(dp)) != 0)
 		VMXNET3_WARN(dp, "failed to reset the device: %d", ret);
 }
 
 /*
- * vmxnet3_intr_events --
+ * Process pending events on a vmxnet3 device.
  *
- *    Process pending events on a vmxnet3 device.
- *
- * Results:
- *    B_TRUE if the link state changed, B_FALSE otherwise.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	B_TRUE if the link state changed, B_FALSE otherwise.
  */
 static boolean_t
 vmxnet3_intr_events(vmxnet3_softc_t *dp)
@@ -1225,15 +1128,10 @@ vmxnet3_intr_events(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_intr --
+ * Interrupt handler of a vmxnet3 device.
  *
- *    Interrupt handler of a vmxnet3 device.
- *
- * Results:
- *    DDI_INTR_CLAIMED or DDI_INTR_UNCLAIMED.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	DDI_INTR_CLAIMED or DDI_INTR_UNCLAIMED.
  */
 /* ARGSUSED1 */
 static uint_t
@@ -1297,6 +1195,8 @@ vmxnet3_kstat_update(kstat_t *ksp, int rw)
 	statp->tx_pullup_needed.value.ul = dp->tx_pullup_needed;
 	statp->tx_ring_full.value.ul = dp->tx_ring_full;
 	statp->rx_alloc_buf.value.ul = dp->rx_alloc_buf;
+	statp->rx_pool_empty.value.ul = dp->rx_pool_empty;
+	statp->rx_num_bufs.value.ul = dp->rx_num_bufs;
 
 	return (0);
 }
@@ -1324,6 +1224,10 @@ vmxnet3_kstat_init(vmxnet3_softc_t *dp)
 	    KSTAT_DATA_ULONG);
 	kstat_named_init(&statp->rx_alloc_buf, "rx_alloc_buf",
 	    KSTAT_DATA_ULONG);
+	kstat_named_init(&statp->rx_pool_empty, "rx_pool_empty",
+	    KSTAT_DATA_ULONG);
+	kstat_named_init(&statp->rx_num_bufs, "rx_num_bufs",
+	    KSTAT_DATA_ULONG);
 
 	kstat_install(dp->devKstats);
 
@@ -1331,15 +1235,10 @@ vmxnet3_kstat_init(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_attach --
- *
- *    Probe and attach a vmxnet3 instance to the stack.
+ * Probe and attach a vmxnet3 instance to the stack.
  *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	DDI_SUCCESS or DDI_FAILURE.
  */
 static int
 vmxnet3_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
@@ -1364,6 +1263,8 @@ vmxnet3_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)
 	dp->dip = dip;
 	dp->instance = ddi_get_instance(dip);
 	dp->cur_mtu = ETHERMTU;
+	dp->allow_jumbo = B_TRUE;
+	dp->alloc_ok = VMXNET3_ALLOC_OK(dp);
 
 	VMXNET3_DEBUG(dp, 1, "attach()\n");
 
@@ -1593,15 +1494,10 @@ error:
 }
 
 /*
- * vmxnet3_detach --
- *
- *    Detach a vmxnet3 instance from the stack.
+ * Detach a vmxnet3 instance from the stack.
  *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	DDI_SUCCESS or DDI_FAILURE.
  */
 static int
 vmxnet3_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
@@ -1616,10 +1512,10 @@ vmxnet3_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 		return (DDI_FAILURE);
 	}
 
-	while (dp->rxNumBufs) {
+	while (dp->rx_num_bufs > 0) {
 		if (retries++ < 10) {
 			VMXNET3_WARN(dp, "rx pending (%u), waiting 1 second\n",
-			    dp->rxNumBufs);
+			    dp->rx_num_bufs);
 			delay(drv_usectohz(1000000));
 		} else {
 			VMXNET3_WARN(dp, "giving up\n");
@@ -1668,7 +1564,7 @@ vmxnet3_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
  * Structures used by the module loader
  */
 
-#define	VMXNET3_IDENT "VMware Ethernet v3 (" BUILD_NUMBER_NUMERIC_STRING ")"
+#define	VMXNET3_IDENT "VMware Ethernet v3 " VMXNET3_DRIVER_VERSION_STRING
 
 DDI_DEFINE_STREAM_OPS(
 	vmxnet3_dev_ops,
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c
index 1084be45df..0099464824 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_rx.c
@@ -12,26 +12,20 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
-
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  */
 
 #include <vmxnet3.h>
 
-static void vmxnet3_put_rxbuf(vmxnet3_rxbuf_t *rxBuf);
+static void vmxnet3_put_rxbuf(vmxnet3_rxbuf_t *);
 
 /*
- * vmxnet3_alloc_rxbuf --
- *
- *    Allocate a new rxBuf from memory. All its fields are set except
- *    for its associated mblk which has to be allocated later.
+ * Allocate a new rxBuf from memory. All its fields are set except
+ * for its associated mblk which has to be allocated later.
  *
- * Results:
- *    A new rxBuf or NULL.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	A new rxBuf or NULL.
  */
 static vmxnet3_rxbuf_t *
 vmxnet3_alloc_rxbuf(vmxnet3_softc_t *dp, boolean_t canSleep)
@@ -40,7 +34,6 @@ vmxnet3_alloc_rxbuf(vmxnet3_softc_t *dp, boolean_t canSleep)
 	int flag = canSleep ? KM_SLEEP : KM_NOSLEEP;
 	int err;
 
-	atomic_inc_32(&dp->rx_alloc_buf);
 	rxBuf = kmem_zalloc(sizeof (vmxnet3_rxbuf_t), flag);
 	if (!rxBuf) {
 		atomic_inc_32(&dp->rx_alloc_failed);
@@ -48,7 +41,7 @@ vmxnet3_alloc_rxbuf(vmxnet3_softc_t *dp, boolean_t canSleep)
 	}
 
 	if ((err = vmxnet3_alloc_dma_mem_1(dp, &rxBuf->dma, (dp->cur_mtu + 18),
-	    canSleep)) != DDI_SUCCESS) {
+	    canSleep)) != 0) {
 		VMXNET3_DEBUG(dp, 0, "Failed to allocate %d bytes for rx buf, "
 		    "err:%d\n", (dp->cur_mtu + 18), err);
 		kmem_free(rxBuf, sizeof (vmxnet3_rxbuf_t));
@@ -60,59 +53,47 @@ vmxnet3_alloc_rxbuf(vmxnet3_softc_t *dp, boolean_t canSleep)
 	rxBuf->freeCB.free_arg = (caddr_t)rxBuf;
 	rxBuf->dp = dp;
 
-	atomic_inc_32(&dp->rxNumBufs);
-
+	atomic_inc_32(&dp->rx_num_bufs);
+	atomic_inc_32(&dp->rx_alloc_buf);
 	return (rxBuf);
 }
 
-/*
- * vmxnet3_free_rxbuf --
- *
- *    Free a rxBuf.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
- */
 static void
 vmxnet3_free_rxbuf(vmxnet3_softc_t *dp, vmxnet3_rxbuf_t *rxBuf)
 {
 	vmxnet3_free_dma_mem(&rxBuf->dma);
 	kmem_free(rxBuf, sizeof (vmxnet3_rxbuf_t));
 
-#ifndef DEBUG
-	atomic_dec_32(&dp->rxNumBufs);
+#ifndef	DEBUG
+	atomic_dec_32(&dp->rx_num_bufs);
 #else
 	{
-		uint32_t nv = atomic_dec_32_nv(&dp->rxNumBufs);
+		uint32_t nv = atomic_dec_32_nv(&dp->rx_num_bufs);
 		ASSERT(nv != (uint32_t)-1);
 	}
 #endif
 }
 
 /*
- * vmxnet3_put_rxpool_buf --
- *
- *    Return a rxBuf to the pool.
- *
- * Results:
- *    B_TRUE if there was room in the pool and the rxBuf was returned,
- *    B_FALSE otherwise.
- *
- * Side effects:
- *    None.
+ * Return a rxBuf to the pool. The init argument, when B_TRUE, indicates
+ * that we're being called for the purpose of pool initialization, and
+ * therefore, we should place the buffer in the pool even if the device
+ * isn't enabled.
+ *
+ * Returns:
+ *	B_TRUE if the buffer was returned to the pool, or B_FALSE if it
+ *	wasn't (e.g. if the device is stopped).
  */
 static boolean_t
-vmxnet3_put_rxpool_buf(vmxnet3_softc_t *dp, vmxnet3_rxbuf_t *rxBuf)
+vmxnet3_put_rxpool_buf(vmxnet3_softc_t *dp, vmxnet3_rxbuf_t *rxBuf,
+    boolean_t init)
 {
 	vmxnet3_rxpool_t *rxPool = &dp->rxPool;
 	boolean_t returned = B_FALSE;
 
 	mutex_enter(&dp->rxPoolLock);
 	ASSERT(rxPool->nBufs <= rxPool->nBufsLimit);
-	if (dp->devEnabled && rxPool->nBufs < rxPool->nBufsLimit) {
+	if ((dp->devEnabled || init) && rxPool->nBufs < rxPool->nBufsLimit) {
 		ASSERT((rxPool->listHead == NULL && rxPool->nBufs == 0) ||
 		    (rxPool->listHead != NULL && rxPool->nBufs != 0));
 		rxBuf->next = rxPool->listHead;
@@ -125,37 +106,22 @@ vmxnet3_put_rxpool_buf(vmxnet3_softc_t *dp, vmxnet3_rxbuf_t *rxBuf)
 }
 
 /*
- * vmxnet3_put_rxbuf --
- *
- *    Return a rxBuf to the pool or free it.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Return a rxBuf to the pool or free it.
  */
 static void
 vmxnet3_put_rxbuf(vmxnet3_rxbuf_t *rxBuf)
 {
 	vmxnet3_softc_t *dp = rxBuf->dp;
 
-	VMXNET3_DEBUG(dp, 5, "free 0x%p\n", rxBuf);
-
-	if (!vmxnet3_put_rxpool_buf(dp, rxBuf))
+	if (!vmxnet3_put_rxpool_buf(dp, rxBuf, B_FALSE))
 		vmxnet3_free_rxbuf(dp, rxBuf);
 }
 
 /*
- * vmxnet3_get_rxpool_buf --
- *
- *    Get an unused rxBuf from the pool.
- *
- * Results:
- *    A rxBuf or NULL if there are no buffers in the pool.
+ * Get an unused rxBuf from the pool.
  *
- * Side effects:
- *    None.
+ * Returns:
+ *	A rxBuf or NULL if there are no buffers in the pool.
  */
 static vmxnet3_rxbuf_t *
 vmxnet3_get_rxpool_buf(vmxnet3_softc_t *dp)
@@ -164,7 +130,7 @@ vmxnet3_get_rxpool_buf(vmxnet3_softc_t *dp)
 	vmxnet3_rxbuf_t *rxBuf = NULL;
 
 	mutex_enter(&dp->rxPoolLock);
-	if (rxPool->listHead) {
+	if (rxPool->listHead != NULL) {
 		rxBuf = rxPool->listHead;
 		rxPool->listHead = rxBuf->next;
 		rxPool->nBufs--;
@@ -176,60 +142,77 @@ vmxnet3_get_rxpool_buf(vmxnet3_softc_t *dp)
 }
 
 /*
- * vmxnet3_get_rxbuf --
+ * Fill a rxPool by allocating the maximum number of buffers.
  *
- *    Get an unused rxBuf from either the pool or from memory.
- *    The returned rxBuf has a mblk associated with it.
- *
- * Results:
- *    A rxBuf or NULL.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero on failure.
  */
-static vmxnet3_rxbuf_t *
-vmxnet3_get_rxbuf(vmxnet3_softc_t *dp, boolean_t canSleep)
+static int
+vmxnet3_rxpool_init(vmxnet3_softc_t *dp)
 {
+	int err = 0;
 	vmxnet3_rxbuf_t *rxBuf;
 
-	if ((rxBuf = vmxnet3_get_rxpool_buf(dp))) {
-		VMXNET3_DEBUG(dp, 5, "alloc 0x%p from pool\n", rxBuf);
-	} else if ((rxBuf = vmxnet3_alloc_rxbuf(dp, canSleep))) {
-		VMXNET3_DEBUG(dp, 5, "alloc 0x%p from mem\n", rxBuf);
+	ASSERT(dp->rxPool.nBufsLimit > 0);
+	while (dp->rxPool.nBufs < dp->rxPool.nBufsLimit) {
+		if ((rxBuf = vmxnet3_alloc_rxbuf(dp, B_FALSE)) == NULL) {
+			err = ENOMEM;
+			break;
+		}
+		VERIFY(vmxnet3_put_rxpool_buf(dp, rxBuf, B_TRUE));
 	}
 
-	if (rxBuf) {
-		rxBuf->mblk = desballoc((uchar_t *)rxBuf->dma.buf,
-		    rxBuf->dma.bufLen, BPRI_MED, &rxBuf->freeCB);
-		if (!rxBuf->mblk) {
-			vmxnet3_put_rxbuf(rxBuf);
-			atomic_inc_32(&dp->rx_alloc_failed);
-			rxBuf = NULL;
+	if (err != 0) {
+		while ((rxBuf = vmxnet3_get_rxpool_buf(dp)) != NULL) {
+			vmxnet3_free_rxbuf(dp, rxBuf);
 		}
 	}
 
-	return (rxBuf);
+	return (err);
 }
 
 /*
- * vmxnet3_rx_populate --
- *
- *    Populate a Rx descriptor with a new rxBuf.
- *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Populate a Rx descriptor with a new rxBuf. If the pool argument is B_TRUE,
+ * then try to take a buffer from rxPool. If the pool is empty and the
+ * dp->alloc_ok is true, then fall back to dynamic allocation. If pool is
+ * B_FALSE, then always allocate a new buffer (this is only used when
+ * populating the initial set of buffers in the receive queue during start).
+ *
+ * Returns:
+ *	0 on success, non-zero on failure.
  */
 static int
 vmxnet3_rx_populate(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq, uint16_t idx,
-    boolean_t canSleep)
+    boolean_t canSleep, boolean_t pool)
 {
-	int ret = DDI_SUCCESS;
-	vmxnet3_rxbuf_t *rxBuf = vmxnet3_get_rxbuf(dp, canSleep);
+	vmxnet3_rxbuf_t *rxBuf = NULL;
+
+	if (pool && (rxBuf = vmxnet3_get_rxpool_buf(dp)) == NULL) {
+		/* The maximum number of pool buffers have been allocated. */
+		atomic_inc_32(&dp->rx_pool_empty);
+		if (!dp->alloc_ok) {
+			atomic_inc_32(&dp->rx_alloc_failed);
+		}
+	}
+
+	if (rxBuf == NULL && (!pool || dp->alloc_ok)) {
+		rxBuf = vmxnet3_alloc_rxbuf(dp, canSleep);
+	}
+
+	if (rxBuf != NULL) {
+		rxBuf->mblk = desballoc((uchar_t *)rxBuf->dma.buf,
+		    rxBuf->dma.bufLen, BPRI_MED, &rxBuf->freeCB);
+		if (rxBuf->mblk == NULL) {
+			if (pool) {
+				VERIFY(vmxnet3_put_rxpool_buf(dp, rxBuf,
+				    B_FALSE));
+			} else {
+				vmxnet3_free_rxbuf(dp, rxBuf);
+			}
+			atomic_inc_32(&dp->rx_alloc_failed);
+			return (ENOMEM);
+		}
 
-	if (rxBuf) {
 		vmxnet3_cmdring_t *cmdRing = &rxq->cmdRing;
 		Vmxnet3_GenericDesc *rxDesc = VMXNET3_GET_DESC(cmdRing, idx);
 
@@ -240,40 +223,45 @@ vmxnet3_rx_populate(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq, uint16_t idx,
 		membar_producer();
 		rxDesc->rxd.gen = cmdRing->gen;
 	} else {
-		ret = DDI_FAILURE;
+		return (ENOMEM);
 	}
 
-	return (ret);
+	return (0);
 }
 
 /*
- * vmxnet3_rxqueue_init --
- *
- *    Initialize a RxQueue by populating the whole Rx ring with rxBufs.
- *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
+ * Initialize a RxQueue by populating the whole Rx ring with rxBufs.
  *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 on success, non-zero on failure.
  */
 int
 vmxnet3_rxqueue_init(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq)
 {
 	vmxnet3_cmdring_t *cmdRing = &rxq->cmdRing;
+	int err;
+
+	dp->rxPool.nBufsLimit = vmxnet3_getprop(dp, "RxBufPoolLimit", 0,
+	    cmdRing->size * 10, cmdRing->size * 2);
 
 	do {
-		if (vmxnet3_rx_populate(dp, rxq, cmdRing->next2fill,
-		    B_TRUE) != DDI_SUCCESS) {
+		if ((err = vmxnet3_rx_populate(dp, rxq, cmdRing->next2fill,
+		    B_TRUE, B_FALSE)) != 0) {
 			goto error;
 		}
 		VMXNET3_INC_RING_IDX(cmdRing, cmdRing->next2fill);
 	} while (cmdRing->next2fill);
 
-	dp->rxPool.nBufsLimit = vmxnet3_getprop(dp, "RxBufPoolLimit", 0,
-	    cmdRing->size * 10, cmdRing->size * 2);
+	/*
+	 * Pre-allocate rxPool buffers so that we never have to allocate
+	 * new buffers from interrupt context when we need to replace a buffer
+	 * in the rxqueue.
+	 */
+	if ((err = vmxnet3_rxpool_init(dp)) != 0) {
+		goto error;
+	}
 
-	return (DDI_SUCCESS);
+	return (0);
 
 error:
 	while (cmdRing->next2fill) {
@@ -281,19 +269,11 @@ error:
 		vmxnet3_free_rxbuf(dp, rxq->bufRing[cmdRing->next2fill].rxBuf);
 	}
 
-	return (DDI_FAILURE);
+	return (err);
 }
 
 /*
- * vmxnet3_rxqueue_fini --
- *
- *    Finish a RxQueue by freeing all the related rxBufs.
- *
- * Results:
- *    DDI_SUCCESS.
- *
- * Side effects:
- *    None.
+ * Finish a RxQueue by freeing all the related rxBufs.
  */
 void
 vmxnet3_rxqueue_fini(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq)
@@ -322,16 +302,8 @@ vmxnet3_rxqueue_fini(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq)
 }
 
 /*
- * vmxnet3_rx_hwcksum --
- *
- *    Determine if a received packet was checksummed by the Vmxnet3
- *    device and tag the mp appropriately.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    The mp may get tagged.
+ * Determine if a received packet was checksummed by the Vmxnet3
+ * device and tag the mp appropriately.
  */
 static void
 vmxnet3_rx_hwcksum(vmxnet3_softc_t *dp, mblk_t *mp,
@@ -355,16 +327,11 @@ vmxnet3_rx_hwcksum(vmxnet3_softc_t *dp, mblk_t *mp,
 }
 
 /*
- * vmxnet3_rx_intr --
- *
- *    Interrupt handler for Rx. Look if there are any pending Rx and
- *    put them in mplist.
- *
- * Results:
- *    A list of messages to pass to the MAC subystem.
+ * Interrupt handler for Rx. Look if there are any pending Rx and
+ * put them in mplist.
  *
- * Side effects:
- *    None.
+ * Returns:
+ *	A list of messages to pass to the MAC subystem.
  */
 mblk_t *
 vmxnet3_rx_intr(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq)
@@ -419,8 +386,8 @@ vmxnet3_rx_intr(vmxnet3_softc_t *dp, vmxnet3_rxqueue_t *rxq)
 			 * descriptor. Grab it only if we achieve to replace
 			 * it with a fresh buffer.
 			 */
-			if (vmxnet3_rx_populate(dp, rxq, rxdIdx,
-			    B_FALSE) == DDI_SUCCESS) {
+			if (vmxnet3_rx_populate(dp, rxq, rxdIdx, B_FALSE,
+			    B_TRUE) == 0) {
 				/* Success, we can chain the mblk with the mp */
 				mblk->b_wptr = mblk->b_rptr + compDesc->rcd.len;
 				*mpTail = mblk;
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c
index b783f4c65f..4789bf55ef 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_tx.c
@@ -14,7 +14,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  */
 
 #include <vmxnet3.h>
@@ -33,33 +33,17 @@ typedef struct vmxnet3_offload_t {
 } vmxnet3_offload_t;
 
 /*
- * vmxnet3_txqueue_init --
- *
- *    Initialize a TxQueue. Currently nothing needs to be done.
- *
- * Results:
- *    DDI_SUCCESS.
- *
- * Side effects:
- *    None.
+ * Initialize a TxQueue. Currently nothing needs to be done.
  */
 /* ARGSUSED */
 int
 vmxnet3_txqueue_init(vmxnet3_softc_t *dp, vmxnet3_txqueue_t *txq)
 {
-	return (DDI_SUCCESS);
+	return (0);
 }
 
 /*
- * vmxnet3_txqueue_fini --
- *
- *    Finish a TxQueue by freeing all pending Tx.
- *
- * Results:
- *    DDI_SUCCESS.
- *
- * Side effects:
- *    None.
+ * Finish a TxQueue by freeing all pending Tx.
  */
 void
 vmxnet3_txqueue_fini(vmxnet3_softc_t *dp, vmxnet3_txqueue_t *txq)
@@ -77,24 +61,19 @@ vmxnet3_txqueue_fini(vmxnet3_softc_t *dp, vmxnet3_txqueue_t *txq)
 }
 
 /*
- * vmxnet3_tx_prepare_offload --
- *
- *    Build the offload context of a msg.
- *
- * Results:
- *    0 if everything went well.
- *    +n if n bytes need to be pulled up.
- *    -1 in case of error (not used).
+ * Build the offload context of a msg.
  *
- * Side effects:
- *    None.
+ * Returns:
+ *	0 if everything went well.
+ *	+n if n bytes need to be pulled up.
+ *	-1 in case of error (not used).
  */
 static int
 vmxnet3_tx_prepare_offload(vmxnet3_softc_t *dp, vmxnet3_offload_t *ol,
     mblk_t *mp)
 {
 	int ret = 0;
-	uint32_t start, stuff, value, flags, lsoflags, mss;
+	uint32_t start, stuff, value, flags, lso_flag, mss;
 
 	ol->om = VMXNET3_OM_NONE;
 	ol->hlen = 0;
@@ -102,12 +81,9 @@ vmxnet3_tx_prepare_offload(vmxnet3_softc_t *dp, vmxnet3_offload_t *ol,
 
 	hcksum_retrieve(mp, NULL, NULL, &start, &stuff, NULL, &value, &flags);
 
-	mac_lso_get(mp, &mss, &lsoflags);
-	if (lsoflags & HW_LSO) {
-		flags |= HW_LSO;
-	}
+	mac_lso_get(mp, &mss, &lso_flag);
 
-	if (flags) {
+	if (flags || lso_flag) {
 		struct ether_vlan_header *eth = (void *) mp->b_rptr;
 		uint8_t ethLen;
 
@@ -120,12 +96,7 @@ vmxnet3_tx_prepare_offload(vmxnet3_softc_t *dp, vmxnet3_offload_t *ol,
 		VMXNET3_DEBUG(dp, 4, "flags=0x%x, ethLen=%u, start=%u, "
 		    "stuff=%u, value=%u\n", flags, ethLen, start, stuff, value);
 
-		if (flags & HCK_PARTIALCKSUM) {
-			ol->om = VMXNET3_OM_CSUM;
-			ol->hlen = start + ethLen;
-			ol->msscof = stuff + ethLen;
-		}
-		if (flags & HW_LSO) {
+		if (lso_flag & HW_LSO) {
 			mblk_t *mblk = mp;
 			uint8_t *ip, *tcp;
 			uint8_t ipLen, tcpLen;
@@ -155,11 +126,15 @@ vmxnet3_tx_prepare_offload(vmxnet3_softc_t *dp, vmxnet3_offload_t *ol,
 
 			ol->om = VMXNET3_OM_TSO;
 			ol->hlen = ethLen + ipLen + tcpLen;
-			ol->msscof = DB_LSOMSS(mp);
+			ol->msscof = mss;
 
 			if (mblk != mp) {
 				ret = ol->hlen;
 			}
+		} else if (flags & HCK_PARTIALCKSUM) {
+			ol->om = VMXNET3_OM_CSUM;
+			ol->hlen = start + ethLen;
+			ol->msscof = stuff + ethLen;
 		}
 	}
 
@@ -167,18 +142,16 @@ vmxnet3_tx_prepare_offload(vmxnet3_softc_t *dp, vmxnet3_offload_t *ol,
 }
 
 /*
- * vmxnet3_tx_one --
- *
- *    Map a msg into the Tx command ring of a vmxnet3 device.
+ * Map a msg into the Tx command ring of a vmxnet3 device.
  *
- * Results:
- *    VMXNET3_TX_OK if everything went well.
- *    VMXNET3_TX_RINGFULL if the ring is nearly full.
- *    VMXNET3_TX_PULLUP if the msg is overfragmented.
- *    VMXNET3_TX_FAILURE if there was a DMA or offload error.
+ * Returns:
+ *	VMXNET3_TX_OK if everything went well.
+ *	VMXNET3_TX_RINGFULL if the ring is nearly full.
+ *	VMXNET3_TX_PULLUP if the msg is overfragmented.
+ *	VMXNET3_TX_FAILURE if there was a DMA or offload error.
  *
  * Side effects:
- *    The ring is filled if VMXNET3_TX_OK is returned.
+ *	The ring is filled if VMXNET3_TX_OK is returned.
  */
 static vmxnet3_txstatus
 vmxnet3_tx_one(vmxnet3_softc_t *dp, vmxnet3_txqueue_t *txq,
@@ -339,16 +312,11 @@ done:
 }
 
 /*
- * vmxnet3_tx --
+ * Send packets on a vmxnet3 device.
  *
- *    Send packets on a vmxnet3 device.
- *
- * Results:
- *    NULL in case of success or failure.
- *    The mps to be retransmitted later if the ring is full.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	NULL in case of success or failure.
+ *	The mps to be retransmitted later if the ring is full.
  */
 mblk_t *
 vmxnet3_tx(void *data, mblk_t *mps)
@@ -450,15 +418,10 @@ vmxnet3_tx(void *data, mblk_t *mps)
 }
 
 /*
- * vmxnet3_tx_complete --
+ * Parse a transmit queue and complete packets.
  *
- *    Parse a transmit queue and complete packets.
- *
- * Results:
- *    B_TRUE if Tx must be updated or B_FALSE if no action is required.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *	B_TRUE if Tx must be updated or B_FALSE if no action is required.
  */
 boolean_t
 vmxnet3_tx_complete(vmxnet3_softc_t *dp, vmxnet3_txqueue_t *txq)
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_utils.c b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_utils.c
index 26784c3d65..bec73524f7 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3_utils.c
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3_utils.c
@@ -12,6 +12,9 @@
  * See the License for the specific language governing permissions
  * and limitations under the License.
  */
+/*
+ * Copyright (c) 2016 by Delphix. All rights reserved.
+ */
 
 #include <vmxnet3.h>
 
@@ -70,16 +73,33 @@ static ddi_dma_attr_t vmxnet3_dma_attrs_512 = {
 	.dma_attr_flags =	0
 };
 
+int
+vmxnet3_dmaerr2errno(int dmaerr)
+{
+	int err;
+
+	switch (dmaerr) {
+	case DDI_DMA_NORESOURCES:
+	case DDI_DMA_TOOBIG:
+		err = ENOMEM;
+		break;
+	case DDI_DMA_INUSE:
+		err = EBUSY;
+		break;
+	case DDI_DMA_BADATTR:
+	case DDI_DMA_NOMAPPING:
+	default:
+		err = EINVAL;
+	}
+
+	return (err);
+}
+
 /*
- * vmxnet3_alloc_dma_mem --
+ * Allocate /size/ bytes of contiguous DMA-ble memory.
  *
- *    Allocate /size/ bytes of contiguous DMA-ble memory.
- *
- * Results:
- *    DDI_SUCCESS or DDI_FAILURE.
- *
- * Side effects:
- *    None.
+ * Returns:
+ *    0 on success, non-zero on failure.
  */
 static int
 vmxnet3_alloc_dma_mem(vmxnet3_softc_t *dp, vmxnet3_dmabuf_t *dma, size_t size,
@@ -87,6 +107,7 @@ vmxnet3_alloc_dma_mem(vmxnet3_softc_t *dp, vmxnet3_dmabuf_t *dma, size_t size,
 {
 	ddi_dma_cookie_t cookie;
 	uint_t cookieCount;
+	int dmaerr, err = 0;
 	int (*cb) (caddr_t) = canSleep ? DDI_DMA_SLEEP : DDI_DMA_DONTWAIT;
 
 	ASSERT(size != 0);
@@ -94,9 +115,10 @@ vmxnet3_alloc_dma_mem(vmxnet3_softc_t *dp, vmxnet3_dmabuf_t *dma, size_t size,
 	/*
 	 * Allocate a DMA handle
 	 */
-	if (ddi_dma_alloc_handle(dp->dip, dma_attrs, cb, NULL,
-	    &dma->dmaHandle) != DDI_SUCCESS) {
-		VMXNET3_WARN(dp, "ddi_dma_alloc_handle() failed\n");
+	if ((dmaerr = ddi_dma_alloc_handle(dp->dip, dma_attrs, cb, NULL,
+	    &dma->dmaHandle)) != DDI_SUCCESS) {
+		VMXNET3_WARN(dp, "ddi_dma_alloc_handle() failed: %d", dmaerr);
+		err = vmxnet3_dmaerr2errno(dmaerr);
 		goto error;
 	}
 
@@ -106,24 +128,27 @@ vmxnet3_alloc_dma_mem(vmxnet3_softc_t *dp, vmxnet3_dmabuf_t *dma, size_t size,
 	if (ddi_dma_mem_alloc(dma->dmaHandle, size, &vmxnet3_dev_attr,
 	    DDI_DMA_CONSISTENT, cb, NULL, &dma->buf, &dma->bufLen,
 	    &dma->dataHandle) != DDI_SUCCESS) {
-		VMXNET3_WARN(dp, "ddi_dma_mem_alloc() failed\n");
+		VMXNET3_WARN(dp, "ddi_dma_mem_alloc() failed");
+		err = ENOMEM;
 		goto error_dma_handle;
 	}
 
 	/*
 	 * Map the memory
 	 */
-	if (ddi_dma_addr_bind_handle(dma->dmaHandle, NULL, dma->buf,
+	if ((dmaerr = ddi_dma_addr_bind_handle(dma->dmaHandle, NULL, dma->buf,
 	    dma->bufLen, DDI_DMA_RDWR | DDI_DMA_STREAMING, cb, NULL, &cookie,
-	    &cookieCount) != DDI_DMA_MAPPED) {
-		VMXNET3_WARN(dp, "ddi_dma_addr_bind_handle() failed\n");
+	    &cookieCount)) != DDI_DMA_MAPPED) {
+		VMXNET3_WARN(dp, "ddi_dma_addr_bind_handle() failed: %d",
+		    dmaerr);
+		err = vmxnet3_dmaerr2errno(dmaerr);
 		goto error_dma_mem;
 	}
 
 	ASSERT(cookieCount == 1);
 	dma->bufPA = cookie.dmac_laddress;
 
-	return (DDI_SUCCESS);
+	return (0);
 
 error_dma_mem:
 	ddi_dma_mem_free(&dma->dataHandle);
@@ -133,7 +158,7 @@ error:
 	dma->buf = NULL;
 	dma->bufPA = NULL;
 	dma->bufLen = 0;
-	return (DDI_FAILURE);
+	return (err);
 }
 
 int
@@ -161,15 +186,7 @@ vmxnet3_alloc_dma_mem_128(vmxnet3_softc_t *dp, vmxnet3_dmabuf_t *dma,
 }
 
 /*
- * vmxnet3_free_dma_mem --
- *
- *    Free DMA-ble memory.
- *
- * Results:
- *    None.
- *
- * Side effects:
- *    None.
+ * Free DMA-ble memory.
  */
 void
 vmxnet3_free_dma_mem(vmxnet3_dmabuf_t *dma)
@@ -184,18 +201,13 @@ vmxnet3_free_dma_mem(vmxnet3_dmabuf_t *dma)
 }
 
 /*
- * vmxnet3_getprop --
- *
- *    Get the numeric value of the property "name" in vmxnet3s.conf for
- *    the corresponding device instance.
- *    If the property isn't found or if it doesn't satisfy the conditions,
- *    "def" is returned.
- *
- * Results:
- *    The value of the property or "def".
+ * Get the numeric value of the property "name" in vmxnet3s.conf for
+ * the corresponding device instance.
+ * If the property isn't found or if it doesn't satisfy the conditions,
+ * "def" is returned.
  *
- * Side effects:
- *    None.
+ * Returns:
+ *	The value of the property or "def".
  */
 int
 vmxnet3_getprop(vmxnet3_softc_t *dp, char *name, int min, int max, int def)
diff --git a/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf b/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf
index 7f16946092..8345dc27f4 100644
--- a/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf
+++ b/usr/src/uts/intel/io/vmxnet3s/vmxnet3s.conf
@@ -27,7 +27,7 @@ RxRingSize=4096,4096,4096,4096,4096,4096,4096,4096,4096,4096;
 #    Minimum value: 0
 #    Maximum value: RxRingSize * 10
 #
-RxBufPoolLimit=4096,4096,4096,4096,4096,4096,4096,4096,4096,4096;
+RxBufPoolLimit=16384,16384,16384,16384,16384,16384,16384,16384,16384,16384;
 
 # EnableLSO --
 #
diff --git a/usr/src/uts/intel/iwn/Makefile b/usr/src/uts/intel/iwn/Makefile
index a629462e56..2dcf4b1eae 100644
--- a/usr/src/uts/intel/iwn/Makefile
+++ b/usr/src/uts/intel/iwn/Makefile
@@ -31,7 +31,7 @@ FWDIR	= $(UTSBASE)/common/io/iwn/fw-iw
 FWFILES	= iwlwifi-100-5.ucode iwlwifi-1000-3.ucode iwlwifi-105-6.ucode \
 	iwlwifi-135-6.ucode iwlwifi-2000-6.ucode iwlwifi-2030-6.ucode \
 	iwlwifi-4965-2.ucode iwlwifi-5000-2.ucode iwlwifi-5150-2.ucode \
-	iwlwifi-6000-4.ucode iwlwifi-6000g2a-5.ucode iwlwifi-6000g2b-6.ucode \
+	iwlwifi-6000-4.ucode iwlwifi-6000g2a-6.ucode iwlwifi-6000g2b-6.ucode \
 	iwlwifi-6050-5.ucode
 
 #