diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
index a7a1fb3302..272d0834c7 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
@@ -36,28 +36,13 @@
 #
 function find_vfstab_dev
 {
-	typeset vfstabdev
-	typeset vfstabdevs=""
-	typeset line
-
 	if is_illumos; then
 		vfstab="/etc/vfstab"
-		tmpfile="$TEST_BASE_DIR/vfstab.tmp"
 	else
 		vfstab="/etc/fstab"
-		tmpfile="$TEST_BASE_DIR/fstab.tmp"
 	fi
 
-	cat $vfstab | grep "^${DEV_DSKDIR}" >$tmpfile
-	while read -r line
-	do
-		vfstabdev=`echo "$line" | awk '{print $1}'`
-		vfstabdev=${vfstabdev%%:}
-		vfstabdevs="$vfstabdev $vfstabdevs"
-	done <$tmpfile
-
-	rm -f $tmpfile
-	echo $vfstabdevs
+	awk -v pat="^${DEV_DSKDIR}" '$0 ~ pat {sub(/:$/, "", $1); print $1}' $vfstab
 }
 
 #
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
index c98e495187..005cf979be 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
@@ -69,28 +69,13 @@ function create_blockfile
 #
 function find_vfstab_dev
 {
-	typeset vfstabdev
-	typeset vfstabdevs=""
-	typeset line
-
 	if is_illumos; then
 		vfstab="/etc/vfstab"
-		tmpfile="$TEST_BASE_DIR/vfstab.tmp"
 	else
 		vfstab="/etc/fstab"
-		tmpfile="$TEST_BASE_DIR/fstab.tmp"
 	fi
 
-	cat $vfstab | grep "^${DEV_DSKDIR}" >$tmpfile
-	while read -r line
-	do
-		vfstabdev=`echo "$line" | awk '{print $1}'`
-		vfstabdev=${vfstabdev%%:}
-		vfstabdevs="$vfstabdev $vfstabdevs"
-	done <$tmpfile
-
-	rm -f $tmpfile
-	echo $vfstabdevs
+	awk -v pat="^${DEV_DSKDIR}" '$0 ~ pat {sub(/:$/, "", $1); print $1}' $vfstab
 }
 
 #