diff --git a/tests/zfs-tests/tests/functional/zvol/zvol.cfg b/tests/zfs-tests/tests/functional/zvol/zvol.cfg
index 71f3d0381c49..fb2a0385a24c 100644
--- a/tests/zfs-tests/tests/functional/zvol/zvol.cfg
+++ b/tests/zfs-tests/tests/functional/zvol/zvol.cfg
@@ -33,6 +33,7 @@ export DISK=${DISKS%% *}
 export TESTVOL=testvol
 export TESTFILE=testfile
 export TESTSNAP=testsnap
-export VOLSIZE=1g
+export VOLSIZE=256m
+export BLOCKSIZE=4K
 export DATA=0
 export ENOSPC=28
diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh
index e5feb6b5809b..629fdfafb129 100755
--- a/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_ENOSPC/setup.ksh
@@ -40,7 +40,7 @@ if is_mpath_device $DISK; then
 	delete_partitions
 fi
 
-default_zvol_setup $DISK $VOLSIZE
+default_zvol_setup $DISK $VOLSIZE $BLOCKSIZE
 
 $ECHO "y" | $NEWFS -v ${ZVOL_RDEVDIR}/$TESTPOOL/$TESTVOL >/dev/null 2>&1
 (( $? != 0 )) && log_fail "Unable to newfs(1M) $TESTPOOL/$TESTVOL"
diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_common.shlib b/tests/zfs-tests/tests/functional/zvol/zvol_common.shlib
index 94da0d4b4df0..b5d5998fcc9b 100644
--- a/tests/zfs-tests/tests/functional/zvol/zvol_common.shlib
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_common.shlib
@@ -36,17 +36,24 @@
 #
 # Where disk_device: is the name of the disk to be used
 #       volume_size: is the size of the volume, e.g. 2G
+#       block_size:  is the block size of the volume
 #
-function default_zvol_setup # disk_device volume_size
+function default_zvol_setup # disk_device volume_size block_size
 {
-        typeset disk=$1
-        typeset size=$2
+	typeset disk=$1
+	typeset size=$2
+	typeset blocksize=$3
 	typeset savedumpdev
 	typeset -i output
+	typeset create_args
 
-        create_pool $TESTPOOL "$disk"
+	create_pool $TESTPOOL "$disk"
 
-        log_must $ZFS create -V $size $TESTPOOL/$TESTVOL
+	if [ -n "$blocksize" ]; then
+		create_args="-b $blocksize"
+	fi
+
+	log_must $ZFS create $create_args -V $size $TESTPOOL/$TESTVOL
 	block_device_wait
 }