diff --git a/usr/src/test/zfs-tests/Makefile b/usr/src/test/zfs-tests/Makefile
index c148fa93e838..580e27b6df3f 100644
--- a/usr/src/test/zfs-tests/Makefile
+++ b/usr/src/test/zfs-tests/Makefile
@@ -15,6 +15,6 @@
 
 .PARALLEL: $(SUBDIRS)
 
-SUBDIRS:sh = find ./* -maxdepth 0 -type d
+SUBDIRS:sh = ls */Makefile 2>/dev/null | sed 's/\/Makefile//g'
 
 include $(SRC)/test/Makefile.com
diff --git a/usr/src/test/zfs-tests/Makefile.com b/usr/src/test/zfs-tests/Makefile.com
index ba9344de5348..610aaa52bc75 100644
--- a/usr/src/test/zfs-tests/Makefile.com
+++ b/usr/src/test/zfs-tests/Makefile.com
@@ -60,4 +60,4 @@ $(TARGETDIR)/%: %
 	$(INS.file)
 
 .PARALLEL: $(SUBDIRS)
-SUBDIRS:sh = find ./* -maxdepth 0 -type d
+SUBDIRS:sh = ls */Makefile 2>/dev/null | sed 's/\/Makefile//g'
diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
index 52a0becedde3..71eb0218dfca 100644
--- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
+++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
@@ -176,6 +176,8 @@ export KEEP="^$(echo $KEEP | sed 's/ /$|^/g')\$"
 num_disks=$(echo $DISKS | awk '{print NF}')
 [[ $num_disks -lt 3 ]] && fail "Not enough disks to run ZFS Test Suite"
 
+sudo -k coreadm -e process
+
 # Ensure user has only basic privileges.
 ppriv -s EIP=basic -e $runner $quiet -c $runfile
 ret=$?