From: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
Date: Fri, 10 Apr 2026 13:44:09 +0000 (-0400)
Subject: tests: quote TS_{OUTPUT,ERRLOG} variables
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e00b01cca63e55bfbac0b9758d213cb0b01288d1;p=thirdparty%2Futil-linux.git

tests: quote TS_{OUTPUT,ERRLOG} variables

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
---

diff --git a/tests/ts/bitops/swapbytes b/tests/ts/bitops/swapbytes
index ca2977fb5..a344abe5f 100755
--- a/tests/ts/bitops/swapbytes
+++ b/tests/ts/bitops/swapbytes
@@ -23,7 +23,7 @@ ts_init "$*"
 
 ts_check_test_command "$TS_HELPER_BYTESWAP"
 
-$TS_HELPER_BYTESWAP >> $TS_OUTPUT
+$TS_HELPER_BYTESWAP >> "$TS_OUTPUT"
 
 ts_finalize
 
diff --git a/tests/ts/bits/bits b/tests/ts/bits/bits
index b9a545c3d..cbf7c6f7c 100755
--- a/tests/ts/bits/bits
+++ b/tests/ts/bits/bits
@@ -20,23 +20,23 @@ ts_check_test_command "$TS_CMD_BITS"
 ts_cd "$TS_OUTDIR"
 
 ts_init_subtest "default"
-$TS_CMD_BITS 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "mask"
-$TS_CMD_BITS --mask 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS --mask 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "grouped-mask"
-$TS_CMD_BITS --grouped-mask 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS --grouped-mask 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "list"
-$TS_CMD_BITS --list 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS --list 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "binary"
-$TS_CMD_BITS --binary 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS --binary 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "expand"
@@ -48,59 +48,59 @@ $TS_CMD_BITS --expand 1,3-5,7 >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest "truncate"
-$TS_CMD_BITS -l 1,10000 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -l 1,10000 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "width"
-$TS_CMD_BITS --width 16384 -l 10000  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS --width 16384 -l 10000  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "width-truncate"
-$TS_CMD_BITS --width 32 -l 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS --width 32 -l 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "width-zero"
-$TS_CMD_BITS --width 0 -l 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS --width 0 -l 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "width-greater-128KB"
-$TS_CMD_BITS --width $(( 129 * 1024 )) -l 11,22,33,44 >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_BITS --width $(( 129 * 1024 )) -l 11,22,33,44 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" "$TS_OUTPUT" "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "parse-mask"
-$TS_CMD_BITS -l 0x0badcaca >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -l 0x0badcaca >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "parse-range"
-$TS_CMD_BITS -g 50-100 75-150 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -g 50-100 75-150 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "parse-grouped-mask"
-$TS_CMD_BITS -l ,9000000,00000000,0c000000,00000000 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -l ,9000000,00000000,0c000000,00000000 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "or"
-$TS_CMD_BITS -l 50-100 '|75-150' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -l 50-100 '|75-150' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "and"
-$TS_CMD_BITS -l 50-100 '&75-150' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -l 50-100 '&75-150' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "xor"
-$TS_CMD_BITS -l 50-100 '^75-150' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -l 50-100 '^75-150' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "not"
-$TS_CMD_BITS -l 50-100 '~75-150' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BITS -l 50-100 '~75-150' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "stdin"
 {
 	echo 11,22,33,44
 	echo ^22
-} | $TS_CMD_BITS --list >> $TS_OUTPUT 2>> $TS_ERRLOG
+} | $TS_CMD_BITS --list >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets
index f3f5a68bb..89925bc42 100755
--- a/tests/ts/blkdiscard/offsets
+++ b/tests/ts/blkdiscard/offsets
@@ -38,7 +38,7 @@ ts_register_loop_device "$DEVICE"
 
 function run_tscmd {
 	local ret
-	"$@" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	"$@" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ret=$?
 	echo "ret: $ret" >> "$TS_OUTPUT"
 	return $ret
@@ -95,7 +95,7 @@ run_tscmd $TS_CMD_BLKDISCARD -v -p 511 -o 511 -l 10240 $DEVICE
 ts_log "testing --force and --quiet"
 run_tscmd $TS_CMD_BLKDISCARD --force --quiet $DEVICE >> "$TS_OUTPUT"
 
-sed -i "s#$DEVICE:\s##" $TS_OUTPUT $TS_ERRLOG
+sed -i "s#$DEVICE:\s##" "$TS_OUTPUT" "$TS_ERRLOG"
 
 ts_log "detach loop device from image"
 
diff --git a/tests/ts/blkid/dm-err b/tests/ts/blkid/dm-err
index 576d53d91..7c3f64b60 100755
--- a/tests/ts/blkid/dm-err
+++ b/tests/ts/blkid/dm-err
@@ -41,8 +41,8 @@ if [ "$TRAVIS" == "true" ] && [ ! -b "$DEVICE" ]; then
 fi
 
 ts_log "Probe device"
-$TS_CMD_BLKID --probe --output udev $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "Return code: $?" >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "Return code: $?" >> "$TS_OUTPUT"
 
 udevadm settle
 ts_log "Deinitialize device"
diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe
index 2be7ef3b2..c3f396439 100755
--- a/tests/ts/blkid/low-probe
+++ b/tests/ts/blkid/low-probe
@@ -48,7 +48,7 @@ for img in $(ls $TS_SELF/images-fs/*.img.xz | sort); do
 		for off in $sessions; do
 			ts_init_subtest $name-$off
 			$TS_CMD_BLKID --probe --output udev $outimg --hint session_offset=$(( $off * 2048 )) \
-				2> $TS_ERRLOG | sort > $TS_OUTPUT
+				2> "$TS_ERRLOG" | sort > "$TS_OUTPUT"
 			ts_finalize_subtest
 		done
 	#
@@ -56,7 +56,7 @@ for img in $(ls $TS_SELF/images-fs/*.img.xz | sort); do
 	#
 	else
 		ts_init_subtest $name
-		$TS_CMD_BLKID --probe --output udev $outimg 2> $TS_ERRLOG | sort > $TS_OUTPUT
+		$TS_CMD_BLKID --probe --output udev $outimg 2> "$TS_ERRLOG" | sort > "$TS_OUTPUT"
 		ts_finalize_subtest
 	fi
 done
diff --git a/tests/ts/blkid/lowprobe-pt b/tests/ts/blkid/lowprobe-pt
index 3223db358..955de076d 100755
--- a/tests/ts/blkid/lowprobe-pt
+++ b/tests/ts/blkid/lowprobe-pt
@@ -36,7 +36,7 @@ for img in $(ls $TS_SELF/images-pt/*.img.xz | sort); do
 
 	xz -dc $img > $outimg
 
-	$TS_HELPER_PARTITIONS $outimg &> $TS_OUTPUT
+	$TS_HELPER_PARTITIONS $outimg &> "$TS_OUTPUT"
 	ts_finalize_subtest
 done
 
diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole
index 9e5bb9fe7..d0be1c53d 100755
--- a/tests/ts/blkid/md-raid0-whole
+++ b/tests/ts/blkid/md-raid0-whole
@@ -49,7 +49,7 @@ mdadm -q -S ${MD_DEVICE} &> /dev/null
 
 ts_log "Create RAID device"
 mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \
-	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # create dos partition table
 $TS_CMD_FDISK --noauto-pt ${MD_DEVICE} &>/dev/null <<EOF
@@ -59,7 +59,7 @@ q
 EOF
 
 ts_log "Create partitions on RAID device"
-$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK ${MD_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 n
 p
 1
@@ -78,13 +78,13 @@ EOF
 udevadm settle
 
 ts_log "Probe first RAID member"
-$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> "$TS_ERRLOG" | sort >> "$TS_OUTPUT"
 
 ts_log "Probe second RAID member"
-$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> "$TS_ERRLOG" | sort >> "$TS_OUTPUT"
 
 ts_log "Stop RAID device"
-mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+mdadm -q -S ${MD_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 udevadm settle
 ts_unlock "md"
@@ -94,6 +94,6 @@ ts_log "Deinitialize devices"
 ts_fdisk_clean $MD_DEVICE
 
 # remove generated UUIDs
-sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT
+sed -i -e 's/ID_FS_UUID.*//g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 25001c313..ac876a1ac 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -35,7 +35,7 @@ TS_KNOWN_FAIL="yes"
 ts_scsi_debug_init dev_size_mb=51 sector_size=512
 
 ts_log "Create partitions"
-$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 o
 n
 p
@@ -71,19 +71,19 @@ ts_lock "md"
 ts_log "Create RAID1 device"
 mdadm -q -S ${MD_DEVICE} &> /dev/null
 mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
-	    --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	    --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 
 ts_log "Probe whole-disk"
-$TS_CMD_BLKID --probe --output udev ${TS_DEVICE} 2>> $TS_ERRLOG | sort >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev ${TS_DEVICE} 2>> "$TS_ERRLOG" | sort >> "$TS_OUTPUT"
 
 ts_log "Probe first RAID member"
-$TS_CMD_BLKID --probe --output udev ${TS_DEVICE}1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev ${TS_DEVICE}1 2>> "$TS_ERRLOG" | sort >> "$TS_OUTPUT"
 
 ts_log "Probe second RAID member"
-$TS_CMD_BLKID --probe --output udev ${TS_DEVICE}2 2>> $TS_ERRLOG | sort >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev ${TS_DEVICE}2 2>> "$TS_ERRLOG" | sort >> "$TS_OUTPUT"
 
-mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+mdadm -q -S ${MD_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 udevadm settle
 ts_unlock "md"
@@ -94,6 +94,6 @@ sed -i \
   -e         's/^\(ID_FS_UUID\)=.*/\1=__ts_uuid__/' \
   -e     's/^\(ID_FS_UUID_ENC\)=.*/\1=__ts_uuid_enc__/' \
   -e 's/^\(ID_PART_ENTRY_DISK\)=.*/\1=__ts_majorminor__/' \
-  $TS_OUTPUT
+  "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 2f81e6b95..deda000ec 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -51,7 +51,7 @@ udevadm settle
 
 ts_log "Create RAID device"
 mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
-	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 
 # create dos partition table
@@ -62,7 +62,7 @@ q
 EOF
 
 ts_log "Create partitions on RAID device"
-$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK ${MD_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 n
 p
 1
@@ -81,13 +81,13 @@ EOF
 udevadm settle
 
 ts_log "Probe first RAID member"
-$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> "$TS_ERRLOG" | sort >> "$TS_OUTPUT"
 
 ts_log "Probe second RAID member"
-$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT
+$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> "$TS_ERRLOG" | sort >> "$TS_OUTPUT"
 
 ts_log "Stop RAID device"
-mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+mdadm -q -S ${MD_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 udevadm settle
 ts_unlock "md"
@@ -96,8 +96,8 @@ ts_log "Deinitialize devices"
 
 ts_fdisk_clean
 # seems that raid1 minimum I/O size has been changed in kernels >4.4.x and >4.8
-sed -i 's@^\(I/O size (minimum/optimal): \)[1-9][0-9]*@\1<removed>@' $TS_OUTPUT
+sed -i 's@^\(I/O size (minimum/optimal): \)[1-9][0-9]*@\1<removed>@' "$TS_OUTPUT"
 # remove generated UUIDs
-sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT
+sed -i -e 's/ID_FS_UUID.*//g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/blkid/offset b/tests/ts/blkid/offset
index 529742025..f6630ede3 100755
--- a/tests/ts/blkid/offset
+++ b/tests/ts/blkid/offset
@@ -28,7 +28,7 @@ ts_skip_nonroot
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=50 sector_size=512
 
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: gpt
 label-id: b181c399-4711-4c52-8b65-9e764541218d
 
@@ -53,6 +53,6 @@ size=$(( $(cat /sys/block/${DEVNAME}/${DEVNAME}2/size) * 512))
 $TS_CMD_PARTX --delete ${TS_DEVICE} &> /dev/null
 
 $TS_CMD_BLKID --probe --output udev --offset=${offset} --size=${size} $TS_DEVICE \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config
index b008c6371..b3449c7f1 100755
--- a/tests/ts/build-sys/config
+++ b/tests/ts/build-sys/config
@@ -44,12 +44,12 @@ function make_conf {
 			sort -u | tr '\n' ' ')
 
 		if [ -n "$libs" ]; then
-			echo "$(basename $b): $libs" >> $TS_OUTPUT
+			echo "$(basename $b): $libs" >> "$TS_OUTPUT"
 		else
 			fres=$(file $b)
 			case $fres in
 			*statically*)
-				echo "$(basename $b): STATIC" >> $TS_OUTPUT
+				echo "$(basename $b): STATIC" >> "$TS_OUTPUT"
 				;;
 			*) # ignore scripts, ...etc.
 				;;
diff --git a/tests/ts/cal/bigyear b/tests/ts/cal/bigyear
index fca23970b..f590e4dfb 100755
--- a/tests/ts/cal/bigyear
+++ b/tests/ts/cal/bigyear
@@ -45,7 +45,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_HELPER_CAL "$@"
 	fi
-	$TS_HELPER_CAL "$@" >> $TS_OUTPUT
+	$TS_HELPER_CAL "$@" >> "$TS_OUTPUT"
 	ts_finalize_subtest
 }
 
diff --git a/tests/ts/cal/color b/tests/ts/cal/color
index 81821895e..816c5b8d6 100755
--- a/tests/ts/cal/color
+++ b/tests/ts/cal/color
@@ -32,7 +32,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@"
 	fi
-	XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> $TS_OUTPUT
+	XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> "$TS_OUTPUT"
 }
 
 USETERM=$( ts_has_option "useterm" "$*" )
diff --git a/tests/ts/cal/colorw b/tests/ts/cal/colorw
index 01f9bc817..50cc5b799 100755
--- a/tests/ts/cal/colorw
+++ b/tests/ts/cal/colorw
@@ -36,7 +36,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		 XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@"
 	fi
-	XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> $TS_OUTPUT
+	XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> "$TS_OUTPUT"
 }
 
 ts_init_subtest "first-day-week-numbers"
diff --git a/tests/ts/cal/column b/tests/ts/cal/column
index d90815c56..fd78de3f3 100755
--- a/tests/ts/cal/column
+++ b/tests/ts/cal/column
@@ -37,7 +37,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_CMD_CAL "$@"
 	fi
-	$TS_CMD_CAL "$@" >> $TS_OUTPUT
+	$TS_CMD_CAL "$@" >> "$TS_OUTPUT"
 	ts_finalize_subtest
 }
 
diff --git a/tests/ts/cal/jan1753 b/tests/ts/cal/jan1753
index e2acdff01..3d2e97b1c 100755
--- a/tests/ts/cal/jan1753
+++ b/tests/ts/cal/jan1753
@@ -34,7 +34,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_CMD_CAL "$@"
 	fi
-	$TS_CMD_CAL "$@" >> $TS_OUTPUT
+	$TS_CMD_CAL "$@" >> "$TS_OUTPUT"
 
 	ts_finalize_subtest
 }
diff --git a/tests/ts/cal/month b/tests/ts/cal/month
index f58beb72c..03c4dc1e0 100755
--- a/tests/ts/cal/month
+++ b/tests/ts/cal/month
@@ -41,7 +41,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_HELPER_CAL "$@"
 	fi
-	$TS_HELPER_CAL "$@" >> $TS_OUTPUT
+	$TS_HELPER_CAL "$@" >> "$TS_OUTPUT"
 
 	ts_finalize_subtest
 }
diff --git a/tests/ts/cal/sep1752 b/tests/ts/cal/sep1752
index 13c83753e..6544e97d0 100755
--- a/tests/ts/cal/sep1752
+++ b/tests/ts/cal/sep1752
@@ -35,7 +35,7 @@ function call_cal_simple {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_HELPER_CAL "$@"
 	fi
-	$TS_HELPER_CAL "$@" >> $TS_OUTPUT
+	$TS_HELPER_CAL "$@" >> "$TS_OUTPUT"
 }
 
 function call_cal {
diff --git a/tests/ts/cal/vertical b/tests/ts/cal/vertical
index 91c9f6ba3..e75d4e523 100755
--- a/tests/ts/cal/vertical
+++ b/tests/ts/cal/vertical
@@ -41,7 +41,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_HELPER_CAL "$@"
 	fi
-	$TS_HELPER_CAL "$@" >> $TS_OUTPUT
+	$TS_HELPER_CAL "$@" >> "$TS_OUTPUT"
 
 	ts_finalize_subtest
 }
diff --git a/tests/ts/cal/weekarg b/tests/ts/cal/weekarg
index 47a3a20fe..3d7ff4abb 100755
--- a/tests/ts/cal/weekarg
+++ b/tests/ts/cal/weekarg
@@ -36,7 +36,7 @@ function call_cal_simple {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_CMD_CAL "$@"
 	fi
-	$TS_CMD_CAL "$@" >> $TS_OUTPUT
+	$TS_CMD_CAL "$@" >> "$TS_OUTPUT"
 }
 
 function call_cal {
diff --git a/tests/ts/cal/weeknum b/tests/ts/cal/weeknum
index fbcff59a6..9471ec25e 100755
--- a/tests/ts/cal/weeknum
+++ b/tests/ts/cal/weeknum
@@ -39,7 +39,7 @@ function call_cal {
 		if [ "$USETERM" == "yes" ]; then
 			$TS_CMD_CAL "$@" 1 $x
 		fi
-		$TS_CMD_CAL "$@" 1 $x >> $TS_OUTPUT
+		$TS_CMD_CAL "$@" 1 $x >> "$TS_OUTPUT"
 	done
 	ts_finalize_subtest
 }
diff --git a/tests/ts/cal/year b/tests/ts/cal/year
index b18954f48..9035bb91f 100755
--- a/tests/ts/cal/year
+++ b/tests/ts/cal/year
@@ -37,7 +37,7 @@ function call_cal {
 	if [ "$USETERM" == "yes" ]; then
 		$TS_CMD_CAL "$@"
 	fi
-	$TS_CMD_CAL "$@" >> $TS_OUTPUT
+	$TS_CMD_CAL "$@" >> "$TS_OUTPUT"
 	ts_finalize_subtest
 }
 
diff --git a/tests/ts/chfn/gecos b/tests/ts/chfn/gecos
index c1b52df42..579fedd0b 100755
--- a/tests/ts/chfn/gecos
+++ b/tests/ts/chfn/gecos
@@ -31,13 +31,13 @@ ts_check_prog "userdel"
 
 ts_log "Initialize user"
 useradd -u 9899 --shell /bin/bash testuser_chfn_test \
-    || ts_skip "coul not create test user (testuser)"
+    || ts_skip "could not create test user (testuser)"
 
 
-grep testuser /etc/passwd >> $TS_OUTPUT
+grep testuser /etc/passwd >> "$TS_OUTPUT"
 $TS_CMD_CHFN --full-name test_gecos --office none --office-phone 111 \
-                                                testuser_chfn_test >>$TS_OUTPUT
-$TS_CMD_CHFN --home-phone 222 testuser_chfn_test >>$TS_OUTPUT
-grep testuser /etc/passwd >> $TS_OUTPUT
+                                                testuser_chfn_test >>"$TS_OUTPUT"
+$TS_CMD_CHFN --home-phone 222 testuser_chfn_test >>"$TS_OUTPUT"
+grep testuser /etc/passwd >> "$TS_OUTPUT"
 userdel --remove testuser_chfn_test &> /dev/null
 ts_finalize
diff --git a/tests/ts/chrt/chrt b/tests/ts/chrt/chrt
index 810d263a3..eaa0a90d5 100755
--- a/tests/ts/chrt/chrt
+++ b/tests/ts/chrt/chrt
@@ -25,7 +25,7 @@ ts_skip_docker
 ts_skip_qemu_user
 
 function do_chrt {
-	$TS_CMD_CHRT "$@" $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_CHRT "$@" $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 }
 
 function skip_policy {
@@ -58,7 +58,7 @@ function skip_kernel_ge {
 }
 
 function cleanup_output {
-	sed -i -e 's/pid [0-9]*/<removed>/' $TS_OUTPUT
+	sed -i -e 's/pid [0-9]*/<removed>/' "$TS_OUTPUT"
 }
 
 
diff --git a/tests/ts/chrt/chrt-non-root b/tests/ts/chrt/chrt-non-root
index 788700c91..aa107dc3f 100755
--- a/tests/ts/chrt/chrt-non-root
+++ b/tests/ts/chrt/chrt-non-root
@@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_CHRT"
 TS_KNOWN_FAIL="yes"
 
 function do_chrt {
-	$TS_CMD_CHRT "$@" $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_CHRT "$@" $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 }
 
 function skip_policy {
@@ -38,14 +38,14 @@ function skip_policy {
 }
 
 function cleanup_output {
-	sed -i -e 's/pid [0-9]*/<removed>/' $TS_OUTPUT
-	sed -i -e 's/[0-9]* (process/<removed> (process/' $TS_OUTPUT
+	sed -i -e 's/pid [0-9]*/<removed>/' "$TS_OUTPUT"
+	sed -i -e 's/[0-9]* (process/<removed> (process/' "$TS_OUTPUT"
 }
 
 ts_init_subtest "batch-vs-nice"
 skip_policy SCHED_BATCH
 if [ $? == 0 ]; then
-	renice -n 5 -p $$ >> $TS_OUTPUT 2>> $TS_ERRLOG
+	renice -n 5 -p $$ >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	do_chrt --batch 0
 	cleanup_output
 	ts_finalize_subtest
diff --git a/tests/ts/col/io b/tests/ts/col/io
index 1143ab890..709702c9a 100755
--- a/tests/ts/col/io
+++ b/tests/ts/col/io
@@ -24,63 +24,63 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_COL"
 
 ts_init_subtest "trailing-spaces"
-printf "1 \t\n2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1 \t\n2\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "tab-backspace"
-printf "1\t\x082\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1\t\x082\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "various-spaces"
-printf "1 \t\f2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1 \t\f2\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "cr"
-printf "1\r2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1\r2\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "vt1"
-printf "1\n23\v\n4\n5\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1\n23\v\n4\n5\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "vt2"
-printf "a\v\vb\v\vc" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "a\v\vb\v\vc" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "reverse-lf"
-printf "1\n2\e\x073\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1\n2\e\x073\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "so-si"
-printf "\x0e\x0f" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "\x0e\x0f" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "esc-tab"
-printf "\e\t\b1\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "\e\t\b1\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "esc-backspace"
-printf "1\e\b2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1\e\b2\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "cs-normal"
-printf "<B\x10\x0E\t\v\x100" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "<B\x10\x0E\t\v\x100" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "cs-alternate"
-printf "1\t\x0E2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1\t\x0E2\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "allocate-here"
-printf "1\t\v2\t\n3" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+printf "1\t\v2\t\n3" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "half-line"
-printf "\e\t\b1\n" | ts_run $TS_CMD_COL --fine >> $TS_OUTPUT 2>&1
+printf "\e\t\b1\n" | ts_run $TS_CMD_COL --fine >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "flushing"
-seq 1 199 | ts_run $TS_CMD_COL --lines 8 >> $TS_OUTPUT 2>&1
+seq 1 199 | ts_run $TS_CMD_COL --lines 8 >> "$TS_OUTPUT" 2>&1
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/col/multibyte b/tests/ts/col/multibyte
index 1b17a2cdb..680bc76a6 100755
--- a/tests/ts/col/multibyte
+++ b/tests/ts/col/multibyte
@@ -27,13 +27,13 @@ ts_check_test_command "$TS_HELPER_STRERROR"
 ts_init_subtest "valid"
 cat $TS_SELF/multibyte.data |
     LC_ALL=C ts_run $TS_CMD_COL 2>&1 |
-    sed -e "s@$($TS_HELPER_STRERROR EILSEQ)@EILSEQ@" > $TS_OUTPUT
+    sed -e "s@$($TS_HELPER_STRERROR EILSEQ)@EILSEQ@" > "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "invalid"
 printf '%s\n' $'abc\200\200jkl' |
 	LC_ALL=C ts_run $TS_CMD_COL 2>&1 |
-	sed -e "s@$($TS_HELPER_STRERROR EILSEQ)@EILSEQ@" > $TS_OUTPUT
+	sed -e "s@$($TS_HELPER_STRERROR EILSEQ)@EILSEQ@" > "$TS_OUTPUT"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/col/newlines b/tests/ts/col/newlines
index 87f9819ff..197ece996 100755
--- a/tests/ts/col/newlines
+++ b/tests/ts/col/newlines
@@ -24,23 +24,23 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_COL"
 
 ts_init_subtest "zero-length-file"
-printf "" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "one-line-no-nl"
-printf "1" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "1" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "one-line-with-nl"
-printf "1\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "1\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "second-line-no-nl"
-printf "1\n2" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "1\n2" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "second-line-with-nl"
-printf "1\n2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "1\n2\n" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/col/options b/tests/ts/col/options
index 490fe2c94..8e8a18454 100755
--- a/tests/ts/col/options
+++ b/tests/ts/col/options
@@ -24,20 +24,20 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_COL"
 
 ts_init_subtest "no-backspaces"
-printf "FIXME" | ts_run $TS_CMD_COL --no-backspaces >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "FIXME" | ts_run $TS_CMD_COL --no-backspaces >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "pass"
-printf "a\x11b" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>> $TS_ERRLOG
-printf "a\x11b" | ts_run $TS_CMD_COL --pass >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "a\x11b" | ts_run $TS_CMD_COL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+printf "a\x11b" | ts_run $TS_CMD_COL --pass >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "tabs"
-printf "        1\n" | ts_run $TS_CMD_COL --tabs >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "        1\n" | ts_run $TS_CMD_COL --tabs >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "spaces"
-printf "\t1\n" | ts_run $TS_CMD_COL --spaces >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "\t1\n" | ts_run $TS_CMD_COL --spaces >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/colcrt/functional b/tests/ts/colcrt/functional
index b5d941659..7a1645674 100755
--- a/tests/ts/colcrt/functional
+++ b/tests/ts/colcrt/functional
@@ -25,27 +25,27 @@ ts_check_wcsspn
 ts_check_test_command "$TS_CMD_COLCRT"
 
 ts_init_subtest 'no-options'
-$TS_CMD_COLCRT < $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_COLCRT < $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "return value: $?" >> $TS_OUTPUT
+$TS_CMD_COLCRT < $TS_SELF/nasty-input >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_COLCRT < $TS_SELF/underlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "return value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'no-underlining'
-$TS_CMD_COLCRT --no-underlining < $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_COLCRT --no-underlining < $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "return value: $?" >> $TS_OUTPUT
+$TS_CMD_COLCRT --no-underlining < $TS_SELF/nasty-input >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_COLCRT --no-underlining < $TS_SELF/underlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "return value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'half-lines'
-$TS_CMD_COLCRT --half-lines < $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_COLCRT --half-lines < $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "return value: $?" >> $TS_OUTPUT
+$TS_CMD_COLCRT --half-lines < $TS_SELF/nasty-input >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_COLCRT --half-lines < $TS_SELF/underlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "return value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'short-options'
-$TS_CMD_COLCRT - -2 $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_COLCRT - -2 $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "return value: $?" >> $TS_OUTPUT
+$TS_CMD_COLCRT - -2 $TS_SELF/nasty-input >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_COLCRT - -2 $TS_SELF/underlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "return value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/colcrt/regressions b/tests/ts/colcrt/regressions
index 6a188be6c..8a48854b4 100755
--- a/tests/ts/colcrt/regressions
+++ b/tests/ts/colcrt/regressions
@@ -26,9 +26,9 @@ ts_check_prog "env"
 
 check_input_file() {
 	ts_init_subtest ${1##*/}
-	timeout 2 env LC_ALL=C.UTF-8 $TS_CMD_COLCRT < $1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-	echo "return value: $?" >> $TS_OUTPUT
-	sed -i -e 's/Illegal byte sequence/Invalid or incomplete multibyte or wide character/' $TS_ERRLOG
+	timeout 2 env LC_ALL=C.UTF-8 $TS_CMD_COLCRT < $1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	echo "return value: $?" >> "$TS_OUTPUT"
+	sed -i -e 's/Illegal byte sequence/Invalid or incomplete multibyte or wide character/' "$TS_ERRLOG"
 	ts_finalize_subtest
 }
 
diff --git a/tests/ts/colrm/rm2-2 b/tests/ts/colrm/rm2-2
index 6e497673a..bc7331d41 100755
--- a/tests/ts/colrm/rm2-2
+++ b/tests/ts/colrm/rm2-2
@@ -23,6 +23,6 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_COLRM"
 
-printf "a       b\nc\td\nef\b\tg\n" | $TS_CMD_COLRM 2 2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "a       b\nc\td\nef\b\tg\n" | $TS_CMD_COLRM 2 2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/column/ansiescape b/tests/ts/column/ansiescape
index dcfced64b..b14debb87 100755
--- a/tests/ts/column/ansiescape
+++ b/tests/ts/column/ansiescape
@@ -26,12 +26,12 @@ ts_check_test_command "$TS_CMD_COLUMN"
 ts_cd "$TS_OUTDIR"
 
 ts_init_subtest "sgr"
-printf '%b' "$(cat $TS_SELF/files/ansiescape)" | $TS_CMD_COLUMN --columns 32 | cat -v >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf '%b' "$(cat $TS_SELF/files/ansiescape)" | $TS_CMD_COLUMN --columns 32 | cat -v >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "scs"
 printf '%b' "\033[32mgreen\033(B\033[m|colored with SCS reset\n\033[31mred\033[m|colored without SCS\nnormal|no colors\n" \
-	| $TS_CMD_COLUMN --table --separator '|' --output-separator '|' >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| $TS_CMD_COLUMN --table --separator '|' --output-separator '|' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/column/columnate b/tests/ts/column/columnate
index a457a1f28..3c11cfbfc 100755
--- a/tests/ts/column/columnate
+++ b/tests/ts/column/columnate
@@ -26,27 +26,27 @@ ts_cd "$TS_OUTDIR"
 
 
 ts_init_subtest "fill-cols-80"
-$TS_CMD_COLUMN -c 80 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN -c 80 $TS_SELF/files/onecolumn >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fill-cols-50"
-$TS_CMD_COLUMN -c 50 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN -c 50 $TS_SELF/files/onecolumn >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fill-cols-250"
-$TS_CMD_COLUMN -c 250 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN -c 250 $TS_SELF/files/onecolumn >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fill-rows-80"
-$TS_CMD_COLUMN --fillrows -c 80 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --fillrows -c 80 $TS_SELF/files/onecolumn >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fill-rows-50"
-$TS_CMD_COLUMN --fillrows -c 50 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --fillrows -c 50 $TS_SELF/files/onecolumn >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fill-rows-250"
-$TS_CMD_COLUMN --fillrows -c 250 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --fillrows -c 250 $TS_SELF/files/onecolumn >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/column/invalid-multibyte b/tests/ts/column/invalid-multibyte
index 1dbfe09af..345676f91 100755
--- a/tests/ts/column/invalid-multibyte
+++ b/tests/ts/column/invalid-multibyte
@@ -25,6 +25,6 @@ ts_check_test_command "$TS_CMD_COLUMN"
 
 ts_cd "$TS_OUTDIR"
 
-printf "\x94\x7e\n" | LC_ALL=C.UTF-8 $TS_CMD_COLUMN >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "\x94\x7e\n" | LC_ALL=C.UTF-8 $TS_CMD_COLUMN >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/column/multi-file b/tests/ts/column/multi-file
index 3d0e8ef0f..c9e73d093 100755
--- a/tests/ts/column/multi-file
+++ b/tests/ts/column/multi-file
@@ -28,7 +28,7 @@ ts_cd "$TS_OUTDIR"
 
 $TS_CMD_COLUMN -x -c 50 $TS_SELF/files/fivecols \
 			$TS_SELF/files/fivecols \
-			$TS_SELF/files/fivecols >> $TS_OUTPUT 2>> $TS_ERRLOG
+			$TS_SELF/files/fivecols >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
 
diff --git a/tests/ts/column/table b/tests/ts/column/table
index 282b058e2..172778642 100755
--- a/tests/ts/column/table
+++ b/tests/ts/column/table
@@ -26,50 +26,50 @@ ts_check_test_command "$TS_CMD_COLUMN"
 ts_cd "$TS_OUTDIR"
 
 ts_init_subtest "default"
-$TS_CMD_COLUMN --table $TS_SELF/files/table >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --table $TS_SELF/files/table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "output-separator"
-$TS_CMD_COLUMN --output-separator '|' --table $TS_SELF/files/table >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --output-separator '|' --table $TS_SELF/files/table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "input-separator"
-$TS_CMD_COLUMN --input-separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --input-separator ',' --table $TS_SELF/files/table-sep >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "input-separator-space"
-$TS_CMD_COLUMN --separator "$(echo -e '\t')" --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --separator "$(echo -e '\t')" --table $TS_SELF/files/table-sep-space >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "empty-lines"
-$TS_CMD_COLUMN --table --keep-empty-lines $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --table --keep-empty-lines $TS_SELF/files/table-empty-lines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "noempty-lines"
-$TS_CMD_COLUMN --table $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --table $TS_SELF/files/table-empty-lines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "long"
-$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "hide"
 $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
-		--table-hide 1,2,3,4,7,8  >> $TS_OUTPUT 2>> $TS_ERRLOG
+		--table-hide 1,2,3,4,7,8  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "headers"
 $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \
 		--table-hide SEP,ID,PARENT,ROOT \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "noheaders"
 $TS_CMD_COLUMN  --table $TS_SELF/files/table \
 		--table-noheadings \
 		--table-columns VERYLONG,COLUMN,NAMES \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "truncate"
@@ -78,7 +78,7 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--table-hide SEP,ID,PARENT,ROOT \
 		--table-truncate VFS-OPTS,FS-OPTS \
 		--output-width 80 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "right"
@@ -87,7 +87,7 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--table-hide SEP,ID,PARENT,ROOT,VFS-OPTS,FS-OPTS,PROP \
 		--table-right SOURCE,TYPE \
 		--output-width 80 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap"
@@ -96,7 +96,7 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--table-hide=SEP,ID,PARENT,ROOT,VFS-OPTS,PROP \
 		--table-wrap FS-OPTS \
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "order"
@@ -105,7 +105,7 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--table-hide=SEP,ID,PARENT,ROOT,PROP,FS-OPTS,MAJMIN \
 		--table-order TARGET,SOURCE,TYPE,VFS-OPTS \
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "limit"
@@ -113,7 +113,7 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \
 		--table-columns-limit 2 \
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "tree"
@@ -125,7 +125,7 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--tree-id ID \
 		--tree-parent PARENT \
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "json"
@@ -136,7 +136,7 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
 		--table-order TARGET,SOURCE,TYPE,VFS-OPTS \
                 --json \
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "json-lines"
@@ -147,7 +147,7 @@ LIBSMARTCOLS_JSON=lines $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \
 		--table-order TARGET,SOURCE,TYPE,VFS-OPTS \
 		--json \
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "json-compact"
@@ -158,7 +158,7 @@ LIBSMARTCOLS_JSON=compact $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \
 		--table-order TARGET,SOURCE,TYPE,VFS-OPTS \
 		--json \
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "use-spaces"
@@ -168,87 +168,87 @@ $TS_CMD_COLUMN  --table $TS_SELF/files/mountinfo \
                 --table-order TARGET,SOURCE,TYPE,VFS-OPTS \
                 --use-spaces 2\
 		--output-width 110 \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "empty-column"
-printf ':a:b\n' | $TS_CMD_COLUMN --table --separator ':' --output-separator  ':' >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf ':a:b\n' | $TS_CMD_COLUMN --table --separator ':' --output-separator  ':' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "empty-column-at-eol"
-printf '|' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf '|' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "empty-column-at-eol2"
-printf '||' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf '||' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "neg-1"
 echo "A B C D" | $TS_CMD_COLUMN --output-separator '|' --table --table-maxout \
-	--table-right -1 --output-width=80 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	--table-right -1 --output-width=80 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "neg-2"
 echo "A B C D" | $TS_CMD_COLUMN --output-separator '|' --table --table-maxout \
-	--table-right -2 --output-width=80 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	--table-right -2 --output-width=80 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "neg-1-2"
 echo "A B C D" | $TS_CMD_COLUMN --output-separator '|' --table --table-maxout \
-	--table-right -1,-2 --output-width=80 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	--table-right -1,-2 --output-width=80 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "range"
 echo "A B C D" | $TS_CMD_COLUMN --output-separator '|' --table --table-maxout \
-	--table-right 2-3 --output-width=80 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	--table-right 2-3 --output-width=80 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap-separator-basic"
-echo -e '0:1:2\na::b|c\nx:y:z' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 3 --wrap-separator '|' >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e '0:1:2\na::b|c\nx:y:z' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 3 --wrap-separator '|' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap-separator-all-columns"
-echo -e '0:1:2\na::b|c\nx:y:z' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 0 --wrap-separator '|' >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e '0:1:2\na::b|c\nx:y:z' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 0 --wrap-separator '|' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap-separator-without-wrap"
-echo -e '0:1:2\na::b|c\nx:y:z' | $TS_CMD_COLUMN --table --separator ':' --wrap-separator '|' >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e '0:1:2\na::b|c\nx:y:z' | $TS_CMD_COLUMN --table --separator ':' --wrap-separator '|' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap-separator-multichar"
-echo -e 'Name:Description\nJohn:A||software||developer\nJane:A||data||scientist' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 2 --wrap-separator '||' >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e 'Name:Description\nJohn:A||software||developer\nJane:A||data||scientist' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 2 --wrap-separator '||' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap-separator-multiple-separators"
-echo -e 'A:B:C\naa:b1|b2|b3:cc\nxx:y1|y2:zz' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 2 --wrap-separator '|' >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e 'A:B:C\naa:b1|b2|b3:cc\nxx:y1|y2:zz' | $TS_CMD_COLUMN --table --separator ':' --table-wrap 2 --wrap-separator '|' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "header-as-columns"
-echo -e 'NAME\tAGE\tCITY\nAlice\t30\tNew York\nBob\t25\tLos Angeles' | $TS_CMD_COLUMN --table -K >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e 'NAME\tAGE\tCITY\nAlice\t30\tNew York\nBob\t25\tLos Angeles' | $TS_CMD_COLUMN --table -K >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "header-as-columns-csv"
-echo -e 'NAME,AGE,CITY\nAlice,30,New York\nBob,25,Los Angeles' | $TS_CMD_COLUMN --table -K --separator ',' >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e 'NAME,AGE,CITY\nAlice,30,New York\nBob,25,Los Angeles' | $TS_CMD_COLUMN --table -K --separator ',' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "header-as-columns-json"
-echo -e 'NAME,AGE,CITY\nAlice,30,New York\nBob,25,Los Angeles' | $TS_CMD_COLUMN --table -K --separator ',' --json >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e 'NAME,AGE,CITY\nAlice,30,New York\nBob,25,Los Angeles' | $TS_CMD_COLUMN --table -K --separator ',' --json >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "header-as-columns-empty"
-echo -e 'COL1\t\tCOL3\nData1\tData2\tData3' | $TS_CMD_COLUMN --table -K >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e 'COL1\t\tCOL3\nData1\tData2\tData3' | $TS_CMD_COLUMN --table -K >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "min-width"
-echo -e "a b c\na b c" | $TS_CMD_COLUMN --table --table-column "name=X,width=5" -C "name=YY,width=5" -C "name=Z" --output-separator '|' --output-width unlimited >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e "a b c\na b c" | $TS_CMD_COLUMN --table --table-column "name=X,width=5" -C "name=YY,width=5" -C "name=Z" --output-separator '|' --output-width unlimited >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "strictwidth"
-echo -e "a b c\na b c" | $TS_CMD_COLUMN --table --table-column "name=X,width=5" -C "name=YY,width=5,strictwidth" -C "name=Z" --output-separator '|' --output-width unlimited >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e "a b c\na b c" | $TS_CMD_COLUMN --table --table-column "name=X,width=5" -C "name=YY,width=5,strictwidth" -C "name=Z" --output-separator '|' --output-width unlimited >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "trunc-wanted"
-echo -e "123456 bbb\na bbb" | $TS_CMD_COLUMN --table --table-column "name=X,width=4,trunc" -C "name=Y" --output-separator '|' --output-width 9 >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e "123456 bbb\na bbb" | $TS_CMD_COLUMN --table --table-column "name=X,width=4,trunc" -C "name=Y" --output-separator '|' --output-width 9 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/cramfs/doubles b/tests/ts/cramfs/doubles
index 20b67311e..dfb3ab5ea 100755
--- a/tests/ts/cramfs/doubles
+++ b/tests/ts/cramfs/doubles
@@ -48,7 +48,7 @@ echo hello > $IMAGE_SRC/b
 chgrp -R 0 "$IMAGE_SRC"
 
 ts_log "create cramfs image"
-$TS_CMD_MKCRAMFS $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MKCRAMFS $IMAGE_SRC $IMAGE_PATH >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ -s "$IMAGE_PATH" ] || ts_die "Cannot create $IMAGE_PATH"
 
 ts_mount "cramfs" -r $IMAGE_PATH $TS_MOUNTPOINT
diff --git a/tests/ts/cramfs/fsck-bad-header b/tests/ts/cramfs/fsck-bad-header
index 29f07faea..a96a94cff 100755
--- a/tests/ts/cramfs/fsck-bad-header
+++ b/tests/ts/cramfs/fsck-bad-header
@@ -52,7 +52,7 @@ function fsck_loop_sizes()
 		cp -a "$IMAGE_FILE" "$IMAGE_FILE.tmp"
 		num2binary "$size" $endian |
 			dd of="$IMAGE_FILE.tmp" bs=1 seek="$seek" count=4 conv=notrunc &> /dev/null
-		$TS_CMD_FSCKCRAMFS "$IMAGE_FILE.tmp" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		$TS_CMD_FSCKCRAMFS "$IMAGE_FILE.tmp" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 		ts_log "ret: $?
 "
 	done
diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness
index b7281f870..b6f770a66 100755
--- a/tests/ts/cramfs/fsck-endianness
+++ b/tests/ts/cramfs/fsck-endianness
@@ -40,13 +40,13 @@ test_image() {
 
 	rm -rf "$IMAGE_DATA"
 	ts_log "extract from $FROM_ENDIANNESS endian"
-	$TS_CMD_FSCKCRAMFS -v -b 4096 --extract=$IMAGE_DATA $FROM_IMAGE | head -n1 | cut -d" " -f4 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_FSCKCRAMFS -v -b 4096 --extract=$IMAGE_DATA $FROM_IMAGE | head -n1 | cut -d" " -f4 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	ts_log "create $TO_ENDIANNESS endian"
 	$TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \
-		"$IMAGE_CREATED" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		"$IMAGE_CREATED" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-	"$TS_HELPER_MD5" < "$IMAGE_CREATED" >> $TS_OUTPUT
+	"$TS_HELPER_MD5" < "$IMAGE_CREATED" >> "$TS_OUTPUT"
 
 	rm "$IMAGE_CREATED"
 }
diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index 3c0902922..a63134941 100755
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -77,21 +77,21 @@ chgrp -R 0 "$IMAGE_SRC"
 ts_cd "$IMAGE_SRC"
 
 ts_log "list checksums from original data"
-find . -type f -exec md5sum {} \; | sort >> $TS_OUTPUT
-echo >> $TS_OUTPUT
+find . -type f -exec md5sum {} \; | sort >> "$TS_OUTPUT"
+echo >> "$TS_OUTPUT"
 
 ts_log "create cramfs image"
-$TS_CMD_MKCRAMFS -n $LABEL $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MKCRAMFS -n $LABEL $IMAGE_SRC $IMAGE_PATH >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ -s "$IMAGE_PATH" ] || ts_die "Cannot create $IMAGE_PATH"
 
 ts_cd "$TS_OUTDIR"
 
 ts_log "count MD5 from the image"
-MD5_OUT=$("$TS_HELPER_MD5" < "$IMAGE_NAME") >> $TS_OUTPUT 2>> $TS_ERRLOG
+MD5_OUT=$("$TS_HELPER_MD5" < "$IMAGE_NAME") >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 if [ "$MD5_EXP" != "$MD5_OUT" -a "$MD5_EXP" != "unknown" ]; then
 	ts_log "is $MD5_OUT, should be $MD5_EXP"
 fi
-echo >> $TS_OUTPUT
+echo >> "$TS_OUTPUT"
 
 ts_log "create loop device from image"
 DEVICE=$($TS_CMD_LOSETUP --show -f $IMAGE_PATH)
@@ -111,12 +111,12 @@ ts_cd "$TS_MOUNTPOINT"
 
 ts_log "list the image"
 export TZ='GMT-1'
-ls -laR --time-style=long-iso . | sed 's:\. : :g' >> $TS_OUTPUT
-echo >> $TS_OUTPUT
+ls -laR --time-style=long-iso . | sed 's:\. : :g' >> "$TS_OUTPUT"
+echo >> "$TS_OUTPUT"
 
 ts_log "list checksums from new data"
-find . -type f -exec md5sum {} \; | sort >> $TS_OUTPUT
-echo >> $TS_OUTPUT
+find . -type f -exec md5sum {} \; | sort >> "$TS_OUTPUT"
+echo >> "$TS_OUTPUT"
 
 ts_cd "$ORIGPWD"
 
diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness
index cf4aa01d0..15bda7aa7 100755
--- a/tests/ts/cramfs/mkfs-endianness
+++ b/tests/ts/cramfs/mkfs-endianness
@@ -36,9 +36,9 @@ test_image() {
 	ts_log "create $TO_ENDIANNESS endian"
 
 	$TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \
-		"$IMAGE_CREATED" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		"$IMAGE_CREATED" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-	$TS_CMD_HEXDUMP -C $IMAGE_CREATED >> $TS_OUTPUT
+	$TS_CMD_HEXDUMP -C $IMAGE_CREATED >> "$TS_OUTPUT"
 
 	rm "$IMAGE_CREATED"
 }
diff --git a/tests/ts/dmesg/cid-json b/tests/ts/dmesg/cid-json
index 5cbfb5b42..4835a3032 100755
--- a/tests/ts/dmesg/cid-json
+++ b/tests/ts/dmesg/cid-json
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --json --file $TS_SELF/cid-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --file "$TS_SELF"/cid-input >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-colors b/tests/ts/dmesg/cid-kmsg-colors
index 71f1e4c8e..ce141d684 100755
--- a/tests/ts/dmesg/cid-kmsg-colors
+++ b/tests/ts/dmesg/cid-kmsg-colors
@@ -24,11 +24,11 @@ ts_inhibit_custom_colorscheme
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --color=always --kmsg-file $TS_SELF/cid-kmsg-input --decode >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --color=always --kmsg-file "$TS_SELF"/cid-kmsg-input --decode >> "$TS_OUTPUT" 2>/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
-sed -i 's/\[ *T/\[T/g' $TS_OUTPUT
-sed -i 's/\[ *C/\[C/g' $TS_OUTPUT
+sed -i 's/\[ *T/\[T/g' "$TS_OUTPUT"
+sed -i 's/\[ *C/\[C/g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-console-levels b/tests/ts/dmesg/cid-kmsg-console-levels
index 051927a39..d18de89ae 100755
--- a/tests/ts/dmesg/cid-kmsg-console-levels
+++ b/tests/ts/dmesg/cid-kmsg-console-levels
@@ -24,26 +24,26 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..8}; do
-        echo "Display console level: $I" >> $TS_OUTPUT
-	$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level $I >> $TS_OUTPUT 2>/dev/null
+        echo "Display console level: $I" >> "$TS_OUTPUT"
+	$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --level "$I" >> "$TS_OUTPUT" 2>/dev/null
 done
 
-echo "Display console level: err+" >> $TS_OUTPUT
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level err+ >> $TS_OUTPUT 2>/dev/null
-echo "Display console level: emerg+" >> $TS_OUTPUT
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level emerg+ >> $TS_OUTPUT 2>/dev/null
-echo "Display console level: +err" >> $TS_OUTPUT
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level +err >> $TS_OUTPUT 2>/dev/null
-echo "Display console level: +debug" >> $TS_OUTPUT
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level +debug >> $TS_OUTPUT 2>/dev/null
-echo "Display console level: debug" >> $TS_OUTPUT
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level debug >> $TS_OUTPUT 2>/dev/null
-echo "Display console level: + (invalid)" >> $TS_OUTPUT
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level + 2>> $TS_OUTPUT >/dev/null
+echo "Display console level: err+" >> "$TS_OUTPUT"
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --level err+ >> "$TS_OUTPUT" 2>/dev/null
+echo "Display console level: emerg+" >> "$TS_OUTPUT"
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --level emerg+ >> "$TS_OUTPUT" 2>/dev/null
+echo "Display console level: +err" >> "$TS_OUTPUT"
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --level +err >> "$TS_OUTPUT" 2>/dev/null
+echo "Display console level: +debug" >> "$TS_OUTPUT"
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --level +debug >> "$TS_OUTPUT" 2>/dev/null
+echo "Display console level: debug" >> "$TS_OUTPUT"
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --level debug >> "$TS_OUTPUT" 2>/dev/null
+echo "Display console level: + (invalid)" >> "$TS_OUTPUT"
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --level + 2>> "$TS_OUTPUT" >/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
-sed -i 's/\[ *T/\[T/g' $TS_OUTPUT
-sed -i 's/\[ *C/\[C/g' $TS_OUTPUT
+sed -i 's/\[ *T/\[T/g' "$TS_OUTPUT"
+sed -i 's/\[ *C/\[C/g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-decode b/tests/ts/dmesg/cid-kmsg-decode
index a1a767dbc..9182c5c47 100755
--- a/tests/ts/dmesg/cid-kmsg-decode
+++ b/tests/ts/dmesg/cid-kmsg-decode
@@ -23,11 +23,11 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --decode --kmsg-file $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --decode --kmsg-file "$TS_SELF"/cid-kmsg-input >> "$TS_OUTPUT" 2>/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
-sed -i 's/\[ *T/\[T/g' $TS_OUTPUT
-sed -i 's/\[ *C/\[C/g' $TS_OUTPUT
+sed -i 's/\[ *T/\[T/g' "$TS_OUTPUT"
+sed -i 's/\[ *C/\[C/g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-delta b/tests/ts/dmesg/cid-kmsg-delta
index d5fc1e157..6357a29ea 100755
--- a/tests/ts/dmesg/cid-kmsg-delta
+++ b/tests/ts/dmesg/cid-kmsg-delta
@@ -23,11 +23,11 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --show-delta --kmsg-file $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --show-delta --kmsg-file "$TS_SELF"/cid-kmsg-input >> "$TS_OUTPUT" 2>/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
-sed -i 's/\[ *T/\[T/g' $TS_OUTPUT
-sed -i 's/\[ *C/\[C/g' $TS_OUTPUT
+sed -i 's/\[ *T/\[T/g' "$TS_OUTPUT"
+sed -i 's/\[ *C/\[C/g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-facilities b/tests/ts/dmesg/cid-kmsg-facilities
index 38cac1704..aa26a2fcc 100755
--- a/tests/ts/dmesg/cid-kmsg-facilities
+++ b/tests/ts/dmesg/cid-kmsg-facilities
@@ -24,13 +24,13 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..12}; do
-        echo "Display facility list: $I" >> $TS_OUTPUT
-	$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --facility $I --decode >> $TS_OUTPUT 2>/dev/null
+        echo "Display facility list: $I" >> "$TS_OUTPUT"
+	$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-input --facility "$I" --decode >> "$TS_OUTPUT" 2>/dev/null
 done
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
-sed -i 's/\[ *T/\[T/g' $TS_OUTPUT
-sed -i 's/\[ *C/\[C/g' $TS_OUTPUT
+sed -i 's/\[ *T/\[T/g' "$TS_OUTPUT"
+sed -i 's/\[ *C/\[C/g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-indentation b/tests/ts/dmesg/cid-kmsg-indentation
index 76cbc6af0..3cb60ba54 100755
--- a/tests/ts/dmesg/cid-kmsg-indentation
+++ b/tests/ts/dmesg/cid-kmsg-indentation
@@ -23,23 +23,23 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --kmsg-file "$TS_SELF"/cid-kmsg-newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=delta --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=delta --kmsg-file "$TS_SELF"/cid-kmsg-newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=notime --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=notime --kmsg-file "$TS_SELF"/cid-kmsg-newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=reltime --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=reltime --kmsg-file "$TS_SELF"/cid-kmsg-newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=ctime --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=ctime --kmsg-file "$TS_SELF"/cid-kmsg-newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=iso --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=iso --kmsg-file "$TS_SELF"/cid-kmsg-newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
-sed -i 's/\[ *T/\[T/g' $TS_OUTPUT
-sed -i 's/\[ *C/\[C/g' $TS_OUTPUT
+sed -i 's/\[ *T/\[T/g' "$TS_OUTPUT"
+sed -i 's/\[ *C/\[C/g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-json b/tests/ts/dmesg/cid-kmsg-json
index 25ed8b5ba..598c79d2e 100755
--- a/tests/ts/dmesg/cid-kmsg-json
+++ b/tests/ts/dmesg/cid-kmsg-json
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --json --kmsg-file $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --kmsg-file "$TS_SELF"/cid-kmsg-input >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-limit b/tests/ts/dmesg/cid-kmsg-limit
index 97be62c39..91ee28e9e 100755
--- a/tests/ts/dmesg/cid-kmsg-limit
+++ b/tests/ts/dmesg/cid-kmsg-limit
@@ -23,12 +23,12 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 --kmsg-file $TS_SELF/cid-kmsg-input \
-	>> $TS_OUTPUT 2> $TS_ERRLOG
+$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 --kmsg-file "$TS_SELF"/cid-kmsg-input \
+	>> "$TS_OUTPUT" 2> "$TS_ERRLOG"
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
-sed -i 's/\[ *T/\[T/g' $TS_OUTPUT
-sed -i 's/\[ *C/\[C/g' $TS_OUTPUT
+sed -i 's/\[ *T/\[T/g' "$TS_OUTPUT"
+sed -i 's/\[ *C/\[C/g' "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/dmesg/colors b/tests/ts/dmesg/colors
index 4bfaaa87e..25ca654cb 100755
--- a/tests/ts/dmesg/colors
+++ b/tests/ts/dmesg/colors
@@ -24,6 +24,6 @@ ts_inhibit_custom_colorscheme
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --color=always --file $TS_SELF/input --decode >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --color=always --file "$TS_SELF"/input --decode >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/console-levels b/tests/ts/dmesg/console-levels
index bb2c32fae..2bb36175d 100755
--- a/tests/ts/dmesg/console-levels
+++ b/tests/ts/dmesg/console-levels
@@ -24,13 +24,13 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..8}; do
-	$TS_HELPER_DMESG --file $TS_SELF/input --level $I >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG --file "$TS_SELF"/input --level "$I" >> "$TS_OUTPUT" 2>/dev/null
 done
 
-$TS_HELPER_DMESG --file $TS_SELF/input --level err+ >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG --file $TS_SELF/input --level emerg+ >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG --file $TS_SELF/input --level +err >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG --file $TS_SELF/input --level +debug >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG --file $TS_SELF/input --level + 2>> $TS_OUTPUT >/dev/null
+$TS_HELPER_DMESG --file "$TS_SELF"/input --level err+ >> "$TS_OUTPUT" 2>/dev/null
+$TS_HELPER_DMESG --file "$TS_SELF"/input --level emerg+ >> "$TS_OUTPUT" 2>/dev/null
+$TS_HELPER_DMESG --file "$TS_SELF"/input --level +err >> "$TS_OUTPUT" 2>/dev/null
+$TS_HELPER_DMESG --file "$TS_SELF"/input --level +debug >> "$TS_OUTPUT" 2>/dev/null
+$TS_HELPER_DMESG --file "$TS_SELF"/input --level + 2>> "$TS_OUTPUT" >/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/decode b/tests/ts/dmesg/decode
index 0e2f8b9b8..970d2fda3 100755
--- a/tests/ts/dmesg/decode
+++ b/tests/ts/dmesg/decode
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --decode --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --decode --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/delta b/tests/ts/dmesg/delta
index c937a1996..44a5965e4 100755
--- a/tests/ts/dmesg/delta
+++ b/tests/ts/dmesg/delta
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --show-delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --show-delta --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/facilities b/tests/ts/dmesg/facilities
index 74e632618..76861731c 100755
--- a/tests/ts/dmesg/facilities
+++ b/tests/ts/dmesg/facilities
@@ -24,7 +24,7 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..12}; do
-	$TS_HELPER_DMESG --file $TS_SELF/input --facility $I >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG --file "$TS_SELF"/input --facility "$I" >> "$TS_OUTPUT" 2>/dev/null
 done
 
 ts_finalize
diff --git a/tests/ts/dmesg/indentation b/tests/ts/dmesg/indentation
index 8372815ee..7dd0828f5 100755
--- a/tests/ts/dmesg/indentation
+++ b/tests/ts/dmesg/indentation
@@ -23,18 +23,18 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --file "$TS_SELF"/newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --file $TS_SELF/newlines --decode >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --file "$TS_SELF"/newlines --decode >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=delta --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=delta --file "$TS_SELF"/newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=notime --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=notime --file "$TS_SELF"/newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=reltime --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=reltime --file "$TS_SELF"/newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=ctime --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=ctime --file "$TS_SELF"/newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_HELPER_DMESG --time-format=iso --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --time-format=iso --file "$TS_SELF"/newlines >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/dmesg/json b/tests/ts/dmesg/json
index 18655ed28..bde456c15 100755
--- a/tests/ts/dmesg/json
+++ b/tests/ts/dmesg/json
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --json --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/kmsg-file b/tests/ts/dmesg/kmsg-file
index c166afb48..d3f3de67e 100755
--- a/tests/ts/dmesg/kmsg-file
+++ b/tests/ts/dmesg/kmsg-file
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --json --kmsg-file $TS_SELF/kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --kmsg-file "$TS_SELF"/kmsg-input >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/limit b/tests/ts/dmesg/limit
index 9439b644f..582c77a2b 100755
--- a/tests/ts/dmesg/limit
+++ b/tests/ts/dmesg/limit
@@ -23,7 +23,7 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 --file $TS_SELF/input \
-	>> $TS_OUTPUT 2> $TS_ERRLOG
+$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 --file "$TS_SELF"/input \
+	>> "$TS_OUTPUT" 2> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/dmesg/timestamp-format b/tests/ts/dmesg/timestamp-format
index 5c27ac621..7d8c15808 100755
--- a/tests/ts/dmesg/timestamp-format
+++ b/tests/ts/dmesg/timestamp-format
@@ -24,27 +24,27 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 ts_init_subtest "multiple"
-$TS_HELPER_DMESG --time-format raw --ctime --time-format iso --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --time-format raw --ctime --time-format iso --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta"
-$TS_HELPER_DMESG --time-format iso --time-format delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --time-format iso --time-format delta --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta-ctime"
-$TS_HELPER_DMESG --reltime --time-format delta --time-format ctime --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --reltime --time-format delta --time-format ctime --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta-raw"
-$TS_HELPER_DMESG --time-format raw --time-format ctime --time-format delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --time-format raw --time-format ctime --time-format delta --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta-notime"
-$TS_HELPER_DMESG --show-delta --notime --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --show-delta --notime --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "notime-delta"
-$TS_HELPER_DMESG --notime --show-delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --notime --show-delta --file "$TS_SELF"/input >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/fallocate/fallocate b/tests/ts/fallocate/fallocate
index 472937d5f..14d6873ce 100755
--- a/tests/ts/fallocate/fallocate
+++ b/tests/ts/fallocate/fallocate
@@ -29,13 +29,13 @@ IMAGE=${TS_OUTDIR}/${TS_TESTNAME}.file
 ts_init_subtest "alloc"
 rm -f $IMAGE
 
-if $TS_CMD_FALLOCATE --offset 128 --length 256 $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG; then
-	stat -c "%s" $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG
+if $TS_CMD_FALLOCATE --offset 128 --length 256 $IMAGE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"; then
+	stat -c "%s" $IMAGE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 else
 	# fs type of $TS_OUTDIR, could be used to skip this test early
 	fs_type=$(${TS_CMD_FINDMNT} --noheadings --output FSTYPE --target ${TS_OUTDIR})
 
-	grep -qi "fallocate: fallocate failed:.*not supported" $TS_ERRLOG \
+	grep -qi "fallocate: fallocate failed:.*not supported" "$TS_ERRLOG" \
 		&& ts_skip "'${fs_type}' not supported"
 fi
 
@@ -56,21 +56,21 @@ rm -f $IMAGE
 # Report holes - initial state with data holes
 #
 ts_init_subtest "report-data-holes"
-$TS_CMD_FALLOCATE --report-holes $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_FALLOCATE --report-holes $IMAGE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 #
 # Dig holes with verbose
 #
 ts_init_subtest "dig-holes"
-$TS_CMD_FALLOCATE --dig-holes --verbose $IMAGE 2>> $TS_ERRLOG | sed "s|$IMAGE|<testfile>|g" >> $TS_OUTPUT
+$TS_CMD_FALLOCATE --dig-holes --verbose $IMAGE 2>> "$TS_ERRLOG" | sed "s|$IMAGE|<testfile>|g" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 #
 # Report holes after digging - should show file holes
 #
 ts_init_subtest "report-file-holes"
-$TS_CMD_FALLOCATE --report-holes $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_FALLOCATE --report-holes $IMAGE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 rm -f $IMAGE
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index 3e491e0d9..55fa6aa23 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -35,7 +35,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 o
 n
 p
@@ -72,7 +72,7 @@ EOF
 
 udevadm settle
 ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fdisk_clean $TS_DEVICE
 
diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index fbb463e07..da35fe45f 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -35,7 +35,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=7
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 o
 n
 p
@@ -72,7 +72,7 @@ EOF
 
 udevadm settle
 ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 
 ts_fdisk_clean $TS_DEVICE
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index 98a3b4568..7de7c34dd 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -39,7 +39,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 o
 n
 p
@@ -58,7 +58,7 @@ EOF
 
 udevadm settle
 ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_lock "md"
 
@@ -69,11 +69,11 @@ mdadm -q -S ${MD_DEVICE} &> /dev/null
 udevadm settle
 
 mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \
-	    --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	    --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 
 ts_log "Create partitions (MD)"
-$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK ${MD_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 n
 p
 1
@@ -91,9 +91,9 @@ EOF
 
 udevadm settle
 ts_log "Alignment offsets (MD):"
-cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+mdadm -q -S ${MD_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 udevadm settle
 ts_unlock "md"
diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
index 8fc7cd0d3..9f36bb474 100755
--- a/tests/ts/fdisk/align-512-512
+++ b/tests/ts/fdisk/align-512-512
@@ -34,7 +34,7 @@ ts_device_init 50
 DEVICE=$TS_LODEV
 
 ts_log "Create partitions"
-$TS_CMD_FDISK --noauto-pt ${DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 o
 n
 p
diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 81a8bdb6a..0d1b90103 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -35,7 +35,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 o
 n
 p
@@ -72,7 +72,7 @@ EOF
 
 udevadm settle
 ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fdisk_clean $TS_DEVICE
 
diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 4927cefb9..9f2185c35 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -66,61 +66,61 @@ case $ARCH in
 		;;
 esac
 
-echo "BSD_LABELSECTOR=$BSD_LABELSECTOR" >> $TS_OUTPUT
-echo "BSD_LABELOFFSET=$BSD_LABELOFFSET" >> $TS_OUTPUT
-echo "BSD_EXTRA=$BSD_EXTRA" >> $TS_OUTPUT
-echo "BYTE_ORDER=$BYTE_ORDER" >> $TS_OUTPUT
-echo >> $TS_OUTPUT
+echo "BSD_LABELSECTOR=$BSD_LABELSECTOR" >> "$TS_OUTPUT"
+echo "BSD_LABELOFFSET=$BSD_LABELOFFSET" >> "$TS_OUTPUT"
+echo "BSD_EXTRA=$BSD_EXTRA" >> "$TS_OUTPUT"
+echo "BYTE_ORDER=$BYTE_ORDER" >> "$TS_OUTPUT"
+echo >> "$TS_OUTPUT"
 
 TS_EXPECTED+="_${BSD_LABELSECTOR}_${BSD_LABELOFFSET}${BSD_EXTRA}.${BYTE_ORDER}"
 
 function print_layout {
-	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-	$TS_CMD_FDISK --list-details ${TEST_IMAGE_NAME}  >> $TS_OUTPUT
-	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> "$TS_OUTPUT"
+	$TS_CMD_FDISK --list-details ${TEST_IMAGE_NAME}  >> "$TS_OUTPUT"
+	echo -ne   "-------------------\n\n" >> "$TS_OUTPUT"
 }
 
 function print_bsd_layout {
-	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> "$TS_OUTPUT"
 	echo -e "${FDISK_CMD_BSD_LIST}" | \
-			$TS_CMD_FDISK ${TEST_IMAGE_NAME} >> $TS_OUTPUT
-	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
+			$TS_CMD_FDISK ${TEST_IMAGE_NAME} >> "$TS_OUTPUT"
+	echo -ne   "-------------------\n\n" >> "$TS_OUTPUT"
 }
 
 ts_log "Initialize empty image"
 TEST_IMAGE_NAME=$(ts_image_init 10)
-$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_SETID}${FDISK_CMD_WRITE_CLOSE}" \
 	 | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 
 ts_log "Create 1st primary partition"
 echo -e "${FDISK_CMD_CREATE_PRIMARY1}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 
 ts_log "Create 2nd primary partition"
 echo -e "${FDISK_CMD_CREATE_PRIMARY2}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log "Set 2nd partition type"
 echo -e "${FDISK_CMD_CHANGE_PART2TYPE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 
 ts_log "Create default BSD"
 echo -e "${FDISK_CMD_BSD_CREATE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_bsd_layout
 
@@ -129,13 +129,13 @@ echo -e "${FDISK_CMD_BSD_CREATE_PART}${FDISK_CMD_WRITE_CLOSE}" | \
 
 echo -e "${FDISK_CMD_BSD_PARTTYPE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_bsd_layout
 
 echo -e "${FDISK_CMD_BSD_LIST_TYPES}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} | \
-	sed 's/Reading .*//g; s/Welcome to fdisk .*//' >> $TS_OUTPUT 2>> $TS_ERRLOG
+	sed 's/Reading .*//g; s/Welcome to fdisk .*//' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize
diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
index 3dffb7682..2880454ca 100755
--- a/tests/ts/fdisk/gpt
+++ b/tests/ts/fdisk/gpt
@@ -35,9 +35,9 @@ FDISK_CMD_DELETE_PART="d\n2\n"               # delete 2nd partition
 FDISK_CMD_CREATE_PART="n\n2\n\n\n"           # create 2nd partition
 
 function print_layout {
-	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
-	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> "$TS_OUTPUT"
+	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	echo -ne   "-------------------\n\n" >> "$TS_OUTPUT"
 
     ts_fdisk_clean ${TEST_IMAGE_NAME}
 }
diff --git a/tests/ts/fdisk/gpt-resize b/tests/ts/fdisk/gpt-resize
index 305031d46..2547b3e94 100755
--- a/tests/ts/fdisk/gpt-resize
+++ b/tests/ts/fdisk/gpt-resize
@@ -36,7 +36,7 @@ ts_device_init 10
 DEVICE=$TS_LODEV
 
 # create GPT with one partition
-echo ",," | $TS_CMD_SFDISK --no-reread --no-tell-kernel --label gpt $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ",," | $TS_CMD_SFDISK --no-reread --no-tell-kernel --label gpt $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 
 # enlarge the image
@@ -51,13 +51,13 @@ udevadm settle
 ts_log_both "----- fixing after resize: -----"
 
 # create another GPT partition on new free space (all default)
-echo -e 'n\n\n\n\nw\n' | $TS_CMD_FDISK $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -e 'n\n\n\n\nw\n' | $TS_CMD_FDISK $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 
 
 ts_log "----- list result: -----"
 
-$TS_CMD_FDISK --list $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_FDISK --list $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fdisk_clean $DEVICE
 ts_finalize
diff --git a/tests/ts/fdisk/id b/tests/ts/fdisk/id
index 15bf2badd..3fcc8538f 100755
--- a/tests/ts/fdisk/id
+++ b/tests/ts/fdisk/id
@@ -44,13 +44,13 @@ TEST_IMAGE_NAME=$(ts_image_init 10)
 ts_init_subtest "create-mbr-with-id-0x1"
 TS_EXPECTED+="${ARCH_EXT}"
 echo -e "${FDISK_CMD_ID1}" | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} | grep identifier >> $TS_OUTPUT
+$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} | grep identifier >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "create-mbr-with-id-0x2"
 TS_EXPECTED+="${ARCH_EXT}"
 echo -e "${FDISK_CMD_ID2}" | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} | grep identifier >> $TS_OUTPUT
+$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} | grep identifier >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode
index 3edce6572..64f543329 100755
--- a/tests/ts/fdisk/mbr-dos-mode
+++ b/tests/ts/fdisk/mbr-dos-mode
@@ -40,9 +40,9 @@ FDISK_CMD_DELETE_EXTENDED="d\n2\n" # delete second primary
 FDISK_OPTIONS="--cylinders 1024 --compatibility=dos --units=cylinders"
 
 function print_layout {
-	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-	$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
-	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> "$TS_OUTPUT"
+	$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> "$TS_OUTPUT"
+	echo -ne   "-------------------\n\n" >> "$TS_OUTPUT"
 
     ts_fdisk_clean ${TEST_IMAGE_NAME}
 }
@@ -53,11 +53,11 @@ function print_layout {
 #
 ts_init_subtest "empty-pt"
 TEST_IMAGE_NAME=$(ts_image_init 10)
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
 	 | $TS_CMD_FDISK --noauto-pt ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -65,7 +65,7 @@ ts_finalize_subtest
 ts_init_subtest "create-primary-partition"
 echo -e "${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -73,7 +73,7 @@ ts_finalize_subtest
 ts_init_subtest "set-partition-type"
 echo -e "${FDISK_CMD_CHANGE_PARTTYPE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -81,7 +81,7 @@ ts_finalize_subtest
 ts_init_subtest "set-primary-par-active"
 echo -e "${FDISK_CMD_SET_ACTIVE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -89,7 +89,7 @@ ts_finalize_subtest
 ts_init_subtest "re-create-primary-par"
 echo -e "d\n${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -97,7 +97,7 @@ ts_finalize_subtest
 ts_init_subtest "create-extended-par"
 echo -e "${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -105,7 +105,7 @@ ts_finalize_subtest
 ts_init_subtest "create-logical-par"
 echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -113,7 +113,7 @@ ts_finalize_subtest
 ts_init_subtest "delete-logical-par"
 echo -e "${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -121,7 +121,7 @@ ts_finalize_subtest
 ts_init_subtest "create-another-log-par"
 echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -129,7 +129,7 @@ ts_finalize_subtest
 ts_init_subtest "delete-primary-par"
 echo -e "${FDISK_CMD_DELETE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -137,7 +137,7 @@ ts_finalize_subtest
 ts_init_subtest "delete-extended-par"
 echo -e "${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index 82ee75fef..251727362 100755
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/tests/ts/fdisk/mbr-nondos-mode
@@ -48,9 +48,9 @@ case $ARCH in
 esac
 
 function print_layout {
-	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-	$TS_CMD_FDISK -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
-	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> "$TS_OUTPUT"
+	$TS_CMD_FDISK -x ${TEST_IMAGE_NAME} >> "$TS_OUTPUT"
+	echo -ne   "-------------------\n\n" >> "$TS_OUTPUT"
 
 	ts_fdisk_clean ${TEST_IMAGE_NAME}
 }
@@ -60,14 +60,14 @@ function print_layout {
 ts_init_subtest "empty-pt"
 ts_log "Initialize empty image"
 TEST_IMAGE_NAME=$(ts_image_init 20)	# 20 MiB
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # need to run init twice, to change system ID after new label, otherwise system
 # ID will be random and will screw up md5's
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
 	 | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -76,7 +76,7 @@ ts_init_subtest "1st-primary"
 ts_log "Create 1st primary partition"
 echo -e "${FDISK_CMD_CREATE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -85,7 +85,7 @@ ts_init_subtest "1st-active"
 ts_log "Set primary partition active"
 echo -e "${FDISK_CMD_SET_ACTIVE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -94,7 +94,7 @@ ts_init_subtest "1st-primary-recreate"
 ts_log "Re-create 1st primary partition"
 echo -e "d\n${FDISK_CMD_CREATE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -103,7 +103,7 @@ ts_init_subtest "2nd-primary"
 ts_log "Create 2nd primary partition"
 echo -e "${FDISK_CMD_CREATE_2PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -112,7 +112,7 @@ ts_init_subtest "extended"
 ts_log "Create extended partition"
 echo -e "${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK  ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -121,7 +121,7 @@ ts_init_subtest "logical"
 ts_log "Create logical partitions"
 echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -130,7 +130,7 @@ ts_init_subtest "logical-delete"
 ts_log "Delete logical partitions"
 echo -e "${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -139,7 +139,7 @@ ts_init_subtest "logical-recreate"
 ts_log "Create another logical partition"
 echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -148,7 +148,7 @@ ts_init_subtest "1st-primary-delete"
 ts_log "Delete primary partition"
 echo -e "${FDISK_CMD_DELETE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -157,7 +157,7 @@ ts_init_subtest "1nd-primary-delete"
 ts_log "Delete primary partition"
 echo -e "${FDISK_CMD_DELETE_2PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -166,7 +166,7 @@ ts_init_subtest "extended-delete"
 ts_log "Delete extended partition"
 echo -e "${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 print_layout
 ts_finalize_subtest
 
@@ -182,7 +182,7 @@ print_layout
 
 ts_log "Create 2nd primary at the begin of device"
 echo -e "n\np\n2\n\n\n${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+	$TS_CMD_FDISK ${TEST_IMAGE_NAME} >> "$TS_OUTPUT"
 print_layout
 ts_finalize_subtest
 
diff --git a/tests/ts/fdisk/mbr-sort b/tests/ts/fdisk/mbr-sort
index ebb9a2227..9b7a9c5e0 100755
--- a/tests/ts/fdisk/mbr-sort
+++ b/tests/ts/fdisk/mbr-sort
@@ -39,9 +39,9 @@ FDISK_CMD_CREATE_4LOGICAL="n\n10240\n12287\n"
 FDISK_CMD_EXPERT_SORT="x\nf\nr\n"
 
 function print_layout {
-	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-	$TS_CMD_FDISK --list-details ${TEST_IMAGE_NAME} >> $TS_OUTPUT
-	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> "$TS_OUTPUT"
+	$TS_CMD_FDISK --list-details ${TEST_IMAGE_NAME} >> "$TS_OUTPUT"
+	echo -ne   "-------------------\n\n" >> "$TS_OUTPUT"
     
     ts_fdisk_clean ${TEST_IMAGE_NAME}
 }
diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput
index f19a35031..779f8f25c 100755
--- a/tests/ts/fdisk/oddinput
+++ b/tests/ts/fdisk/oddinput
@@ -28,7 +28,7 @@ ts_check_test_command "$TS_HELPER_STRERROR"
 
 ts_log "---Initialize empty image"
 TEST_IMAGE_NAME=$(ts_image_init 10)
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 #
 # Note that since 2.23 the DOS-mode has effect only if there is a MBR on the device.
@@ -36,19 +36,19 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "---Empty image listing" # this should report empty partition table
 # TEST_IMAGE_NAME has absolute path, and is by definition different on each computer, we need to sed it away
-$TS_CMD_FDISK -c=dos -u=cylinders -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_FDISK -c=dos -u=cylinders -x ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" "$TS_OUTPUT" "$TS_ERRLOG"
 
 #
 # Errors
 #
 ts_logerr "---Nonexistent file"
-$TS_CMD_FDISK -c=dos -u=cylinders -x _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR ENOENT)@ENOENT@" $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_FDISK -c=dos -u=cylinders -x _a_file_that_does_not_exist_ >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR ENOENT)@ENOENT@" "$TS_OUTPUT" "$TS_ERRLOG"
 
 ts_logerr "---Too small file"
 echo  "This file is too small" >> oddinput.toosmall
-$TS_CMD_FDISK -c=dos -u=cylinders -x oddinput.toosmall >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_FDISK -c=dos -u=cylinders -x oddinput.toosmall >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" "$TS_OUTPUT" "$TS_ERRLOG"
 rm oddinput.toosmall
 ts_finalize
diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel
index aa98b8366..7660bb801 100755
--- a/tests/ts/fdisk/sunlabel
+++ b/tests/ts/fdisk/sunlabel
@@ -36,7 +36,7 @@ FDISK_CMD_CREATE_SECONDARY="n\n2\n128\n\n" # create secondary partition to the e
 FDISK_OPTIONS="--heads 1 --sectors 63 --units=cylinders"
 
 function print_layout {
-    $TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+    $TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> "$TS_OUTPUT"
     ts_fdisk_clean ${TEST_IMAGE_NAME}
 }
 
@@ -44,11 +44,11 @@ function print_layout {
 
 ts_init_subtest "empty-sun-pt"
 TEST_IMAGE_NAME=$(ts_image_init 10)
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" \
 	 | $TS_CMD_FDISK --noauto-pt ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -57,7 +57,7 @@ ts_finalize_subtest
 ts_init_subtest "create-first-partition"
 echo -e "${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -65,7 +65,7 @@ ts_finalize_subtest
 ts_init_subtest "set-partition-sysid"
 echo -e "${FDISK_CMD_CHANGE_SYSID}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -73,7 +73,7 @@ ts_finalize_subtest
 ts_init_subtest "set-first-par-readonly"
 echo -e "${FDISK_CMD_TOGGLE_READONLY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -81,15 +81,15 @@ ts_finalize_subtest
 ts_init_subtest "set-first-par-mountable"
 echo -e "${FDISK_CMD_TOGGLE_MOUNTABLE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
 
 ts_init_subtest "create-second-partition"
 echo -e "${FDISK_CMD_CREATE_SECONDARY}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 print_layout
 ts_finalize_subtest
@@ -97,7 +97,7 @@ ts_finalize_subtest
 ts_init_subtest "delete-all-partitions"
 echo -e "${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
-ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_image_md5sum >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count
index 7c0558e58..ab9beb7b2 100755
--- a/tests/ts/fincore/count
+++ b/tests/ts/fincore/count
@@ -148,105 +148,105 @@ ts_log_both "[ NON EXISTING FILE ]"
 
     $TS_CMD_FINCORE --raw --output $OUT_COLUMNS --bytes --noheadings $input
     footer "$?"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_test "EMPTY FILE" 0
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_test "PAGESIZE -1 (incore)" $(( PAGE_SIZE - 1 ))
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_test "JUST PAGESIZE(incore)" $(( PAGE_SIZE ))
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_test "JUST PAGESIZE(directio)" $(( PAGE_SIZE )) "oflag=direct"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_test "TWO PAGES(incore)" $(( 2 * PAGE_SIZE ))
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_test "TWO PAGES(directio)" $(( 2 * PAGE_SIZE )) "oflag=direct"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_dd_test "TWO PAGES(mixed directio,incore)" \
 			    oflag=direct \
 			    "oflag=append seek=1"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     run_dd_dd_test "TWO PAGES(mixed incore,directio)" \
 		   "" \
 		   "oflag=direct,append seek=1"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 ))
     run_dd_dd_test "WINDOW SIZE(incore-sparse-incore)" \
 		   "" \
 		   "oflag=append seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 ))
     run_dd_dd_test "WINDOW SIZE(directio-sparse-directio)" \
 		   "oflag=direct" \
 		   "oflag=append,direct seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 ))
     run_dd_dd_test "WINDOW SIZE(incore-sparse-directio)" \
 		   "" \
 		   "oflag=append,direct seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 ))
     run_dd_dd_test "WINDOW SIZE(directio-sparse-incore)" \
 		   "oflag=direct" \
 		   "oflag=append seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 ))
     run_dd_dd_test "WINDOW SIZE + 1 page(incore-sparse-incore)" \
 		   "" \
 		   "oflag=append seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 ))
     run_dd_dd_test "WINDOW SIZE + 1 page(directio-sparse-directio)" \
 		   "oflag=direct" \
 		   "oflag=append,direct seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 ))
     run_dd_dd_test "WINDOW SIZE + 1 page(incore-sparse-directio)" \
 		   "" \
 		   "oflag=append,direct seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
     hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 ))
     run_dd_dd_test "WINDOW SIZE + 1 page(directio-sparse-incore)" \
 		   "oflag=direct" \
 		   "oflag=append seek=$hole_count"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log_both "[ MULTIPLE FILES ]"
 {
     $TS_CMD_FINCORE --raw --output $OUT_COLUMNS --bytes $INPUT
     footer "$?"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f $INPUT
 INPUT=
@@ -256,25 +256,25 @@ OUT_COLUMNS=SIZE,FILE
 
 {
 	run_dd_test "EMPTY" 0
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
 	run_dd_test 1b 1
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
 	run_dd_test 1k 1024
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
 	run_dd_test 10k 10240
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log_both "[ GRAND TOTAL SIZE ]"
 {
     $TS_CMD_FINCORE --raw --output $OUT_COLUMNS --bytes --noheadings --total $INPUT
     footer "$?"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f $INPUT
 INPUT=
@@ -283,29 +283,29 @@ OUT_COLUMNS=PAGES,FILE
 
 {
 	run_dd_test "EMPTY" 0
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
 	run_dd_test 1b 1
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
 	run_dd_test 'ONE PAGE' $PAGE_SIZE
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
 	run_dd_test 'TWO PAGES' $(( 2 * PAGE_SIZE ))
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 {
 	run_dd_test 'TEN PAGES' $(( 10 * PAGE_SIZE ))
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log_both "[ GRAND TOTAL PAGES ]"
 {
     $TS_CMD_FINCORE --raw --output $OUT_COLUMNS --bytes --noheadings --total $INPUT
     footer "$?"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 OUT_COLUMNS=$OLD_COLUMNS
 
@@ -315,21 +315,21 @@ if [ -n "$RECURSIVE" ]; then
 
 	{
 	    run_dd_test "dir/EMPTY FILE" 0
-	} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	{
 	    run_dd_test "dir/PAGESIZE -1 (incore)" $(( PAGE_SIZE - 1 ))
-	} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	{
 	    run_dd_test "dir/JUST PAGESIZE(incore)" $(( PAGE_SIZE ))
-	} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	ts_log_both "[ RECURSIVE SCAN ]"
 	{
 	    $TS_CMD_FINCORE --raw --output $OUT_COLUMNS --bytes --recursive --raw "$dir" |sort
 	    footer "$?"
-	} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 fi
 
 rm -f $INPUT
diff --git a/tests/ts/findmnt/filter b/tests/ts/findmnt/filter
index ca9edce4c..fa523933d 100755
--- a/tests/ts/findmnt/filter
+++ b/tests/ts/findmnt/filter
@@ -21,58 +21,58 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_FINDMNT"
 
 ts_init_subtest "types"
-$TS_CMD_FINDMNT --types ext3 --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --types ext3 --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "types-multi"
-$TS_CMD_FINDMNT --types ext3,ext4, --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --types ext3,ext4, --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "types-neg"
-$TS_CMD_FINDMNT --types noext3,ext4, --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --types noext3,ext4, --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options"
-$TS_CMD_FINDMNT --options relatime --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options relatime --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-name"
-$TS_CMD_FINDMNT --options fd --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options fd --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-nameval"
-$TS_CMD_FINDMNT --options "fd=22" --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options "fd=22" --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-nameval-neg"
-$TS_CMD_FINDMNT --options "nofd=22" --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options "nofd=22" --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-nameval-multi"
-$TS_CMD_FINDMNT --options "gid=5,mode=620,ptmxmode=000" --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options "gid=5,mode=620,ptmxmode=000" --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-neg"
-$TS_CMD_FINDMNT --options norelatime --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options norelatime --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-no"
-$TS_CMD_FINDMNT --options +noatime --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options +noatime --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-no-multi"
-$TS_CMD_FINDMNT --options +nosuid,+nodev,blkio --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --options +nosuid,+nodev,blkio --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/findmnt/filterQ b/tests/ts/findmnt/filterQ
index 9bd667ed3..fe97a7ecf 100755
--- a/tests/ts/findmnt/filterQ
+++ b/tests/ts/findmnt/filterQ
@@ -21,57 +21,57 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_FINDMNT"
 
 ts_init_subtest "types"
-$TS_CMD_FINDMNT --filter 'FSTYPE == "ext3"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'FSTYPE == "ext3"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "types-multi"
-$TS_CMD_FINDMNT --filter 'FSTYPE =~ "ext[34]"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'FSTYPE =~ "ext[34]"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "types-neg"
-$TS_CMD_FINDMNT --filter 'FSTYPE !~ "ext[34]"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'FSTYPE !~ "ext[34]"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options"
-$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<relatime\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<relatime\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-name"
-$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<fd\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<fd\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-nameval"
-$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<fd=22\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<fd=22\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-nameval-neg"
-$TS_CMD_FINDMNT --filter 'OPTIONS !~ "\<fd=22\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS !~ "\<fd=22\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-nameval-multi"
-$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<ptmxmode=000\>" && OPTIONS =~ "\<mode=620\>" && OPTIONS =~ "\<gid=5\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<ptmxmode=000\>" && OPTIONS =~ "\<mode=620\>" && OPTIONS =~ "\<gid=5\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-neg"
-$TS_CMD_FINDMNT --filter 'OPTIONS !~ "\<relatime\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS !~ "\<relatime\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-no"
-$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<noatime\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<noatime\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options-no-multi"
-$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<nosuid\>" && OPTIONS =~ "\<nodev\>" && OPTIONS =~ "\<blkio\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --filter 'OPTIONS =~ "\<nosuid\>" && OPTIONS =~ "\<nodev\>" && OPTIONS =~ "\<blkio\>"' --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/findmnt/listmount b/tests/ts/findmnt/listmount
index 33182528d..7f7c81f10 100755
--- a/tests/ts/findmnt/listmount
+++ b/tests/ts/findmnt/listmount
@@ -32,39 +32,39 @@ function check_field {
 
 
 ts_init_subtest "target"
-check_field "TARGET" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "TARGET" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "vfs-options"
-check_field "VFS-OPTIONS" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "VFS-OPTIONS" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fs-options"
-check_field "FS-OPTIONS" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "FS-OPTIONS" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "options"
-check_field "OPTIONS" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "OPTIONS" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fstype"
-check_field "FSTYPE" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "FSTYPE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "propagation"
-check_field "PROPAGATION" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "PROPAGATION" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "fsroot"
-check_field "FSROOT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "FSROOT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "parent"
-check_field "PARENT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "PARENT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "id"
-check_field "ID" >> $TS_OUTPUT 2>> $TS_ERRLOG
+check_field "ID" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/findmnt/outputs b/tests/ts/findmnt/outputs
index ee762d7fd..ab0b33ee4 100755
--- a/tests/ts/findmnt/outputs
+++ b/tests/ts/findmnt/outputs
@@ -22,34 +22,34 @@ ts_check_test_command "$TS_CMD_FINDMNT"
 
 
 ts_init_subtest "default"
-$TS_CMD_FINDMNT --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "kernel"
-$TS_CMD_FINDMNT --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "force-tree"
-$TS_CMD_FINDMNT --tree --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --tree --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "submounts"
-$TS_CMD_FINDMNT /sys --submounts --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT /sys --submounts --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "messy-mountinfo"
-$TS_CMD_FINDMNT --tab-file "$TS_SELF/files/mountinfo-messy" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --tab-file "$TS_SELF/files/mountinfo-messy" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "empty-file"
 touch "$TS_OUTDIR/empty"
-$TS_CMD_FINDMNT --tab-file "$TS_OUTDIR/empty" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --tab-file "$TS_OUTDIR/empty" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/findmnt/target b/tests/ts/findmnt/target
index 0c427cd2c..f82a3c3c6 100755
--- a/tests/ts/findmnt/target
+++ b/tests/ts/findmnt/target
@@ -22,14 +22,14 @@ ts_check_test_command "$TS_CMD_FINDMNT"
 
 
 ts_init_subtest "root"
-$TS_CMD_FINDMNT --target "/" --kernel --tab-file "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --target "/" --kernel --tab-file "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 
 ts_init_subtest "non-root"
-$TS_CMD_FINDMNT --target "/" --kernel --tab-file "$TS_SELF/files/mountinfo-nonroot" &> $TS_OUTPUT
-echo rc=$? >> $TS_OUTPUT
+$TS_CMD_FINDMNT --target "/" --kernel --tab-file "$TS_SELF/files/mountinfo-nonroot" &> "$TS_OUTPUT"
+echo rc=$? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/flock/flock b/tests/ts/flock/flock
index 004a6b532..2f5b3cd34 100755
--- a/tests/ts/flock/flock
+++ b/tests/ts/flock/flock
@@ -30,7 +30,7 @@ function do_lock {
 
 	$TS_CMD_FLOCK $1 $TS_OUTDIR/lockfile \
 		echo "$mesg" \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	local rc="$?"
 
@@ -95,7 +95,7 @@ for api in flock fcntl ; do
 	rm 4 2> /dev/null
 	exec 4<>$TS_OUTDIR/lockfile || ts_log "Could not open lockfile"
 	$TS_CMD_FLOCK $api_arg --nonblock --exclusive --conflict-exit-code 123 4 \
-		      >> $TS_OUTPUT 2>> $TS_ERRLOG
+		      >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	rc="$?"
 
diff --git a/tests/ts/flock/range-lock b/tests/ts/flock/range-lock
index 25065cb37..31a09835d 100755
--- a/tests/ts/flock/range-lock
+++ b/tests/ts/flock/range-lock
@@ -50,7 +50,7 @@ ts_cd "$TS_OUTDIR"
     fi
     # Closing the connection to the coproc makes the cat process exit.
     exec {FLOCK[1]}>&-
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 wait "${FLOCK_PID}"
 
 ts_finalize
diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index 7d194294d..6b6dd7435 100755
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -28,7 +28,7 @@ ts_skip_nonroot
 ts_check_losetup
 ts_check_prog "mkfs.ext2"
 
-> $TS_OUTPUT
+> "$TS_OUTPUT"
 
 ts_device_init
 DEVICE=$TS_LODEV
@@ -39,10 +39,10 @@ ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
-$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # test by ismounted.c
-$TS_HELPER_ISMOUNTED $DEVICE | awk '{print $1}' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_ISMOUNTED $DEVICE | awk '{print $1}' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
diff --git a/tests/ts/fuzzers/test_blkid_fuzz b/tests/ts/fuzzers/test_blkid_fuzz
index 982ae2eea..5c8adbfeb 100755
--- a/tests/ts/fuzzers/test_blkid_fuzz
+++ b/tests/ts/fuzzers/test_blkid_fuzz
@@ -24,6 +24,6 @@ ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_HELPER_BLKID_FUZZ")"
 [ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD"
 
 mkdir -p ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files
-ts_run $TS_HELPER_BLKID_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >$TS_OUTPUT 2>$TS_ERRLOG
+ts_run $TS_HELPER_BLKID_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >"$TS_OUTPUT" 2>"$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/fuzzers/test_fdisk_script_fuzz b/tests/ts/fuzzers/test_fdisk_script_fuzz
index 340ab5452..56a8b5868 100755
--- a/tests/ts/fuzzers/test_fdisk_script_fuzz
+++ b/tests/ts/fuzzers/test_fdisk_script_fuzz
@@ -24,6 +24,6 @@ ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_HELPER_LIBFDISK_SCRIPT_FUZZ")"
 [ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD"
 
 mkdir -p ${TS_OUTPUT}_workdir
-ts_run $TS_HELPER_LIBFDISK_SCRIPT_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >$TS_OUTPUT 2>$TS_ERRLOG
+ts_run $TS_HELPER_LIBFDISK_SCRIPT_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >"$TS_OUTPUT" 2>"$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/fuzzers/test_last_fuzz b/tests/ts/fuzzers/test_last_fuzz
index 9d1eb770f..f84184b8e 100755
--- a/tests/ts/fuzzers/test_last_fuzz
+++ b/tests/ts/fuzzers/test_last_fuzz
@@ -24,6 +24,6 @@ ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_HELPER_LAST_FUZZ")"
 [ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD"
 
 mkdir -p ${TS_OUTPUT}_workdir
-ts_run $TS_HELPER_LAST_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >$TS_OUTPUT 2>$TS_ERRLOG
+ts_run $TS_HELPER_LAST_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >"$TS_OUTPUT" 2>"$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/fuzzers/test_mount_fuzz b/tests/ts/fuzzers/test_mount_fuzz
index 124150291..ebcccccdc 100755
--- a/tests/ts/fuzzers/test_mount_fuzz
+++ b/tests/ts/fuzzers/test_mount_fuzz
@@ -24,6 +24,6 @@ ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_HELPER_LIBMOUNT_FUZZ")"
 [ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD"
 
 mkdir -p ${TS_OUTPUT}_workdir
-ts_run $TS_HELPER_LIBMOUNT_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >$TS_OUTPUT 2>$TS_ERRLOG
+ts_run $TS_HELPER_LIBMOUNT_FUZZ ${TS_OUTPUT}_workdir ${TS_SCRIPT}_files -max_total_time=10 >"$TS_OUTPUT" 2>"$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/getopt/basic b/tests/ts/getopt/basic
index 0b483176c..8fbe44209 100755
--- a/tests/ts/getopt/basic
+++ b/tests/ts/getopt/basic
@@ -41,9 +41,9 @@ while true ; do
 		--) shift ; break ;;
 		*) echo "Internal error!"; break;;
 	esac
-done >> $TS_OUTPUT 2>> $TS_ERRLOG
+done >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-echo "Remaining arguments:" >> $TS_OUTPUT 2>> $TS_ERRLOG
-for arg do echo '--> '"\`$arg'" >> $TS_OUTPUT 2>> $TS_ERRLOG; done
+echo "Remaining arguments:" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+for arg do echo '--> '"\`$arg'" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"; done
 
 ts_finalize
diff --git a/tests/ts/getopt/options b/tests/ts/getopt/options
index 7c50f9966..cfbca67d9 100755
--- a/tests/ts/getopt/options
+++ b/tests/ts/getopt/options
@@ -29,128 +29,128 @@ function gnu_getopt_clean() {
 		-e "s/unrecognized option: \(.\)$/invalid option -- '\1'/" \
 		-e "s/option requires an argument: \(.\)$/option requires an argument -- '\1'/" \
 		-e "s/unrecognized option: \([^'-].\{1,\}\)$/unrecognized option '--\1'/" \
-		$TS_OUTPUT $TS_ERRLOG
+		"$TS_OUTPUT" "$TS_ERRLOG"
 }
 
 ts_init_subtest alternative_option_clash
-$TS_CMD_GETOPT -a --options abcde --longoptions abcde -- -a -ab -abc -ac >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -a --options abcde --longoptions abcde -- -a -ab -abc -ac >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest alternative_option_long
-$TS_CMD_GETOPT --alternative -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT --alternative -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest alternative_option_short
-$TS_CMD_GETOPT -a -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -a -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest invalid_getopt_option
-$TS_CMD_GETOPT -b >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,1s/.*\///' $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_GETOPT -b >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+sed -i '1,1s/.*\///' "$TS_OUTPUT" "$TS_ERRLOG"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest invocation_model_one
-$TS_CMD_GETOPT abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest invocation_model_three_as_one
-$TS_CMD_GETOPT -o abc:d::e::f::g: -- ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -o abc:d::e::f::g: -- ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest invocation_model_two_as_one
-$TS_CMD_GETOPT -- abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -- abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest invocation_without_parameters
-$TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest long_option_ambiguous_1
-$TS_CMD_GETOPT -o a -l long1,long2 -- --long >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-sed -i -e '1,1s/.*\///' -e "1s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
-sed -i -e "1s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_GETOPT -o a -l long1,long2 -- --long >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+sed -i -e '1,1s/.*\///' -e "1s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" "$TS_OUTPUT" "$TS_ERRLOG"
+sed -i -e "1s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" "$TS_OUTPUT" "$TS_ERRLOG"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest longopts
-$TS_CMD_GETOPT -o a -l long1,secondlong:,thirdlong::,abbreviation: -- --long1 EXTRA1 --thirdlong=ARGUMENT --secondlong=ARG --abbr ABBRARG -a >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -o a -l long1,secondlong:,thirdlong::,abbreviation: -- --long1 EXTRA1 --thirdlong=ARGUMENT --secondlong=ARG --abbr ABBRARG -a >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest name_option_long
-$TS_CMD_GETOPT -n THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -n THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest name_option_short
-$TS_CMD_GETOPT --name THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT --name THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest quiet_option_long
-$TS_CMD_GETOPT --quiet -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT --quiet -o a,b: -l long1,long2 -- -c --unknown --long -b >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest quiet_option_short
-$TS_CMD_GETOPT -q -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -q -o a,b: -l long1,long2 -- -c --unknown --long -b >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest quiet_output_option_long
-$TS_CMD_GETOPT --quiet-output -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
-sed -i -e "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_GETOPT --quiet-output -o a,b: -l long1,long2 -- -c --unknown --long -b >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" "$TS_OUTPUT" "$TS_ERRLOG"
+sed -i -e "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" "$TS_OUTPUT" "$TS_ERRLOG"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest quiet_output_option_short
-$TS_CMD_GETOPT -Q -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
-sed -i "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_GETOPT -Q -o a,b: -l long1,long2 -- -c --unknown --long -b >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" "$TS_OUTPUT" "$TS_ERRLOG"
+sed -i "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" "$TS_OUTPUT" "$TS_ERRLOG"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest same_long_short_options
-$TS_CMD_GETOPT -o a -l a -- -a --a >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -o a -l a -- -a --a >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest test_for_enhanced_getopt
-$TS_CMD_GETOPT -T >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -T >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest unknown_options
-$TS_CMD_GETOPT -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,2s/.*\///' $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_GETOPT -o a -l long -- -b --long --whatever -a >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+sed -i '1,2s/.*\///' "$TS_OUTPUT" "$TS_ERRLOG"
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -158,8 +158,8 @@ ts_init_subtest unquoted_option_bash
 $TS_CMD_GETOPT -s bash -u -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More
  than
 one
-line' >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+line' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -167,8 +167,8 @@ ts_init_subtest unquoted_option_tcsh
 $TS_CMD_GETOPT -s tcsh --unquoted -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More
  than
 one
-line' >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+line' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -176,8 +176,8 @@ ts_init_subtest weird_quoting_bash
 $TS_CMD_GETOPT -s bash -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More
  than
 one
-line' >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+line' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
@@ -185,47 +185,47 @@ ts_init_subtest weird_quoting_tcsh
 $TS_CMD_GETOPT --shell tcsh -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More
  than
 one
-line' >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+line' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 gnu_getopt_clean
 ts_finalize_subtest
 
 ts_init_subtest compatible
-$TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-GETOPT_COMPATIBLE='' $TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,1s/.*\///' $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_GETOPT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+GETOPT_COMPATIBLE='' $TS_CMD_GETOPT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+sed -i '1,1s/.*\///' "$TS_OUTPUT" "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest sh
-$TS_CMD_GETOPT --shell=sh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.sh' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT --shell=sh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.sh' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest csh
-$TS_CMD_GETOPT --shell=csh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.csh' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT --shell=csh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.csh' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest no-arguments
-$TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-sed -i '1,1s/.*\///' $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_GETOPT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+sed -i '1,1s/.*\///' "$TS_OUTPUT" "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest posix_correctly
-$TS_CMD_GETOPT -o +ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
-POSIXLY_CORRECT='' $TS_CMD_GETOPT -o ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -o +ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
+POSIXLY_CORRECT='' $TS_CMD_GETOPT -o ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2  --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest non-option
-$TS_CMD_GETOPT -o +a:b: -- -a x y -b z w >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_GETOPT -o  a:b: -- -a x y -b z w >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_GETOPT -o -a:b: -- -a x y -b z w >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit value: $?" >> $TS_OUTPUT
+$TS_CMD_GETOPT -o +a:b: -- -a x y -b z w >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_GETOPT -o  a:b: -- -a x y -b z w >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_GETOPT -o -a:b: -- -a x y -b z w >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit value: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options
index 5b1c36f37..64d2e0550 100755
--- a/tests/ts/hardlink/options
+++ b/tests/ts/hardlink/options
@@ -47,60 +47,60 @@ summary_clean()
 		-e 's/^Method:.*/Method: [Redacted]/' \
 		-e 's/^Compared:.*files/Compared: [Redacted] files/' \
 		-e '/^Compared:.*xattrs/d' \
-		$TS_OUTPUT
+		"$TS_OUTPUT"
 }
 
 create_srcdir
 
 ts_init_subtest "orig" # just list original dir
-show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG
+show_srcdir >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "dryrun"
-$TS_CMD_HARDLINK --quiet --dry-run "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG
-show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HARDLINK --quiet --dry-run "$SRCDIR" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+show_srcdir >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "nargs"
-$TS_CMD_HARDLINK --quiet "$SRCDIR"/dir-1/sdir-1 "$SRCDIR"/file-?-{1,2} >> $TS_OUTPUT 2>> $TS_ERRLOG
-show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HARDLINK --quiet "$SRCDIR"/dir-1/sdir-1 "$SRCDIR"/file-?-{1,2} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+show_srcdir >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 # cases without and with -x support
 tmp=$($TS_CMD_HARDLINK --quiet --exclude pattern "$SRCDIR"/dir-1/sdir-2 2>&1)
 if test $? -ne 0; then
 	ts_init_subtest "noregex"
-	printf "%s\n" "$tmp" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	printf "%s\n" "$tmp" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 else
 	ts_init_subtest "regex-escapes"
-	$TS_CMD_HARDLINK --quiet --exclude '.*z-"§\$%&\(\)=\?\*\+$' "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG
-	show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_HARDLINK --quiet --exclude '.*z-"§\$%&\(\)=\?\*\+$' "$SRCDIR" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	show_srcdir >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 fi
 
 ts_init_subtest "content"
-$TS_CMD_HARDLINK --quiet --content "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HARDLINK --quiet --content "$SRCDIR" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 # When using -c we need to cheat with sed because it's not deterministic which
 # file (i.e. which timestamp and perms) wins. TODO at least the choice of the
 # permissions should be sensitive by default and/or controllable by the user.
-show_srcdir | sed 's/\(1540236\).*/\1xxx\tperm/' >> $TS_OUTPUT 2>> $TS_ERRLOG
+show_srcdir | sed 's/\(1540236\).*/\1xxx\tperm/' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "maximum-size-8191"
 create_srcdir
-echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> $TS_OUTPUT
-$TS_CMD_HARDLINK --maximum-size 8191 "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> "$TS_OUTPUT"
+$TS_CMD_HARDLINK --maximum-size 8191 "$SRCDIR" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 summary_clean
-show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG
+show_srcdir >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "maximum-size-8192"
 create_srcdir
-echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> $TS_OUTPUT
-$TS_CMD_HARDLINK --maximum-size 8192 "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> "$TS_OUTPUT"
+$TS_CMD_HARDLINK --maximum-size 8192 "$SRCDIR" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 summary_clean
-show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG
+show_srcdir >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/hexdump/format-strings b/tests/ts/hexdump/format-strings
index 9b6039025..502b857d2 100755
--- a/tests/ts/hexdump/format-strings
+++ b/tests/ts/hexdump/format-strings
@@ -33,41 +33,41 @@ BE_EXT=$(test "$BYTE_ORDER" = "BE" && echo ".BE")
 ts_init_subtest "empty-format"
 TS_EXPECTED+=$BE_EXT
 INPUT=$(printf \\1)
-$TS_CMD_HEXDUMP --length 1 --no-squeezing --format '2 "" "%x"' <<< $INPUT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP --length 1 --no-squeezing --format '2 "" "%x"' <<< $INPUT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_CMD_HEXDUMP -n1 -ve '4 "%x"' -e '2 ""' <<< $INPUT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_HEXDUMP -n1 -ve '4 "%x"' -e '2 ""' <<< $INPUT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 #basic formats
 ts_init_subtest "1b_octal"
-$TS_CMD_HEXDUMP --one-byte-octal $FILES/ascii.in &> $TS_OUTPUT
+$TS_CMD_HEXDUMP --one-byte-octal $FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "1b_hex"
-$TS_CMD_HEXDUMP --one-byte-hex $FILES/ascii.in &> $TS_OUTPUT
+$TS_CMD_HEXDUMP --one-byte-hex $FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "1b_char"
-$TS_CMD_HEXDUMP --one-byte-char $FILES/ascii.in &> $TS_OUTPUT
+$TS_CMD_HEXDUMP --one-byte-char $FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "canon"
-$TS_CMD_HEXDUMP -C $FILES/ascii.in &> $TS_OUTPUT
+$TS_CMD_HEXDUMP -C $FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "2b_dec"
 TS_EXPECTED+=$BE_EXT
-$TS_CMD_HEXDUMP --two-bytes-decimal $FILES/ascii.in &> $TS_OUTPUT
+$TS_CMD_HEXDUMP --two-bytes-decimal $FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "2b_octal"
 TS_EXPECTED+=$BE_EXT
-$TS_CMD_HEXDUMP --two-bytes-octal $FILES/ascii.in &> $TS_OUTPUT
+$TS_CMD_HEXDUMP --two-bytes-octal $FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "2b_hex"
 TS_EXPECTED+=$BE_EXT
-$TS_CMD_HEXDUMP --two-bytes-hex $FILES/ascii.in &> $TS_OUTPUT
+$TS_CMD_HEXDUMP --two-bytes-hex $FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/hexdump/highlighting b/tests/ts/hexdump/highlighting
index 111b74a0f..343cc7927 100755
--- a/tests/ts/hexdump/highlighting
+++ b/tests/ts/hexdump/highlighting
@@ -39,7 +39,7 @@ BE_EXT=$(test "$BYTE_ORDER" = "BE" && echo ".BE")
 ts_init_subtest "1b_octal-1"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red:A,red:a] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight bytes with the value of 0x41 (A) and 0x61 (a)
@@ -47,14 +47,14 @@ ts_init_subtest "1b_octal-2"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red:0x41,red:0x61] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight the bytes at offsets 130 and  194 (decimal)
 ts_init_subtest "1b_octal-3"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red@130,red@194] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight the byte at offset 194 if its value is 0x61 (a)
@@ -63,7 +63,7 @@ ts_init_subtest "1b_octal-4"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red:A@130,red:0x61@194] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight the byte at offset 194 if its value is 0x61 (a)
@@ -72,14 +72,14 @@ ts_init_subtest "1b_octal-5"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red:C@130,red:0x61@194] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight a range longer than the byte count of %o
 ts_init_subtest "1b_octal-6"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red@193-194] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight bytes with the value of 0101 (A) and 0141 (a)
@@ -87,7 +87,7 @@ ts_init_subtest "1b_octal-7"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red:0101,red:0141] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight bytes with the value of 0101 (A), 0x61 (a), or if the character is a caret
@@ -95,7 +95,7 @@ ts_init_subtest "1b_octal-8"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red:0101,blue:0x61,green:^] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # highlight bytes with the value of 0101 (A), 0x61 (a), or if the character at 196 is not 'c'
@@ -103,28 +103,28 @@ ts_init_subtest "1b_octal-9"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%03o_L[red:0101,blue:0x61,!green:c@196] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 #color the addresses red and the characters in UTIL-LINUX green
 ts_init_subtest "1b_char-1"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax_L[red] " 16/1 "%3_c_L[green:-,green:I,green:L,green:N,green:T,green:U,green:X] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 #color the address 0xe0 red
 ts_init_subtest "1b_char-2"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax_L[red:0xe0] " 16/1 "%3_c " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 #highlight ':' and '@'
 ts_init_subtest "1b_char-3"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 16/1 "%3_c_L[red::@116,red:@@128] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color last address gray, the null byte blue, the spaces brown(-ish) and the text cyan
@@ -134,7 +134,7 @@ $TS_CMD_HEXDUMP $OPTS \
 	-e '"%08.8_Ax_L[gray]\n"' \
 	-e '"%08.8_ax  " 8/1 "%02x_L[blue:0x0,brown:0x20] " "  " 8/1 "%02x_L[brown:0x20] " ' \
 	-e '"  |" 16/1 "%_p_L[cyan]" "|\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color last address gray - if it's 0x280 or blue if it's 0x380
@@ -144,7 +144,7 @@ $TS_CMD_HEXDUMP $OPTS \
 	-e '"%08.8_Ax_L[blue:0x380,red:0x280]\n"' \
 	-e '"%08.8_ax  " 8/1 "%02x_L[blue:A,blue:a] " "  " 8/1 "%02x_L[blue:A,blue:a] " ' \
 	-e '"  |" 16/1 "%_p_L[green:A,green:a]" "|\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if one of the bytes it prints is at offset 100 (0x64)
@@ -152,7 +152,7 @@ ts_init_subtest "2b_dec-1"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[red@100] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if of the bytes it prints are at offsets 98 and 99
@@ -160,7 +160,7 @@ ts_init_subtest "2b_dec-2"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[red@98-99] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if some or all of the bytes it prints are at offsets 98 and 99
@@ -168,7 +168,7 @@ ts_init_subtest "2b_dec-3"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[red@97-99] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if it prints "A " at 130-131
@@ -176,7 +176,7 @@ ts_init_subtest "2b_dec-4"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[red:A @130-131] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if it doesn't print "B " at 130-131
@@ -184,21 +184,21 @@ ts_init_subtest "2b_dec-5"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[!red:B @130-131] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # specify a string shorter than the range - error
 ts_init_subtest "2b_dec-6"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[red:A@130-131] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # specify a negative-length range
 ts_init_subtest "2b_dec-7"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[red:A@131-130] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if of the bytes it prints are at offsets 98-102 (multiple print units)
@@ -206,7 +206,7 @@ ts_init_subtest "2b_dec-8"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/2 "  %05u_L[red@98-102] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if some or all of the bytes it prints are at offsets 97 and 99 (true)
@@ -214,7 +214,7 @@ ts_init_subtest "4b_dec-1"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/4 "  %05u_L[red@97-99] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # color the current print unit if some or all of the bytes it prints are at offsets 96-99
@@ -222,7 +222,7 @@ ts_init_subtest "4b_dec-2"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/4 "  %05u_L[red@96-99] " "\n"' \
-	$FILES/ascii.in &> $TS_OUTPUT
+	$FILES/ascii.in &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # look for @@@@
@@ -230,7 +230,7 @@ ts_init_subtest "4b_dec-3"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/4 "  %05u_L[red:@@@@] " "\n"' \
-	&> $TS_OUTPUT <<< "@@@@"
+	&> "$TS_OUTPUT" <<< "@@@@"
 ts_finalize_subtest
 
 # look for @@@@ at 0-3
@@ -238,14 +238,14 @@ ts_init_subtest "4b_dec-4"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/4 "  %05u_L[red:@@@@@0-3] " "\n"' \
-	&> $TS_OUTPUT <<< "@@@@"
+	&> "$TS_OUTPUT" <<< "@@@@"
 ts_finalize_subtest
 
 # look for @@@ at 0-3 (wrong byte count error)
 ts_init_subtest "4b_dec-5"
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/4 "  %05u_L[red:@@@@0-3] " "\n"' \
-	&> $TS_OUTPUT <<< "@@@@"
+	&> "$TS_OUTPUT" <<< "@@@@"
 ts_finalize_subtest
 
 # look for @@@ at 1-3 - in the format boundaries - correct
@@ -253,7 +253,7 @@ ts_init_subtest "4b_dec-6"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/4 "  %05u_L[red:@@@@1-3] " "\n"' \
-	&> $TS_OUTPUT <<< "@@@@"
+	&> "$TS_OUTPUT" <<< "@@@@"
 ts_finalize_subtest
 
 # look for @@@ at 2-4 - correct range length, however steps over 2 print units - no colors
@@ -261,7 +261,7 @@ ts_init_subtest "4b_dec-7"
 TS_EXPECTED+=$BE_EXT
 $TS_CMD_HEXDUMP $OPTS $ADDRFMT \
 	-e '"%07.7_ax " 8/4 "  %05u_L[red:@@@@2-4] " "\n"' \
-	&> $TS_OUTPUT <<< "@@@@"
+	&> "$TS_OUTPUT" <<< "@@@@"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/ionice/ionice b/tests/ts/ionice/ionice
index 43c80d65b..f18056f68 100755
--- a/tests/ts/ionice/ionice
+++ b/tests/ts/ionice/ionice
@@ -20,11 +20,11 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_IONICE"
 
-$TS_CMD_IONICE --pid $$ --classdata 0 --class 0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IONICE --pid $$ --classdata 3 --class 7 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IONICE --pid $$ --classdata 4 --class 7 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IONICE --pid $$ --classdata 1 --class 8 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IONICE --classdata 3 ls /etc/passwd >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IONICE --pid $$ >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IONICE --pid $$ --classdata 0 --class 0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IONICE --pid $$ --classdata 3 --class 7 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IONICE --pid $$ --classdata 4 --class 7 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IONICE --pid $$ --classdata 1 --class 8 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IONICE --classdata 3 ls /etc/passwd >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IONICE --pid $$ >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/ipcs/headers b/tests/ts/ipcs/headers
index 8566410a9..6cad067e6 100755
--- a/tests/ts/ipcs/headers
+++ b/tests/ts/ipcs/headers
@@ -24,37 +24,37 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_IPCS"
 
 ts_init_subtest "shm-headers"
-$TS_CMD_IPCS --shmems --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --shmems --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --shmems --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --shmems --limits | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --shmems --summary | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --shmems --time | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --shmems --pid | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --shmems --creator | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --shmems --limits | grep "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --shmems --summary | grep "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "mesg-headers"
-$TS_CMD_IPCS --queues --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --queues --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --queues --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --queues --limits | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --queues --summary | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --queues --time | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --queues --pid | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --queues --creator | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --queues --limits | grep  "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --queues --summary | grep  "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "sem-headers"
-$TS_CMD_IPCS --semaphores --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --semaphores --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --semaphores --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --semaphores --limits | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --semaphores --summary | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --semaphores --time | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --semaphores --pid | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --semaphores --creator | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --semaphores --limits | grep  "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --semaphores --summary | grep  "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "all-headers"
-$TS_CMD_IPCS --all | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_CMD_IPCS --all --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --all --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --all --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --all --limits | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS --all --summary | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all --time | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --all --pid | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --all --creator | grep -A1 "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --all --limits | grep "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_IPCS --all --summary | grep "^---"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits
index 8cf19e3b2..1a6d40e36 100755
--- a/tests/ts/ipcs/limits
+++ b/tests/ts/ipcs/limits
@@ -35,20 +35,20 @@ ts_lock "ipcslimits"
 ts_log "load original values"
 for i in $IPCS_IDX; do
 	SHM_ORG[$i]=$(cat ${IPCS_PROCFILES[$i]})
-done >> $TS_OUTPUT
+done >> "$TS_OUTPUT"
 
 ts_log "maximize kernel setting"
 for i in $IPCS_IDX; do
 	echo ${IPCS_LIMITS[$i]} >> ${IPCS_PROCFILES[$i]}
-done >> $TS_OUTPUT
+done >> "$TS_OUTPUT"
 
 ts_log "check for difference between kernel and IPC"
-ipcs_limits_check >> $TS_OUTPUT
+ipcs_limits_check >> "$TS_OUTPUT"
 
 ts_log "write original values to kernel"
 for i in $IPCS_IDX; do
 	echo ${SHM_ORG[$i]} >> ${IPCS_PROCFILES[$i]}
-done >> $TS_OUTPUT
+done >> "$TS_OUTPUT"
 
 ts_finalize
 
diff --git a/tests/ts/ipcs/limits2 b/tests/ts/ipcs/limits2
index 495aa060f..377043b77 100755
--- a/tests/ts/ipcs/limits2
+++ b/tests/ts/ipcs/limits2
@@ -31,7 +31,7 @@ ts_check_prog "bc"
 ts_lock "ipcslimits"
 
 ts_log "check for difference between kernel and IPC"
-ipcs_limits_check >> $TS_OUTPUT
+ipcs_limits_check >> "$TS_OUTPUT"
 
 ts_finalize
 
diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg
index e08c18649..f6dc45c6d 100755
--- a/tests/ts/ipcs/mk-rm-msg
+++ b/tests/ts/ipcs/mk-rm-msg
@@ -26,18 +26,18 @@ ts_check_test_command "$TS_HELPER_SYSINFO"
 . "$TS_SELF"/functions.sh
 
 rm -f $TS_OUTDIR/id-msg
-$TS_CMD_IPCMK --queue 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg
+$TS_CMD_IPCMK --queue 2>>"$TS_OUTPUT" | ipcmk_output_handler "$TS_OUTPUT" $TS_OUTDIR/id-msg
 $TS_CMD_IPCS --queues --id "$(cat $TS_OUTDIR/id-msg)" |\
-	grep -c "^Message Queue msqid=$(cat $TS_OUTDIR/id-msg)$" >>$TS_OUTPUT
-$TS_CMD_IPCRM -q "$(cat $TS_OUTDIR/id-msg)" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	grep -c "^Message Queue msqid=$(cat $TS_OUTDIR/id-msg)$" >>"$TS_OUTPUT"
+$TS_CMD_IPCRM -q "$(cat $TS_OUTDIR/id-msg)" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f $TS_OUTDIR/id-msg
-$TS_CMD_IPCMK -Q 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg
+$TS_CMD_IPCMK -Q 2>>"$TS_OUTPUT" | ipcmk_output_handler "$TS_OUTPUT" $TS_OUTDIR/id-msg
 $TS_CMD_IPCRM -Q "$(
 	$TS_CMD_IPCS -q |
 	awk -v id="$(cat $TS_OUTDIR/id-msg)" '{if ($2 == id){print $1}}' |
 	uniq
-)" >> $TS_OUTPUT 2>> $TS_ERRLOG
+)" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f $TS_OUTDIR/id-msg
 
diff --git a/tests/ts/ipcs/mk-rm-sem b/tests/ts/ipcs/mk-rm-sem
index 28eb23769..5a67a6152 100755
--- a/tests/ts/ipcs/mk-rm-sem
+++ b/tests/ts/ipcs/mk-rm-sem
@@ -26,18 +26,18 @@ ts_check_test_command "$TS_HELPER_SYSINFO"
 . "$TS_SELF"/functions.sh
 
 rm -f $TS_OUTDIR/id-sem
-$TS_CMD_IPCMK --semaphore 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem
-$TS_CMD_IPCS --semaphores --id "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT
-$TS_CMD_IPCRM -s "$(cat $TS_OUTDIR/id-sem)" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCMK --semaphore 1 2>>"$TS_OUTPUT" | ipcmk_output_handler "$TS_OUTPUT" $TS_OUTDIR/id-sem
+$TS_CMD_IPCS --semaphores --id "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>"$TS_OUTPUT"
+$TS_CMD_IPCRM -s "$(cat $TS_OUTDIR/id-sem)" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f $TS_OUTDIR/id-sem
-$TS_CMD_IPCMK --semaphore 2 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem
-$TS_CMD_IPCS --semaphores --id "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT
+$TS_CMD_IPCMK --semaphore 2 2>>"$TS_OUTPUT" | ipcmk_output_handler "$TS_OUTPUT" $TS_OUTDIR/id-sem
+$TS_CMD_IPCS --semaphores --id "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>"$TS_OUTPUT"
 $TS_CMD_IPCRM --semaphore-key "$(
 	$TS_CMD_IPCS --semaphores |
 	awk -v id="$(cat $TS_OUTDIR/id-sem)" '{if ($2 == id){print $1}}' |
 	uniq
-)" >> $TS_OUTPUT 2>> $TS_ERRLOG
+)" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f $TS_OUTDIR/id-sem
 
diff --git a/tests/ts/ipcs/mk-rm-shm b/tests/ts/ipcs/mk-rm-shm
index b329b82f9..c49408492 100755
--- a/tests/ts/ipcs/mk-rm-shm
+++ b/tests/ts/ipcs/mk-rm-shm
@@ -26,18 +26,18 @@ ts_check_test_command "$TS_HELPER_SYSINFO"
 . "$TS_SELF"/functions.sh
 
 rm -f $TS_OUTDIR/id-shm
-$TS_CMD_IPCMK -M 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-shm
-$TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>$TS_OUTPUT
-$TS_CMD_IPCRM -m "$(cat $TS_OUTDIR/id-shm)" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCMK -M 1 2>>"$TS_OUTPUT" | ipcmk_output_handler "$TS_OUTPUT" $TS_OUTDIR/id-shm
+$TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>"$TS_OUTPUT"
+$TS_CMD_IPCRM -m "$(cat $TS_OUTDIR/id-shm)" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f $TS_OUTDIR/id-shm
 
-$TS_CMD_IPCMK -M 12 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-shm
-$TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>$TS_OUTPUT
+$TS_CMD_IPCMK -M 12 2>>"$TS_OUTPUT" | ipcmk_output_handler "$TS_OUTPUT" $TS_OUTDIR/id-shm
+$TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>"$TS_OUTPUT"
 $TS_CMD_IPCRM -M "$(
 	$TS_CMD_IPCS -m |
 	awk -v id="$(cat $TS_OUTDIR/id-shm)" '{if ($2 == id){print $1}}' |
 	uniq
-)" >> $TS_OUTPUT 2>> $TS_ERRLOG
+)" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f $TS_OUTDIR/id-shm
 
diff --git a/tests/ts/isosize/print-size b/tests/ts/isosize/print-size
index ed3799ffd..e9317dc6d 100755
--- a/tests/ts/isosize/print-size
+++ b/tests/ts/isosize/print-size
@@ -23,15 +23,15 @@ ts_check_test_command "$TS_CMD_ISOSIZE"
 gzip -cd $TS_SELF/sample.iso.gz >| $TS_OUTDIR/sample.iso
 
 ts_init_subtest "default_output"
-$TS_CMD_ISOSIZE $TS_OUTDIR/sample.iso >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_ISOSIZE $TS_OUTDIR/sample.iso >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "sector_output"
-$TS_CMD_ISOSIZE --sectors $TS_OUTDIR/sample.iso >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_ISOSIZE --sectors $TS_OUTDIR/sample.iso >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "divisor_output"
-$TS_CMD_ISOSIZE --divisor=9 $TS_OUTDIR/sample.iso >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_ISOSIZE --divisor=9 $TS_OUTDIR/sample.iso >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/kill/all_processes b/tests/ts/kill/all_processes
index 89ba4c5a3..3bd4dbac9 100755
--- a/tests/ts/kill/all_processes
+++ b/tests/ts/kill/all_processes
@@ -33,7 +33,7 @@ ts_check_test_command "$TS_HELPER_SIGRECEIVE"
 HELPER_SYMLINK="$(mktemp "${TS_OUTDIR}/alXXXXXXXXXXXXX")"
 ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK"
 
-"$HELPER_SYMLINK" -s "$TS_TESTUSER" >> $TS_OUTPUT 2>> $TS_ERRLOG &
+"$HELPER_SYMLINK" -s "$TS_TESTUSER" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 TEST_PID=$!
 
 check_test_sigreceive $TEST_PID
@@ -41,25 +41,25 @@ check_test_sigreceive $TEST_PID
 
 
 ts_log_both "test 1"
-"$TS_CMD_KILL" ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG
+"$TS_CMD_KILL" ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 if [ $? -ne 1 ]; then
 	echo "kill did not return 1" >> "$TS_OUTPUT"
 fi
 
 ts_log_both "test 2"
-"$TS_CMD_KILL" -a ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG
+"$TS_CMD_KILL" -a ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 if [ $? -ne 0 ]; then
 	echo "kill did not return 0" >> "$TS_OUTPUT"
 fi
 wait $TEST_PID
 
 ts_log_both "test 3"
-"$TS_CMD_KILL" -a -p ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG
+"$TS_CMD_KILL" -a -p ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 if [ $? -ne 1 ]; then
 	echo "kill -a -p did not return 1" >> "$TS_OUTPUT"
 fi
 
-sed -i "s/${HELPER_SYMLINK##*/}/${TS_HELPER_SIGRECEIVE##*/}/" $TS_OUTPUT $TS_ERRLOG
+sed -i "s/${HELPER_SYMLINK##*/}/${TS_HELPER_SIGRECEIVE##*/}/" "$TS_OUTPUT" "$TS_ERRLOG"
 
 rm -f "$HELPER_SYMLINK"
 
diff --git a/tests/ts/kill/name_to_number b/tests/ts/kill/name_to_number
index 50c1102a6..70074665c 100755
--- a/tests/ts/kill/name_to_number
+++ b/tests/ts/kill/name_to_number
@@ -58,12 +58,12 @@ for SIG in $($TS_CMD_KILL -L); do
 		SIG="$SIG-0"
 	fi
 
-	"$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG &
+	"$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 	TEST_PID=$!
 	check_test_sigreceive $TEST_PID
 	[ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT"
 
-	"$TS_CMD_KILL" -$SIG ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	"$TS_CMD_KILL" -$SIG ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	wait $TEST_PID
 	if [ $? -ne $EXPECTED ]; then
 		echo "$SIG returned $? while $EXPECTED was expected" >> "$TS_OUTPUT"
diff --git a/tests/ts/kill/options b/tests/ts/kill/options
index 6478613f0..8313a6fec 100755
--- a/tests/ts/kill/options
+++ b/tests/ts/kill/options
@@ -35,12 +35,12 @@ ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK"
 
 try_option()
 {
-	"$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG &
+	"$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 	TEST_PID=$!
 	check_test_sigreceive $TEST_PID
 	[ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT"
 
-	"$TS_CMD_KILL" "$@" $TEST_PID >> $TS_OUTPUT 2>> $TS_ERRLOG
+	"$TS_CMD_KILL" "$@" $TEST_PID >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	if [ $? -ne 0 ]; then
 		echo "kill $@ did not work" >> "$TS_OUTPUT"
 		all_ok=false
diff --git a/tests/ts/kill/pidfdino b/tests/ts/kill/pidfdino
index 5e6c54d66..9d6e57ed6 100755
--- a/tests/ts/kill/pidfdino
+++ b/tests/ts/kill/pidfdino
@@ -45,7 +45,7 @@ ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK"
 
 try_option()
 {
-	"$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG &
+	"$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 	TEST_PID=$!
 	TEST_PIDFD_INO=$( "$TS_HELPER_KILL_PIDFDINO" ${TEST_PID} )
 	ts_skip_exitcode_not_supported
@@ -53,7 +53,7 @@ try_option()
 	check_test_sigreceive "${TEST_PID}"
 	[ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT"
 
-	"$TS_CMD_KILL" "$@" "${TEST_PID}:${TEST_PIDFD_INO}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	"$TS_CMD_KILL" "$@" "${TEST_PID}:${TEST_PIDFD_INO}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	if [ $? -ne 0 ]; then
 		echo "kill $* did not work" >> "$TS_OUTPUT"
 		all_ok=false
diff --git a/tests/ts/kill/print_pid b/tests/ts/kill/print_pid
index ea2638ab2..f97f88d86 100755
--- a/tests/ts/kill/print_pid
+++ b/tests/ts/kill/print_pid
@@ -33,12 +33,12 @@ all_ok=true
 HELPER_SYMLINK="$(mktemp "${TS_OUTDIR}/prXXXXXXXXXXXXX")"
 ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK"
 
-"$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG &
+"$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 TEST_PID=$!
 check_test_sigreceive $TEST_PID
 [ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT"
 
-KILL_PID=$("$TS_CMD_KILL" -p ${HELPER_SYMLINK##*/} 2>> $TS_OUTPUT 2>> $TS_ERRLOG)
+KILL_PID=$("$TS_CMD_KILL" -p ${HELPER_SYMLINK##*/} 2>> "$TS_OUTPUT" 2>> "$TS_ERRLOG")
 if [ $? -ne 0 ]; then
 	echo "kill -p did not work" >> "$TS_OUTPUT"
 	all_ok=false
diff --git a/tests/ts/kill/queue b/tests/ts/kill/queue
index 5a9da6d79..0a7d5d26a 100755
--- a/tests/ts/kill/queue
+++ b/tests/ts/kill/queue
@@ -33,12 +33,12 @@ all_ok=true
 HELPER_SYMLINK="$(mktemp "${TS_OUTDIR}/quXXXXXXXXXXXXX")"
 ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK"
 
-"$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG &
+"$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 TEST_PID=$!
 check_test_sigreceive $TEST_PID
 [ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT"
 
-"$TS_CMD_KILL" -1 --queue 42 $TEST_PID >> $TS_OUTPUT 2>> $TS_ERRLOG
+"$TS_CMD_KILL" -1 --queue 42 $TEST_PID >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 if [ $? -ne 0 ]; then
 	echo "kill --queue 42 failed" >> "$TS_OUTPUT"
 	all_ok=false
diff --git a/tests/ts/lib/pidutils b/tests/ts/lib/pidutils
index a000a4c91..ee7069b7c 100755
--- a/tests/ts/lib/pidutils
+++ b/tests/ts/lib/pidutils
@@ -24,70 +24,70 @@ ts_check_test_command "$TS_HELPER_STRERROR"
 
 ts_init_subtest "flag-unset"
 
-"$TS_HELPER_PARSEPID" 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" 1: >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" 1:0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" 1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" -- -1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" -- -2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" '1:-122' >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" 2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" -- 0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-
-sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" $TS_OUTPUT $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" $TS_OUTPUT $TS_ERRLOG
+"$TS_HELPER_PARSEPID" 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" 1: >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" 1:0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" 1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" -- -1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" -- -2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" '1:-122' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" 2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" -- 0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+
+sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" "$TS_OUTPUT" "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" "$TS_OUTPUT" "$TS_ERRLOG"
 
 ts_finalize_subtest
 
 ts_init_subtest "flag-zero"
 
-"$TS_HELPER_PARSEPID" --zero 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero 1: >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero 1:0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero 1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero -- -1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero -- -2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero '1:-122' >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero 2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero 0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" $TS_OUTPUT $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" $TS_OUTPUT $TS_ERRLOG
+"$TS_HELPER_PARSEPID" --zero 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero 1: >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero 1:0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero 1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero -- -1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero -- -2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero '1:-122' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero 2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero 0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" "$TS_OUTPUT" "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" "$TS_OUTPUT" "$TS_ERRLOG"
 
 ts_finalize_subtest
 
 ts_init_subtest "flag-negative"
 
-"$TS_HELPER_PARSEPID" --negative 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative 1: >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative -- -1:0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative 1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative '1:-122' >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative 1:0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative -- -1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative -- -2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative -- '-2147:78' >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative 2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --negative 0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" $TS_OUTPUT $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" $TS_OUTPUT $TS_ERRLOG
+"$TS_HELPER_PARSEPID" --negative 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative 1: >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative -- -1:0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative 1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative '1:-122' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative 1:0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative -- -1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative -- -2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative -- '-2147:78' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative 2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --negative 0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" "$TS_OUTPUT" "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" "$TS_OUTPUT" "$TS_ERRLOG"
 
 
 ts_finalize_subtest
 
 ts_init_subtest "flag-zero-negative"
 
-"$TS_HELPER_PARSEPID" --zero --negative 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative 1: >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative -- -1443 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative 1:0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative 1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative '1:-122' >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative -- -1:122 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative -- -2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative 2147 >> $TS_OUTPUT 2>> $TS_ERRLOG
-"$TS_HELPER_PARSEPID" --zero --negative 0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" $TS_OUTPUT $TS_ERRLOG
-sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" $TS_OUTPUT $TS_ERRLOG
+"$TS_HELPER_PARSEPID" --zero --negative 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative 1: >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative -- -1443 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative 1:0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative 1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative '1:-122' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative -- -1:122 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative -- -2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative 2147 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+"$TS_HELPER_PARSEPID" --zero --negative 0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" "$TS_OUTPUT" "$TS_ERRLOG"
+sed -i -e "s@$($TS_HELPER_STRERROR ERANGE)@ERANGE@" "$TS_OUTPUT" "$TS_ERRLOG"
 
 
 ts_finalize_subtest
diff --git a/tests/ts/libfdisk/gpt b/tests/ts/libfdisk/gpt
index 97411e52d..1dba4aeac 100755
--- a/tests/ts/libfdisk/gpt
+++ b/tests/ts/libfdisk/gpt
@@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_SFDISK"
 TEST_IMAGE_NAME=$(ts_image_init 10)
 
 ts_init_subtest "all-defaults"
-$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: gpt
 label-id: b181c399-4711-4c52-8b65-9e764541218d
 
@@ -40,7 +40,7 @@ ts_finalize_subtest
 TEST_IMAGE_NAME=$(ts_image_init 10)
 
 ts_init_subtest "all-defaults-with-typo"
-$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: gpt
 label-id: b181c399-4711-4c52-8b65-9e764541218d
 
@@ -51,15 +51,15 @@ ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
 ts_init_subtest "getattr"
-ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "setattr"
-ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 1 0xff00000000000000 >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 2 0x4 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 1 0xff00000000000000 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 2 0x4 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libfdisk/mkpart b/tests/ts/libfdisk/mkpart
index 69791d274..a6655f700 100755
--- a/tests/ts/libfdisk/mkpart
+++ b/tests/ts/libfdisk/mkpart
@@ -30,8 +30,8 @@ TEST_IMAGE_NAME=$(ts_image_init 15)
 
 ts_init_subtest "mbr"
 $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
-	1M 1M 1M - >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	1M 1M 1M - >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -39,8 +39,8 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "mbr-logic"
 $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
-	1M 1M 1M - 1M 1M ->> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	1M 1M 1M - 1M 1M ->> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -48,8 +48,8 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "mbr-nopartno"
 $TESTPROG --nopartno --label mbr --device ${TEST_IMAGE_NAME} \
-	1M 1M 1M - 1M 1M ->> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	1M 1M 1M - 1M 1M ->> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -57,8 +57,8 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "gpt"
 $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
-	1M 1M 1M 1M 1M 1M - >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	1M 1M 1M 1M 1M 1M - >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
diff --git a/tests/ts/libfdisk/mkpart-full b/tests/ts/libfdisk/mkpart-full
index fa17c36fd..c29f50d4e 100755
--- a/tests/ts/libfdisk/mkpart-full
+++ b/tests/ts/libfdisk/mkpart-full
@@ -36,8 +36,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
 	2,4096,2048 \
 	3,6144,2048 \
 	4,8192,22528 \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -50,8 +50,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
 	-,4096,2048 \
 	-,6144,2048 \
 	-,8192,22528 \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -63,8 +63,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
 	1,2048,2048 \
 	2,4096,2048 \
 	7,6144,2048 \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -76,8 +76,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
 	1,2048,2048 \
 	2,4096,2048 \
 	3,4096,2048 \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -93,8 +93,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
 	5,10240,2048 \
 	6,14336,2048 \
 	7,18432,12288 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -109,8 +109,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
 	-,10240,2048 \
 	-,14336,2048 \
 	-,18432,12288 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -126,8 +126,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
 	5,10240,2048 \
 	6,4096,2048 \
 	7,18432,12288 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -138,8 +138,8 @@ ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
 	1,2048,2048 \
 	2,6144,2048 \
 	3,8192,2048 \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -154,8 +154,8 @@ ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
 	5,10240,2048 \
 	6,12288,2048 \
 	7,14336,2048 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -170,8 +170,8 @@ ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} -- \
 	-,10240,2048 \
 	-,12288,2048 \
 	-,14336,2048 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -187,8 +187,8 @@ ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
 	5,10240,2048 \
 	6,12288,2048 \
 	7,14336,2048 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -203,8 +203,8 @@ ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
 	7,10240,2048 \
 	8,12288,2048 \
 	9,14336,2048 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
@@ -217,8 +217,8 @@ ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
 	3,8192,2048 \
 	4,12288,2048 \
 	5,14336,2048 \
-       	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+       	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
diff --git a/tests/ts/liblastlog2/write_read_user b/tests/ts/liblastlog2/write_read_user
index a8b9a5706..d96fef061 100755
--- a/tests/ts/liblastlog2/write_read_user
+++ b/tests/ts/liblastlog2/write_read_user
@@ -8,7 +8,7 @@ ts_init "$*"
 
 ts_check_test_command $TS_HELPER_LIBLASTLOG2_WRITE_READ_USER
 
-$TS_HELPER_LIBLASTLOG2_WRITE_READ_USER >> $TS_OUTPUT 2>> $TS_ERRLOG || ts_failed "returned an error"
+$TS_HELPER_LIBLASTLOG2_WRITE_READ_USER >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" || ts_failed "returned an error"
 
 rm tst-write-read-user.db
 
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 76e62477a..8ed878068 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -70,59 +70,59 @@ ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 ts_init_subtest "mount-by-devname"
 mkdir -p $MOUNTPOINT &>  /dev/null
-ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount-by-devname"
-ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --umount $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-by-label"
 mkdir -p $MOUNTPOINT &>  /dev/null
-ts_run $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount-by-mountpoint"
-ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE  && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE  && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-by-uuid"
 mkdir -p $MOUNTPOINT &> /dev/null
-ts_run $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE  || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE  || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 sleep 1
-ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 sleep 1
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-flags"
 mkdir -p $MOUNTPOINT &> /dev/null
-ts_run $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-ts_run $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount -o remount,rw $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # Test that the atime option works after the migration to use the new kernel mount APIs.
-ts_run $TESTPROG --mount -o atime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount -o atime $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_run $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize_subtest
 
@@ -132,11 +132,11 @@ img=$(ts_image_init)
 mkfs.ext2 -F $img &> /dev/null
 udevadm settle
 
-ts_run $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount -o loop $img $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
-ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -145,8 +145,8 @@ ts_init_subtest "x-permanent"
 TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST
 
-$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>> $TS_ERRLOG &&
-  echo "successfully mounted" >> $TS_OUTPUT
+$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &&
+  echo "successfully mounted" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 $TS_CMD_UMOUNT $TS_NOEXIST
@@ -158,8 +158,8 @@ ts_init_subtest "X-comment"
 TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST
 
-$TS_CMD_MOUNT -o X-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>> $TS_ERRLOG &&
-  echo "successfully mounted" >> $TS_OUTPUT
+$TS_CMD_MOUNT -o X-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &&
+  echo "successfully mounted" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 $TS_CMD_UMOUNT $TS_NOEXIST
diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index b07bd8adc..862ca0de1 100755
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -79,50 +79,50 @@ ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 ts_init_subtest "mount-by-devname"
 mkdir -p $MOUNTPOINT &>  /dev/null
-$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount-by-devname"
-$PYTHON $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --umount $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-by-label"
 mkdir -p $MOUNTPOINT &>  /dev/null
-$PYTHON $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount-by-mountpoint"
-$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-by-uuid"
 mkdir -p $MOUNTPOINT &> /dev/null
-$PYTHON $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$PYTHON $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-flags"
 mkdir -p $MOUNTPOINT &> /dev/null
-$PYTHON $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE || echo "$DEVICE not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$PYTHON $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount -o remount,rw $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $DEVICE && echo "$DEVICE still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -132,16 +132,16 @@ img=$(ts_image_init)
 mkfs.ext2 -F $img &> /dev/null
 udevadm settle
 
-$PYTHON $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount -o loop $img $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
-$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "x-mount.mkdir"
-$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>> $TS_ERRLOG &&
-  echo "successfully mounted" >> $TS_OUTPUT
+$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &&
+  echo "successfully mounted" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 56a7f12c4..b955c2eb9 100755
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -55,7 +55,7 @@ mkfs.ext4 -L "$LABEL" -U "$UUID" $DEVICE &> /dev/null
 
 ts_log "Do tests..."
 
-export LIBMOUNT_UTAB=$TS_OUTPUT.utab
+export LIBMOUNT_UTAB="$TS_OUTPUT".utab
 rm -f $LIBMOUNT_UTAB
 > $LIBMOUNT_UTAB
 
@@ -63,31 +63,31 @@ udevadm settle
 
 ts_init_subtest "mount-by-devname"
 mkdir -p $MOUNTPOINT &>  /dev/null
-ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted "$DEVICE" || \
-	echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "(by device) cannot find $DEVICE in /proc/mounts" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount-by-devname"
-ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --umount $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted "$DEVICE" &&
-	echo "umount (device) failed: found $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "umount (device) failed: found $DEVICE in /proc/mounts" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-uhelper"
 mkdir -p $MOUNTPOINT &>  /dev/null
-ts_run $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \
-	echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount"
-ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" && \
-	echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -105,9 +105,9 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
 
 	ts_init_subtest "mount-uhelper-subvol"
 	mkdir -p $MOUNTPOINT &>  /dev/null
-	ts_run $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+	ts_run $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \
-		echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 
 	# Don't temporary write btrfs mount options to the test output,
@@ -115,13 +115,13 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
 	# subvol= and subvolid=).
 	#
 	#ts_log "All mount options (btrfs subvolume + utab) ---"
-	#$TS_CMD_FINDMNT --mtab --mountpoint $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
+	#$TS_CMD_FINDMNT --mtab --mountpoint $MOUNTPOINT -o OPTIONS -n >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	#ts_log "---"
 
 	ts_init_subtest "umount-subvol"
-	ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+	ts_run $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" && \
-		echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 fi
 
diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index 7e9bc1e91..cf1a0654c 100755
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -60,7 +60,7 @@ mkfs.ext4 -L "$LABEL" -U "$UUID" $DEVICE &> /dev/null
 
 ts_log "Do tests..."
 
-export LIBMOUNT_UTAB=$TS_OUTPUT.utab
+export LIBMOUNT_UTAB="$TS_OUTPUT".utab
 rm -f $LIBMOUNT_UTAB
 > $LIBMOUNT_UTAB
 
@@ -68,31 +68,31 @@ udevadm settle
 
 ts_init_subtest "mount-by-devname"
 mkdir -p $MOUNTPOINT &>  /dev/null
-$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted "$DEVICE" || \
-	echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "(by device) cannot find $DEVICE in /proc/mounts" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount-by-devname"
-$PYTHON $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --umount $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted "$DEVICE" &&
-	echo "umount (device) failed: found $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "umount (device) failed: found $DEVICE in /proc/mounts" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "mount-uhelper"
 mkdir -p $MOUNTPOINT &>  /dev/null
-$PYTHON $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \
-	echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "umount"
-$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$PYTHON $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" && \
-	echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -110,9 +110,9 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
 
 	ts_init_subtest "mount-uhelper-subvol"
 	mkdir -p $MOUNTPOINT &>  /dev/null
-	$PYTHON $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$PYTHON $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE  $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \
-		echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 
 	# Don't temporary write btrfs mount options to the test output,
@@ -120,13 +120,13 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then
 	# subvol= and subvolid=).
 	#
 	#ts_log "All mount options (btrfs subvolume + utab) ---"
-	#$TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
+	#$TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	#ts_log "---"
 
 	ts_init_subtest "umount-subvol"
-	$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$PYTHON $TESTPROG --umount $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	grep -q $DEVICE $LIBMOUNT_UTAB && \
-		echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 fi
 
diff --git a/tests/ts/libmount/debug b/tests/ts/libmount/debug
index c4c38c50c..37e159974 100755
--- a/tests/ts/libmount/debug
+++ b/tests/ts/libmount/debug
@@ -14,17 +14,17 @@ TESTPROG="$TS_HELPER_LIBMOUNT_DEBUG"
 
 # CACHE | LOCKS
 ts_init_subtest "set-from-code"
-ts_run $TESTPROG 20 2>&1 | grep -o '0x.*' &> $TS_OUTPUT
+ts_run $TESTPROG 20 2>&1 | grep -o '0x.*' &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # CACHE | LOCKS
 ts_init_subtest "set-from-env-str"
-LIBMOUNT_DEBUG=cache,locks ts_run $TESTPROG 2>&1 | grep -o '0x.*' &> $TS_OUTPUT
+LIBMOUNT_DEBUG=cache,locks ts_run $TESTPROG 2>&1 | grep -o '0x.*' &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # CACHE | LOCKS
 ts_init_subtest "set-from-env-int"
-LIBMOUNT_DEBUG=20 ts_run $TESTPROG 2>&1 | grep -o '0x.*' &> $TS_OUTPUT
+LIBMOUNT_DEBUG=20 ts_run $TESTPROG 2>&1 | grep -o '0x.*' &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/lock b/tests/ts/libmount/lock
index 444a98e39..ed69dd927 100755
--- a/tests/ts/libmount/lock
+++ b/tests/ts/libmount/lock
@@ -28,12 +28,12 @@ NLOOPS=1000
 NPROCESSES=50
 
 
-> $TS_OUTPUT.debug
-echo 0 > $TS_OUTPUT
+> "$TS_OUTPUT".debug
+echo 0 > "$TS_OUTPUT"
 SYNCTIME=$(( $(date +%s) + 5 ))
 
 for id in $(seq 0 $(( $NPROCESSES - 1 ))); do
-	ts_run $TESTPROG --lock --synctime $SYNCTIME $TS_OUTPUT $NLOOPS >> $TS_OUTPUT.debug 2>&1 &
+	ts_run $TESTPROG --lock --synctime $SYNCTIME "$TS_OUTPUT" $NLOOPS >> "$TS_OUTPUT".debug 2>&1 &
 done
 
 wait
diff --git a/tests/ts/libmount/loop b/tests/ts/libmount/loop
index fbbed8a30..3a8e74051 100755
--- a/tests/ts/libmount/loop
+++ b/tests/ts/libmount/loop
@@ -56,27 +56,27 @@ udevadm settle
 
 ts_init_subtest "file"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_log "Success"
 ts_finalize_subtest
 
 ts_init_subtest "file-o-loop"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT -oloop "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -oloop "$BACKFILE" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_log "Success"
 ts_finalize_subtest
 
 ts_init_subtest "dev-loop"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show $BACKFILE 2>> $TS_OUTPUT )
-$TS_CMD_MOUNT $LODEV "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG
+LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show $BACKFILE 2>> "$TS_OUTPUT" )
+$TS_CMD_MOUNT $LODEV "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_LOSETUP --detach $LODEV >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_log "Success"
 ts_finalize_subtest
@@ -87,10 +87,10 @@ if [ "$TS_PARALLEL" = "yes" ]; then
 	ts_skip_subtest "no-reentrant"
 else
 	[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-	LODEV=$( $TS_CMD_LOSETUP --find 2>> $TS_OUTPUT )
-	$TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-	verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-	$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	LODEV=$( $TS_CMD_LOSETUP --find 2>> "$TS_OUTPUT" )
+	$TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	udevadm settle
 	ts_log "Success"
 	ts_finalize_subtest
@@ -98,31 +98,31 @@ fi
 
 ts_init_subtest "reuse"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show "$BACKFILE" 2>> $TS_OUTPUT )
-$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG
+LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show "$BACKFILE" 2>> "$TS_OUTPUT" )
+$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_LOSETUP --detach $LODEV >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_log "Success"
 ts_finalize_subtest
 
 ts_init_subtest "conflict"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show --offset=1000 "$BACKFILE" 2>> $TS_OUTPUT )
+LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show --offset=1000 "$BACKFILE" 2>> "$TS_OUTPUT" )
 $TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \
-	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $TS_OUTPUT
-$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' > "$TS_OUTPUT"
+$TS_CMD_LOSETUP --detach $LODEV >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_log "Success"
 ts_finalize_subtest
 
 ts_init_subtest "o-loop-val-initialized"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE" 2>>$TS_OUTPUT)
+LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE" 2>>"$TS_OUTPUT")
 $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \
-       | sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $TS_OUTPUT
-$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG
+       | sed 's/:.*:/: <target>/; s/for .*/for <source>/' > "$TS_OUTPUT"
+$TS_CMD_LOSETUP --detach $LODEV >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_log "Success"
 ts_finalize_subtest
@@ -130,10 +130,10 @@ ts_finalize_subtest
 ts_init_subtest "o-loop-val-conflict"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 cp "$BACKFILE" "$BACKFILE"-2
-LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE"-2 2>> $TS_OUTPUT)
+LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE"-2 2>> "$TS_OUTPUT")
 $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \
-	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $TS_OUTPUT
-$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' > "$TS_OUTPUT"
+$TS_CMD_LOSETUP --detach $LODEV >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm "$BACKFILE"-2
 udevadm settle
 ts_log "Success"
@@ -141,10 +141,10 @@ ts_finalize_subtest
 
 ts_init_subtest "explicit-rw"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT -o rw "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -o rw "$BACKFILE" "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 FINDMNT_RES=$( $TS_CMD_FINDMNT -Q 'OPTIONS =~ "[,]?rw[,]?"' -no OPTIONS --mountpoint "$TS_MOUNTPOINT" )
 [ -n "$FINDMNT_RES" ] || ts_log "$TS_MOUNTPOINT not mounted as read-write"
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_log "Success"
 ts_finalize_subtest
diff --git a/tests/ts/libmount/loop-overlay b/tests/ts/libmount/loop-overlay
index bb893e399..e31aa7fad 100755
--- a/tests/ts/libmount/loop-overlay
+++ b/tests/ts/libmount/loop-overlay
@@ -41,24 +41,24 @@ dd if="$IMG" of="$IMG" oflag=append bs=1024k count=5 conv=notrunc &>/dev/null
 [ -d "$TS_MOUNTPOINT-1" ] || mkdir -p $TS_MOUNTPOINT-1
 [ -d "$TS_MOUNTPOINT-2" ] || mkdir -p $TS_MOUNTPOINT-2
 
-echo "second should fail" >>$TS_OUTPUT
-$TS_CMD_MOUNT -oloop "$IMG" "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo "second should fail" >>"$TS_OUTPUT"
+$TS_CMD_MOUNT -oloop "$IMG" "$TS_MOUNTPOINT-1" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 $TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" 2>&1 \
-       | sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> $TS_OUTPUT
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG
+       | sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> "$TS_OUTPUT"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-echo "should succeed" >>$TS_OUTPUT
-$TS_CMD_MOUNT -oloop,sizelimit=$OFFSET "$IMG" "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo "should succeed" >>"$TS_OUTPUT"
+$TS_CMD_MOUNT -oloop,sizelimit=$OFFSET "$IMG" "$TS_MOUNTPOINT-1" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-echo "both should fail" >>$TS_OUTPUT
+echo "both should fail" >>"$TS_OUTPUT"
 LOOPDEV=$($TS_CMD_LOSETUP --show -f --offset 1 --sizelimit $OFFSET "$IMG")
 $TS_CMD_MOUNT -oloop,sizelimit=$OFFSET "$IMG" "$TS_MOUNTPOINT-1" 2>&1 \
-	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> $TS_OUTPUT
+	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> "$TS_OUTPUT"
 $TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" 2>&1 \
-	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> $TS_OUTPUT
+	| sed 's/:.*:/: <target>/; s/for .*/for <source>/' >> "$TS_OUTPUT"
 $TS_CMD_LOSETUP --detach $LOOPDEV
 
 ts_log "Success"
diff --git a/tests/ts/libmount/optlist b/tests/ts/libmount/optlist
index 315834006..d88cbea99 100755
--- a/tests/ts/libmount/optlist
+++ b/tests/ts/libmount/optlist
@@ -13,55 +13,55 @@ ts_check_test_command $TS_HELPER_LIBMOUNT_OPTLIST
 TESTPROG="$TS_HELPER_LIBMOUNT_OPTLIST"
 
 ts_init_subtest "append"
-ts_run $TESTPROG --append-str "aaa,bbb=BBB,context=\"foo,bar,gogo\",ccc" "ddd" &> $TS_OUTPUT
+ts_run $TESTPROG --append-str "aaa,bbb=BBB,context=\"foo,bar,gogo\",ccc" "ddd" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "append-value"
-ts_run $TESTPROG --append-str "aaa,bbb=BBB,ccc" "ddd=DDD" &> $TS_OUTPUT
+ts_run $TESTPROG --append-str "aaa,bbb=BBB,ccc" "ddd=DDD" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "append-empty-value"
-ts_run $TESTPROG --append-str "aaa,bbb=BBB,ccc" "ddd=" &> $TS_OUTPUT
+ts_run $TESTPROG --append-str "aaa,bbb=BBB,ccc" "ddd=" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend"
-ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend-list"
-ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd,eee=EEE,fff" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd,eee=EEE,fff" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend-value"
-ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd=DDD" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd=DDD" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend-empty-value"
-ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd=" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend-str "aaa,bbb=BBB,ccc" "ddd=" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set"
-ts_run $TESTPROG --set-str "aaa,bbb=BBB,ccc" "new,data,for,list" &> $TS_OUTPUT
+ts_run $TESTPROG --set-str "aaa,bbb=BBB,ccc" "new,data,for,list" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "get-str"
-ts_run $TESTPROG --get-str "aaa,bbb=BBB,ccc,defaults" &> $TS_OUTPUT
+ts_run $TESTPROG --get-str "aaa,bbb=BBB,ccc,defaults" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "get-str-linux"
-ts_run $TESTPROG --get-str "noexec,noauto,user,defaults" linux &> $TS_OUTPUT
+ts_run $TESTPROG --get-str "noexec,noauto,user,defaults" linux &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "get-str-user"
-ts_run $TESTPROG --get-str "noexec,noauto,user,defaults" user &> $TS_OUTPUT
+ts_run $TESTPROG --get-str "noexec,noauto,user,defaults" user &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "get-flg-linux"
-ts_run $TESTPROG --get-flg "noexec,noauto,user,defaults" linux &> $TS_OUTPUT
+ts_run $TESTPROG --get-flg "noexec,noauto,user,defaults" linux &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "get-flg-user"
-ts_run $TESTPROG --get-flg "noexec,noauto,user,defaults" user &> $TS_OUTPUT
+ts_run $TESTPROG --get-flg "noexec,noauto,user,defaults" user &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/optstr b/tests/ts/libmount/optstr
index 083a85533..821b03296 100755
--- a/tests/ts/libmount/optstr
+++ b/tests/ts/libmount/optstr
@@ -13,152 +13,152 @@ ts_check_test_command $TS_HELPER_LIBMOUNT_OPTSTR
 TESTPROG="$TS_HELPER_LIBMOUNT_OPTSTR"
 
 ts_init_subtest "append"
-ts_run $TESTPROG --append "aaa,bbb=BBB,context=\"foo,bar,gogo\",ccc" "ddd" &> $TS_OUTPUT
+ts_run $TESTPROG --append "aaa,bbb=BBB,context=\"foo,bar,gogo\",ccc" "ddd" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "append-value"
-ts_run $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "DDD" &> $TS_OUTPUT
+ts_run $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "DDD" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "append-empty-value"
-ts_run $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "" &> $TS_OUTPUT
+ts_run $TESTPROG --append "aaa,bbb=BBB,ccc" "ddd" "" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend"
-ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend-list"
-ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd,eee=EEE,fff" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd,eee=EEE,fff" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend-value"
-ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "DDD" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "DDD" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "prepend-empty-value"
-ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "" &> $TS_OUTPUT
+ts_run $TESTPROG --prepend "aaa,bbb=BBB,ccc" "ddd" "" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-remove"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-small"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "X" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "X" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-large"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "XXX-YYY-ZZZ" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "XXX-YYY-ZZZ" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-empty"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "bbb" "" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-new"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "XXX" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "XXX" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-new-empty"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "aaa" "" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-new-end"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "XXX" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "XXX" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "set-new-end-empty"
-ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "" &> $TS_OUTPUT
+ts_run $TESTPROG --set "aaa,bbb=BBB,ccc" "ccc" "" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "get"
-ts_run $TESTPROG --get "aaa,bbb=BBB,ccc" "aaa" &> $TS_OUTPUT
+ts_run $TESTPROG --get "aaa,bbb=BBB,ccc" "aaa" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "get-value"
-ts_run $TESTPROG --get "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT
+ts_run $TESTPROG --get "aaa,bbb=BBB,ccc" "bbb" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "remove"
-ts_run $TESTPROG --remove "aaa,bbb=BBB,ccc" "aaa" &> $TS_OUTPUT
+ts_run $TESTPROG --remove "aaa,bbb=BBB,ccc" "aaa" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "remove-quoted"
-ts_run $TESTPROG --remove "aaa,context=\"foo,bar,gogo\",bbb=BBB,ccc" "context" &> $TS_OUTPUT
+ts_run $TESTPROG --remove "aaa,context=\"foo,bar,gogo\",bbb=BBB,ccc" "context" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "remove-value"
-ts_run $TESTPROG --remove "aaa,bbb=BBB,ccc" "bbb" &> $TS_OUTPUT
+ts_run $TESTPROG --remove "aaa,bbb=BBB,ccc" "bbb" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "remove-empty-value"
-ts_run $TESTPROG --remove "aaa,bbb=,ccc" "bbb" &> $TS_OUTPUT
+ts_run $TESTPROG --remove "aaa,bbb=,ccc" "bbb" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "split"
-ts_run $TESTPROG --split "aaa,bbb=BBB,ccc,x-bar,x-foo=foodata,user=kzak,noexec,nosuid,loop=/dev/loop0" &> $TS_OUTPUT
+ts_run $TESTPROG --split "aaa,bbb=BBB,ccc,x-bar,x-foo=foodata,user=kzak,noexec,nosuid,loop=/dev/loop0" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "flags"
-ts_run $TESTPROG --flags "aaa,bbb=BBB,x-foo,ccc,user=kzak,nodev,noexec,nosuid,loop=/dev/loop0" &> $TS_OUTPUT
+ts_run $TESTPROG --flags "aaa,bbb=BBB,x-foo,ccc,user=kzak,nodev,noexec,nosuid,loop=/dev/loop0" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "apply-linux"
 # Use kernel mount options man (--linux), add noatime, remove noexec and nosuid,
 # and keep unknown(e.g. user=kzak)
-ts_run $TESTPROG --apply --linux "user=kzak,noexec,nosuid" 0x400 &> $TS_OUTPUT
+ts_run $TESTPROG --apply --linux "user=kzak,noexec,nosuid" 0x400 &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "apply-user"
 # Use userspace options map (--user), add user and nofail, remove loop,
 # and keep unknown (e.g. noexec, nosuid)
-ts_run $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> $TS_OUTPUT
+ts_run $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "apply-user-small-x"
 # Use userspace options map (--user), remove X-* and loop=, keep unknown 'something' and
 # keep by flags specified x-*
 ts_run $TESTPROG --apply --user \
-	"something,loop=/dev/looop0,x-gvfs-hide,x-gdu.hide,x-canary,X-foo" 0x00002000 &> $TS_OUTPUT
+	"something,loop=/dev/looop0,x-gvfs-hide,x-gdu.hide,x-canary,X-foo" 0x00002000 &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "apply-user-large-X"
 # Use userspace options map (--user), remove x-* and loop=, keep unknown 'something' and
 # keep by flags specified X-*
 ts_run $TESTPROG --apply --user \
-	"something,loop=/dev/looop0,x-gvfs-hide,x-gdu.hide,x-canary,X-foo,X-bar" 0x00020000 &> $TS_OUTPUT
+	"something,loop=/dev/looop0,x-gvfs-hide,x-gdu.hide,x-canary,X-foo,X-bar" 0x00020000 &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "apply-user-Xx"
 # Use userspace options map (--user), remove loop=, keep unknown 'something' and
 # keep by flags specified X-* and x-*, add by flag specified nofail
 ts_run $TESTPROG --apply --user \
-	"something,loop=/dev/looop0,x-gvfs-hide,x-gdu.hide,x-canary,X-foo,X-bar" 0x00022400 &> $TS_OUTPUT
+	"something,loop=/dev/looop0,x-gvfs-hide,x-gdu.hide,x-canary,X-foo,X-bar" 0x00022400 &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "deduplicate"
-ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT
+ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "deduplicate-empty"
-ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=,fff=eee AAA &> $TS_OUTPUT
+ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=,fff=eee AAA &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match"
-ts_run $TESTPROG --match "xxx,yyy,zzz" "nozzz"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match "xxx,yyy,zzz" "xxx,noeee"	&>> $TS_OUTPUT
-ts_run $TESTPROG --match "bar,zzz"     "nofoo"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match "nofoo,bar"   "nofoo"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match "nofoo,bar"   "+nofoo"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match "bar,zzz"     "+nofoo"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match "bar,zzz"     ""		&>> $TS_OUTPUT
-ts_run $TESTPROG --match "bar,zzz"     "+"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match ""            ""		&>> $TS_OUTPUT
-ts_run $TESTPROG --match ""            "foo"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match ""            "nofoo"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match ""            "no,foo"		&>> $TS_OUTPUT
-ts_run $TESTPROG --match "no"          "+no"		&>> $TS_OUTPUT
+ts_run $TESTPROG --match "xxx,yyy,zzz" "nozzz"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "xxx,yyy,zzz" "xxx,noeee"	&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "bar,zzz"     "nofoo"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "nofoo,bar"   "nofoo"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "nofoo,bar"   "+nofoo"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "bar,zzz"     "+nofoo"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "bar,zzz"     ""		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "bar,zzz"     "+"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match ""            ""		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match ""            "foo"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match ""            "nofoo"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match ""            "no,foo"		&>> "$TS_OUTPUT"
+ts_run $TESTPROG --match "no"          "+no"		&>> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/tabdiff b/tests/ts/libmount/tabdiff
index 9108ef5e4..605a36b0e 100755
--- a/tests/ts/libmount/tabdiff
+++ b/tests/ts/libmount/tabdiff
@@ -13,19 +13,19 @@ TESTPROG="$TS_HELPER_LIBMOUNT_TABDIFF"
 [ -x $TESTPROG ] || ts_skip "test not compiled"
 
 ts_init_subtest "mount"
-ts_run $TESTPROG --diff $TS_SELF/files/mountinfo_u $TS_SELF/files/mountinfo &> $TS_OUTPUT
+ts_run $TESTPROG --diff $TS_SELF/files/mountinfo_u $TS_SELF/files/mountinfo &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "umount"
-ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_u  &> $TS_OUTPUT
+ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_u  &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "remount"
-ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_re  &> $TS_OUTPUT
+ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_re  &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "move"
-ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_mv  &> $TS_OUTPUT
+ts_run $TESTPROG --diff $TS_SELF/files/mountinfo $TS_SELF/files/mountinfo_mv  &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles
index f57c8dcb8..9e52314ce 100755
--- a/tests/ts/libmount/tabfiles
+++ b/tests/ts/libmount/tabfiles
@@ -13,77 +13,77 @@ TESTPROG="$TS_HELPER_LIBMOUNT_TAB"
 [ -x $TESTPROG ] || ts_skip "test not compiled"
 
 ts_init_subtest "parse-fstab"
-ts_run $TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --parse "$TS_SELF/files/fstab" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-fstab-full"
-ts_run $TESTPROG --parse "$TS_SELF/files/fstab.comment" --comments &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --parse "$TS_SELF/files/fstab.comment" --comments &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-mtab"
-ts_run $TESTPROG --parse "$TS_SELF/files/mtab" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --parse "$TS_SELF/files/mtab" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-fstab-broken"
-ts_run $TESTPROG --parse "$TS_SELF/files/fstab.broken" &> $TS_OUTPUT
-sed -i -e 's/.*fstab.broken:[[:digit:]]*: parse error//g; s/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --parse "$TS_SELF/files/fstab.broken" &> "$TS_OUTPUT"
+sed -i -e 's/.*fstab.broken:[[:digit:]]*: parse error//g; s/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-mountinfo"
-ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-mountinfo-nosrc"
-ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo_nosrc" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo_nosrc" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-swaps"
-ts_run $TESTPROG --parse "$TS_SELF/files/swaps" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --parse "$TS_SELF/files/swaps" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "copy"
-ts_run $TESTPROG --copy-fs "$TS_SELF/files/fstab" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --copy-fs "$TS_SELF/files/fstab" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-source"
-ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" source UUID=fef7ccb3-821c-4de8-88dc-71472be5946f &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" source UUID=fef7ccb3-821c-4de8-88dc-71472be5946f &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-target"
-ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-target2"
-ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-target3"
-ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-pair"
-ts_run $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-fs"
-ts_run $TESTPROG --find-fs "$TS_SELF/files/mountinfo" /home/kzak &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-fs "$TS_SELF/files/mountinfo" /home/kzak &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "is-mounted-btrfs"
-ts_run $TESTPROG --is-mounted "$TS_SELF/files/fstab_btrfs" "$TS_SELF/files/mountinfo_btrfs" &> $TS_OUTPUT
+ts_run $TESTPROG --is-mounted "$TS_SELF/files/fstab_btrfs" "$TS_SELF/files/mountinfo_btrfs" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/tabfiles-py b/tests/ts/libmount/tabfiles-py
index 0d4205108..06f3923fb 100755
--- a/tests/ts/libmount/tabfiles-py
+++ b/tests/ts/libmount/tabfiles-py
@@ -18,58 +18,58 @@ TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB"
 [ -x $TESTPROG ] || ts_die "test script missing"
 
 ts_init_subtest "parse-fstab"
-$PYTHON $TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --parse "$TS_SELF/files/fstab" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-fstab-full"
-$PYTHON $TESTPROG --parse "$TS_SELF/files/fstab.comment" --comments &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --parse "$TS_SELF/files/fstab.comment" --comments &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-mtab"
-$PYTHON $TESTPROG --parse "$TS_SELF/files/mtab" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --parse "$TS_SELF/files/mtab" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-fstab-broken"
-$PYTHON $TESTPROG --parse "$TS_SELF/files/fstab.broken" &> $TS_OUTPUT
-sed -i -e 's/.*fstab.broken:[[:digit:]]*: parse error//g; s/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --parse "$TS_SELF/files/fstab.broken" &> "$TS_OUTPUT"
+sed -i -e 's/.*fstab.broken:[[:digit:]]*: parse error//g; s/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "parse-mountinfo"
-$PYTHON $TESTPROG --parse "$TS_SELF/files/mountinfo" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --parse "$TS_SELF/files/mountinfo" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "copy"
-$PYTHON $TESTPROG --copy-fs "$TS_SELF/files/fstab" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --copy-fs "$TS_SELF/files/fstab" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-source"
-$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" source UUID=fef7ccb3-821c-4de8-88dc-71472be5946f &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" source UUID=fef7ccb3-821c-4de8-88dc-71472be5946f &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-target"
-$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-target2"
-$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-target3"
-$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "find-pair"
-$PYTHON $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index 6a6df9c65..ce13412ba 100755
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -38,13 +38,13 @@ echo "LABEL=$LABEL /mnt/mountpoint auto defaults" > $FSTAB
 ts_udevadm_settle "$TS_DEVICE" "LABEL" "UUID"
 
 ts_init_subtest "fstab-label2uuid"
-ts_run $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "fstab-label2dev"
-ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 #
@@ -54,21 +54,21 @@ echo "UUID=$UUID  /mnt/mountpoint2 auto defaults" >> $FSTAB
 
 ts_init_subtest "fstab-uuid"
 # has to return /mnt/mountpoint2
-ts_run $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "fstab-label"
 # has to return /mnt/mountpoint
-ts_run $TESTPROG --find-forward $FSTAB source "LABEL=$LABEL" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward $FSTAB source "LABEL=$LABEL" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 
 ts_init_subtest "fstab-dev2label"
 # has to return /mnt/mountpoint
-ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 #
@@ -78,9 +78,9 @@ echo "$TS_DEVICE  /mnt/mountpoint3 auto defaults" >> $FSTAB
 
 ts_init_subtest "fstab-dev"
 # has to return /mnt/mountpoint3
-ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
-sed -i -e 's/source: .*//g' $TS_OUTPUT		# devname is generated, remove it
+ts_run $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
+sed -i -e 's/source: .*//g' "$TS_OUTPUT"		# devname is generated, remove it
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py
index 96689cdd3..5e9d3f0fe 100755
--- a/tests/ts/libmount/tabfiles-tags-py
+++ b/tests/ts/libmount/tabfiles-tags-py
@@ -42,13 +42,13 @@ echo "LABEL=$LABEL /mnt/mountpoint auto defaults" > $FSTAB
 ts_udevadm_settle "$DEVICE" "LABEL" "UUID"
 
 ts_init_subtest "fstab-label2uuid"
-$PYTHON $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "fstab-label2dev"
-$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 #
@@ -58,21 +58,21 @@ echo "UUID=$UUID  /mnt/mountpoint2 auto defaults" >> $FSTAB
 
 ts_init_subtest "fstab-uuid"
 # has to return /mnt/mountpoint2
-$PYTHON $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward $FSTAB source "UUID=$UUID" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "fstab-label"
 # has to return /mnt/mountpoint
-$PYTHON $TESTPROG --find-forward $FSTAB source "LABEL=$LABEL" &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward $FSTAB source "LABEL=$LABEL" &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 
 ts_init_subtest "fstab-dev2label"
 # has to return /mnt/mountpoint
-$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
+$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 #
@@ -82,9 +82,9 @@ echo "$TS_DEVICE  /mnt/mountpoint3 auto defaults" >> $FSTAB
 
 ts_init_subtest "fstab-dev"
 # has to return /mnt/mountpoint3
-$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> $TS_OUTPUT
-sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
-sed -i -e 's/source: .*//g' $TS_OUTPUT		# devname is generated, remove it
+$PYTHON $TESTPROG --find-forward $FSTAB source $TS_DEVICE &> "$TS_OUTPUT"
+sed -i -e 's/fs: 0x.*/fs:/g' "$TS_OUTPUT"
+sed -i -e 's/source: .*//g' "$TS_OUTPUT"		# devname is generated, remove it
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libmount/update b/tests/ts/libmount/update
index c96620e01..fd63f1af2 100755
--- a/tests/ts/libmount/update
+++ b/tests/ts/libmount/update
@@ -14,16 +14,16 @@ TESTPROG="$TS_HELPER_LIBMOUNT_UPDATE"
 
 # IMPORTANT notes:
 #
-#  - the $TS_OUTPUT variable is between ts_init_subtest and ts_finalize_subtest
-#    redefined to subtest specific namespace -- it means that $TS_OUTPUT is a
+#  - the "$TS_OUTPUT" variable is between ts_init_subtest and ts_finalize_subtest
+#    redefined to subtest specific namespace -- it means that "$TS_OUTPUT" is a
 #    different file within a subtest.
 #
-#  - all this test uses global $TS_OUTPUT.mountinfo
+#  - all this test uses global "$TS_OUTPUT".mountinfo
 
 #
 # utab
 #
-export LIBMOUNT_UTAB=$TS_OUTPUT.utab
+export LIBMOUNT_UTAB="$TS_OUTPUT".utab
 rm -f $LIBMOUNT_UTAB
 > $LIBMOUNT_UTAB
 
@@ -32,37 +32,37 @@ ts_run $TESTPROG --add /dev/sda1 /mnt/foo ext3 "rw,bbb,ccc,fff=FFF,ddd,noexec"
 ts_run $TESTPROG --add /dev/sdb1 /mnt/bar ext3 "ro,user"
 ts_run $TESTPROG --add /dev/sda2 /mnt/xyz ext3 "rw,loop=/dev/loop0,uhelper=hal"
 ts_run $TESTPROG --add none /proc proc "rw,user"
-cp $LIBMOUNT_UTAB $TS_OUTPUT	# save the utab aside
+cp $LIBMOUNT_UTAB "$TS_OUTPUT"	# save the utab aside
 ts_finalize_subtest		# checks the utab
 
 ts_init_subtest "utab-move"
 ts_run $TESTPROG --move /mnt/bar /mnt/newbar
 ts_run $TESTPROG --move /mnt/xyz /mnt/newxyz
-cp $LIBMOUNT_UTAB $TS_OUTPUT	# save the utab aside
+cp $LIBMOUNT_UTAB "$TS_OUTPUT"	# save the utab aside
 ts_finalize_subtest		# checks the utab
 
 ts_init_subtest "utab-remount"
 ts_run $TESTPROG --remount /mnt/newbar "ro,noatime"
 ts_run $TESTPROG --remount /mnt/newxyz "rw,user"
-cp $LIBMOUNT_UTAB $TS_OUTPUT	# save the utab aside
+cp $LIBMOUNT_UTAB "$TS_OUTPUT"	# save the utab aside
 ts_finalize_subtest		# checks the utab
 
 ts_init_subtest "utab-umount"
 ts_run $TESTPROG --remove /mnt/newbar
 ts_run $TESTPROG --remove /proc
-cp $LIBMOUNT_UTAB $TS_OUTPUT	# save the utab aside
+cp $LIBMOUNT_UTAB "$TS_OUTPUT"	# save the utab aside
 ts_finalize_subtest		# checks the utab
 
 #
 # fstab - replace
 #
-export LIBMOUNT_FSTAB=$TS_OUTPUT.fstab
+export LIBMOUNT_FSTAB="$TS_OUTPUT".fstab
 rm -f $LIBMOUNT_FSTAB
 cp "$TS_SELF/files/fstab.comment" $LIBMOUNT_FSTAB
 
 ts_init_subtest "fstab-replace"
 ts_run $TESTPROG --replace "LABEL=foo" "/mnt/foo"
-cp $LIBMOUNT_FSTAB $TS_OUTPUT	# save the fstab aside
+cp $LIBMOUNT_FSTAB "$TS_OUTPUT"	# save the fstab aside
 ts_finalize_subtest		#checks the fstab
 
 ts_finalize
diff --git a/tests/ts/libmount/update-py b/tests/ts/libmount/update-py
index 847cf92da..8bc4a6deb 100755
--- a/tests/ts/libmount/update-py
+++ b/tests/ts/libmount/update-py
@@ -19,13 +19,13 @@ TESTPROG="$TS_HELPER_PYLIBMOUNT_UPDATE"
 #
 # fstab - replace
 #
-export LIBMOUNT_FSTAB=$TS_OUTPUT.fstab
+export LIBMOUNT_FSTAB="$TS_OUTPUT".fstab
 rm -f $LIBMOUNT_FSTAB
 cp "$TS_SELF/files/fstab.comment" $LIBMOUNT_FSTAB
 
 ts_init_subtest "fstab-replace"
 $PYTHON $TESTPROG --replace "LABEL=foo" "/mnt/foo" >/dev/null 2>&1
-cp $LIBMOUNT_FSTAB $TS_OUTPUT	# save the fstab aside
+cp $LIBMOUNT_FSTAB "$TS_OUTPUT"	# save the fstab aside
 ts_finalize_subtest		#checks the fstab
 
 ts_finalize
diff --git a/tests/ts/libmount/utils b/tests/ts/libmount/utils
index 21537e50b..d7993ef47 100755
--- a/tests/ts/libmount/utils
+++ b/tests/ts/libmount/utils
@@ -13,48 +13,48 @@ TESTPROG="$TS_HELPER_LIBMOUNT_UTILS"
 [ -x $TESTPROG ] || ts_skip "test not compiled"
 
 ts_init_subtest "match-fstype"
-ts_run $TESTPROG --match-fstype ext3 "ext2,ext3,cifs" &> $TS_OUTPUT
+ts_run $TESTPROG --match-fstype ext3 "ext2,ext3,cifs" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match-fstype-neg"
-ts_run $TESTPROG --match-fstype cifs "ext2,ext3,nocifs" &> $TS_OUTPUT
+ts_run $TESTPROG --match-fstype cifs "ext2,ext3,nocifs" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match-fstype-neg2"
-ts_run $TESTPROG --match-fstype cifs "noext2,ext3,cifs" &> $TS_OUTPUT
+ts_run $TESTPROG --match-fstype cifs "noext2,ext3,cifs" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match-options"
-ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc" &> $TS_OUTPUT
+ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match-options-list"
-ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc,aaa,ddd" &> $TS_OUTPUT
+ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ccc,aaa,ddd" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match-options-neg"
-ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx" &> $TS_OUTPUT
+ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match-options-neg-list"
-ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ddd,noaaa" &> $TS_OUTPUT
+ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "ddd,noaaa" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "match-options-neg-list2"
-ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx,ccc,aaa" &> $TS_OUTPUT
+ts_run $TESTPROG --match-options "aaa,bbb=BBB,ccc,ddd" "noxxx,ccc,aaa" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "starts-with"
-ts_run $TESTPROG --starts-with "AAAbbbCCC" "AAA" &> $TS_OUTPUT
+ts_run $TESTPROG --starts-with "AAAbbbCCC" "AAA" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "ends-with"
-ts_run $TESTPROG --ends-with "AAAbbbCCC" "CCC" &> $TS_OUTPUT
+ts_run $TESTPROG --ends-with "AAAbbbCCC" "CCC" &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "mountpoint"
 if [ -d /proc ]; then
-	ts_run $TESTPROG --mountpoint /proc &> $TS_OUTPUT
+	ts_run $TESTPROG --mountpoint /proc &> "$TS_OUTPUT"
 	ts_finalize_subtest
 else
 	ts_skip_subtest "no /proc"
@@ -62,23 +62,23 @@ fi
 
 ts_init_subtest "mountpoint-subdir"
 if [ -d /proc/sys/kernel ]; then
-	ts_run $TESTPROG --mountpoint /proc/sys/kernel &> $TS_OUTPUT
+	ts_run $TESTPROG --mountpoint /proc/sys/kernel &> "$TS_OUTPUT"
 	ts_finalize_subtest
 else
 	ts_skip_subtest "no /proc"
 fi
 
 ts_init_subtest "mountpoint-root"
-ts_run $TESTPROG --mountpoint / &> $TS_OUTPUT
+ts_run $TESTPROG --mountpoint / &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "kernel-cmdline"
 export LIBMOUNT_KERNEL_CMDLINE="$TS_SELF/files/kernel_cmdline"
-ts_run $TESTPROG --kernel-cmdline selinux= >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_run $TESTPROG --kernel-cmdline selinux >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_run $TESTPROG --kernel-cmdline ro >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_run $TESTPROG --kernel-cmdline ro= >> $TS_OUTPUT 2>> $TS_ERRLOG
-ts_run $TESTPROG --kernel-cmdline root= >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --kernel-cmdline selinux= >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_run $TESTPROG --kernel-cmdline selinux >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_run $TESTPROG --kernel-cmdline ro >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_run $TESTPROG --kernel-cmdline ro= >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+ts_run $TESTPROG --kernel-cmdline root= >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/libsmartcols/continuous-json b/tests/ts/libsmartcols/continuous-json
index 4f4565b69..c157159ce 100755
--- a/tests/ts/libsmartcols/continuous-json
+++ b/tests/ts/libsmartcols/continuous-json
@@ -23,6 +23,6 @@ ts_init "$*"
 TESTPROG="$TS_HELPER_LIBSMARTCOLS_CONTINUOUS_JSON"
 ts_check_test_command "$TESTPROG"
 
-ts_run $TESTPROG --width 80 >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --width 80 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/libsmartcols/filter b/tests/ts/libsmartcols/filter
index f597f2be7..064ed6c0b 100755
--- a/tests/ts/libsmartcols/filter
+++ b/tests/ts/libsmartcols/filter
@@ -49,15 +49,15 @@ FILTERS["as-string"]='NUM == "100"'
 
 for name in "${!FILTERS[@]}"; do
 	ts_init_subtest "$prefix-$name"
-	echo "expr: ${FILTERS[$name]}" >> $TS_OUTPUT
-	echo >> $TS_OUTPUT
+	echo "expr: ${FILTERS[$name]}" >> "$TS_OUTPUT"
+	echo >> "$TS_OUTPUT"
 	ts_run $TESTPROG --nlines 10 --width 80 \
 		--filter "${FILTERS[$name]}" \
 		--column $TS_SELF/files/col-name \
 		--column $TS_SELF/files/col-number \
 		$TS_SELF/files/data-string \
 		$TS_SELF/files/data-number \
-	>> $TS_OUTPUT 2> /dev/null
+	>> "$TS_OUTPUT" 2> /dev/null
 	ts_finalize_subtest
 done
 FILTERS=()
@@ -96,15 +96,15 @@ FILTERS["as-string2"]='NUM == "100.5"'
 
 for name in "${!FILTERS[@]}"; do
 	ts_init_subtest "$prefix-$name"
-	echo "expr: ${FILTERS[$name]}" >> $TS_OUTPUT
-	echo >> $TS_OUTPUT
+	echo "expr: ${FILTERS[$name]}" >> "$TS_OUTPUT"
+	echo >> "$TS_OUTPUT"
 	ts_run $TESTPROG --nlines 10 --width 80 \
 		--filter "${FILTERS[$name]}" \
 		--column $TS_SELF/files/col-name \
 		--column $TS_SELF/files/col-float \
 		$TS_SELF/files/data-string \
 		$TS_SELF/files/data-float \
-	>> $TS_OUTPUT 2> /dev/null
+	>> "$TS_OUTPUT" 2> /dev/null
 	ts_finalize_subtest
 done
 FILTERS=()
@@ -135,15 +135,15 @@ FILTERS["as-string2"]='BOOL == "1"'
 
 for name in "${!FILTERS[@]}"; do
 	ts_init_subtest "$prefix-$name"
-	echo "expr: ${FILTERS[$name]}" >> $TS_OUTPUT
-	echo >> $TS_OUTPUT
+	echo "expr: ${FILTERS[$name]}" >> "$TS_OUTPUT"
+	echo >> "$TS_OUTPUT"
 	ts_run $TESTPROG --nlines 10 --width 80 \
 		--filter "${FILTERS[$name]}" \
 		--column $TS_SELF/files/col-name \
 		--column $TS_SELF/files/col-bool \
 		$TS_SELF/files/data-string \
 		$TS_SELF/files/data-bool \
-	>> $TS_OUTPUT 2> /dev/null
+	>> "$TS_OUTPUT" 2> /dev/null
 	ts_finalize_subtest
 done
 FILTERS=()
@@ -170,13 +170,13 @@ FILTERS["nreg"]='NAME !~ "aaa.*"'
 
 for name in "${!FILTERS[@]}"; do
 	ts_init_subtest "$prefix-$name"
-	echo "expr: ${FILTERS[$name]}" >> $TS_OUTPUT
-	echo >> $TS_OUTPUT
+	echo "expr: ${FILTERS[$name]}" >> "$TS_OUTPUT"
+	echo >> "$TS_OUTPUT"
 	ts_run $TESTPROG --nlines 10 --width 80 \
 		--filter "${FILTERS[$name]}" \
 		--column $TS_SELF/files/col-name \
 		$TS_SELF/files/data-string \
-	>> $TS_OUTPUT 2> /dev/null
+	>> "$TS_OUTPUT" 2> /dev/null
 	ts_finalize_subtest
 done
 FILTERS=()
@@ -199,15 +199,15 @@ FILTERS["bad-float"]='NUM == 100 . 5'
 
 for name in "${!FILTERS[@]}"; do
 	ts_init_subtest "$prefix-$name"
-	echo "expr: ${FILTERS[$name]}" >> $TS_OUTPUT
-	echo >> $TS_OUTPUT
+	echo "expr: ${FILTERS[$name]}" >> "$TS_OUTPUT"
+	echo >> "$TS_OUTPUT"
 	ts_run $TESTPROG --nlines 10 --width 80 \
 		--filter "${FILTERS[$name]}" \
 		--column $TS_SELF/files/col-number \
 		$TS_SELF/files/data-number \
-	2>> $TS_OUTPUT 1> /dev/null
+	2>> "$TS_OUTPUT" 1> /dev/null
 
-	sed -i -e 's/syntax error.*/<bison syntax error message removed>/g' $TS_OUTPUT
+	sed -i -e 's/syntax error.*/<bison syntax error message removed>/g' "$TS_OUTPUT"
 	ts_finalize_subtest
 done
 FILTERS=()
diff --git a/tests/ts/libsmartcols/fromfile b/tests/ts/libsmartcols/fromfile
index d56b4de31..45bd12e1d 100755
--- a/tests/ts/libsmartcols/fromfile
+++ b/tests/ts/libsmartcols/fromfile
@@ -35,7 +35,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-id \
 	$TS_SELF/files/data-parent \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "tree-json"
@@ -50,7 +50,7 @@ ts_run $TESTPROG --nlines 10 --json \
 	$TS_SELF/files/data-id \
 	$TS_SELF/files/data-parent \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "tree-middle"
@@ -65,7 +65,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-parent \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "tree-end"
@@ -80,7 +80,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-parent \
 	$TS_SELF/files/data-string-long \
 	$TS_SELF/files/data-string \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "trunc"
@@ -91,7 +91,7 @@ ts_run $TESTPROG --nlines 10 --width 40 \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "right"
@@ -102,7 +102,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "right-maxout"
@@ -111,7 +111,7 @@ ts_run $TESTPROG --nlines 10 --maxout --width 80\
 	--column $TS_SELF/files/col-number \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "padding-default"
@@ -125,7 +125,7 @@ ts_run $TESTPROG --nlines 10 --width 80 \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-empty \
 	$TS_SELF/files/data-string-empty \
-	>> $TS_OUTPUT 2> /dev/null
+	>> "$TS_OUTPUT" 2> /dev/null
 ts_finalize_subtest
 
 ts_init_subtest "padding-maxout"
@@ -140,7 +140,7 @@ ts_run $TESTPROG --nlines 10 --width 80 \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-empty \
 	$TS_SELF/files/data-string-empty \
-	>> $TS_OUTPUT 2> /dev/null
+	>> "$TS_OUTPUT" 2> /dev/null
 ts_finalize_subtest
 
 ts_init_subtest "padding-minout"
@@ -155,7 +155,7 @@ ts_run $TESTPROG --nlines 10 --width 80 \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-empty \
 	$TS_SELF/files/data-string-empty \
-	>> $TS_OUTPUT 2> /dev/null
+	>> "$TS_OUTPUT" 2> /dev/null
 ts_finalize_subtest
 
 unset LIBSMARTCOLS_DEBUG_PADDING
@@ -168,7 +168,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number-tiny \
 	$TS_SELF/files/data-number \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "noextremes"
@@ -183,7 +183,7 @@ ts_run $TESTPROG --nlines 10 --width 45 \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "hidden"
@@ -194,7 +194,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-string-long \
 	$TS_SELF/files/data-number \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap"
@@ -205,7 +205,7 @@ ts_run $TESTPROG --nlines 10 --width 40 \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrap-tree"
@@ -220,7 +220,7 @@ ts_run $TESTPROG --nlines 10 --width 45 \
 	$TS_SELF/files/data-id \
 	$TS_SELF/files/data-parent \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrapnl"
@@ -231,7 +231,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-nl \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrapnl-tree"
@@ -246,7 +246,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-id \
 	$TS_SELF/files/data-parent \
 	$TS_SELF/files/data-string-nl \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrapzero"
@@ -257,7 +257,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-zero \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "wrapzero-tree"
@@ -272,7 +272,7 @@ ts_run $TESTPROG --nlines 10 \
 	$TS_SELF/files/data-id \
 	$TS_SELF/files/data-parent \
 	$TS_SELF/files/data-string-zero \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "raw"
@@ -283,7 +283,7 @@ ts_run $TESTPROG --nlines 10 --raw \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "export"
@@ -294,7 +294,7 @@ ts_run $TESTPROG --nlines 10 --export \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "column-separator"
@@ -305,7 +305,7 @@ ts_run $TESTPROG --nlines 10 --colsep \| \
 	$TS_SELF/files/data-string \
 	$TS_SELF/files/data-number \
 	$TS_SELF/files/data-string-long \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_log "...done."
diff --git a/tests/ts/libsmartcols/termreduce-loop b/tests/ts/libsmartcols/termreduce-loop
index 13a02f85f..e5095789b 100755
--- a/tests/ts/libsmartcols/termreduce-loop
+++ b/tests/ts/libsmartcols/termreduce-loop
@@ -24,7 +24,7 @@ TESTPROG="$TS_HELPER_SCOLS_TERMREDUCE"
 ts_check_test_command "$TESTPROG"
 
 # Single-shot test: output must match expected file exactly.
-ts_run $TESTPROG >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
 
diff --git a/tests/ts/libsmartcols/title b/tests/ts/libsmartcols/title
index ac0e88068..6d104d942 100755
--- a/tests/ts/libsmartcols/title
+++ b/tests/ts/libsmartcols/title
@@ -23,6 +23,6 @@ ts_init "$*"
 TESTPROG="$TS_HELPER_LIBSMARTCOLS_TITLE"
 ts_check_test_command "$TESTPROG"
 
-ts_run $TESTPROG --width 80 >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_run $TESTPROG --width 80 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/line/line b/tests/ts/line/line
index 03d0484f9..7dd0e9230 100755
--- a/tests/ts/line/line
+++ b/tests/ts/line/line
@@ -23,43 +23,43 @@ ts_check_test_command "$TS_CMD_HEXDUMP"
 
 ts_init_subtest 'one-call'
 printf "a\nb\n" |
-	$TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_OUTPUT
+	$TS_CMD_LINE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'two-calls'
 printf "1\n2\n" |
-	($TS_CMD_LINE && $TS_CMD_LINE) >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_OUTPUT
+	($TS_CMD_LINE && $TS_CMD_LINE) >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'text-without-eol'
 printf "abc" |
-	$TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_OUTPUT
+	$TS_CMD_LINE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'empty-input'
 printf "" |
-	$TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_OUTPUT
+	$TS_CMD_LINE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'wait-for-eof'
 (printf "xyz" && cat </dev/null) |
-	$TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_OUTPUT
+	$TS_CMD_LINE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'empty-input-wait-for-eof'
-$TS_CMD_LINE </dev/null >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_OUTPUT
+$TS_CMD_LINE </dev/null >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest 'large-line'
 dd if=/dev/zero  bs=1k count=1k 2>/dev/null |
-	$TS_CMD_LINE line | $TS_CMD_HEXDUMP -C >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_OUTPUT
+	$TS_CMD_LINE line | $TS_CMD_HEXDUMP -C >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors
index 166af7a6a..1b6080ac3 100755
--- a/tests/ts/logger/errors
+++ b/tests/ts/logger/errors
@@ -41,7 +41,7 @@ SOCAT_PID="$!"
 function logger_fun {
 	# logger without --no-act to write all data to the socket
 	echo "socket data, ${TS_SUBNAME}:" |socat -u - UNIX-CONNECT:$DEVLOG
-	$TS_HELPER_LOGGER --socket $DEVLOG --stderr "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_LOGGER --socket $DEVLOG --stderr "$@" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	echo "ret: $?" >> "$TS_OUTPUT"
 	echo |socat -u - UNIX-CONNECT:$DEVLOG
 }
@@ -51,7 +51,7 @@ function logger_printf {
 	local fmt="$1"
 	shift
 	echo "socket data, ${TS_SUBNAME}:" |socat -u - UNIX-CONNECT:$DEVLOG
-	printf "$fmt" | $TS_HELPER_LOGGER --socket $DEVLOG --stderr "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	printf "$fmt" | $TS_HELPER_LOGGER --socket $DEVLOG --stderr "$@" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	echo "ret: $?" >> "$TS_OUTPUT"
 	echo |socat -u - UNIX-CONNECT:$DEVLOG
 }
@@ -109,7 +109,7 @@ ts_log "Check written socket data of all subtests."
 sleep 1
 kill $SOCAT_PID
 wait $SOCAT_PID &>/dev/null
-cat "$SOCKIN" >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat "$SOCKIN" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$DEVLOG" "$SOCKIN"
 ts_finalize_subtest
 
diff --git a/tests/ts/logger/formats b/tests/ts/logger/formats
index b5fe57e7d..eba888d33 100755
--- a/tests/ts/logger/formats
+++ b/tests/ts/logger/formats
@@ -37,7 +37,7 @@ ts_init_socket_to_file $DEVLOG $SOCKIN
 SOCAT_PID="$!"
 
 function logger_fun {
-	$TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	echo "ret: $?" >> "$TS_ERRLOG"	# keep all in stderr
 }
 
@@ -78,7 +78,7 @@ ts_init_subtest "check_socket"
 sleep 1
 kill $SOCAT_PID
 wait $SOCAT_PID &>/dev/null
-cat "$SOCKIN" >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat "$SOCKIN" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$DEVLOG" "$SOCKIN"
 ts_finalize_subtest
 
diff --git a/tests/ts/logger/journald b/tests/ts/logger/journald
index f15366640..448c66211 100755
--- a/tests/ts/logger/journald
+++ b/tests/ts/logger/journald
@@ -30,6 +30,6 @@ if ! $TS_HELPER_LOGGER --help | grep -q journald; then
 fi
 
 printf "%s\n%s\n%s\n" MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a MESSAGE="a b c 1 2 3" |
-$TS_HELPER_LOGGER -u /bad/boy --no-act --journald --stderr >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "ret: $?" >> $TS_ERRLOG  # keep it on stderr too
+$TS_HELPER_LOGGER -u /bad/boy --no-act --journald --stderr >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "ret: $?" >> "$TS_ERRLOG"  # keep it on stderr too
 ts_finalize
diff --git a/tests/ts/logger/options b/tests/ts/logger/options
index 52e2b397e..54f639870 100755
--- a/tests/ts/logger/options
+++ b/tests/ts/logger/options
@@ -57,7 +57,7 @@ ts_init_socket_to_file $DEVLOG $SOCKIN
 SOCAT_PID="$!"
 
 function logger_fun {
-	$TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	echo "ret: $?" >> "$TS_ERRLOG"  # keep all on stderr
 }
 
@@ -75,7 +75,7 @@ ts_init_subtest "check_socket"
 sleep 1
 kill $SOCAT_PID
 wait $SOCAT_PID &>/dev/null
-cat "$SOCKIN" >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat "$SOCKIN" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$DEVLOG" "$SOCKIN"
 ts_finalize_subtest
 
diff --git a/tests/ts/login/islocal b/tests/ts/login/islocal
index 42b2912ed..f6ebe727e 100755
--- a/tests/ts/login/islocal
+++ b/tests/ts/login/islocal
@@ -25,5 +25,5 @@ ts_check_test_command "$TS_HELPER_ISLOCAL"
 
 $TS_HELPER_ISLOCAL "$TS_SELF/islocal.data" root nobody "" youngman youngman2 \
     abcdefghx nobo long rot al malformed \
-    nonl znobody >> $TS_OUTPUT
+    nonl znobody >> "$TS_OUTPUT"
 ts_finalize
diff --git a/tests/ts/login/logindefs b/tests/ts/login/logindefs
index 21280aa9e..db4c217ab 100755
--- a/tests/ts/login/logindefs
+++ b/tests/ts/login/logindefs
@@ -13,14 +13,14 @@ ts_init "$*"
 ts_check_test_command "$TS_HELPER_LOGINDEFS"
 
 # list all items
-$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" | sed 's:'$TS_SELF'/::g' >> $TS_OUTPUT
+$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" | sed 's:'$TS_SELF'/::g' >> "$TS_OUTPUT"
 
 # search
-$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" str STRING >> $TS_OUTPUT
-$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" num NUMBER >> $TS_OUTPUT
-$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" bool BOOLEAN >> $TS_OUTPUT
-$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" str EMPTY >> $TS_OUTPUT
+$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" str STRING >> "$TS_OUTPUT"
+$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" num NUMBER >> "$TS_OUTPUT"
+$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" bool BOOLEAN >> "$TS_OUTPUT"
+$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" str EMPTY >> "$TS_OUTPUT"
 
-$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" str UNKNOWN >> $TS_OUTPUT
+$TS_HELPER_LOGINDEFS "$TS_SELF/logindefs.data" str UNKNOWN >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/look/separator b/tests/ts/look/separator
index aed1c58e3..39762af1e 100755
--- a/tests/ts/look/separator
+++ b/tests/ts/look/separator
@@ -36,6 +36,6 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_LOOK"
 
-$TS_CMD_LOOK apple-pie $TS_TOPDIR/ts/look/words >> $TS_OUTPUT
+$TS_CMD_LOOK apple-pie $TS_TOPDIR/ts/look/words >> "$TS_OUTPUT"
 ts_finalize
 
diff --git a/tests/ts/losetup/losetup b/tests/ts/losetup/losetup
index 9ee478668..883935f61 100755
--- a/tests/ts/losetup/losetup
+++ b/tests/ts/losetup/losetup
@@ -27,9 +27,9 @@ ts_check_test_command "$TS_CMD_LSBLK"
 
 # Before checking for loop support we would need to test if losetup -f works at
 # all. At least we do a simple executable test for now.
-$TS_CMD_LOSETUP --version >/dev/null 2>$TS_OUTPUT || ts_failed
-$TS_CMD_LOSETUP --unknownopt >>$TS_OUTPUT 2>/dev/null && ts_failed
-test -s $TS_OUTPUT && ts_failed
+$TS_CMD_LOSETUP --version >/dev/null 2>"$TS_OUTPUT" || ts_failed
+$TS_CMD_LOSETUP --unknownopt >>"$TS_OUTPUT" 2>/dev/null && ts_failed
+test -s "$TS_OUTPUT" && ts_failed
 
 ts_skip_nonroot
 ts_check_losetup
@@ -46,7 +46,7 @@ LODEV=$( $TS_CMD_LOSETUP --find --show $BACKFILE )
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 $TS_CMD_LOSETUP --detach $LODEV
 ts_finalize_subtest
 
@@ -55,7 +55,7 @@ LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --find --show $BACKFILE )
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 $TS_CMD_LOSETUP --detach $LODEV
 ts_finalize_subtest
 
@@ -65,7 +65,7 @@ LODEV=$( $TS_CMD_LOSETUP --sizelimit 3MiB --find --show $BACKFILE )
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 $TS_CMD_LOSETUP -d $LODEV
 ts_finalize_subtest
 
@@ -75,7 +75,7 @@ LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --sizelimit 3MiB --find --show $BACKFILE
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 $TS_CMD_LOSETUP -d $LODEV
 ts_finalize_subtest
 
diff --git a/tests/ts/losetup/losetup-blkdev b/tests/ts/losetup/losetup-blkdev
index db56b6db4..9229cbf74 100755
--- a/tests/ts/losetup/losetup-blkdev
+++ b/tests/ts/losetup/losetup-blkdev
@@ -41,7 +41,7 @@ LODEV=$( $TS_CMD_LOSETUP --find --show $BACKFILE )
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 udevadm settle
 $TS_CMD_LOSETUP -d $LODEV
 ts_finalize_subtest
@@ -51,7 +51,7 @@ LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --find --show $BACKFILE )
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 udevadm settle
 $TS_CMD_LOSETUP -d $LODEV
 ts_finalize_subtest
@@ -62,7 +62,7 @@ LODEV=$( $TS_CMD_LOSETUP --sizelimit 3MiB --find --show $BACKFILE )
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 udevadm settle
 $TS_CMD_LOSETUP -d $LODEV
 ts_finalize_subtest
@@ -73,7 +73,7 @@ LODEV=$( $TS_CMD_LOSETUP --offset 1MiB --sizelimit 3MiB --find --show $BACKFILE
 if [ -z "$LODEV" ]; then
 	ts_log "Failed to create loop device"
 fi
-lo_print $LODEV >> $TS_OUTPUT
+lo_print $LODEV >> "$TS_OUTPUT"
 udevadm settle
 $TS_CMD_LOSETUP -d $LODEV
 ts_finalize_subtest
diff --git a/tests/ts/losetup/losetup-loop b/tests/ts/losetup/losetup-loop
index 11af74ac0..119e5a256 100755
--- a/tests/ts/losetup/losetup-loop
+++ b/tests/ts/losetup/losetup-loop
@@ -67,9 +67,9 @@ if [ -z "$LODEVR" ]; then
 fi
 udevadm settle
 if test "$LODEV" = "$LODEVR" ; then
-	echo "equal" >>$TS_OUTPUT
+	echo "equal" >>"$TS_OUTPUT"
 else
-	echo "different" >>$TS_OUTPUT
+	echo "different" >>"$TS_OUTPUT"
 	if test -n "$LODEVR" ; then
 		$TS_CMD_LOSETUP -d "$LODEVR"
 	fi
@@ -91,9 +91,9 @@ if [ -z "$LODEVR" ]; then
 fi
 udevadm settle
 if test "$LODEV" = "$LODEVR" ; then
-	echo "equal" >>$TS_OUTPUT
+	echo "equal" >>"$TS_OUTPUT"
 else
-	echo "different" >>$TS_OUTPUT
+	echo "different" >>"$TS_OUTPUT"
 	if test -n "$LODEVR" ; then
 		$TS_CMD_LOSETUP -d "$LODEVR"
 	fi
@@ -115,9 +115,9 @@ if [ -z "$LODEVR" ]; then
 fi
 udevadm settle
 if test "$LODEV" = "$LODEVR" ; then
-	echo "equal" >>$TS_OUTPUT
+	echo "equal" >>"$TS_OUTPUT"
 else
-	echo "different" >>$TS_OUTPUT
+	echo "different" >>"$TS_OUTPUT"
 	if test -n "$LODEVR" ; then
 		$TS_CMD_LOSETUP -d "$LODEVR"
 	fi
@@ -139,9 +139,9 @@ if [ -z "$LODEVR" ]; then
 fi
 udevadm settle
 if test "$LODEV" = "$LODEVR" ; then
-	echo "equal" >>$TS_OUTPUT
+	echo "equal" >>"$TS_OUTPUT"
 else
-	echo "different" >>$TS_OUTPUT
+	echo "different" >>"$TS_OUTPUT"
 	if test -n "$LODEVR" ; then
 		$TS_CMD_LOSETUP -d "$LODEVR"
 	fi
@@ -163,9 +163,9 @@ if [ -z "$LODEVR" ]; then
 fi
 udevadm settle
 if test "$LODEV" = "$LODEVR" ; then
-	echo "equal" >>$TS_OUTPUT
+	echo "equal" >>"$TS_OUTPUT"
 else
-	echo "different" >>$TS_OUTPUT
+	echo "different" >>"$TS_OUTPUT"
 	if test -n "$LODEVR" ; then
 		$TS_CMD_LOSETUP -d "$LODEVR"
 	fi
@@ -188,9 +188,9 @@ if [ -z "$LODEVR" ]; then
 fi
 udevadm settle
 if test "$LODEV" = "$LODEVR" ; then
-	echo "equal" >>$TS_OUTPUT
+	echo "equal" >>"$TS_OUTPUT"
 else
-	echo "different" >>$TS_OUTPUT
+	echo "different" >>"$TS_OUTPUT"
 	if test -n "$LODEVR" ; then
 		$TS_CMD_LOSETUP -d "$LODEVR"
 	fi
diff --git a/tests/ts/lsblk/lsblk b/tests/ts/lsblk/lsblk
index 00d98d467..509b8d0cd 100755
--- a/tests/ts/lsblk/lsblk
+++ b/tests/ts/lsblk/lsblk
@@ -46,7 +46,7 @@ for dump in $(ls $TS_SELF/dumps/*.tar.xz | sort); do
 		cols=$(cat $cols_file)
 		${TS_CMD_LSBLK} --sysroot "${dumpdir}/${name}" \
 			        --output $cols \
-			        >> ${TS_OUTPUT} 2>> $TS_ERRLOG
+			        >> ${TS_OUTPUT} 2>> "$TS_ERRLOG"
 
 		ts_finalize_subtest
 	done
diff --git a/tests/ts/lscpu/lscpu b/tests/ts/lscpu/lscpu
index 0ef1d9998..3b7eb3592 100755
--- a/tests/ts/lscpu/lscpu
+++ b/tests/ts/lscpu/lscpu
@@ -37,21 +37,21 @@ for dump in $(ls $TS_SELF/dumps/*.tar.gz | sort); do
 
 	# Architecture information is not applicable with -s.
 	"${TS_CMD_LSCPU}" --sysroot "${dumpdir}/${name}" | \
-		grep -v "Architecture" >> ${TS_OUTPUT} 2>> $TS_ERRLOG
+		grep -v "Architecture" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-	echo >>"${TS_OUTPUT}"
+	echo >>"$TS_OUTPUT"
 
 	"${TS_CMD_LSCPU}" --parse --sysroot "${dumpdir}/${name}" \
-		 >> ${TS_OUTPUT} 2>> $TS_ERRLOG
+		 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-	echo >>"${TS_OUTPUT}"
+	echo >>"$TS_OUTPUT"
 
 	"${TS_CMD_LSCPU}" --parse --physical --sysroot "${dumpdir}/${name}" \
-		 >> ${TS_OUTPUT} 2>> $TS_ERRLOG
+		 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	if [[ ! -e "${dumpdir}/${name}/sys/kernel/cpu_byteorder" ]]; then
 		# LE/BE depends on binary if we can't read it from the dump
-		sed -i -e '/Byte Order:.*/d' $TS_OUTPUT
+		sed -i -e '/Byte Order:.*/d' "$TS_OUTPUT"
 	fi
 
 	ts_finalize_subtest
diff --git a/tests/ts/lsfd/assoc-pidfs b/tests/ts/lsfd/assoc-pidfs
index 446c2396f..6e35b7677 100755
--- a/tests/ts/lsfd/assoc-pidfs
+++ b/tests/ts/lsfd/assoc-pidfs
@@ -74,6 +74,6 @@ INODE=
 
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/column-kthread b/tests/ts/lsfd/column-kthread
index 6507c6adb..855942b25 100755
--- a/tests/ts/lsfd/column-kthread
+++ b/tests/ts/lsfd/column-kthread
@@ -34,7 +34,7 @@ ts_cd "$TS_OUTDIR"
     "$TS_CMD_LSFD" --threads -o COMMAND,PID,USER,MODE,TYPE,NAME,KTHREAD \
 		   -Q '(PID < 3) and ((ASSOC == "cwd") or (ASSOC == "rtd"))'
     echo $?
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
 
diff --git a/tests/ts/lsfd/filter-broken-exp b/tests/ts/lsfd/filter-broken-exp
index 95f3aa87b..ae16dfe1b 100755
--- a/tests/ts/lsfd/filter-broken-exp
+++ b/tests/ts/lsfd/filter-broken-exp
@@ -29,9 +29,9 @@ ts_cd "$TS_OUTDIR"
     $TS_CMD_LSFD -Q ')'
     $TS_CMD_LSFD -Q '(FD == 1)garbage'
     $TS_CMD_LSFD -Q 'NOSUCHCOLUMN'
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 sed -i -e 's/syntax error.*/<bison syntax error message removed>/g' \
-	$TS_OUTPUT $TS_ERRLOG
+	"$TS_OUTPUT" "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-cdev-tun b/tests/ts/lsfd/mkfds-cdev-tun
index 37482aadb..8cbb2507f 100755
--- a/tests/ts/lsfd/mkfds-cdev-tun
+++ b/tests/ts/lsfd/mkfds-cdev-tun
@@ -119,7 +119,7 @@ cdev_tun_test()
 		echo "output TUN.IFACE: $output"
 	    fi
 	fi
-    } > $TS_OUTPUT 2>&1
+    } > "$TS_OUTPUT" 2>&1
     ts_finalize_subtest
 
     ts_init_subtest "$tname"-devnetns
@@ -135,14 +135,14 @@ cdev_tun_test()
 		echo "expected TUN.DEVNETNS: $netns"
 		echo "output TUN.DEVNETNS: $output"
 	    fi
-	} > $TS_OUTPUT 2>&1
+	} > "$TS_OUTPUT" 2>&1
     fi
     ts_finalize_subtest
 
     ts_init_subtest "$tname"-socknetns
     if [[ -n "$IFNAME" ]]; then
 	cdev_tun_test_socknetns \
-	    "$IFNAME" "${PID}" "${EXPR}" "$netns" > $TS_OUTPUT 2>&1
+	    "$IFNAME" "${PID}" "${EXPR}" "$netns" > "$TS_OUTPUT" 2>&1
     fi
     ts_finalize_subtest
 
diff --git a/tests/ts/lsfd/mkfds-directory b/tests/ts/lsfd/mkfds-directory
index 567ab980b..bc39b7af9 100755
--- a/tests/ts/lsfd/mkfds-directory
+++ b/tests/ts/lsfd/mkfds-directory
@@ -106,6 +106,6 @@ esac
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-eventfd b/tests/ts/lsfd/mkfds-eventfd
index f2ca428aa..826a11ed3 100755
--- a/tests/ts/lsfd/mkfds-eventfd
+++ b/tests/ts/lsfd/mkfds-eventfd
@@ -99,6 +99,6 @@ ENDPOINTS=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-eventpoll b/tests/ts/lsfd/mkfds-eventpoll
index f99688ea3..e0340ed96 100755
--- a/tests/ts/lsfd/mkfds-eventpoll
+++ b/tests/ts/lsfd/mkfds-eventpoll
@@ -41,6 +41,6 @@ FD2=7
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket
index 61c2f51d7..57fc5397e 100755
--- a/tests/ts/lsfd/mkfds-mapped-packet-socket
+++ b/tests/ts/lsfd/mkfds-mapped-packet-socket
@@ -58,7 +58,7 @@ for PROTOCOL in $(printf "%d" 0x10) 10000; do
 	    break
 	fi
     done
-done > $TS_OUTPUT 2>&1
+done > "$TS_OUTPUT" 2>&1
 
 if [[ "$ERR" == "$ENOPROTOOPT" ]]; then
     ts_skip "packet socket doesn't support attaching a buffer on this platform"
diff --git a/tests/ts/lsfd/mkfds-mqueue b/tests/ts/lsfd/mkfds-mqueue
index c725625b5..4682eed13 100755
--- a/tests/ts/lsfd/mkfds-mqueue
+++ b/tests/ts/lsfd/mkfds-mqueue
@@ -78,6 +78,6 @@ ENDPOINTS=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-pidfd b/tests/ts/lsfd/mkfds-pidfd
index a0b381529..c4b70dd97 100755
--- a/tests/ts/lsfd/mkfds-pidfd
+++ b/tests/ts/lsfd/mkfds-pidfd
@@ -45,13 +45,13 @@ RC=
     fi
     wait ${MKFDS_PID}
     RC=$?
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 if [ "$RC" == "$TS_EXIT_NOTSUPP" ]; then
     ts_skip "pidfd_open(2) is not available"
 fi
 
 sed -i -E -e 's/UNKN|REG/[STTYPE]/' -e 's/pidfs|anon_inodefs/[SOURCE]/' \
-    $TS_OUTPUT
+    "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-pipe-no-fork b/tests/ts/lsfd/mkfds-pipe-no-fork
index 9e279ce62..e4479ceaf 100755
--- a/tests/ts/lsfd/mkfds-pipe-no-fork
+++ b/tests/ts/lsfd/mkfds-pipe-no-fork
@@ -119,6 +119,6 @@ EOF
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-pty b/tests/ts/lsfd/mkfds-pty
index afe03be5e..00c2a1410 100755
--- a/tests/ts/lsfd/mkfds-pty
+++ b/tests/ts/lsfd/mkfds-pty
@@ -68,6 +68,6 @@ col_test()
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-ro-block-device b/tests/ts/lsfd/mkfds-ro-block-device
index e00dff1e9..b7c719514 100755
--- a/tests/ts/lsfd/mkfds-ro-block-device
+++ b/tests/ts/lsfd/mkfds-ro-block-device
@@ -75,6 +75,6 @@ EXPR=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-ro-regular-file b/tests/ts/lsfd/mkfds-ro-regular-file
index 6fa0683e9..3635fd77c 100755
--- a/tests/ts/lsfd/mkfds-ro-regular-file
+++ b/tests/ts/lsfd/mkfds-ro-regular-file
@@ -73,6 +73,6 @@ EXPR=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-rw-character-device b/tests/ts/lsfd/mkfds-rw-character-device
index f8b71dcd2..a5ba35009 100755
--- a/tests/ts/lsfd/mkfds-rw-character-device
+++ b/tests/ts/lsfd/mkfds-rw-character-device
@@ -45,6 +45,6 @@ EXPR=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mkfds-symlink b/tests/ts/lsfd/mkfds-symlink
index f575315f7..e5bee6b87 100755
--- a/tests/ts/lsfd/mkfds-symlink
+++ b/tests/ts/lsfd/mkfds-symlink
@@ -42,6 +42,6 @@ EXPR=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/mount-over-same-path b/tests/ts/lsfd/mount-over-same-path
index c8be01d57..f389364c3 100755
--- a/tests/ts/lsfd/mount-over-same-path
+++ b/tests/ts/lsfd/mount-over-same-path
@@ -91,9 +91,9 @@ if read -r -u "${MKFDS[0]}" PID FD0; then
 	if read -r -u "${MKFDS[0]}" FD1; then
 	    if inode1=$(${TS_CMD_LSFD} --noheadings --raw --pid "$PID" --filter "FD == $FD1" -oINODE); then
 		if [[ -n "$INODE1" && "$INODE1" == "$inode1" ]]; then
-		    echo inode1: OK >> $TS_OUTPUT
+		    echo inode1: OK >> "$TS_OUTPUT"
 		else
-		    echo inode1: FAILED "$INODE1" == "$inode1" >> $TS_OUTPUT
+		    echo inode1: FAILED "$INODE1" == "$inode1" >> "$TS_OUTPUT"
 
 		    echo >&"${MKFDS[1]}"
 		    ts_failed "inode doesn't match in the second file open"
diff --git a/tests/ts/lsfd/option-pid b/tests/ts/lsfd/option-pid
index eb8420bbf..183b4cdb7 100755
--- a/tests/ts/lsfd/option-pid
+++ b/tests/ts/lsfd/option-pid
@@ -75,6 +75,6 @@ POUT=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/lsfd/option-summary b/tests/ts/lsfd/option-summary
index 739b7ec7e..9a1548f96 100755
--- a/tests/ts/lsfd/option-summary
+++ b/tests/ts/lsfd/option-summary
@@ -53,7 +53,7 @@ ${TS_CMD_LSFD} -n --summary=only \
 		 --counter=GROUP:'(NAME == "/etc/group")' \
 		 --counter=PASSWD:'(NAME == "/etc/passwd")' \
 		 --counter=PROC:'(ASSOC == "exe")' \
-		 > $TS_OUTPUT 2>&1
+		 > "$TS_OUTPUT" 2>&1
 
 for PID in ${PIDS}; do
     kill -CONT "${PID}"
diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem
index e5b4dbfb6..5a40e549e 100755
--- a/tests/ts/lsmem/lsmem
+++ b/tests/ts/lsmem/lsmem
@@ -32,7 +32,7 @@ function do_lsmem {
 
         echo -e "\n---\n" >>${TS_OUTPUT}
         echo "\$ lsmem $opts" >>${TS_OUTPUT}
-        ${TS_CMD_LSMEM} $opts --sysroot "${dumpdir}/${name}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+        ${TS_CMD_LSMEM} $opts --sysroot "${dumpdir}/${name}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 }
 
diff --git a/tests/ts/lsns/filedesc b/tests/ts/lsns/filedesc
index bc2785c9f..c572996b1 100755
--- a/tests/ts/lsns/filedesc
+++ b/tests/ts/lsns/filedesc
@@ -77,5 +77,5 @@ trap "cleanup" EXIT
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait "${MKFDS_PID}"
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 ts_finalize
diff --git a/tests/ts/lsns/filter b/tests/ts/lsns/filter
index b93d400e0..192961f66 100755
--- a/tests/ts/lsns/filter
+++ b/tests/ts/lsns/filter
@@ -74,7 +74,7 @@ RC=
     fi
     wait "${MKFDS_PID}"
     RC=$?
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 if [ "$RC" == "$EPERM" ]; then
     ts_skip "unshare(2) is not permitted on this platform"
 fi
diff --git a/tests/ts/lsns/ioctl_ns b/tests/ts/lsns/ioctl_ns
index d57d24549..468b02ce9 100755
--- a/tests/ts/lsns/ioctl_ns
+++ b/tests/ts/lsns/ioctl_ns
@@ -99,7 +99,7 @@ init
 	cleanup
     fi
     exit $RESULT
-) >> $TS_ERRLOG 2>&1 &
+) >> "$TS_ERRLOG" 2>&1 &
 mainpid=$!
 (
     exec 4< $FIFO_WAIT
@@ -116,7 +116,7 @@ wait $subpid
 wait $mainpid
 
 RESULT=$?
-echo $RESULT >> $TS_OUTPUT
+echo $RESULT >> "$TS_OUTPUT"
 
 cleanup
 ts_finalize
diff --git a/tests/ts/lsns/netns-from-sock b/tests/ts/lsns/netns-from-sock
index 57a5a70a3..31d680ce4 100755
--- a/tests/ts/lsns/netns-from-sock
+++ b/tests/ts/lsns/netns-from-sock
@@ -75,7 +75,7 @@ RC=
 
     wait "${MKFDS_PID}"
     RC=$?
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 if [[ "$RC" == "$EPERM" ]]; then
     ts_skip "unshare(2) is not permitted on this platform"
 fi
diff --git a/tests/ts/lsns/netnsid b/tests/ts/lsns/netnsid
index c50ef6e5b..fa9f906e1 100755
--- a/tests/ts/lsns/netnsid
+++ b/tests/ts/lsns/netnsid
@@ -91,7 +91,7 @@ fi
 } > $FIFO
 
 test "$IP_ID" = "$LSNS_ID"
-echo $? >> $TS_OUTPUT
+echo $? >> "$TS_OUTPUT"
 
 cleanup
 ts_finalize
diff --git a/tests/ts/lsns/nsfs b/tests/ts/lsns/nsfs
index 32863c375..39f1c9b32 100755
--- a/tests/ts/lsns/nsfs
+++ b/tests/ts/lsns/nsfs
@@ -97,7 +97,7 @@ does_combination_include $NSFS_NAMES_MLINES &&
     does_combination_include ${NSFS_NAMES_1LINE//,/ }
 
 RESULT=$?
-echo $RESULT >> $TS_OUTPUT
+echo $RESULT >> "$TS_OUTPUT"
 
 if [ $RESULT -ne 0 ]; then
 	echo
diff --git a/tests/ts/mcookie/mcookie b/tests/ts/mcookie/mcookie
index d6b72a18b..adbc6cb61 100755
--- a/tests/ts/mcookie/mcookie
+++ b/tests/ts/mcookie/mcookie
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_CMD_MCOOKIE"
 $TS_CMD_MCOOKIE -f /etc/services |
 	# The sed will convert only 32 characters long hexadecimal string
 	# to expected string, but nothing else.
-	sed 's/^[0-9a-f]\{32\}$/the string meets expectations/' >> $TS_OUTPUT 2>> $TS_ERRLOG
+	sed 's/^[0-9a-f]\{32\}$/the string meets expectations/' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/md5/md5 b/tests/ts/md5/md5
index 88808e1f8..151963312 100755
--- a/tests/ts/md5/md5
+++ b/tests/ts/md5/md5
@@ -24,7 +24,7 @@ ts_check_test_command "$TS_HELPER_MD5"
 
 cat $TS_SELF/data | while read data
 do
-	echo -n $data | $TS_HELPER_MD5 >> $TS_OUTPUT
+	echo -n $data | $TS_HELPER_MD5 >> "$TS_OUTPUT"
 done
 
 ts_finalize
diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck
index a08681b4f..f8a8ef4ea 100755
--- a/tests/ts/minix/fsck
+++ b/tests/ts/minix/fsck
@@ -27,15 +27,15 @@ mkfs_and_fsck_minix() {
 	local ret
 	ts_log "#####################################"
 	ts_log_both "$ mkfs.minix $1 image"
-	$TS_CMD_MKMINIX $1 $img >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_MKMINIX $1 $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ret=$?
-	echo "return mkfs: $ret" >> $TS_OUTPUT
+	echo "return mkfs: $ret" >> "$TS_OUTPUT"
 	test $ret = 0 || return $ret
 
 	ts_log_both "$ fsck.minix -lavsf image"
-	$TS_CMD_FSCKMINIX -lavsf $img >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_FSCKMINIX -lavsf $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ret=$?
-	echo "return fsck: $ret" >> $TS_OUTPUT
+	echo "return fsck: $ret" >> "$TS_OUTPUT"
 	return $ret
 }
 
@@ -52,7 +52,7 @@ rm -f $img
 
 # escape "@" with "\@" in $img. This way sed correctly
 # replaces paths containing "@" characters
-sed -i "s@${img//\@/\\\@}@image@g" $TS_OUTPUT
+sed -i "s@${img//\@/\\\@}@image@g" "$TS_OUTPUT"
 
 
 ts_finalize
diff --git a/tests/ts/minix/fsck-images b/tests/ts/minix/fsck-images
index 8e61a6d77..b836f4789 100755
--- a/tests/ts/minix/fsck-images
+++ b/tests/ts/minix/fsck-images
@@ -37,11 +37,11 @@ check_minix_fs_type() {
 	TS_EXPECTED+=$BE_EXT
 	img=${TS_OUTPUT}.img
 	dd if=/dev/zero bs=1024 count=16 of=$img >/dev/null 2>&1
-	$TS_HELPER_MKFS_MINIX $2 $img >> $TS_OUTPUT 2>> $TS_ERRLOG
-	echo "mkfs return value: $?" >> $TS_OUTPUT
-	$TS_CMD_FSCKMINIX $img >> $TS_OUTPUT 2>> $TS_ERRLOG
-	echo "fsck return value: $?" >> $TS_OUTPUT
-	$TS_CMD_HEXDUMP -C $img >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_MKFS_MINIX $2 $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	echo "mkfs return value: $?" >> "$TS_OUTPUT"
+	$TS_CMD_FSCKMINIX $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	echo "fsck return value: $?" >> "$TS_OUTPUT"
+	$TS_CMD_HEXDUMP -C $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	rm -f $img
 	ts_finalize_subtest
 }
@@ -71,20 +71,20 @@ fi
 ts_init_subtest "auto-fix"
 img=${TS_OUTPUT}.img
 cp "$TS_SELF/broken-root" $img
-$TS_CMD_FSCKMINIX -sav $img >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "fsck reports changed and uncorrected: $?" >> $TS_OUTPUT
-$TS_CMD_HEXDUMP -C $img >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i 's/Filesystem on .* is dirty/Filesystem auto-fix is dirty/' $TS_OUTPUT $TS_ERRLOG
+$TS_CMD_FSCKMINIX -sav $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "fsck reports changed and uncorrected: $?" >> "$TS_OUTPUT"
+$TS_CMD_HEXDUMP -C $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i 's/Filesystem on .* is dirty/Filesystem auto-fix is dirty/' "$TS_OUTPUT" "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "bug.773892"
 "$TS_CMD_FSCKMINIX" -f "$TS_SELF/debian.bug.773892" 2>&1 >/dev/null
-echo "fsck reports uncorrected: $?" >> $TS_OUTPUT
+echo "fsck reports uncorrected: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "broken-root"
-"$TS_CMD_FSCKMINIX" "$TS_SELF/broken-root" >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "fsck reports uncorrected: $?" >> $TS_OUTPUT
+"$TS_CMD_FSCKMINIX" "$TS_SELF/broken-root" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "fsck reports uncorrected: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index a34ac5e71..56b8b2ba1 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -34,8 +34,8 @@ test -b $dev || sleep 1
 mkfs_and_mount_minix() {
 	ts_init_subtest $1
 	ts_log "create minix fs $2"
-	$TS_CMD_MKMINIX $2 $dev >> $TS_OUTPUT 2>> $TS_ERRLOG
-	echo "mkfs return value: $?" >> $TS_OUTPUT
+	$TS_CMD_MKMINIX $2 $dev >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+	echo "mkfs return value: $?" >> "$TS_OUTPUT"
 	udevadm settle
 	[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 	ts_mount "minix" $dev $TS_MOUNTPOINT
diff --git a/tests/ts/misc/canonicalize b/tests/ts/misc/canonicalize
index b72593294..d65c79412 100755
--- a/tests/ts/misc/canonicalize
+++ b/tests/ts/misc/canonicalize
@@ -27,7 +27,7 @@ grep -q 'nodev[[:space:]]*tmpfs' /proc/filesystems || \
 	ts_skip_subtest "tmpfs unsupported"
 
 mkdir -p $TS_MOUNTPOINT &>  /dev/null
-$TS_CMD_MOUNT -t tmpfs tmpfs $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -t tmpfs tmpfs $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? -eq 0 ] || ts_skip "tmpfs mount failed"
 
 # reuse the same TS_MOUNTPOINT in all subtests
@@ -49,7 +49,7 @@ ts_init_subtest root-user
 mkdir -p ${BASE}/aaa/bbb
 mkdir -p ${BASE}/ccc/ddd
 ln -s ${BASE}/ccc ${BASE}/aaa/bbb/ccc-sym
-$TESTPROG ${BASE}/aaa/bbb/ccc-sym/ddd | sed "s:${BASE}::g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TESTPROG ${BASE}/aaa/bbb/ccc-sym/ddd | sed "s:${BASE}::g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -66,7 +66,7 @@ if id $uid &>/dev/null; then
 	$TS_CMD_SETPRIV --reuid="$uid" --regid="$gid" --clear-groups \
 			--inh-caps=-all --reset-env \
 			-- $TESTPROG ${BASE}/root-sym/foo \
-		| sed "s:${BASE}::g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+		| sed "s:${BASE}::g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	ts_finalize_subtest
 else
diff --git a/tests/ts/misc/colors b/tests/ts/misc/colors
index f87abeb7e..8dcd5dfc0 100755
--- a/tests/ts/misc/colors
+++ b/tests/ts/misc/colors
@@ -34,8 +34,8 @@ COLOR_NAMES=$(awk '
 ' "$SRC")
 
 for color in $COLOR_NAMES; do
-	printf "%15s: " "$color" >> $TS_OUTPUT
-	$TS_HELPER_COLORS --mode always --color "$color" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	printf "%15s: " "$color" >> "$TS_OUTPUT"
+	$TS_HELPER_COLORS --mode always --color "$color" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 done
 
 ts_finalize
diff --git a/tests/ts/misc/configs b/tests/ts/misc/configs
index ecaff960c..09de16b61 100755
--- a/tests/ts/misc/configs
+++ b/tests/ts/misc/configs
@@ -30,20 +30,20 @@ mkdir -p "$USR_DIR/proj"
 # Test 1: Main config file in /etc
 ts_init_subtest "main-etc"
 echo "main config" > "$ETC_DIR/proj/example.conf"
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--project "proj" --name "example" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$ETC_DIR/proj/example.conf"
 ts_finalize_subtest
 
 # Test 2: Main config file in /usr (fallback)
 ts_init_subtest "main-usr"
 echo "usr config" > "$USR_DIR/proj/example.conf"
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--project "proj" --name "example" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$USR_DIR/proj/example.conf"
 ts_finalize_subtest
 
@@ -52,10 +52,10 @@ ts_init_subtest "dropin-etc"
 mkdir -p "$ETC_DIR/proj/example.conf.d"
 echo "etc drop-in 1" > "$ETC_DIR/proj/example.conf.d/10-first.conf"
 echo "etc drop-in 2" > "$ETC_DIR/proj/example.conf.d/20-second.conf"
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--project "proj" --name "example" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -rf "$ETC_DIR/proj/example.conf.d"
 ts_finalize_subtest
 
@@ -64,10 +64,10 @@ ts_init_subtest "dropin-usr"
 mkdir -p "$USR_DIR/proj/example.conf.d"
 echo "usr drop-in 1" > "$USR_DIR/proj/example.conf.d/10-first.conf"
 echo "usr drop-in 2" > "$USR_DIR/proj/example.conf.d/20-second.conf"
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--project "proj" --name "example" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -rf "$USR_DIR/proj/example.conf.d"
 ts_finalize_subtest
 
@@ -80,10 +80,10 @@ mkdir -p "$USR_DIR/proj/example.conf.d"
 echo "usr drop-in" > "$USR_DIR/proj/example.conf.d/10-base.conf"
 echo "run drop-in" > "$RUN_DIR/proj/example.conf.d/20-override.conf"
 echo "etc drop-in" > "$ETC_DIR/proj/example.conf.d/30-local.conf"
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--project "proj" --name "example" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$ETC_DIR/proj/example.conf"
 rm -rf "$ETC_DIR/proj/example.conf.d"
 rm -rf "$RUN_DIR/proj/example.conf.d"
@@ -96,10 +96,10 @@ mkdir -p "$ETC_DIR/proj/example.conf.d"
 mkdir -p "$USR_DIR/proj/example.conf.d"
 echo "usr version" > "$USR_DIR/proj/example.conf.d/10-config.conf"
 echo "etc version" > "$ETC_DIR/proj/example.conf.d/10-config.conf"
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--project "proj" --name "example" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -rf "$ETC_DIR/proj/example.conf.d"
 rm -rf "$USR_DIR/proj/example.conf.d"
 ts_finalize_subtest
@@ -108,10 +108,10 @@ ts_finalize_subtest
 ts_init_subtest "no-project"
 mkdir -p "$ETC_DIR"
 echo "root config" > "$ETC_DIR/test.conf"
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--name "test" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$ETC_DIR/test.conf"
 ts_finalize_subtest
 
@@ -126,10 +126,10 @@ echo "zzz from usr" > "$USR_DIR/proj/example.conf.d/zzz.conf"
 echo "mmm from usr" > "$USR_DIR/proj/example.conf.d/mmm.conf"
 echo "bbb from etc" > "$ETC_DIR/proj/example.conf.d/bbb.conf"
 echo "mmm from etc" > "$ETC_DIR/proj/example.conf.d/mmm.conf"  # masks usr/mmm.conf
-find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> $TS_OUTPUT
+find "$TESTDIR" -type f | sed "s|$TESTDIR|@TESTDIR@|g" | sort >> "$TS_OUTPUT"
 $TS_HELPER_CONFIGS --etc "$ETC_DIR" --run "$RUN_DIR" --usr "$USR_DIR" \
 	--project "proj" --name "example" --suffix "conf" \
-	| sed "s|$TESTDIR|@TESTDIR@|g" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	| sed "s|$TESTDIR|@TESTDIR@|g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f "$ETC_DIR/proj/example.conf"
 rm -rf "$ETC_DIR/proj/example.conf.d"
 rm -rf "$USR_DIR/proj/example.conf.d"
diff --git a/tests/ts/misc/mbsencode b/tests/ts/misc/mbsencode
index 4e0412f9b..8d7967997 100755
--- a/tests/ts/misc/mbsencode
+++ b/tests/ts/misc/mbsencode
@@ -52,12 +52,12 @@ else
 fi
 
 ts_init_subtest "safe-ascii"
-$TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "invalid-ascii"
 if [ "$HAVE_WIDECHAR" = true ]; then
-	$TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 else
 	ts_skip_subtest 'No widechar support'
@@ -66,7 +66,7 @@ fi
 ts_init_subtest "safe-utf8"
 if [ "$HAVE_WIDECHAR" = true ]; then
 	LC_ALL=C.UTF-8 \
-	$TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 else
 	ts_skip_subtest 'No widechar support'
@@ -75,7 +75,7 @@ fi
 ts_init_subtest "invalid-utf8"
 if [ "$HAVE_WIDECHAR" = true ]; then
 	LC_ALL=C.UTF-8 \
-	$TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 else
 	ts_skip_subtest 'No widechar support'
diff --git a/tests/ts/misc/optstr b/tests/ts/misc/optstr
index bf57adfbf..19c395213 100755
--- a/tests/ts/misc/optstr
+++ b/tests/ts/misc/optstr
@@ -8,7 +8,7 @@ ts_init "$*"
 
 ts_check_test_command "$TS_HELPER_STRUTILS"
 
-$TS_HELPER_STRUTILS --optstr ",,key=\"v,a,l,u,e\",foo,,,,bar=BAR,\"/path/with/,comma\"=data,," >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_STRUTILS --optstr ",,key=\"v,a,l,u,e\",foo,,,,bar=BAR,\"/path/with/,comma\"=data,," >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
 
diff --git a/tests/ts/misc/strtobool b/tests/ts/misc/strtobool
index 30fcf554c..295ed2358 100755
--- a/tests/ts/misc/strtobool
+++ b/tests/ts/misc/strtobool
@@ -24,30 +24,30 @@ ts_init "$*"
 ts_check_test_command "$TS_HELPER_STRUTILS"
 
 # true values
-$TS_HELPER_STRUTILS --strtobool 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool y >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool t >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool yes >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool true >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool on >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool enable >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_STRUTILS --strtobool 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool y >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool t >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool yes >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool true >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool on >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool enable >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # true values (case insensitive)
-$TS_HELPER_STRUTILS --strtobool YES >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool True >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool ON >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_STRUTILS --strtobool YES >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool True >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool ON >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # false values
-$TS_HELPER_STRUTILS --strtobool 0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool no >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool not >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool false >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool off >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool disable >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_STRUTILS --strtobool 0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool no >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool not >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool false >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool off >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool disable >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # false values (case insensitive)
-$TS_HELPER_STRUTILS --strtobool NO >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool False >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --strtobool OFF >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_STRUTILS --strtobool NO >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool False >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --strtobool OFF >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/misc/strtosize b/tests/ts/misc/strtosize
index ea9a9ea8c..03902f26f 100755
--- a/tests/ts/misc/strtosize
+++ b/tests/ts/misc/strtosize
@@ -23,40 +23,40 @@ ts_init "$*"
 
 ts_check_test_command "$TS_HELPER_STRUTILS"
 
-$TS_HELPER_STRUTILS --size -1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 0 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 123 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 18446744073709551615 >> $TS_OUTPUT 2>> $TS_ERRLOG
-
-$TS_HELPER_STRUTILS --size 1K >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1KiB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1M >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1MiB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1G >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1GiB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1T >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1TiB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1P >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1PiB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1E >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1EiB >> $TS_OUTPUT 2>> $TS_ERRLOG
-
-$TS_HELPER_STRUTILS --size 1KB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1MB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1GB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1TB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1PB >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 1EB >> $TS_OUTPUT 2>> $TS_ERRLOG
-
-$TS_HELPER_STRUTILS --size "" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size " " >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size " 1" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size "1 " >> $TS_OUTPUT 2>> $TS_ERRLOG
-
-$TS_HELPER_STRUTILS --size 0x0a >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 0xff00 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_HELPER_STRUTILS --size 0x80000000 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_STRUTILS --size -1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 0 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 123 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 18446744073709551615 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+
+$TS_HELPER_STRUTILS --size 1K >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1KiB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1M >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1MiB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1G >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1GiB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1T >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1TiB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1P >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1PiB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1E >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1EiB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+
+$TS_HELPER_STRUTILS --size 1KB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1MB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1GB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1TB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1PB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 1EB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+
+$TS_HELPER_STRUTILS --size "" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size " " >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size " 1" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size "1 " >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+
+$TS_HELPER_STRUTILS --size 0x0a >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 0xff00 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_HELPER_STRUTILS --size 0x80000000 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
 
diff --git a/tests/ts/mkswap/mkswap b/tests/ts/mkswap/mkswap
index b4e27042c..2b0eb1788 100755
--- a/tests/ts/mkswap/mkswap
+++ b/tests/ts/mkswap/mkswap
@@ -50,7 +50,7 @@ for PAGESIZE in 4096 8192; do
 		ts_init_subtest $name
 
 		rm -f "$outimg"
-		truncate -s $(( PAGESIZE * 10 )) "$outimg" >> $TS_ERRLOG 2>&1
+		truncate -s $(( PAGESIZE * 10 )) "$outimg" >> "$TS_ERRLOG" 2>&1
 
 		"$TS_CMD_MKSWAP" -q -L label -U "$UUID" -e "$ENDIANNESS" -p "$PAGESIZE" "$outimg" \
 			>> "$TS_OUTPUT" 2>/dev/null \
@@ -82,10 +82,10 @@ offset=10000
 outimg="$TS_OUTDIR/offset.img"
 
 rm -f "$outimg"
-truncate -s $(( 4096 * 10 )) "$outimg" > $TS_ERRLOG 2>&1
+truncate -s $(( 4096 * 10 )) "$outimg" > "$TS_ERRLOG" 2>&1
 
 rm -f "$outimg.offset"
-truncate -s $(( 4096 * 10 + $offset )) "$outimg.offset" > $TS_ERRLOG 2>&1
+truncate -s $(( 4096 * 10 + $offset )) "$outimg.offset" > "$TS_ERRLOG" 2>&1
 
 "$TS_CMD_MKSWAP" -q -U "$UUID" -p 4096 "$outimg" \
 	>> "$TS_OUTPUT" 2>/dev/null \
diff --git a/tests/ts/more/regexp b/tests/ts/more/regexp
index 699c28360..01c6d8157 100755
--- a/tests/ts/more/regexp
+++ b/tests/ts/more/regexp
@@ -22,6 +22,6 @@ ts_check_test_command "$TS_HELPER_MORE"
 
 export TERM=linux
 printf "abba\nbar\nfoo\nxyzzy\n" |
-	$TS_HELPER_MORE +/foo >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_MORE +/foo >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/more/squeeze b/tests/ts/more/squeeze
index a319a969f..ccdbd908a 100755
--- a/tests/ts/more/squeeze
+++ b/tests/ts/more/squeeze
@@ -21,6 +21,6 @@ ts_init "$*"
 ts_check_test_command "$TS_HELPER_MORE"
 
 printf "a\n\n\nb\n" |
-	$TS_HELPER_MORE --squeeze >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_MORE --squeeze >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/mount/complex b/tests/ts/mount/complex
index 6cb3be2d1..6fae83e74 100755
--- a/tests/ts/mount/complex
+++ b/tests/ts/mount/complex
@@ -40,7 +40,7 @@ B_MOUNTPOINT="${ROOT_MOUNTPOINT}/B"
 
 ## create a private directory
 ts_init_subtest "init"
-$TS_CMD_MOUNT --bind --make-private $ROOT_MOUNTPOINT $ROOT_MOUNTPOINT  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --bind --make-private $ROOT_MOUNTPOINT $ROOT_MOUNTPOINT  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 $TS_CMD_FINDMNT -nr --mountpoint $ROOT_MOUNTPOINT -o PROPAGATION | grep -q private \
 	|| ts_log "Cannot find private $ROOT_MOUNTPOINT"
 ts_finalize_subtest
@@ -48,14 +48,14 @@ ts_finalize_subtest
 
 ## mount the device 
 ts_init_subtest "rw-mount"
-$TS_CMD_MOUNT --options rw $DEVICE $A_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --options rw $DEVICE $A_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
 ts_finalize_subtest
 
 
 ## move device and set it read-only for VFS (FS is still rw)
 ts_init_subtest "ro-move"
-$TS_CMD_MOUNT --move --options ro $A_MOUNTPOINT $B_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --move --options ro $A_MOUNTPOINT $B_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 findmnt -nr -o VFS-OPTIONS --mountpoint $B_MOUNTPOINT | grep -q 'ro' \
 	|| ts_log "Cannot find ro VFS"
 findmnt -nr -o FS-OPTIONS --mountpoint $B_MOUNTPOINT | grep -q 'rw' \
@@ -65,7 +65,7 @@ ts_finalize_subtest
 
 ## remount to set FS to read-only (VFS is still ro)
 ts_init_subtest "ro-remount"
-$TS_CMD_MOUNT --options remount,ro,noexec $B_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --options remount,ro,noexec $B_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 findmnt -nr -o VFS-OPTIONS --mountpoint $B_MOUNTPOINT | grep -q 'ro' \
 	|| ts_log "Cannot find ro VFS"
 findmnt -nr -o FS-OPTIONS --mountpoint $B_MOUNTPOINT | grep -q 'ro' \
@@ -75,7 +75,7 @@ ts_finalize_subtest
 
 ## remount to set FS and VFS to read-write
 ts_init_subtest "rw-remount"
-$TS_CMD_MOUNT --options remount,rw $B_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --options remount,rw $B_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 findmnt -nr -o VFS-OPTIONS --mountpoint $B_MOUNTPOINT | grep -q 'rw' \
 	|| ts_log "Cannot find rw VFS"
 findmnt -nr -o FS-OPTIONS --mountpoint $B_MOUNTPOINT | grep -q 'rw' \
@@ -86,7 +86,7 @@ ts_finalize_subtest
 ## bind as read-only (VFS), set shared propagation,
 ## and remove noexec (but keep FS rw)
 ts_init_subtest "ro-shared-bind"
-$TS_CMD_MOUNT --make-shared --bind --options ro,exec $B_MOUNTPOINT $A_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --make-shared --bind --options ro,exec $B_MOUNTPOINT $A_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 findmnt -nr -o VFS-OPTIONS --mountpoint $A_MOUNTPOINT | grep -q 'ro' \
 	|| ts_log "Cannot find ro VFS"
 findmnt -nr -o FS-OPTIONS --mountpoint $A_MOUNTPOINT | grep -q 'rw' \
diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index 8c06730c8..15a40b5b9 100755
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -40,17 +40,17 @@ ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
-$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 
 grep -q "\(^\| \)$DEVICE " $MTAB_FILE ||
-	echo "mount failed: cannot find $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "mount failed: cannot find $DEVICE in $MTAB_FILE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
 grep -q "\(^\| \)$DEVICE " $MTAB_FILE &&
-	echo "umount failed: found $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo "umount failed: found $DEVICE in $MTAB_FILE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/mount/dm-verity b/tests/ts/mount/dm-verity
index 863cbcf24..ae46809da 100755
--- a/tests/ts/mount/dm-verity
+++ b/tests/ts/mount/dm-verity
@@ -52,8 +52,8 @@ ts_init_subtest "roothash"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 $TS_CMD_MOUNT --options verity.hashdevice=$HASH_DEVICE,verity.roothash=$HASH,verity.hashoffset=0 \
     $VERITY_DEVICE_ABS \
-    $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT --lazy $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+    $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT --lazy $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -61,8 +61,8 @@ ts_init_subtest "roothashfile"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 $TS_CMD_MOUNT --options verity.hashdevice=$HASH_DEVICE,verity.roothashfile=$ROOT_HASH_FILE \
     $VERITY_DEVICE_ABS \
-    $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT --lazy $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+    $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT --lazy $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/mount/fallback b/tests/ts/mount/fallback
index afa4d7498..8a24634b2 100755
--- a/tests/ts/mount/fallback
+++ b/tests/ts/mount/fallback
@@ -50,34 +50,34 @@ mkdir -p "$MOUNTPOINT"
 
 ts_init_subtest "later-fsopen"
 $TS_CMD_ENOSYS -s fsopen -- "$TS_CMD_MOUNT" --types foo,bar,ext2 "$DEVICE" "$MOUNTPOINT" \
-		>> $TS_OUTPUT 2>> $TS_ERRLOG
+		>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
 mkdir -p ${MOUNTPOINT}/subdir
-$TS_CMD_UMOUNT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "subdir"
 $TS_CMD_ENOSYS -s fsopen -s open_tree -- \
 	"$TS_CMD_MOUNT" --options X-mount.subdir=subdir "$DEVICE" "$MOUNTPOINT" \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest
 
 
 ts_init_subtest "mount_setattr"
-"$TS_CMD_MOUNT" "$DEVICE" "$MOUNTPOINT"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+"$TS_CMD_MOUNT" "$DEVICE" "$MOUNTPOINT"  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_ENOSYS -s mount_setattr -- \
 	"$TS_CMD_MOUNT" --options remount,ro "$MOUNTPOINT" \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 $TS_CMD_FINDMNT --kernel --mountpoint "$MOUNTPOINT" --options "ro" &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot find read-only in $MOUNTPOINT in /proc/self/mountinfo"
 $TS_CMD_ENOSYS -s mount_setattr -- \
  	"$TS_CMD_MOUNT" --make-slave "$MOUNTPOINT" \
- 	>> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT -n --kernel --mountpoint "$MOUNTPOINT" -o PROPAGATION >> $TS_OUTPUT
+ 	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT -n --kernel --mountpoint "$MOUNTPOINT" -o PROPAGATION >> "$TS_OUTPUT"
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest
 
diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
index 8b7e25b2a..e69e0998e 100755
--- a/tests/ts/mount/fslists
+++ b/tests/ts/mount/fslists
@@ -42,7 +42,7 @@ ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 ts_init_subtest "one-type"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT --types ext2 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --types ext2 $DEVICE $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
@@ -51,7 +51,7 @@ ts_finalize_subtest
 
 ts_init_subtest "more-types"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT --types foo,bar,ext2 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --types foo,bar,ext2 $DEVICE $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
@@ -61,7 +61,7 @@ ts_finalize_subtest
 ts_init_subtest "more-types-fstab"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext2"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fstab_clean
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
@@ -71,7 +71,7 @@ ts_finalize_subtest
 
 ts_init_subtest "type-pattern"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT --internal-only --types nofoo,bar $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --internal-only --types nofoo,bar $DEVICE $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
diff --git a/tests/ts/mount/fstab-all b/tests/ts/mount/fstab-all
index 9cd4e344b..2519230cd 100755
--- a/tests/ts/mount/fstab-all
+++ b/tests/ts/mount/fstab-all
@@ -76,7 +76,7 @@ echo  "${TS_DEVICE}4 ${MOUNTPOINT}D ext4 rw,defaults 0 0" >> "${TS_FSTAB}"
 
 
 ts_init_subtest "basic"
-$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT ${MOUNTPOINT}{A,B,C,D}
@@ -85,7 +85,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "filter-type"
-$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --types ext4 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --types ext4 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT ${MOUNTPOINT}D
@@ -94,7 +94,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "filter-notype"
-$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --types noext4 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --types noext4 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT ${MOUNTPOINT}{A,B,C}
@@ -103,7 +103,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "filter-option"
-$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --test-opts ro >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --test-opts ro >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT ${MOUNTPOINT}C
@@ -112,7 +112,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "override-option"
-$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --options ro >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --all --fstab "${TS_FSTAB}" --options ro >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT ${MOUNTPOINT}{A,B,C,D}
@@ -122,7 +122,7 @@ ts_finalize_subtest
 
 ts_init_subtest "relative-path"
 cd "$TS_OUTDIR" > /dev/null
-$TS_CMD_MOUNT --all --fstab $(basename "${TS_FSTAB}") >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --all --fstab $(basename "${TS_FSTAB}") >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT ${MOUNTPOINT}{A,B,C,D}
@@ -143,7 +143,7 @@ echo  "${TS_DEVICE}4 /foo/D ext4 rw,defaults 0 0" >> "${TS_FSTAB}"
 $TS_CMD_MOUNT	--all \
 		--fstab "${TS_FSTAB}" \
 		--target-prefix $MY_ROOT \
-		--options X-mount.mkdir >> $TS_OUTPUT 2>> $TS_ERRLOG
+		--options X-mount.mkdir >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT $MY_ROOT/foo/{A,B,C,D}
diff --git a/tests/ts/mount/fstab-bind b/tests/ts/mount/fstab-bind
index 3ee337797..cd47fd122 100755
--- a/tests/ts/mount/fstab-bind
+++ b/tests/ts/mount/fstab-bind
@@ -20,7 +20,7 @@ ts_fstab_add $MY_SOURCE "$TS_MOUNTPOINT" "none" "bind,default,noauto"
 mkdir -p $MY_SOURCE
 mkdir -p $TS_MOUNTPOINT
 
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT"
 
 $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null
diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs
index e28b36f79..3e3ce5984 100755
--- a/tests/ts/mount/fstab-btrfs
+++ b/tests/ts/mount/fstab-btrfs
@@ -94,16 +94,16 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "btrfs" "subvolid=$NON_DEFA
 ts_fstab_addline "$TS_MOUNTPOINT_SUBVOLID" "$TS_MOUNTPOINT_BIND" "auto" "bind"
 ts_fstab_close
 
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # check that everything was unmounted
-$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fstab_clean		# this unlock too
 ts_log "Success"
@@ -124,16 +124,16 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "auto" "subvolid=$NON_DEFAU
 ts_fstab_addline "$TS_MOUNTPOINT_SUBVOL/bind-mnt" "$TS_MOUNTPOINT_BIND" "auto" "bind"
 ts_fstab_close
 
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # check that everything was unmounted
-$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fstab_clean		# this unlock too
 ts_log "Success"
diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index 99570914b..3f5fe4b51 100755
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -42,15 +42,15 @@ MOUNTPOINT=$TS_MOUNTPOINT
 ts_fstab_add $DEVICE
 
 ts_init_subtest "mountpoint"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE || >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE || >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "device-name"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_fstab_clean
diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index d72cbb116..ca1a2dfe1 100755
--- a/tests/ts/mount/fstab-devname2label
+++ b/tests/ts/mount/fstab-devname2label
@@ -41,7 +41,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \
 ts_fstab_add "LABEL=$LABEL"
 ts_udevadm_settle "$DEVICE" "LABEL"
 
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index 256a29371..325379632 100755
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/tests/ts/mount/fstab-devname2uuid
@@ -39,7 +39,7 @@ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
 ts_fstab_add "UUID=$UUID"
 ts_udevadm_settle "$DEVICE" "UUID"
 
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index 47e22ff26..c592a3cee 100755
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -42,21 +42,21 @@ ts_fstab_add "LABEL=$LABEL"
 ts_udevadm_settle "$DEVICE" "LABEL"
 
 ts_init_subtest "no-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "L-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --label $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --label $LABEL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG 
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" 
 ts_finalize_subtest
 
 ts_init_subtest "LABEL-option"
-$TS_CMD_MOUNT -T "$TS_FSTAB" LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -T "$TS_FSTAB" LABEL=$LABEL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index 23fb3d875..a650e7ec0 100755
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -44,15 +44,15 @@ ts_udevadm_settle "$DEVICE" "LABEL"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_init_subtest "L-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --label $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --label $LABEL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "LABEL-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" "LABEL=$LABEL" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_fstab_clean
diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index 40977eae0..9657fe57a 100755
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -46,15 +46,15 @@ ts_udevadm_settle "$DEVICE" "LABEL" "UUID"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_init_subtest "L-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --label $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --label $LABEL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "LABEL-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" "LABEL=$LABEL" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_fstab_clean
diff --git a/tests/ts/mount/fstab-loop b/tests/ts/mount/fstab-loop
index 46c9d1022..9b2e92558 100755
--- a/tests/ts/mount/fstab-loop
+++ b/tests/ts/mount/fstab-loop
@@ -39,15 +39,15 @@ ts_fstab_lock
 ts_fstab_open
 
 ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-1" "ext2" "loop"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-2" "ext2" "loop"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --all >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fstab_close
 
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none
index 8ffae2893..f7526d19a 100755
--- a/tests/ts/mount/fstab-none
+++ b/tests/ts/mount/fstab-none
@@ -17,7 +17,7 @@ ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime"
 
 mkdir -p $TS_MOUNTPOINT
 
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT"
 
 $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null
diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index bf8447ce4..f9daa2318 100755
--- a/tests/ts/mount/fstab-symlink
+++ b/tests/ts/mount/fstab-symlink
@@ -46,7 +46,7 @@ ln -s $DEVICE $LINKNAME
 ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user"
 
 # variant A) -- UID=0
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $LINKNAME >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME"
 
@@ -57,10 +57,10 @@ $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME"
 #ts_init_suid $TS_CMD_MOUNT
 #ts_init_suid $TS_CMD_UMOUNT
 #
-#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" >> $TS_OUTPUT 2>> $TS_ERRLOG
+#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 #ts_is_mounted $DEVICE
 #   || ts_die "B) Cannot find $DEVICE in /proc/mounts"
-#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" >> $TS_OUTPUT 2>> $TS_ERRLOG \
+#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" \
 #   || ts_die "B) Cannot umount $LINKNAME"
 
 ts_fstab_clean
diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index 5e0e4b2b1..980e3f493 100755
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -42,21 +42,21 @@ ts_fstab_add "UUID=$UUID"
 ts_udevadm_settle "$DEVICE" "UUID"
 
 ts_init_subtest "no-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "U-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --uuid $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --uuid $UUID >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "UUID-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" UUID=$UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" UUID=$UUID >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_fstab_clean
diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index 290333384..d37c3e419 100755
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -42,15 +42,15 @@ ts_udevadm_settle "$DEVICE" "UUID"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_init_subtest "U-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --uuid $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --uuid $UUID >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "UUID-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" "UUID=$UUID" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_fstab_clean
diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index 3810b0cc8..a7bf83a52 100755
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -45,15 +45,15 @@ ts_udevadm_settle "$DEVICE" "LABEL" "UUID"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_init_subtest "U-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" --uuid $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" --uuid $UUID >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "UUID-option"
-$TS_CMD_MOUNT --fstab "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --fstab "$TS_FSTAB" "UUID=$UUID" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>>$TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>>"$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_fstab_clean
diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index e561043d4..8d8d3f111 100755
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -41,16 +41,16 @@ ts_udevadm_settle "$DEVICE" "LABEL"
 
 ts_init_subtest "L-option"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT --label $LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --label $LABEL $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "LABEL-option"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index 877ab39e5..38423c0c4 100755
--- a/tests/ts/mount/regfile
+++ b/tests/ts/mount/regfile
@@ -21,7 +21,7 @@ mkfs.ext2 -F $IMAGE &> /dev/null || ts_die "Cannot make ext2 on $IMAGE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
-$TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 DEVICE=$(awk '/regfile/ { print $1 }' /proc/mounts)
 
diff --git a/tests/ts/mount/set_ugid_mode b/tests/ts/mount/set_ugid_mode
index 1e0fcb663..74c44b74a 100755
--- a/tests/ts/mount/set_ugid_mode
+++ b/tests/ts/mount/set_ugid_mode
@@ -22,10 +22,10 @@ do_one() {
 	expected="$1"; shift
 	what="$1"; shift
 	where="$1"; shift
-	$TS_CMD_MOUNT "$@" "$what" "$where" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_MOUNT "$@" "$what" "$where" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	actual=$(stat --format="%A %u %g" "$where")
-	[ "$actual" = "$expected" ] || echo "$*: $actual != $expected" >> $TS_ERRLOG
-	$TS_CMD_UMOUNT "$where" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	[ "$actual" = "$expected" ] || echo "$*: $actual != $expected" >> "$TS_ERRLOG"
+	$TS_CMD_UMOUNT "$where" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 }
 
 ts_device_init
diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index 70f2c9726..09779b956 100755
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -29,19 +29,19 @@ MOUNTPOINT="$TS_MOUNTPOINT"
 
 
 ts_init_subtest "make-shared"
-$TS_CMD_MOUNT --make-shared $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_MOUNT --make-shared $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "make-private"
-$TS_CMD_MOUNT --make-private $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_MOUNT --make-private $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 
 ts_init_subtest "make-unbindable"
-$TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # clean up
@@ -50,8 +50,8 @@ $TS_CMD_UMOUNT $MOUNTPOINT
 
 ts_init_subtest "bind-shared"
 $TS_CMD_MOUNT --make-shared \
-	      --bind $MOUNTPOINT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+	      --bind $MOUNTPOINT $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> "$TS_OUTPUT"
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest
 
@@ -68,15 +68,15 @@ ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
 
 ts_init_subtest "mount-private"
 $TS_CMD_MOUNT --make-private --make-unbindable \
-	      $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+	      $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> "$TS_OUTPUT"
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest
 
 ts_init_subtest "mount-private-ro"
-$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
-$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT
+$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> "$TS_OUTPUT"
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o VFS-OPTIONS >> "$TS_OUTPUT"
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest
 
diff --git a/tests/ts/mount/special b/tests/ts/mount/special
index 2b5c1cbe7..8b0cc94d5 100755
--- a/tests/ts/mount/special
+++ b/tests/ts/mount/special
@@ -37,23 +37,23 @@ EOF
 chmod +x $MOUNTER
 
 ts_init_subtest "basic"
-$TS_CMD_MOUNT -t mytest /foo /bar &> $TS_OUTPUT
+$TS_CMD_MOUNT -t mytest /foo /bar &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "options"
-$TS_CMD_MOUNT -t mytest -o foo,defaults /foo /bar &> $TS_OUTPUT
+$TS_CMD_MOUNT -t mytest -o foo,defaults /foo /bar &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "multi-types"
-$TS_CMD_MOUNT -t mytest,invalid /foo /bar &> $TS_OUTPUT
+$TS_CMD_MOUNT -t mytest,invalid /foo /bar &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "user"
-$TS_CMD_MOUNT -t mytest -ouser,abc /foo /bar &> $TS_OUTPUT
+$TS_CMD_MOUNT -t mytest -ouser,abc /foo /bar &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "username"
-$TS_CMD_MOUNT -t mytest -ouser=name,abc /foo /bar &> $TS_OUTPUT
+$TS_CMD_MOUNT -t mytest -ouser=name,abc /foo /bar &> "$TS_OUTPUT"
 ts_finalize_subtest
 
 
@@ -76,7 +76,7 @@ EOF
 	rm -f $LIBMOUNT_UTAB
 	echo -n "" > $LIBMOUNT_UTAB
 
-	$TS_CMD_MOUNT -t mytest -o x-bar=BAR /foo "$mountpoint" &> $TS_OUTPUT
+	$TS_CMD_MOUNT -t mytest -o x-bar=BAR /foo "$mountpoint" &> "$TS_OUTPUT"
 	udevadm settle
 
 	grep -q "$mountpoint" /proc/mounts
@@ -85,7 +85,7 @@ EOF
 			| grep "$mountpoint" \
 			| sed -e "s|$mountpoint|/mountpoint|g" \
 			      -e 's/ID=[[:digit:]]* //g' \
-			&> $TS_OUTPUT
+			&> "$TS_OUTPUT"
 		$TS_CMD_UMOUNT "$mountpoint"
 		unset LIBMOUNT_UTAB
 		rm -f $MOUNTER
diff --git a/tests/ts/mount/subdir b/tests/ts/mount/subdir
index 00436a8a8..bdd3ed095 100755
--- a/tests/ts/mount/subdir
+++ b/tests/ts/mount/subdir
@@ -45,21 +45,21 @@ MOUNTPOINT="$TS_MOUNTPOINT"
 
 # create subdirectory on the filesystem
 ts_init_subtest "init"
-$TS_CMD_MOUNT $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
 mkdir -p $MOUNTPOINT/submnt
 touch $MOUNTPOINT/submnt/file
-$TS_CMD_UMOUNT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest "subdir"
-$TS_CMD_MOUNT -o X-mount.subdir=submnt $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -o X-mount.subdir=submnt $DEVICE $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
 if [ ! -f "$MOUNTPOINT/file" ]; then
-	echo "$MOUNTPOINT/file not found" >> $TS_OUTPUT 
+	echo "$MOUNTPOINT/file not found" >> "$TS_OUTPUT" 
 fi
-$TS_CMD_UMOUNT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 52def8d64..96e071050 100755
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -66,15 +66,15 @@ function multi_mount() {
 
 	ts_log "prepare: Mount dev to mnt1"
 	[ -d "${MNT}1" ] || mkdir -p ${MNT}1
-	$TS_CMD_MOUNT $DEV ${MNT}1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_MOUNT $DEV ${MNT}1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	ts_log "prepare: Mount dev to mnt2"
 	[ -d "${MNT}2" ] || mkdir -p ${MNT}2
-	$TS_CMD_MOUNT $DEV ${MNT}2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_MOUNT $DEV ${MNT}2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	ts_log "prepare: Mount /dev/xxx1 to mnt3"
 	[ -d "${MNT}3" ] || mkdir -p ${MNT}3
-	$TS_CMD_MOUNT $DEV ${MNT}3 >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_MOUNT $DEV ${MNT}3 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 	udevadm settle
 }
@@ -87,7 +87,7 @@ MOUNTPOINT=$TS_MOUNTPOINT
 #
 ts_init_subtest "all-targets-mnt"
 multi_mount ${TS_DEVICE}1 $MOUNTPOINT
-$TS_CMD_UMOUNT --all-targets ${MOUNTPOINT}1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT --all-targets ${MOUNTPOINT}1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "umount failed"
 ts_finalize_subtest
 
@@ -96,7 +96,7 @@ ts_finalize_subtest
 #
 ts_init_subtest "all-targets-dev"
 multi_mount ${TS_DEVICE}1 $MOUNTPOINT
-$TS_CMD_UMOUNT --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT --all-targets ${TS_DEVICE}1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "umount failed"
 ts_finalize_subtest
 
@@ -112,7 +112,7 @@ $TS_CMD_MOUNT ${TS_DEVICE}2 ${MOUNTPOINT}1/subA &> /dev/null
 $TS_CMD_MOUNT ${TS_DEVICE}3 ${MOUNTPOINT}1/subA/subAB &> /dev/null
 [ -d "${MOUNTPOINT}1/subB" ] || mkdir -p ${MOUNTPOINT}1/subB
 $TS_CMD_MOUNT ${TS_DEVICE}4 ${MOUNTPOINT}1/subB &> /dev/null
-$TS_CMD_UMOUNT --recursive --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT --recursive --all-targets ${TS_DEVICE}1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_log "umount failed"
 ts_finalize_subtest
 
diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index f2ea25f48..1b0b29fb3 100755
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -66,23 +66,23 @@ ts_log "Do tests..."
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_log "A) Mount root"
-$TS_CMD_MOUNT ${TS_DEVICE}1 $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT ${TS_DEVICE}1 $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 $TS_CMD_MOUNT --make-shared $TS_MOUNTPOINT &> /dev/null
 
 ts_log "B) Mount child"
 mkdir -p $TS_MOUNTPOINT/mntB
-$TS_CMD_MOUNT ${TS_DEVICE}2 $TS_MOUNTPOINT/mntB >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT ${TS_DEVICE}2 $TS_MOUNTPOINT/mntB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log "B2) Mount child-bind"
 mkdir -p $TS_MOUNTPOINT/bindB
-$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB $TS_MOUNTPOINT/bindB >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB $TS_MOUNTPOINT/bindB >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log "C) Mount child/child"
 mkdir -p $TS_MOUNTPOINT/mntB/mnt{C,D}
-$TS_CMD_MOUNT ${TS_DEVICE}3 $TS_MOUNTPOINT/mntB/mntC >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT ${TS_DEVICE}3 $TS_MOUNTPOINT/mntB/mntC >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log "D) Mount child/child"
-$TS_CMD_MOUNT ${TS_DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT ${TS_DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_log "E) Mount child-bind"
 mkdir -p $TS_MOUNTPOINT/bindC
@@ -92,15 +92,15 @@ ts_log "F) Mount mountpoint-bind"
 $TS_CMD_MOUNT --bind $TS_MOUNTPOINT $TS_MOUNTPOINT &> /dev/null
 
 udevadm settle
-$TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_die "umount failed"
 
 # the mountpoint has already been unmounted, so this second call should not fail
-$TS_CMD_UMOUNT --graceful $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT --graceful $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_die "--graceful on unmounted mountpoint failed"
 
 # non-existent path should not fail with --graceful
-$TS_CMD_UMOUNT --graceful /non-existent-path-$$ >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT --graceful /non-existent-path-$$ >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [ $? == 0 ] || ts_die "--graceful on non-existent path failed"
 
 ts_log "Success"
diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index a641edbec..86355735d 100755
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -38,16 +38,16 @@ ts_udevadm_settle "$DEVICE" "UUID"
 
 ts_init_subtest "U-option"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT --uuid $UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT --uuid $UUID $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "UUID-option"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
-$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/mount/xnocanon b/tests/ts/mount/xnocanon
index bfd65b051..1f7fd95e3 100755
--- a/tests/ts/mount/xnocanon
+++ b/tests/ts/mount/xnocanon
@@ -49,31 +49,31 @@ ln -s $FILE_B $SYMLINK_B
 # Symlink converted to file
 #
 ts_init_subtest "file-over-symlink"
-$TS_CMD_MOUNT -o X-mount.nocanonicalize --bind $FILE_A $SYMLINK_B >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -o X-mount.nocanonicalize --bind $FILE_A $SYMLINK_B >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
-cat $SYMLINK_B >> $TS_OUTPUT
-stat -c '%F' $SYMLINK_B >> $TS_OUTPUT
-$TS_CMD_UMOUNT $SYMLINK_B >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat $SYMLINK_B >> "$TS_OUTPUT"
+stat -c '%F' $SYMLINK_B >> "$TS_OUTPUT"
+$TS_CMD_UMOUNT $SYMLINK_B >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 # File converted to symlink
 #
 ts_init_subtest "symlink-over-file"
-$TS_CMD_MOUNT -o X-mount.nocanonicalize --bind $SYMLINK_A $FILE_B >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -o X-mount.nocanonicalize --bind $SYMLINK_A $FILE_B >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
-cat $FILE_B >> $TS_OUTPUT
-stat -c '%F' $FILE_B >> $TS_OUTPUT
-$TS_CMD_UMOUNT $FILE_B >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat $FILE_B >> "$TS_OUTPUT"
+stat -c '%F' $FILE_B >> "$TS_OUTPUT"
+$TS_CMD_UMOUNT $FILE_B >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 # Symlink converted to another symlink
 #
 ts_init_subtest "symlink-over-symlink"
-$TS_CMD_MOUNT -o X-mount.nocanonicalize --bind $SYMLINK_A $SYMLINK_B >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNT -o X-mount.nocanonicalize --bind $SYMLINK_A $SYMLINK_B >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
-cat $SYMLINK_B >> $TS_OUTPUT
-stat -c '%F' $SYMLINK_B >> $TS_OUTPUT
-$TS_CMD_UMOUNT $SYMLINK_B >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat $SYMLINK_B >> "$TS_OUTPUT"
+stat -c '%F' $SYMLINK_B >> "$TS_OUTPUT"
+$TS_CMD_UMOUNT $SYMLINK_B >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
diff --git a/tests/ts/mountpoint/mountpoint b/tests/ts/mountpoint/mountpoint
index 678a039cc..0193f5a98 100755
--- a/tests/ts/mountpoint/mountpoint
+++ b/tests/ts/mountpoint/mountpoint
@@ -18,18 +18,18 @@ FIRST_MOUNTPOINT=$($TS_CMD_FINDMNT -no TARGET / || $TS_CMD_FINDMNT -fno TARGET)
 ln -s $FIRST_MOUNTPOINT ./symlink-to-mountpoint
 
 ts_init_subtest "default"
-$TS_CMD_MOUNTPOINT ./symlink-to-mountpoint >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo $? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNTPOINT ./symlink-to-mountpoint >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo $? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "nofollow"
-$TS_CMD_MOUNTPOINT --nofollow ./symlink-to-mountpoint >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo $? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNTPOINT --nofollow ./symlink-to-mountpoint >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo $? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "mutually-exclusive"
-$TS_CMD_MOUNTPOINT --devno --nofollow / >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo $? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_MOUNTPOINT --devno --nofollow / >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo $? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 rm -f ./symlink-to-mountpoint
diff --git a/tests/ts/namei/logic b/tests/ts/namei/logic
index 53e9f2495..d6077fed5 100755
--- a/tests/ts/namei/logic
+++ b/tests/ts/namei/logic
@@ -28,8 +28,8 @@ ts_cd "$TS_OUTDIR"
 mkdir -p namei1/namei2
 touch namei1/namei2/a namei1/namei2/b
 
-$TS_CMD_NAMEI namei1/namei2/a   >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_NAMEI namei1/namei2/b   >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_NAMEI namei1/namei2/a   >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_NAMEI namei1/namei2/b   >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
 
diff --git a/tests/ts/nsenter/enter-via-socket b/tests/ts/nsenter/enter-via-socket
index aa07020c0..5e984de91 100755
--- a/tests/ts/nsenter/enter-via-socket
+++ b/tests/ts/nsenter/enter-via-socket
@@ -53,6 +53,6 @@ NETNS=
 	echo DONE >&"${MKFDS[1]}"
     fi
     wait "${MKFDS_PID}"
-} > $TS_OUTPUT 2>&1
+} > "$TS_OUTPUT" 2>&1
 
 ts_finalize
diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx
index 8b8686ea3..2cd794eb3 100755
--- a/tests/ts/partx/partx
+++ b/tests/ts/partx/partx
@@ -57,7 +57,7 @@ ts_init_subtest "addpart"
 		echo OK ||
 		echo "Unable to add partition"
 	check_partition_count 1
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -68,7 +68,7 @@ ts_init_subtest "delpart"
 		echo OK ||
 		echo "Unable to remove partition"
 	check_partition_count 0
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -89,7 +89,7 @@ ts_init_subtest "detect-parts"
 		echo OK ||
 		echo "Unable to list partitions"
 	check_partition_count $PARTS
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -101,7 +101,7 @@ ts_init_subtest "delete-all"
 		echo "partitions deleted" ||
 		echo "Unable to delete partitions on $TS_DEVICE"
 	check_partition_count 0
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -113,7 +113,7 @@ ts_init_subtest "add-all"
 		echo "partitions added" ||
 		echo "Unable to add partitions for $TS_DEVICE"
 	check_partition_count $PARTS
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -125,7 +125,7 @@ ts_init_subtest "update-one"
 		echo "partitions updated" ||
 		echo "Unable to update 2nd partition for $TS_DEVICE"
 	check_partition_count $PARTS
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -137,7 +137,7 @@ ts_init_subtest "delete-one"
 		echo "last partition removed" ||
 		echo "Unable to remove a partition on $TS_DEVICE"
 	check_partition_count $((PARTS-1))
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -153,7 +153,7 @@ ts_init_subtest "delete-non-existent"
 	$TS_CMD_PARTX -d --nr $PARTS $TS_DEVICE &&
 		echo "partx: OK" ||
 		echo "partx failed: removed non-existing partition"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -164,7 +164,7 @@ ts_init_subtest "add-existing"
 	$TS_CMD_PARTX -a --nr 1 $TS_DEVICE 2>/dev/null &&
 		echo "partx failed: re-added an existing partition" ||
 		echo "partx: OK"
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 udevadm settle
@@ -180,7 +180,7 @@ ts_init_subtest "change-by-range"
 		echo "partitions added" ||
 		echo "Failed to add $TS_DEVICE partitions"
 	check_partition_count $PARTS
-} >> $TS_OUTPUT 2>> $TS_ERRLOG
+} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/partx/partx-image b/tests/ts/partx/partx-image
index 9c53aed14..15f1d8e77 100755
--- a/tests/ts/partx/partx-image
+++ b/tests/ts/partx/partx-image
@@ -36,7 +36,7 @@ for img in $TS_IMGDIR/*.img.xz; do
 		xz -dc $img > $outimg &&
 			$TS_CMD_PARTX $outimg ||
 			echo "failed: $?"
-	} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_finalize_subtest
 done
 
diff --git a/tests/ts/paths/built-in b/tests/ts/paths/built-in
index 2eea142dd..3584506b1 100755
--- a/tests/ts/paths/built-in
+++ b/tests/ts/paths/built-in
@@ -26,7 +26,7 @@ ts_init "$*"
 
 ts_check_test_command "$TS_HELPER_PATHS"
 
-$TS_HELPER_PATHS &> $TS_OUTPUT
+$TS_HELPER_PATHS &> "$TS_OUTPUT"
 
 ts_finalize
 
diff --git a/tests/ts/pipesz/pipesz b/tests/ts/pipesz/pipesz
index 991eec3fc..0090c5d98 100755
--- a/tests/ts/pipesz/pipesz
+++ b/tests/ts/pipesz/pipesz
@@ -26,52 +26,52 @@ set -o pipefail
 DEFAULT_PIPE_SIZE=$(($($TS_HELPER_SYSINFO pagesize) * 16))
 
 ts_init_subtest "set-fd-bad"
-$TS_CMD_PIPESZ --check --set 4096 --fd 42 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_PIPESZ --check --set 4096 --fd 42 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -eq 0 ]] && ts_logerr "expected failure"
 ts_finalize_subtest
 
 ts_init_subtest "set-fd"
-echo -n | $TS_CMD_PIPESZ --check --set 4096 --stdin >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -n | $TS_CMD_PIPESZ --check --set 4096 --stdin >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
 ts_init_subtest "set-file-bad"
-$TS_CMD_PIPESZ --check --set 4096 --file "/dev/null" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_PIPESZ --check --set 4096 --file "/dev/null" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -eq 0 ]] && ts_logerr "expected failure"
 ts_finalize_subtest
 
 ts_init_subtest "set-file"
-echo -n | $TS_CMD_PIPESZ --check --set 4096 --file "/dev/stdin" >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -n | $TS_CMD_PIPESZ --check --set 4096 --file "/dev/stdin" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
 ts_init_subtest "get-fd-bad"
-$TS_CMD_PIPESZ --check --get --fd 42 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_PIPESZ --check --get --fd 42 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -eq 0 ]] && ts_logerr "expected failure"
 ts_finalize_subtest
 
 ts_init_subtest "get-fd"
-echo -n | $TS_CMD_PIPESZ --check --get --stdin 2>> $TS_ERRLOG | sed "s/$DEFAULT_PIPE_SIZE/DEFAULT_PIPE_SIZE/g" >> $TS_OUTPUT
+echo -n | $TS_CMD_PIPESZ --check --get --stdin 2>> "$TS_ERRLOG" | sed "s/$DEFAULT_PIPE_SIZE/DEFAULT_PIPE_SIZE/g" >> "$TS_OUTPUT"
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
 ts_init_subtest "get-file-bad"
-$TS_CMD_PIPESZ --check --get --file "/dev/null" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_PIPESZ --check --get --file "/dev/null" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -eq 0 ]] && ts_logerr "expected failure"
 ts_finalize_subtest
 
 ts_init_subtest "get-file"
-echo -n | $TS_CMD_PIPESZ --check --get --file "/dev/stdin" 2>> $TS_ERRLOG | sed "s/$DEFAULT_PIPE_SIZE/DEFAULT_PIPE_SIZE/g" >> $TS_OUTPUT
+echo -n | $TS_CMD_PIPESZ --check --get --file "/dev/stdin" 2>> "$TS_ERRLOG" | sed "s/$DEFAULT_PIPE_SIZE/DEFAULT_PIPE_SIZE/g" >> "$TS_OUTPUT"
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
 ts_init_subtest "pipe-max-size"
-echo -n | $TS_CMD_PIPESZ --check --stdin >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -n | $TS_CMD_PIPESZ --check --stdin >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
 ts_init_subtest "exec"
-echo this_should_be_output_by_cat | $TS_CMD_PIPESZ --check --stdin cat >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo this_should_be_output_by_cat | $TS_CMD_PIPESZ --check --stdin cat >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
diff --git a/tests/ts/rename/basic b/tests/ts/rename/basic
index fd3d74b29..8d50de478 100755
--- a/tests/ts/rename/basic
+++ b/tests/ts/rename/basic
@@ -25,14 +25,14 @@ ts_check_test_command "$TS_CMD_RENAME"
 ts_cd "$TS_OUTDIR"
 
 touch rename_basic.{1..3}
-$TS_CMD_RENAME --verbose basic test rename_basic.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose basic test rename_basic.? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 for i in rename_basic.?; do
-	echo "what is $i doing here?" >> $TS_OUTPUT
+	echo "what is $i doing here?" >> "$TS_OUTPUT"
 done
 for i in rename_test.{1..3}; do
 	if [ ! -f $i ]; then
-		echo "file $i is missing" >> $TS_OUTPUT
+		echo "file $i is missing" >> "$TS_OUTPUT"
 	else
 		rm -f $i
 	fi
@@ -40,40 +40,40 @@ done
 
 
 touch rename_all\ file\ with\ spaces.{1..3}
-$TS_CMD_RENAME --verbose --all ' ' '_' rename_all*.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose --all ' ' '_' rename_all*.? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 for i in rename_all*\ *.?; do
-	echo "what is $i doing here?" >> $TS_OUTPUT
+	echo "what is $i doing here?" >> "$TS_OUTPUT"
 done
 for i in rename_all_file_with_spaces.{1..3}; do
 	if [ ! -f $i ]; then
-		echo "file $i is missing" >> $TS_OUTPUT
+		echo "file $i is missing" >> "$TS_OUTPUT"
 	else
 		rm -f $i
 	fi
 done
 
 touch rename_zz_last_{z,z{,z{,z}}}.{x..z}
-$TS_CMD_RENAME --verbose --last zz AAzzBB rename_zz_last_* >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose --last zz AAzzBB rename_zz_last_* >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 for i in rename_AAzzBB_last_z.x rename_AAzzBB_last_z.y rename_AAzzBB_last_z.z \
 	rename_zz_last_AAzzBB.x rename_zz_last_AAzzBB.y rename_zz_last_AAzzBB.z \
 	rename_zz_last_zAAzzBB.x rename_zz_last_zAAzzBB.y rename_zz_last_zAAzzBB.z ; do
 	if [ ! -f $i ]; then
-		echo "file $i is missing" >> $TS_OUTPUT
+		echo "file $i is missing" >> "$TS_OUTPUT"
 	else
 		rm -f $i
 	fi
 done
 for i in rename*last* ; do
-	echo "what is $i doing here?" >> $TS_OUTPUT
+	echo "what is $i doing here?" >> "$TS_OUTPUT"
 done
 
 touch rename_all_empty
-$TS_CMD_RENAME --verbose --all '' _ rename_all_empty >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose --all '' _ rename_all_empty >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f _r_e_n_a_m_e___a_l_l___e_m_p_t_y_
 
 mkdir rename_dir
-$TS_CMD_RENAME --verbose dir new_dir rename_dir/ >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose dir new_dir rename_dir/ >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rmdir rename_new_dir
 
 ts_finalize
diff --git a/tests/ts/rename/exit_codes b/tests/ts/rename/exit_codes
index 49898a4a5..82513db3d 100755
--- a/tests/ts/rename/exit_codes
+++ b/tests/ts/rename/exit_codes
@@ -26,15 +26,15 @@ ts_check_test_command "$TS_CMD_RENAME"
 ts_cd "$TS_OUTDIR"
 
 touch rename_exit_codes.{1..2}
-$TS_CMD_RENAME -v not_a_match impossible rename_exit_codes.? >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "RENAME_EXIT_NOTHING: $?" >> $TS_OUTPUT
+$TS_CMD_RENAME -v not_a_match impossible rename_exit_codes.? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "RENAME_EXIT_NOTHING: $?" >> "$TS_OUTPUT"
 
-$TS_CMD_RENAME -v codes values rename_exit_codes.? >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "EXIT_SUCCESS: $?" >> $TS_OUTPUT
+$TS_CMD_RENAME -v codes values rename_exit_codes.? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "EXIT_SUCCESS: $?" >> "$TS_OUTPUT"
 
 mkdir rename_exit_codes.2
-$TS_CMD_RENAME -v values codes rename_exit_values.? >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "RENAME_EXIT_SOMEOK: $?" >> $TS_OUTPUT
+$TS_CMD_RENAME -v values codes rename_exit_values.? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "RENAME_EXIT_SOMEOK: $?" >> "$TS_OUTPUT"
 
 rmdir rename_exit_codes.2
 rm rename_exit_codes.? rename_exit_values.?
diff --git a/tests/ts/rename/overwrite b/tests/ts/rename/overwrite
index 990858637..c9891ee8b 100755
--- a/tests/ts/rename/overwrite
+++ b/tests/ts/rename/overwrite
@@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_RENAME"
 ts_cd "$TS_OUTDIR"
 
 touch rename_from rename_to
-$TS_CMD_RENAME -v --no-overwrite from to rename_from >> $TS_OUTPUT 2>> $TS_ERRLOG
-rm rename_from rename_to >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME -v --no-overwrite from to rename_from >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+rm rename_from rename_to >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir
index bcb3eb418..becea3945 100755
--- a/tests/ts/rename/subdir
+++ b/tests/ts/rename/subdir
@@ -24,72 +24,72 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_RENAME"
 ts_cd "$TS_OUTDIR"
 
-echo "== files ==" >> $TS_OUTPUT
+echo "== files ==" >> "$TS_OUTPUT"
 mkdir rename_a{a,b}
 touch rename_a{a,b}/aa
-$TS_CMD_RENAME --verbose a x rename_a?/aa >> $TS_OUTPUT 2>> $TS_ERRLOG
-find rename_a{a,b} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose a x rename_a?/aa >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+find rename_a{a,b} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-echo "== symlinks ==" >> $TS_OUTPUT
+echo "== symlinks ==" >> "$TS_OUTPUT"
 for i in rename_a{a,b}/sublink.{1..3}; do
 	ln -s rename/aa $i
 done
-$TS_CMD_RENAME --symlink --verbose a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose a x rename_a{a,b}/sublink.? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 for i in rename_a{a,b}/sublink.?; do
-	readlink $i >> $TS_OUTPUT 2>> $TS_ERRLOG
+	readlink $i >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 done
 
 rm -rf rename_a{a,b}
 
-echo "== fullpath ==" >> $TS_OUTPUT
+echo "== fullpath ==" >> "$TS_OUTPUT"
 touch rename_path1
-$TS_CMD_RENAME --verbose ./rename_path1 ./rename_path2 ./rename_path1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose ./rename_path1 ./rename_path2 ./rename_path1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-find . -name 'rename_path*' >> $TS_OUTPUT 2>> $TS_ERRLOG
+find . -name 'rename_path*' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f ./rename_path*
 
 mkdir rename_path_a
 touch rename_path_test1
 
-$TS_CMD_RENAME --verbose rename_path_test1 rename_path_a/test1 rename_path_test1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose rename_path_test1 rename_path_a/test1 rename_path_test1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-find . -name '*test1*' >> $TS_OUTPUT 2>> $TS_ERRLOG
+find . -name '*test1*' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f rename_path_test1 rename_path_a/test1
 
 mkdir rename_path_b
 touch rename_path_a/test2
-$TS_CMD_RENAME --verbose rename_path_a/test2 rename_path_b/test2 rename_path_a/test2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose rename_path_a/test2 rename_path_b/test2 rename_path_a/test2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-find rename_path_a rename_path_b >> $TS_OUTPUT 2>> $TS_ERRLOG
+find rename_path_a rename_path_b >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f rename_path_a/test2 rename_path_b/test2
 
 rmdir rename_path_a rename_path_b
 
 ln -s some/nonexistent/path rename_link
-$TS_CMD_RENAME --symlink --verbose t/p _ rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_RENAME --symlink --verbose exist / rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_RENAME --symlink --verbose e x rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
-readlink rename_link >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose t/p _ rename_link >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_RENAME --symlink --verbose exist / rename_link >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_RENAME --symlink --verbose e x rename_link >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+readlink rename_link >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm rename_link
 
-echo "== empty 'from' ==" >> $TS_OUTPUT
+echo "== empty 'from' ==" >> "$TS_OUTPUT"
 
 touch rename_test
-$TS_CMD_RENAME --verbose '' _ rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' _ rename_test >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f *rename_test
 
 touch rename_test
-$TS_CMD_RENAME --verbose '' _ ./rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' _ ./rename_test >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f *rename_test
 
 touch rename_test
 mkdir rename_subdir
-$TS_CMD_RENAME --verbose '' rename_subdir/ rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' rename_subdir/ rename_test >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -rf rename_subdir
 
 touch rename_test
 mkdir rename_subdir
-$TS_CMD_RENAME --verbose '' rename_subdir/ ./rename_test >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose '' rename_subdir/ ./rename_test >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -rf rename_subdir
 
 ts_finalize
diff --git a/tests/ts/rename/symlink b/tests/ts/rename/symlink
index bad23097b..d05f8c5dd 100755
--- a/tests/ts/rename/symlink
+++ b/tests/ts/rename/symlink
@@ -28,30 +28,30 @@ for i in rename_slink.{1..3}; do
 	ln -s old $i
 done
 
-$TS_CMD_RENAME --symlink --verbose old new rename_slink.? >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --symlink --verbose old new rename_slink.? >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 for i in rename_slink.{1..3}; do
 	where="$(readlink $i)"
 	if [ "$where" != "new" ]; then
-		echo "error: $i points to $where" >> $TS_OUTPUT
+		echo "error: $i points to $where" >> "$TS_OUTPUT"
 	fi
 	rm -f $i
 done
 
 touch target
 ln -s target rename_slink.1
-$TS_CMD_RENAME --verbose slink symlink rename_slink.1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-readlink rename_symlink.1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose slink symlink rename_slink.1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+readlink rename_symlink.1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f rename_slink.1 rename_symlink.1
 
 rm target
 ln -s target rename_slink.2
-$TS_CMD_RENAME -v slink symlink rename_slink.2 >> $TS_OUTPUT 2>> $TS_ERRLOG
-readlink rename_symlink.2 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME -v slink symlink rename_slink.2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+readlink rename_symlink.2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 rm -f rename_slink.2 rename_symlink.2
 
-$TS_CMD_RENAME --verbose slink symlink rename_slink.3 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_RENAME --verbose slink symlink rename_slink.3 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 # The error may differ on Mac OS X due to faccessat()/lstat(); normalize it.
-sed -i -e 's/\(rename_slink.3\): not accessible/\1/' -e 's/stat of \(rename_slink.3\) failed/\1/' $TS_ERRLOG
+sed -i -e 's/\(rename_slink.3\): not accessible/\1/' -e 's/stat of \(rename_slink.3\) failed/\1/' "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/rev/rev b/tests/ts/rev/rev
index 0ca44e2e8..9e70c4907 100755
--- a/tests/ts/rev/rev
+++ b/tests/ts/rev/rev
@@ -21,14 +21,14 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_REV"
 ts_check_test_command "$TS_HELPER_MD5"
 
-for I in {0..512}; do printf "%s " {a..z}; done | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>> $TS_ERRLOG
+for I in {0..512}; do printf "%s " {a..z}; done | "$TS_HELPER_MD5" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 for I in {0..512}; do printf "%s " {a..z}; done | \
-				    $TS_CMD_REV | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>> $TS_ERRLOG
+				    $TS_CMD_REV | "$TS_HELPER_MD5" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-printf "abc\n123" | $TS_CMD_REV >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo >> $TS_OUTPUT
-printf "abc\000123" | $TS_CMD_REV --zero | tr '\0' '|' >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo >> $TS_OUTPUT
+printf "abc\n123" | $TS_CMD_REV >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo >> "$TS_OUTPUT"
+printf "abc\000123" | $TS_CMD_REV --zero | tr '\0' '|' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/schedutils/cpuset b/tests/ts/schedutils/cpuset
index a64257bac..fe4f66023 100755
--- a/tests/ts/schedutils/cpuset
+++ b/tests/ts/schedutils/cpuset
@@ -48,12 +48,12 @@ RANGES="0 \
 
 ts_log "masks:"
 for i in $MASKS; do
-	$TS_HELPER_CPUSET --mask $i >> $TS_OUTPUT
+	$TS_HELPER_CPUSET --mask $i >> "$TS_OUTPUT"
 done
 
 ts_log "strings:"
 for i in $RANGES; do
-	$TS_HELPER_CPUSET --range $i >> $TS_OUTPUT
+	$TS_HELPER_CPUSET --range $i >> "$TS_OUTPUT"
 done
 
 ts_finalize
diff --git a/tests/ts/script/buffering-race b/tests/ts/script/buffering-race
index b1e811bfc..9efc47300 100755
--- a/tests/ts/script/buffering-race
+++ b/tests/ts/script/buffering-race
@@ -21,7 +21,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_SCRIPT"
 
 #SCRIPT_DEBUG=all ULPTY_DEBUG=all
-$TS_CMD_SCRIPT --command "echo Hallo World" /dev/null </dev/null >$TS_OUTPUT
+$TS_CMD_SCRIPT --command "echo Hallo World" /dev/null </dev/null >"$TS_OUTPUT"
 
 ts_finalize
 
diff --git a/tests/ts/script/options b/tests/ts/script/options
index ba7d37d98..3fdbf83a8 100755
--- a/tests/ts/script/options
+++ b/tests/ts/script/options
@@ -24,43 +24,43 @@ export TZ="GMT"
 ts_check_test_command "$TS_HELPER_SCRIPT"
 
 ts_init_subtest "append"
-$TS_HELPER_SCRIPT --command "echo append1" $TS_OUTPUT </dev/null >/dev/null 2>&1
-$TS_HELPER_SCRIPT --append --command "echo append2" $TS_OUTPUT </dev/null >/dev/null 2>&1
+$TS_HELPER_SCRIPT --command "echo append1" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+$TS_HELPER_SCRIPT --append --command "echo append2" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "force"
-ln -s $TS_OUTPUT typescript
-$TS_HELPER_SCRIPT --command "echo no force" </dev/null >/dev/null 2>> $TS_OUTPUT
-echo $? >> $TS_OUTPUT
+ln -s "$TS_OUTPUT" typescript
+$TS_HELPER_SCRIPT --command "echo no force" </dev/null >/dev/null 2>> "$TS_OUTPUT"
+echo $? >> "$TS_OUTPUT"
 $TS_HELPER_SCRIPT --append --force --command "echo with force" </dev/null >/dev/null
-echo $? >> $TS_OUTPUT
+echo $? >> "$TS_OUTPUT"
 rm -f typescript
-ln -s $TS_OUTPUT tpircsepyt
+ln -s "$TS_OUTPUT" tpircsepyt
 $TS_HELPER_SCRIPT --append --command "echo not typescript" tpircsepyt </dev/null >/dev/null
-echo $? >> $TS_OUTPUT
+echo $? >> "$TS_OUTPUT"
 rm -f tpircsepyt
 ts_finalize_subtest
 
 ts_init_subtest "quiet"
-$TS_HELPER_SCRIPT --quiet --command "echo quiet1" $TS_OUTPUT </dev/null >/dev/null 2>&1
-$TS_HELPER_SCRIPT --append --quiet --command "echo quiet2" $TS_OUTPUT </dev/null >/dev/null 2>&1
+$TS_HELPER_SCRIPT --quiet --command "echo quiet1" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+$TS_HELPER_SCRIPT --append --quiet --command "echo quiet2" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
 ts_finalize_subtest
 
 ts_init_subtest "return"
-$TS_HELPER_SCRIPT --command "exit 1" $TS_OUTPUT </dev/null >/dev/null 2>&1
-echo $? >> $TS_OUTPUT
-$TS_HELPER_SCRIPT -a --command "exit 0" $TS_OUTPUT </dev/null >/dev/null 2>&1
-echo $? >> $TS_OUTPUT
-$TS_HELPER_SCRIPT --return --append -c "exit 42" $TS_OUTPUT </dev/null >/dev/null 2>&1
-echo $? >> $TS_OUTPUT
-$TS_HELPER_SCRIPT --return --append -c "exit 127" $TS_OUTPUT </dev/null >/dev/null 2>&1
-echo $? >> $TS_OUTPUT
+$TS_HELPER_SCRIPT --command "exit 1" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+echo $? >> "$TS_OUTPUT"
+$TS_HELPER_SCRIPT -a --command "exit 0" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+echo $? >> "$TS_OUTPUT"
+$TS_HELPER_SCRIPT --return --append -c "exit 42" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+echo $? >> "$TS_OUTPUT"
+$TS_HELPER_SCRIPT --return --append -c "exit 127" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+echo $? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "size"
-$TS_HELPER_SCRIPT --output-limit 9 --command "echo 1:1234567890" $TS_OUTPUT </dev/null >/dev/null 2>&1
-$TS_HELPER_SCRIPT -a --output-limit 9 --command "echo 2:1234567890" $TS_OUTPUT </dev/null >/dev/null 2>&1
-echo $? >> $TS_OUTPUT
+$TS_HELPER_SCRIPT --output-limit 9 --command "echo 1:1234567890" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+$TS_HELPER_SCRIPT -a --output-limit 9 --command "echo 2:1234567890" "$TS_OUTPUT" </dev/null >/dev/null 2>&1
+echo $? >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/script/race b/tests/ts/script/race
index 79e87745b..4f6cf21b7 100755
--- a/tests/ts/script/race
+++ b/tests/ts/script/race
@@ -33,13 +33,13 @@ bingofile="$TS_OUTDIR/${TS_TESTNAME}-bingo"
 count=1000
 for i in `seq 1 $count`; do
 	$TS_CMD_SCRIPT -q -c "printf 'Bingo\n'" $bingofile
-done | grep -c Bingo >> $TS_OUTPUT
+done | grep -c Bingo >> "$TS_OUTPUT"
 
-seen=$(<$TS_OUTPUT)
+seen=$(<"$TS_OUTPUT")
 if [ "$seen" = "$count" ]; then
-	echo "all bingos seen" > $TS_OUTPUT
+	echo "all bingos seen" > "$TS_OUTPUT"
 else
-	echo "only $seen of $count bingos seen" > $TS_OUTPUT
+	echo "only $seen of $count bingos seen" > "$TS_OUTPUT"
 fi
 
 rm -f $bingofile
diff --git a/tests/ts/script/replay b/tests/ts/script/replay
index 72daf9657..d002077ff 100755
--- a/tests/ts/script/replay
+++ b/tests/ts/script/replay
@@ -38,12 +38,12 @@ echo "===recording" >"$TS_OUTPUT"
 $TS_CMD_SCRIPT \
 	--command "echo hello world; sleep 0.5; echo all done" \
 	--timing="$TIMING_FILE" \
-	"$LOG_OUT_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	"$LOG_OUT_FILE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 echo "===replaying" >>"$TS_OUTPUT"
-$TS_CMD_SCRIPTREPLAY "$TIMING_FILE" "$LOG_OUT_FILE" 1.5 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SCRIPTREPLAY "$TIMING_FILE" "$LOG_OUT_FILE" 1.5 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-sed -i "s|$TIMING_FILE|timingfile|g; s|$LOG_OUT_FILE|outlog|g" $TS_OUTPUT $TS_ERRLOG
+sed -i "s|$TIMING_FILE|timingfile|g; s|$LOG_OUT_FILE|outlog|g" "$TS_OUTPUT" "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -55,14 +55,14 @@ echo "===recording" >"$TS_OUTPUT"
 NUMBER=1 $TS_CMD_SCRIPT \
         --command 'echo "result is $(($NUMBER + 1))"' \
 	--log-out "$LOG_OUT_FILE" \
-	--log-timing "$TIMING_FILE"    >> $TS_OUTPUT 2>> $TS_ERRLOG
+	--log-timing "$TIMING_FILE"    >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 echo "===replaying" >>"$TS_OUTPUT"
 $TS_CMD_SCRIPTREPLAY \
 	--log-out "$LOG_OUT_FILE" \
-	--log-timing "$TIMING_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	--log-timing "$TIMING_FILE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
-sed -i "s|$TIMING_FILE|timingfile|g; s|$LOG_OUT_FILE|outlog|g" $TS_OUTPUT $TS_ERRLOG
+sed -i "s|$TIMING_FILE|timingfile|g; s|$LOG_OUT_FILE|outlog|g" "$TS_OUTPUT" "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -74,12 +74,12 @@ echo "===recording" >"$TS_OUTPUT"
 echo 'echo "result is $(($NUMBER + 1))"' | $TS_CMD_SCRIPT \
 	--command 'sh' \
 	--log-in "$LOG_IN_FILE" \
-	--log-timing "$TIMING_FILE" >> /dev/null 2>> $TS_ERRLOG
+	--log-timing "$TIMING_FILE" >> /dev/null 2>> "$TS_ERRLOG"
 
 echo "===replaying" >>"$TS_OUTPUT"
 $TS_CMD_SCRIPTREPLAY \
 	--log-in "$LOG_IN_FILE" \
-	--log-timing "$TIMING_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	--log-timing "$TIMING_FILE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -91,8 +91,8 @@ TS_KNOWN_FAIL="yes"
 NUMBER=123 $TS_CMD_SCRIPTLIVE \
 	--command 'sh' \
 	--log-in "$LOG_IN_FILE" \
-	--log-timing "$TIMING_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i 's/^[[:alnum:][:punct:][:blank:]]*[\$\#] /prompt> /g' $TS_OUTPUT
+	--log-timing "$TIMING_FILE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i 's/^[[:alnum:][:punct:][:blank:]]*[\$\#] /prompt> /g' "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/setarch/pid-without-show b/tests/ts/setarch/pid-without-show
index a1b7e79ab..0d3ef3c76 100755
--- a/tests/ts/setarch/pid-without-show
+++ b/tests/ts/setarch/pid-without-show
@@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_SETARCH"
 
 ts_cd "$TS_OUTDIR"
 
-LC_ALL=C "$TS_CMD_SETARCH" --pid=$$ 2 2> $TS_ERRLOG > $TS_OUTPUT
-echo "exit status: $?" >> $TS_OUTPUT
+LC_ALL=C "$TS_CMD_SETARCH" --pid=$$ 2 2> "$TS_ERRLOG" > "$TS_OUTPUT"
+echo "exit status: $?" >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/setarch/setarch b/tests/ts/setarch/setarch
index 274053e8b..05b72f3cb 100755
--- a/tests/ts/setarch/setarch
+++ b/tests/ts/setarch/setarch
@@ -25,28 +25,28 @@ ARCH=$(uname -m)
 
 ts_init_subtest options
 ts_log_both "###### unknown arch"
-$TS_CMD_SETARCH qubit --verbose echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit: $?" >>$TS_OUTPUT
+$TS_CMD_SETARCH qubit --verbose echo "success" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit: $?" >>"$TS_OUTPUT"
 
 ts_log_both "###### unknown command"
-$TS_CMD_SETARCH $ARCH --verbose /das/gibs/nicht >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "exit: $?" >>$TS_OUTPUT
+$TS_CMD_SETARCH $ARCH --verbose /das/gibs/nicht >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "exit: $?" >>"$TS_OUTPUT"
 
-echo "###### noop uname -a" >>$TS_OUTPUT
+echo "###### noop uname -a" >>"$TS_OUTPUT"
 uname_a=$(uname -srm)
-$TS_CMD_SETARCH $ARCH --verbose uname -srm >> $TS_OUTPUT 2>> $TS_ERRLOG
-sed -i "$ s@${uname_a}@uname -a unchanged@" $TS_OUTPUT
+$TS_CMD_SETARCH $ARCH --verbose uname -srm >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+sed -i "$ s@${uname_a}@uname -a unchanged@" "$TS_OUTPUT"
 
-echo "###### almost all options" >>$TS_OUTPUT
-$TS_CMD_SETARCH $ARCH -vRFZLXBIST3 echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo "###### almost all options" >>"$TS_OUTPUT"
+$TS_CMD_SETARCH $ARCH -vRFZLXBIST3 echo "success" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
 ts_init_subtest uname26
 finmsg="" # for debugging 2.6 issues
 
-echo "###### --uname-2.6 echo" >>$TS_OUTPUT
-$TS_CMD_SETARCH $ARCH --verbose --uname-2.6 echo "2.6 worked" >> $TS_OUTPUT 2>&1
+echo "###### --uname-2.6 echo" >>"$TS_OUTPUT"
+$TS_CMD_SETARCH $ARCH --verbose --uname-2.6 echo "2.6 worked" >> "$TS_OUTPUT" 2>&1
 if [ $? -eq 0 ]; then
 	expected='^2.6 worked$'
 else
@@ -54,16 +54,16 @@ else
 	expected="^FATAL: kernel too old$"
 	finmsg+=" echo"
 fi
-sed -i "$ s/$expected/2.6 works or kernel too old/" $TS_OUTPUT
+sed -i "$ s/$expected/2.6 works or kernel too old/" "$TS_OUTPUT"
 
-echo "###### --uname-2.6 true, non-verbose" >>$TS_OUTPUT
-$TS_CMD_SETARCH $ARCH --uname-2.6 true >> $TS_OUTPUT 2>&1
+echo "###### --uname-2.6 true, non-verbose" >>"$TS_OUTPUT"
+$TS_CMD_SETARCH $ARCH --uname-2.6 true >> "$TS_OUTPUT" 2>&1
 if [ $? -eq 0 ]; then
-	echo "2.6 works or kernel too old" >> $TS_OUTPUT
+	echo "2.6 works or kernel too old" >> "$TS_OUTPUT"
 else
 	# this may happen after execvp - gets written to stderr
 	expected="^FATAL: kernel too old$"
-	sed -i "$ s/$expected/2.6 works or kernel too old/" $TS_OUTPUT
+	sed -i "$ s/$expected/2.6 works or kernel too old/" "$TS_OUTPUT"
 	finmsg+=" true"
 fi
 
@@ -80,21 +80,21 @@ if [ "$uname26_seems_supported" = "yes" ]; then
 ts_init_subtest uname26-version
 	tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname -r)
 	if echo "$tmp" | grep -q "^2\.6\."; then
-		echo "kernel version changed to 2.6" >> $TS_OUTPUT
+		echo "kernel version changed to 2.6" >> "$TS_OUTPUT"
 	else
-		echo "uname26 failed" >> $TS_OUTPUT
-		echo "original kernel: $(uname -r)" >> $TS_OUTPUT
-		echo "uname26 kernel:  $tmp" >> $TS_OUTPUT
+		echo "uname26 failed" >> "$TS_OUTPUT"
+		echo "original kernel: $(uname -r)" >> "$TS_OUTPUT"
+		echo "uname26 kernel:  $tmp" >> "$TS_OUTPUT"
 	fi
 ts_finalize_subtest
 fi # conditional subtest
 
 ts_init_subtest show
-echo "###### --show" >>$TS_OUTPUT
+echo "###### --show" >>"$TS_OUTPUT"
 
 show() {
-	echo -n "$1: " >> $TS_OUTPUT
-	$TS_CMD_SETARCH --show=$1 >> $TS_OUTPUT 2> $TS_ERRLOG
+	echo -n "$1: " >> "$TS_OUTPUT"
+	$TS_CMD_SETARCH --show=$1 >> "$TS_OUTPUT" 2> "$TS_ERRLOG"
 }
 
 show 0x00000000
diff --git a/tests/ts/setarch/show-with-pid b/tests/ts/setarch/show-with-pid
index 7cdd0fa11..285b66d2e 100755
--- a/tests/ts/setarch/show-with-pid
+++ b/tests/ts/setarch/show-with-pid
@@ -51,7 +51,7 @@ SKIP_REASON=
     fi
     exec {BASH[1]}>&-
     wait ${BASH_PID}
-}  > $TS_OUTPUT 2>&1
+}  > "$TS_OUTPUT" 2>&1
 
 if [[ -n "$SKIP_REASON" ]]; then
     ts_skip "$SKIP_REASON"
diff --git a/tests/ts/setpgid/setpgid b/tests/ts/setpgid/setpgid
index b8d154387..4394502b4 100755
--- a/tests/ts/setpgid/setpgid
+++ b/tests/ts/setpgid/setpgid
@@ -21,7 +21,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_SETPGID"
 [ -e /proc/self/stat ] || ts_skip "/proc/self/stat is missing"
 
-$TS_CMD_SETPGID echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SETPGID echo "success" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # qemu-user always reports '0' for the pgid field which prevents the test from
 # working so we skip it.
@@ -29,6 +29,6 @@ ts_skip_qemu_user
 
 PGID1="$(awk '{print $5}' /proc/self/stat)"
 PGID2="$($TS_CMD_SETPGID awk '{print $5}' /proc/self/stat)"
-test ! "$PGID1" = "$PGID2" && echo "not equal" >> $TS_OUTPUT
+test ! "$PGID1" = "$PGID2" && echo "not equal" >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/setsid/setsid b/tests/ts/setsid/setsid
index ab3f51de9..f59da4fd3 100755
--- a/tests/ts/setsid/setsid
+++ b/tests/ts/setsid/setsid
@@ -20,6 +20,6 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_SETSID"
 
-$TS_CMD_SETSID echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SETSID echo "success" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos
index e62751acf..53083ba08 100755
--- a/tests/ts/sfdisk/dos
+++ b/tests/ts/sfdisk/dos
@@ -31,7 +31,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 
 
 ts_init_subtest "simple-commas"
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
  2048,6144,L
 8192, 6144,S
 14336 , 6144 ,
@@ -45,8 +45,8 @@ ts_finalize_subtest
 
 
 ts_init_subtest "activate"
-$TS_CMD_SFDISK --activate ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --unit S --list ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --activate ${TS_DEVICE} 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --unit S --list ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -55,7 +55,7 @@ ts_finalize_subtest
 ts_init_subtest "simple-space"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
  2048 6144 L
 8192  6144 S
 ,,
@@ -68,7 +68,7 @@ ts_finalize_subtest
 ts_init_subtest "read-dump-case"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label-id: 0x1ddc8a79
 
@@ -82,7 +82,7 @@ ts_finalize_subtest
 ts_init_subtest "read-dump"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label-id: 0x1ddc8a79
 
@@ -99,13 +99,13 @@ ts_finalize_subtest
 
 
 ts_init_subtest "write-dump"
-$TS_CMD_SFDISK --unit S --dump ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --unit S --dump ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 
 ts_init_subtest "write-json"
-$TS_CMD_SFDISK --json ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --json ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
@@ -117,7 +117,7 @@ ts_finalize_subtest
 ts_init_subtest "explicit-size"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: dos
 1, 1000, L
 1001, 1000, S
@@ -140,7 +140,7 @@ label: dos
 ,10M,S,*
 EOF
 udevadm settle
-echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -155,7 +155,7 @@ label: dos
 ,2M,E
 EOF
 udevadm settle
-echo ',+' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',+' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -170,7 +170,7 @@ label: dos
 ,5M,E
 EOF
 udevadm settle
-echo ',-2M' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',-2M' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -188,7 +188,7 @@ label: dos
 ,1M
 EOF
 udevadm settle
-echo ',+' | $TS_CMD_SFDISK --no-reread -N4 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',+' | $TS_CMD_SFDISK --no-reread -N4 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -207,7 +207,7 @@ label: dos
 ,1M
 EOF
 udevadm settle
-echo ',+' | $TS_CMD_SFDISK --no-reread -N6 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',+' | $TS_CMD_SFDISK --no-reread -N6 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -216,7 +216,7 @@ ts_finalize_subtest
 ts_init_subtest "dump-old"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-old >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-old >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
@@ -226,7 +226,7 @@ ts_finalize_subtest
 ts_init_subtest "dump-gaps"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-gaps >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-gaps >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
@@ -236,7 +236,7 @@ ts_finalize_subtest
 ts_init_subtest "default-vs-gap1"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 3MiB 5MiB L
 - 6MiB L
 EOF
@@ -248,7 +248,7 @@ ts_finalize_subtest
 ts_init_subtest "default-vs-gap2"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 4MiB 3MiB L
 13MiB 5MiB L
 - 4MiB L
@@ -263,7 +263,7 @@ ts_finalize_subtest
 ts_init_subtest "sizes-vs-gaps"
 $TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 2048 1023 L -
 4096 4095 L -
 8192 8191 L -
diff --git a/tests/ts/sfdisk/dump b/tests/ts/sfdisk/dump
index f9442cff8..549c9ee27 100755
--- a/tests/ts/sfdisk/dump
+++ b/tests/ts/sfdisk/dump
@@ -32,7 +32,7 @@ ts_scsi_debug_init dev_size_mb=100 sector_size=512 physblk_exp=3
 ts_init_subtest "v2.32"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: gpt
 label-id: 613005F9-1C8C-E141-8AEB-F32E8E296C75
 device: ${TS_DEVICE}
@@ -46,7 +46,7 @@ ${TS_DEVICE}3 : start=       45056, size=       24576, type=0FC63DAF-8483-4772-8
 ${TS_DEVICE}4 : start=       69632, size=      135135, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=AF79D434-C8B3-2445-80FB-317AB157447C
 EOF
 udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
@@ -54,7 +54,7 @@ ts_finalize_subtest
 ts_init_subtest "v2.35"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: gpt
 label-id: 613005F9-1C8C-E141-8AEB-F32E8E296C75
 device: ${TS_DEVICE}
@@ -69,18 +69,18 @@ ${TS_DEVICE}3 : start=       45056, size=       24576, type=0FC63DAF-8483-4772-8
 ${TS_DEVICE}4 : start=       69632, size=      135135, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=AF79D434-C8B3-2445-80FB-317AB157447C
 EOF
 udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 
 ts_init_subtest "current"
-$TS_CMD_SFDISK --dump ${TS_DEVICE} > $TS_OUTPUT.dump 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --dump ${TS_DEVICE} > "$TS_OUTPUT".dump 2>> "$TS_ERRLOG"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-cat $TS_OUTPUT.dump | $TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+cat "$TS_OUTPUT".dump | $TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
diff --git a/tests/ts/sfdisk/gpt b/tests/ts/sfdisk/gpt
index 9b0d78de5..27f449f91 100755
--- a/tests/ts/sfdisk/gpt
+++ b/tests/ts/sfdisk/gpt
@@ -32,7 +32,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 
 
 ts_init_subtest "all-defaults"
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: gpt
 label-id: b181c399-4711-4c52-8b65-9e764541218d
 
@@ -54,78 +54,78 @@ $TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 3 cead8a87-ff1a-45cb-83e5-99b08d0ebc87 &
 $TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 4 d4fcdc60-765d-4bc3-bd84-0d0b9842c6db &> /dev/null
 $TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 5 60155bd7-bfd8-4e8c-b800-221900779373 &> /dev/null
 
-$TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
 
 
 ts_init_subtest "label"
-$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 "EFI system" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 "EFI system" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
 
 
 ts_init_subtest "type"
-$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
 
 
 ts_init_subtest "attrs"
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition,NoBlockIOProtocol,48,51" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition,NoBlockIOProtocol,48,51" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
 
 
 ts_init_subtest "attrs-space"
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition NoBlockIOProtocol 48 51" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition NoBlockIOProtocol 48 51" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
 
 
 ts_init_subtest "attrs-guid"
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:48 GUID:51,52,63" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:48 GUID:51,52,63" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
 
 
 ts_init_subtest "attrs-with-typo"
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartiton,NoBlockIOProtocol,48,51" >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartiton,NoBlockIOProtocol,48,51" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
 
 
 ts_init_subtest "attrs-unsupported"
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocol FooBar 48 51" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocol FooBar 48 51" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 
 ts_init_subtest "attrs-broken-nosep"
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocolRequiredPartiton" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocolRequiredPartiton" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 
 ts_init_subtest "attrs-broken-guid"
-$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
@@ -133,7 +133,7 @@ ts_finalize_subtest
 ts_init_subtest "read-dump"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -144,25 +144,25 @@ ${TS_DEVICE}3 : start=14336, size=6144, uuid=643e1d0d-bc02-4ced-b83b-86121062858
 ${TS_DEVICE}4 : start=20480, size=81887,uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c, name="GPT is the best"
 EOF
 udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 
 ts_init_subtest "write-dump"
-$TS_CMD_SFDISK --unit S --dump ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --unit S --dump ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 
 ts_init_subtest "write-json"
-$TS_CMD_SFDISK --json ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --json ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 
 ts_init_subtest "list-pmbr"
-$TS_CMD_SFDISK --list --label-nested dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list --label-nested dos ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
@@ -175,7 +175,7 @@ label: gpt
 ,10M,S,*
 EOF
 udevadm settle
-echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
@@ -184,7 +184,7 @@ ts_finalize_subtest
 ts_init_subtest "reorder"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -196,8 +196,8 @@ ${TS_DEVICE}4 : start=14336, size=6144
 EOF
 udevadm settle
 # why --reorder does not re-read?
-$TS_CMD_SFDISK --reorder ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_SFDISK --list ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --reorder ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_SFDISK --list ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata
index 2f9b2f8ea..4b8a4ed73 100755
--- a/tests/ts/sfdisk/movedata
+++ b/tests/ts/sfdisk/movedata
@@ -42,12 +42,12 @@ function checksum() {
 	local dev="$1"
 	CHECK=$("$TS_HELPER_MD5" < "${dev}")
 	if [ "$CHECKSUM" != "$CHECK" ]; then
-		echo "Checksum does not match!" >> $TS_OUTPUT
+		echo "Checksum does not match!" >> "$TS_OUTPUT"
 	fi
 }
 
 ts_init_subtest "up"
-echo '+1000,' | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo '+1000,' | $TS_CMD_SFDISK --no-reread --move-data="$TS_OUTPUT".log -N1 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 checksum ${TS_DEVICE}1
@@ -56,7 +56,7 @@ ts_finalize_subtest
 udevadm settle
 
 ts_init_subtest "down"
-echo "-500," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo "-500," | $TS_CMD_SFDISK --no-reread --move-data="$TS_OUTPUT".log -N1 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 checksum ${TS_DEVICE}1
@@ -65,7 +65,7 @@ ts_finalize_subtest
 udevadm settle
 
 ts_init_subtest "non-overlay"
-echo "+30M," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo "+30M," | $TS_CMD_SFDISK --no-reread --move-data="$TS_OUTPUT".log -N1 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 checksum ${TS_DEVICE}1
diff --git a/tests/ts/sfdisk/resize b/tests/ts/sfdisk/resize
index ab37fc8b4..297eecc47 100755
--- a/tests/ts/sfdisk/resize
+++ b/tests/ts/sfdisk/resize
@@ -84,8 +84,8 @@ function test_label_resize {
 		name=${NAME[$idx]}
 
 		ts_init_subtest "$label-$idx-$name"
-		echo -e "$cmd\n" >> $TS_OUTPUT
-		echo "$cmd" | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+		echo -e "$cmd\n" >> "$TS_OUTPUT"
+		echo "$cmd" | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 		ts_fdisk_clean $TS_DEVICE
 		udevadm settle
 		ts_finalize_subtest
@@ -100,8 +100,8 @@ function test_label_resize {
 	idx=$(( $idx + 1 ))
 	ts_init_subtest "$label-$idx-reduce-midle"
 	cmd=',-5M'
-	echo -e "$cmd\n" >> $TS_OUTPUT
-	echo "$cmd" | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo -e "$cmd\n" >> "$TS_OUTPUT"
+	echo "$cmd" | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_fdisk_clean $TS_DEVICE
 	udevadm settle
 	ts_finalize_subtest
@@ -109,8 +109,8 @@ function test_label_resize {
 	idx=$(( $idx + 1 ))
 	ts_init_subtest "$label-$idx-max-last"
 	cmd='-5M,+'
-	echo -e "$cmd\n" >> $TS_OUTPUT
-	echo $cmd | $TS_CMD_SFDISK --no-reread -N3 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+	echo -e "$cmd\n" >> "$TS_OUTPUT"
+	echo $cmd | $TS_CMD_SFDISK --no-reread -N3 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	ts_fdisk_clean $TS_DEVICE
 	udevadm settle
 	ts_finalize_subtest
@@ -131,7 +131,7 @@ ts_init_subtest "dos-unsorted"
 # and there is freespace at the end of the disk. Note that #4 is not the last
 # partno on the disk. The libfdisk has to be able to check for the free space
 # independently on the partno, only offset+size matters.
-$TS_CMD_SFDISK --no-reread ${TS_DEVICE}  >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK --no-reread ${TS_DEVICE}  >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 label: dos
 label-id: 0xda2e45ac
 device: ${TS_DEVICE}
@@ -146,7 +146,7 @@ ${TS_DEVICE}6 : start=       12288, size=       96256, type=83
 EOF
 udevadm settle
 # enlarge to use all space behind partition #4
-echo ',+,' | $TS_CMD_SFDISK --no-reread -N 4 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',+,' | $TS_CMD_SFDISK --no-reread -N 4 ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_finalize_subtest
diff --git a/tests/ts/sfdisk/script b/tests/ts/sfdisk/script
index c2117eb08..ca871de1d 100755
--- a/tests/ts/sfdisk/script
+++ b/tests/ts/sfdisk/script
@@ -32,7 +32,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 ts_init_subtest "type-and-id"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -43,14 +43,14 @@ ${TS_DEVICE}3 : start=14336, size=6144, type=44479540-F297-41B2-9AF7-D131D5F0458
 ${TS_DEVICE}4 : start=20480, size=81887,Type=44479540-F297-41B2-9AF7-D131D5F0458A, uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c
 EOF
 udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
 ts_init_subtest "separator"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -61,7 +61,7 @@ ${TS_DEVICE}3 : start=14336 , size=6144 ,uuid=643e1d0d-bc02-4ced-b83b-8612106285
 ${TS_DEVICE}4 : start=20480; size=81887 ;     uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c
 EOF
 udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
@@ -69,7 +69,7 @@ ts_finalize_subtest
 ts_init_subtest "quotes"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -80,7 +80,7 @@ ${TS_DEVICE}3: start=14336 uuid="643e1d0d-bc02-4ced-b83b-86121062858f",size=6144
 ${TS_DEVICE}4  : start=20480 uuid="d2a29b0a-fdee-40c3-9bae-b9fa782c986c",     size=6144
 EOF
 udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
@@ -88,7 +88,7 @@ ts_finalize_subtest
 ts_init_subtest "broken-1"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -102,7 +102,7 @@ ts_finalize_subtest
 ts_init_subtest "broken-2"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -116,7 +116,7 @@ ts_finalize_subtest
 ts_init_subtest "broken-3"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -130,7 +130,7 @@ ts_finalize_subtest
 ts_init_subtest "broken-4"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
@@ -144,7 +144,7 @@ ts_finalize_subtest
 ts_init_subtest "broken-5"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" <<EOF
 unit: sectors
 label: gpt
 label-id: 3b8559db-33af-43e9-befc-c331d829b539
diff --git a/tests/ts/sfdisk/wipe b/tests/ts/sfdisk/wipe
index 9675a30ae..1c7efb5aa 100755
--- a/tests/ts/sfdisk/wipe
+++ b/tests/ts/sfdisk/wipe
@@ -34,14 +34,14 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 
 ts_init_subtest "gpt-to-dos"
 ts_separator "Create GPT"
-echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_separator "Create DOS"
-echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_separator "Check content"
-$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -50,14 +50,14 @@ ts_finalize_subtest
 #
 ts_init_subtest "gpt-to-dos-auto"
 ts_separator "Create GPT"
-echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_separator "Create DOS"
-echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=dos ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_separator "Check content"
-$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -68,11 +68,11 @@ udevadm settle
 $TS_CMD_MKSWAP ${TS_DEVICE} &> /dev/null
 udevadm settle
 ts_separator "Create DOS"
-echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always  --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always  --label=dos ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 udevadm settle
 ts_separator "Check content"
-$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 
@@ -80,7 +80,7 @@ ts_init_subtest "partition"
 ts_separator "Create GPT"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
-echo ',,L' | $TS_CMD_SFDISK --no-reread --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',,L' | $TS_CMD_SFDISK --no-reread --label=gpt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_separator "Create FS in partition"
 $TS_CMD_MKSWAP ${TS_DEVICE}1 &> /dev/null
@@ -89,13 +89,13 @@ ts_separator "Wipe whole-disk device"
 $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
 udevadm settle
 ts_separator "Create GPT (again)"
-echo ',,L' | $TS_CMD_SFDISK --no-reread --wipe-partition=always --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo ',,L' | $TS_CMD_SFDISK --no-reread --wipe-partition=always --label=gpt ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_separator "Check content (disk)"
-$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 udevadm settle
 ts_separator "Check content (partition)"
-$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE}1 >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE}1 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
diff --git a/tests/ts/sha1/sha1 b/tests/ts/sha1/sha1
index 3a344cdec..22cd63eda 100755
--- a/tests/ts/sha1/sha1
+++ b/tests/ts/sha1/sha1
@@ -24,7 +24,7 @@ ts_check_test_command "$TS_HELPER_SHA1"
 
 cat $TS_SELF/data | while read data
 do
-	echo -n $data | $TS_HELPER_SHA1 >> $TS_OUTPUT
+	echo -n $data | $TS_HELPER_SHA1 >> "$TS_OUTPUT"
 done
 
 ts_finalize
diff --git a/tests/ts/su/environ b/tests/ts/su/environ
index 995bcca7a..88242936c 100755
--- a/tests/ts/su/environ
+++ b/tests/ts/su/environ
@@ -17,22 +17,22 @@ export FOO=abc
 export BAR=baar
 
 # All should be available
-$TS_CMD_SU --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SU --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # All should be removed
-$TS_CMD_SU --login --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SU --login --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # Only specified options should be available
-$TS_CMD_SU --whitelist-environment FOO --login --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SU --whitelist-environment FOO --login --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # Only specified options should be available
-$TS_CMD_SU --whitelist-environment FOO,BAR --login --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SU --whitelist-environment FOO,BAR --login --command 'echo foo:$FOO bar:$BAR zuu:$ZUU' >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 # We do not have control over PAM setup, and the goal of this test is to check
 # the environment, not the overall functionality of su(1). Therefore, if su(1)
 # fails due to authentication, the test should be skipped.
 #
-grep -q 'Authentication failure' $TS_ERRLOG
+grep -q 'Authentication failure' "$TS_ERRLOG"
 [ $? -eq 0 ] && ts_skip "authentication failure"
 
 ts_finalize
diff --git a/tests/ts/swaplabel/swaplabel b/tests/ts/swaplabel/swaplabel
index 3139f5167..08d44a562 100755
--- a/tests/ts/swaplabel/swaplabel
+++ b/tests/ts/swaplabel/swaplabel
@@ -35,27 +35,27 @@ $TS_CMD_FALLOCATE --posix --length $(( $MIN_SWAP_SIZE - 1 )) $IMAGE 2> /dev/null
 $TS_CMD_MKSWAP \
 	--label 1234567890abcdef \
 	--uuid 12345678-abcd-abcd-abcd-1234567890ab \
-	$IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$IMAGE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 sed -i -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
     -e "s:$IMAGE:<swapfile>:g" \
     -e "s/insecure permissions [0-9]*/insecure permissions <perm>/g" \
-   $TS_OUTPUT $TS_ERRLOG
+   "$TS_OUTPUT" "$TS_ERRLOG"
 
 rm -f $IMAGE
 $TS_CMD_FALLOCATE --posix --length $MIN_SWAP_SIZE $IMAGE 2> /dev/null
 $TS_CMD_MKSWAP \
 	--label 1234567890abcdef \
 	--uuid 12345678-abcd-abcd-abcd-1234567890ab \
-	$IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$IMAGE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 sed -i -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
     -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \
     -e "s:$IMAGE:<swapfile>:g" \
     -e "s/insecure permissions [0-9]*/insecure permissions <perm>/g" \
-    $TS_OUTPUT $TS_ERRLOG
+    "$TS_OUTPUT" "$TS_ERRLOG"
 
-$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SWAPLABEL $IMAGE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 #rm -f $IMAGE
 
diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname
index 1c84317db..44bdbc6fa 100755
--- a/tests/ts/swapon/devname
+++ b/tests/ts/swapon/devname
@@ -31,19 +31,19 @@ ts_check_losetup
 ts_device_init
 DEVICE=$TS_LODEV
 
-$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
+$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> "$TS_OUTPUT" \
  || ts_die "Cannot make swap $DEVICE"
 
 ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE"
 
-$TS_CMD_SWAPON $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG || ts_die "Swapon failed"
+$TS_CMD_SWAPON $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" || ts_die "Swapon failed"
 
 grep -q "^$DEVICE\b" /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE || ts_die "Swapoff failed"
 
 # swapon/mkswap warns if system sets different permissions for loop devices
-sed --in-place '/insecure permissions .*, 0660 suggested/d' $TS_OUTPUT
+sed --in-place '/insecure permissions .*, 0660 suggested/d' "$TS_OUTPUT"
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/swapon/fixsig b/tests/ts/swapon/fixsig
index 7deb70339..ad66ee45f 100755
--- a/tests/ts/swapon/fixsig
+++ b/tests/ts/swapon/fixsig
@@ -22,7 +22,7 @@ PAGESIZE=$($TS_HELPER_SYSINFO pagesize)
 ts_device_init
 DEVICE=$TS_LODEV
 
-$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
+$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> "$TS_OUTPUT" \
  || ts_die "Cannot make swap $DEVICE"
 
 ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE"
@@ -30,8 +30,8 @@ ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE"
 #
 # Rewrite signature to swsuspend
 #
-echo "S2SUSPEND " > $TS_OUTPUT.signature
-dd if=$TS_OUTPUT.signature of=$DEVICE \
+echo "S2SUSPEND " > "$TS_OUTPUT".signature
+dd if="$TS_OUTPUT".signature of=$DEVICE \
 	seek=$(( $PAGESIZE - 10 )) count=10 bs=1 conv=notrunc &> /dev/null
 
 ts_device_has "TYPE" "swsuspend" $DEVICE || ts_die "Cannot find swsuspend on $DEVICE"
@@ -46,7 +46,7 @@ grep -q "^$DEVICE\b" /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 $TS_CMD_SWAPOFF $DEVICE
 
 # swapon/mkswap warns if system sets different permissions for loop devices
-sed --in-place '/insecure permissions .*, 0660 suggested/d' $TS_OUTPUT
+sed --in-place '/insecure permissions .*, 0660 suggested/d' "$TS_OUTPUT"
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index b77a94d3e..2cf94f15c 100755
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -32,20 +32,20 @@ ts_check_losetup
 ts_device_init
 DEVICE=$TS_LODEV
 
-$TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \
+$TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> "$TS_OUTPUT" \
  || ts_die "Cannot make swap on $DEVICE"
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 ts_udevadm_settle "$DEVICE" "LABEL"
 
-$TS_CMD_SWAPON -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SWAPON -L $LABEL >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 grep -q "^$DEVICE\b" /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE
 
 # swapon/mkswap warns if system sets different permissions for loop devices
-sed --in-place '/insecure permissions .*, 0660 suggested/d' $TS_OUTPUT
+sed --in-place '/insecure permissions .*, 0660 suggested/d' "$TS_OUTPUT"
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid
index bf6a52e0e..0b6bd51dd 100755
--- a/tests/ts/swapon/uuid
+++ b/tests/ts/swapon/uuid
@@ -31,19 +31,19 @@ ts_check_losetup
 ts_device_init
 DEVICE=$TS_LODEV
 
-$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
+$TS_CMD_MKSWAP $DEVICE > /dev/null 2>> "$TS_OUTPUT" \
  || ts_die "Cannot make swap $DEVICE"
 UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
 ts_udevadm_settle "$DEVICE" "UUID"
 
-$TS_CMD_SWAPON -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SWAPON -U $UUID >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 grep -q "^$DEVICE\b" /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE
 
 # swapon/mkswap warns if system sets different permissions for loop devices
-sed --in-place '/insecure permissions .*, 0660 suggested/d' $TS_OUTPUT
+sed --in-place '/insecure permissions .*, 0660 suggested/d' "$TS_OUTPUT"
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/ul/basic b/tests/ts/ul/basic
index 160a44f35..8f12a4beb 100755
--- a/tests/ts/ul/basic
+++ b/tests/ts/ul/basic
@@ -28,15 +28,15 @@ ts_check_test_command "$TS_CMD_UL"
 TS_KNOWN_FAIL="yes"
 
 ts_init_subtest "printable-characters"
-$TS_CMD_UL < $TS_SELF/basic.input >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UL < $TS_SELF/basic.input >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "filter-input"
-$TS_CMD_UL $TS_SELF/filter.input >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UL $TS_SELF/filter.input >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "indicated"
-printf "u\b_l\b_\n" | ul --indicated >> $TS_OUTPUT 2>> $TS_ERRLOG
+printf "u\b_l\b_\n" | ul --indicated >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/ul/ul b/tests/ts/ul/ul
index 8acb5594c..1ac795ca5 100755
--- a/tests/ts/ul/ul
+++ b/tests/ts/ul/ul
@@ -24,6 +24,6 @@ ts_check_test_command "$TS_CMD_UL"
 TS_KNOWN_FAIL="yes"
 
 printf "a\x08ab\x5F\x08c\\n\\ttab\\f\\b\\r" |
-	$TS_CMD_UL --terminal xterm >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_CMD_UL --terminal xterm >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/unshare/forward-signals b/tests/ts/unshare/forward-signals
index 6c0b4e6c3..617746d33 100755
--- a/tests/ts/unshare/forward-signals
+++ b/tests/ts/unshare/forward-signals
@@ -35,7 +35,7 @@ ts_skip_nonroot
 "$TS_CMD_UNSHARE" --user --map-root-user \
 	--pid --mount-proc \
 	--fork --forward-signals \
-	"$TS_HELPER_SIGRECEIVE" < /dev/null >> $TS_OUTPUT 2>> $TS_ERRLOG &
+	"$TS_HELPER_SIGRECEIVE" < /dev/null >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 
 UNSHARE_PID=$!
 
@@ -65,9 +65,9 @@ EXIT_CODE=$?
 
 # test_sigreceive exits with the signal number it receives (15 = SIGTERM)
 if [ $EXIT_CODE -eq 15 ]; then
-	echo "SIGTERM forwarded successfully" >> $TS_OUTPUT
+	echo "SIGTERM forwarded successfully" >> "$TS_OUTPUT"
 else
-	echo "UNEXPECTED EXIT CODE: $EXIT_CODE" >> $TS_OUTPUT
+	echo "UNEXPECTED EXIT CODE: $EXIT_CODE" >> "$TS_OUTPUT"
 fi
 
 ts_finalize
diff --git a/tests/ts/unshare/forward-signals-kill-child b/tests/ts/unshare/forward-signals-kill-child
index 77f80aeb7..5856aa175 100755
--- a/tests/ts/unshare/forward-signals-kill-child
+++ b/tests/ts/unshare/forward-signals-kill-child
@@ -35,7 +35,7 @@ ts_skip_nonroot
 "$TS_CMD_UNSHARE" --user --map-root-user \
 	--pid --mount-proc \
 	--fork --forward-signals --kill-child \
-	"$TS_HELPER_SIGRECEIVE" < /dev/null >> $TS_OUTPUT 2>> $TS_ERRLOG &
+	"$TS_HELPER_SIGRECEIVE" < /dev/null >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" &
 
 UNSHARE_PID=$!
 
@@ -66,9 +66,9 @@ EXIT_CODE=$?
 # test_sigreceive exits with the signal number it receives (15 = SIGTERM)
 # With --kill-child, it should still receive SIGTERM first via forwarding
 if [ $EXIT_CODE -eq 15 ]; then
-	echo "SIGTERM forwarded successfully with kill-child" >> $TS_OUTPUT
+	echo "SIGTERM forwarded successfully with kill-child" >> "$TS_OUTPUT"
 else
-	echo "UNEXPECTED EXIT CODE: $EXIT_CODE" >> $TS_OUTPUT
+	echo "UNEXPECTED EXIT CODE: $EXIT_CODE" >> "$TS_OUTPUT"
 fi
 
 ts_finalize
diff --git a/tests/ts/utmp/last b/tests/ts/utmp/last
index f1176c8c4..5c69408a1 100755
--- a/tests/ts/utmp/last
+++ b/tests/ts/utmp/last
@@ -45,47 +45,47 @@ if ts_resolve_host "a.root-servers.net" >/dev/null; then
 ts_init_subtest "dns"
 
 ts_log "~~~ dns short ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -d root >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -d root >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ dns long ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -w -d root >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -w -d root >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ dns host last ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -a -d root >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -a -d root >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize_subtest
 fi
 
 ts_init_subtest "nodns"
 ts_log "~~~ basic output ~~~"
-$TS_CMD_LAST -f $WTMP_FILE >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ include system ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -x >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -x >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ show ip ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -i torvalds >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -i torvalds >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ no host ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -R torvalds >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -R torvalds >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ full times shortopt ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -F >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -F >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ full times longopt ~~~"
-$TS_CMD_LAST -f $WTMP_FILE --time-format=full >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE --time-format=full >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ no time ~~~"
-$TS_CMD_LAST -f $WTMP_FILE --time-format=notime >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE --time-format=notime >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ iso-8601 time ~~~"
-$TS_CMD_LAST -f $WTMP_FILE --time-format=iso -w >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE --time-format=iso -w >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ since and until ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -s "2013-08-28 02:20" -t "2013-08-28 08:20" >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -s "2013-08-28 02:20" -t "2013-08-28 08:20" >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ present ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -p "2013-08-28 11:20" >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -p "2013-08-28 11:20" >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 rm -f $WTMP_FILE
diff --git a/tests/ts/utmp/last-ipv6 b/tests/ts/utmp/last-ipv6
index 4eec017d0..3717f1ef2 100755
--- a/tests/ts/utmp/last-ipv6
+++ b/tests/ts/utmp/last-ipv6
@@ -42,23 +42,23 @@ if ts_resolve_host "a.root-servers.net" >/dev/null; then
 ts_init_subtest "dns"
 
 ts_log "~~~ dns short ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -d >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -d >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ dns long ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -d -w >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -d -w >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ dns host last ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -d -a >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -d -a >> "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize_subtest
 fi
 
 ts_init_subtest "nodns"
 ts_log "~~~ show ip ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -i >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -i >> "$TS_OUTPUT" 2>/dev/null
 
 ts_log "~~~ show ip last ~~~"
-$TS_CMD_LAST -f $WTMP_FILE -i -a >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_LAST -f $WTMP_FILE -i -a >> "$TS_OUTPUT" 2>/dev/null
 ts_finalize_subtest
 
 rm -f $WTMP_FILE
diff --git a/tests/ts/utmp/utmpdump-circle b/tests/ts/utmp/utmpdump-circle
index 719c7adb0..b2dbba64e 100755
--- a/tests/ts/utmp/utmpdump-circle
+++ b/tests/ts/utmp/utmpdump-circle
@@ -33,7 +33,7 @@ OUT_TXT=${TS_OUTDIR}/${TS_TESTNAME}.txt
 #
 # old text format -> binary -> new text format -> binary
 
-echo "no output expected" > $TS_OUTPUT
+echo "no output expected" > "$TS_OUTPUT"
 for f in txt-a txt-b txt-ipv6; do
 	$TS_CMD_UTMPDUMP -r $TS_SELF/$f-old > $OUT_BIN1 2>/dev/null &&
 	$TS_CMD_UTMPDUMP $OUT_BIN1 > $OUT_TXT 2>/dev/null &&
@@ -41,7 +41,7 @@ for f in txt-a txt-b txt-ipv6; do
 	$TS_CMD_UTMPDUMP -r $OUT_TXT > $OUT_BIN2 2>/dev/null &&
 	diff -q $OUT_BIN1 $OUT_BIN2 ||
 	echo "circle failed for $f"
-done >> $TS_OUTPUT 2>> $TS_ERRLOG
+done >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 rm -f "$OUT_BIN1" "$OUT_BIN2" "$OUT_TXT"
 
diff --git a/tests/ts/utmp/utmpdump-subsecond b/tests/ts/utmp/utmpdump-subsecond
index 8ccd1713a..cc031434b 100755
--- a/tests/ts/utmp/utmpdump-subsecond
+++ b/tests/ts/utmp/utmpdump-subsecond
@@ -23,9 +23,9 @@ ts_check_test_command "$TS_CMD_UTMPDUMP"
 
 OUT_BIN=${TS_OUTDIR}/${TS_TESTNAME}.bin
 
-echo "last 9 is expected to disappear in conversion" > $TS_OUTPUT
+echo "last 9 is expected to disappear in conversion" > "$TS_OUTPUT"
 $TS_CMD_UTMPDUMP -r $TS_SELF/subsec > $OUT_BIN 2>/dev/null
-$TS_CMD_UTMPDUMP $OUT_BIN >> $TS_OUTPUT 2>/dev/null
+$TS_CMD_UTMPDUMP $OUT_BIN >> "$TS_OUTPUT" 2>/dev/null
 
 rm -f "$OUT_BIN"
 
diff --git a/tests/ts/utmp/utmpdump-tobin b/tests/ts/utmp/utmpdump-tobin
index c7a6b766d..219f71b4e 100755
--- a/tests/ts/utmp/utmpdump-tobin
+++ b/tests/ts/utmp/utmpdump-tobin
@@ -27,6 +27,6 @@ OUTFILE=${TS_OUTDIR}/${TS_TESTNAME}.file
 $TS_CMD_UTMPDUMP -r $TS_SELF/txt-b >| $OUTFILE 2>/dev/null
 if diff -q $TS_SELF/wtmp-b.$BYTE_ORDER $OUTFILE; then
 	echo "no diff"
-fi >> $TS_OUTPUT 2>> $TS_ERRLOG
+fi >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/utmp/utmpdump-tobin-ipv6 b/tests/ts/utmp/utmpdump-tobin-ipv6
index 3c822ee98..8595d8a59 100755
--- a/tests/ts/utmp/utmpdump-tobin-ipv6
+++ b/tests/ts/utmp/utmpdump-tobin-ipv6
@@ -27,6 +27,6 @@ OUTFILE=${TS_OUTDIR}/${TS_TESTNAME}.file
 $TS_CMD_UTMPDUMP -r $TS_SELF/txt-ipv6 >| $OUTFILE 2>/dev/null
 if diff -q $TS_SELF/wtmp-ipv6.$BYTE_ORDER $OUTFILE; then
 	echo "no diff"
-fi >> $TS_OUTPUT 2>> $TS_ERRLOG
+fi >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/utmp/utmpdump-totxt b/tests/ts/utmp/utmpdump-totxt
index 59c8ce18f..29ae67741 100755
--- a/tests/ts/utmp/utmpdump-totxt
+++ b/tests/ts/utmp/utmpdump-totxt
@@ -23,6 +23,6 @@ ts_init "$*"
 
 export LANG=C
 export TZ=Asia/Tokyo
-$TS_CMD_UTMPDUMP $TS_SELF/wtmp-b.$BYTE_ORDER >| $TS_OUTPUT 2>/dev/null
+$TS_CMD_UTMPDUMP $TS_SELF/wtmp-b.$BYTE_ORDER >| "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/utmp/utmpdump-totxt-ipv6 b/tests/ts/utmp/utmpdump-totxt-ipv6
index 277d682ff..f30d07d5a 100755
--- a/tests/ts/utmp/utmpdump-totxt-ipv6
+++ b/tests/ts/utmp/utmpdump-totxt-ipv6
@@ -23,6 +23,6 @@ ts_init "$*"
 
 export LANG=C
 export TZ=Asia/Tokyo
-$TS_CMD_UTMPDUMP $TS_SELF/wtmp-ipv6.$BYTE_ORDER >| $TS_OUTPUT 2>/dev/null
+$TS_CMD_UTMPDUMP $TS_SELF/wtmp-ipv6.$BYTE_ORDER >| "$TS_OUTPUT" 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/uuid/namespace b/tests/ts/uuid/namespace
index 0eca918a2..6c0956e88 100755
--- a/tests/ts/uuid/namespace
+++ b/tests/ts/uuid/namespace
@@ -22,7 +22,7 @@ ts_init "$*"
 
 ts_check_test_command "$TS_HELPER_UUID_NAMESPACE"
 
-$TS_HELPER_UUID_NAMESPACE > $TS_OUTPUT
+$TS_HELPER_UUID_NAMESPACE > "$TS_OUTPUT"
 
 ts_finalize
 
diff --git a/tests/ts/uuid/uuid_parser b/tests/ts/uuid/uuid_parser
index cf42827a6..a035b3118 100755
--- a/tests/ts/uuid/uuid_parser
+++ b/tests/ts/uuid/uuid_parser
@@ -20,7 +20,7 @@ ts_init "$*"
 
 ts_check_test_command "$TS_HELPER_UUID_PARSER"
 
-$TS_HELPER_UUID_PARSER >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "return value: $?" >> $TS_OUTPUT
+$TS_HELPER_UUID_PARSER >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "return value: $?" >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/uuidgen/oids b/tests/ts/uuidgen/oids
index 900587766..55b51c8c7 100755
--- a/tests/ts/uuidgen/oids
+++ b/tests/ts/uuidgen/oids
@@ -18,16 +18,16 @@ TS_DESC="oids"
 . "$TS_TOPDIR"/functions.sh
 ts_init "$*"
 
-: . > $TS_OUTPUT
+: . > "$TS_OUTPUT"
 
 ts_check_test_command "$TS_CMD_UUIDGEN"
 
-$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.widgets.com" >> $TS_OUTPUT
+$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.widgets.com" >> "$TS_OUTPUT"
 
-$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
+$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.example.com" >> "$TS_OUTPUT"
 
-$TS_CMD_UUIDGEN --sha1 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
+$TS_CMD_UUIDGEN --sha1 --namespace @dns --name "www.example.com" >> "$TS_OUTPUT"
 
-$TS_CMD_UUIDGEN --sha1 --namespace @oid --hex --name "525400fc0f5e" >> $TS_OUTPUT
+$TS_CMD_UUIDGEN --sha1 --namespace @oid --hex --name "525400fc0f5e" >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/uuidgen/uuidgen b/tests/ts/uuidgen/uuidgen
index 1f58a0b9c..112eab766 100755
--- a/tests/ts/uuidgen/uuidgen
+++ b/tests/ts/uuidgen/uuidgen
@@ -24,15 +24,15 @@ ts_check_test_command "$TS_CMD_UUIDGEN"
 OUTPUT_FILE="$(mktemp "${TS_OUTDIR}/uuidgenXXXXXXXXXXXXX")"
 
 test_flag() {
-	echo "option: $1" >> $TS_OUTPUT
-	$TS_CMD_UUIDGEN $1 > "$OUTPUT_FILE" 2>>$TS_OUTPUT
+	echo "option: $1" >> "$TS_OUTPUT"
+	$TS_CMD_UUIDGEN $1 > "$OUTPUT_FILE" 2>>"$TS_OUTPUT"
 	ret=$?
-	$TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG
+	$TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	if [ $? -ne 0 ] || [ $ret -ne 0 ]; then
-		echo "something wrong with $OUTPUT_FILE" >> $TS_OUTPUT
-		cat $OUTPUT_FILE >> $TS_OUTPUT 2>> $TS_ERRLOG
+		echo "something wrong with $OUTPUT_FILE" >> "$TS_OUTPUT"
+		cat $OUTPUT_FILE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 	fi
-	echo "return values: $ret and $?" >> $TS_OUTPUT
+	echo "return values: $ret and $?" >> "$TS_OUTPUT"
 }
 
 test_flag -r
diff --git a/tests/ts/uuidparse/time b/tests/ts/uuidparse/time
index f167519ed..b5ab2abd2 100755
--- a/tests/ts/uuidparse/time
+++ b/tests/ts/uuidparse/time
@@ -22,6 +22,6 @@ ts_check_test_command "$TS_HELPER_UUID_TIME"
 ts_check_test_command "$TS_CMD_UUIDPARSE"
 
 $TS_HELPER_UUID_TIME | TZ=UTC $TS_CMD_UUIDPARSE -o VARIANT,TYPE,TIME \
-	>> $TS_OUTPUT 2>> $TS_ERRLOG
+	>> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 
 ts_finalize
diff --git a/tests/ts/uuidparse/uuidparse b/tests/ts/uuidparse/uuidparse
index a03f718c2..b76be0dc1 100755
--- a/tests/ts/uuidparse/uuidparse
+++ b/tests/ts/uuidparse/uuidparse
@@ -61,7 +61,7 @@ f81d4fae-7dec-11d0-a765-00a0c91e6bf6
 01234567-89ab-1def-8000-123456789abc
 5c146b14-3c52-8afd-938a-375d0df1fbf6
 
-invalid-input' | $TS_CMD_UUIDPARSE >> $TS_OUTPUT 2>> $TS_ERRLOG
-echo "return value: $?" >> $TS_OUTPUT
+invalid-input' | $TS_CMD_UUIDPARSE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+echo "return value: $?" >> "$TS_OUTPUT"
 
 ts_finalize
diff --git a/tests/ts/whereis/whereis b/tests/ts/whereis/whereis
index 02df90af1..053495d85 100755
--- a/tests/ts/whereis/whereis
+++ b/tests/ts/whereis/whereis
@@ -39,9 +39,9 @@ for COMMAND in fsck fsck.ext4 python python3 python3.8
 do
 	COUNT=$($TS_CMD_WHEREIS -B $BIN_DIR -M $MAN_DIR -f $COMMAND | wc -w)
 	if [ $COUNT -eq 3 ]; then
-		echo "$COMMAND success" >> $TS_OUTPUT
+		echo "$COMMAND success" >> "$TS_OUTPUT"
 	else
-		echo "$COMMAND failure" >> $TS_OUTPUT
+		echo "$COMMAND failure" >> "$TS_OUTPUT"
 	fi
 done
 
diff --git a/tests/ts/wipefs/wipefs b/tests/ts/wipefs/wipefs
index 3e25134be..bc2d7812d 100755
--- a/tests/ts/wipefs/wipefs
+++ b/tests/ts/wipefs/wipefs
@@ -30,6 +30,6 @@ dd if=$INFILE of=$img bs=1 conv=notrunc seek=$(($OFFT)) &>/dev/null
 $TS_CMD_WIPEFS -a ${img} > $TS_OUTDIR/out 2>/dev/null
 
 # check for output
-[ -s $TS_OUTDIR/out ] && echo "OK" &> $TS_OUTPUT || exit 1
+[ -s $TS_OUTDIR/out ] && echo "OK" &> "$TS_OUTPUT" || exit 1
 
 ts_finalize