diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
index 55465bd86699..e79e0d541580 100755
--- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
@@ -1,62 +1,66 @@
 #
 # Copyright 2015 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 . "$(dirname "$0")/makefs_tests_common.sh"
 
 MAKEFS="makefs -t cd9660"
-TEST_IMAGE="test.iso"
 
 atf_test_case basic_cd9660 cleanup
 basic_cd9660_body()
 {
 	create_test_inputs
 
 	atf_check -e empty -o empty -s exit:0 \
 	    $MAKEFS $TEST_IMAGE $TEST_INPUTS_DIR
 	atf_check -e empty -o save:$TEST_MD_DEVICE_FILE -s exit:0 \
 	    mdconfig -a -f $TEST_IMAGE
 	atf_check -e empty -o empty -s exit:0 \
 	    mount_cd9660 /dev/$(cat $TEST_MD_DEVICE_FILE) $TEST_MOUNT_DIR
-	atf_check -e empty -o not-empty -s exit:0 ls $TEST_MOUNT_DIR
+	# diffutils doesn't feature --no-dereference until v3.3, so
+	# $TEST_INPUTS_DIR/c will mismatch with $TEST_MOUNT_DIR/c (the
+	# former will look like a directory; the latter like a file).
+	#
+	# XXX: the latter behavior seems suspect; seems like it should be a
+	# symlink; need to verify this with mkisofs, etc
+	atf_check -e empty -o empty -s exit:0 \
+	    diff --exclude c -Naur $TEST_INPUTS_DIR $TEST_MOUNT_DIR
 }
 basic_cd9660_cleanup()
 {
-	ls -a
-
 	test_md_device=$(cat $TEST_MD_DEVICE_FILE) || return
 
 	umount -f /dev/$test_md_device
 	mdconfig -d -u $test_md_device
 }
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case basic_cd9660
 }
diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
index ff86c74663aa..ee5827db2d82 100755
--- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
@@ -1,64 +1,62 @@
 #
 # Copyright 2015 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 . "$(dirname "$0")/makefs_tests_common.sh"
 
 MAKEFS="makefs -t ffs"
-TEST_IMAGE="test.img"
 
 atf_test_case basic_ffs cleanup
 basic_ffs_body()
 {
 	create_test_inputs
 
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -M 1m $TEST_IMAGE $TEST_INPUTS_DIR
 	atf_check -e empty -o save:$TEST_MD_DEVICE_FILE -s exit:0 \
 	    mdconfig -a -f $TEST_IMAGE
 	atf_check -e save:$ATF_TMPDIR/tunefs.output -o empty -s exit:0 \
 	    tunefs -p /dev/$(cat $TEST_MD_DEVICE_FILE)
 	atf_check -e empty -o empty -s exit:0 \
 	    mount /dev/$(cat $TEST_MD_DEVICE_FILE) $TEST_MOUNT_DIR
-	atf_check -e empty -o not-empty -s exit:0 ls $TEST_MOUNT_DIR
+	atf_check -e empty -o empty -s exit:0 \
+	    diff -Naur $TEST_INPUTS_DIR $TEST_MOUNT_DIR
 }
 basic_ffs_cleanup()
 {
-	ls -a
-
 	test_md_device=$(cat $TEST_MD_DEVICE_FILE) || return
 
 	umount -f /dev/$test_md_device
 	mdconfig -d -u $test_md_device
 }
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case basic_ffs
 }
diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs/tests/makefs_tests_common.sh
index c90557a352b6..a3d6e50e5d15 100755
--- a/usr.sbin/makefs/tests/makefs_tests_common.sh
+++ b/usr.sbin/makefs/tests/makefs_tests_common.sh
@@ -1,81 +1,86 @@
 #
 # Copyright 2015 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
+KB=1024
+TEST_IMAGE="test.img"
+TEST_INPUTS_DIR="inputs"
 TEST_MD_DEVICE_FILE="md.output"
 TEST_MOUNT_DIR="mnt"
 
-create_test_dir()
+create_test_dirs()
 {
-	[ -z "$ATF_TMPDIR" ] || return 0
-
-	export ATF_TMPDIR=$(pwd)
-
-	TEST_MD_DEVICE_FILE="${ATF_TMPDIR}/${TEST_MD_DEVICE_FILE}"
-	TEST_MOUNT_DIR="${ATF_TMPDIR}/${TEST_MOUNT_DIR}"
-
-	# XXX: need to nest this because of how kyua creates $TMPDIR; otherwise
-	# it will run into EPERM issues later
-	TEST_INPUTS_DIR="${ATF_TMPDIR}/test/inputs"
-
 	atf_check -e empty -s exit:0 mkdir -m 0777 -p $TEST_MOUNT_DIR
 	atf_check -e empty -s exit:0 mkdir -m 0777 -p $TEST_INPUTS_DIR
-	cd $TEST_INPUTS_DIR
 }
 
 create_test_inputs()
 {
-	create_test_dir
+	create_test_dirs
+
+	cd $TEST_INPUTS_DIR
 
 	atf_check -e empty -s exit:0 mkdir -m 0755 -p a/b/1
 	atf_check -e empty -s exit:0 ln -s a/b c
 	atf_check -e empty -s exit:0 touch d
 	atf_check -e empty -s exit:0 ln d e
 	atf_check -e empty -s exit:0 touch .f
 	atf_check -e empty -s exit:0 mkdir .g
-	atf_check -e empty -s exit:0 mkfifo h
+	# XXX: fifos on the filesystem don't match fifos created by makefs for
+	# some odd reason.
+	#atf_check -e empty -s exit:0 mkfifo h
 	atf_check -e ignore -s exit:0 dd if=/dev/zero of=i count=1000 bs=1
 	atf_check -e empty -s exit:0 touch klmn
 	atf_check -e empty -s exit:0 touch opqr
 	atf_check -e empty -s exit:0 touch stuv
 	atf_check -e empty -s exit:0 install -m 0755 /dev/null wxyz
 	atf_check -e empty -s exit:0 touch 0b00000001
 	atf_check -e empty -s exit:0 touch 0b00000010
 	atf_check -e empty -s exit:0 touch 0b00000011
 	atf_check -e empty -s exit:0 touch 0b00000100
 	atf_check -e empty -s exit:0 touch 0b00000101
 	atf_check -e empty -s exit:0 touch 0b00000110
 	atf_check -e empty -s exit:0 touch 0b00000111
 	atf_check -e empty -s exit:0 touch 0b00001000
 	atf_check -e empty -s exit:0 touch 0b00001001
 	atf_check -e empty -s exit:0 touch 0b00001010
 	atf_check -e empty -s exit:0 touch 0b00001011
 	atf_check -e empty -s exit:0 touch 0b00001100
 	atf_check -e empty -s exit:0 touch 0b00001101
 	atf_check -e empty -s exit:0 touch 0b00001110
+
+	for filesize in 1 512 $(( 2 * $KB )) $(( 10 * $KB )) $(( 512 * $KB )); \
+	do
+		atf_check -e ignore -o empty -s exit:0 \
+		    dd if=/dev/zero of=${filesize}.file bs=1 \
+		    count=1 oseek=${filesize} conv=sparse
+		files="${files} ${filesize}.file"
+	done
+
+	cd -
 }