diff --git a/dracut/90zfs/mount-zfs.sh.in b/dracut/90zfs/mount-zfs.sh.in
index 1fb4ea537..ffc3f2013 100755
--- a/dracut/90zfs/mount-zfs.sh.in
+++ b/dracut/90zfs/mount-zfs.sh.in
@@ -22,13 +22,13 @@ case "$root" in
 			# Might be imported by the kernel module, so try searching before
 			# we import anything.
 			zfsbootfs=`zpool list -H -o bootfs | sed -n '/^-$/ !p' | sed 'q'`
-			if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \
+			if [ $? -ne 0 ] || [ -z "$zfsbootfs" ] || \
 				[ "$zfsbootfs" = "no pools available" ] ; then
 				# Not there, so we need to import everything.
 				info "ZFS: Attempting to import additional pools."
 				zpool import -N -a ${ZPOOL_FORCE}
 				zfsbootfs=`zpool list -H -o bootfs | sed -n '/^-$/ !p' | sed 'q'`
-				if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \
+				if [ $? -ne 0 ] || [ -z "$zfsbootfs" ] || \
 					[ "$zfsbootfs" = "no pools available" ] ; then
 					rootok=0
 					pool=""
diff --git a/dracut/90zfs/parse-zfs.sh.in b/dracut/90zfs/parse-zfs.sh.in
index 571d263ce..f945a27c1 100755
--- a/dracut/90zfs/parse-zfs.sh.in
+++ b/dracut/90zfs/parse-zfs.sh.in
@@ -52,7 +52,7 @@ esac
 
 # Make sure Dracut is happy that we have a root and will wait for ZFS
 # modules to settle before mounting.
-if [ "${wait_for_zfs}" = "1" ]; then
+if [ ${wait_for_zfs} -eq 1 ]; then
 	ln -s /dev/null /dev/root 2>/dev/null
 	echo '[ -e /dev/zfs ]' > $hookdir/initqueue/finished/zfs.sh
 fi