diff --git a/2.24-tests-portability.patch b/2.24-tests-portability.patch
new file mode 100644
index 0000000..d16d020
--- /dev/null
+++ b/2.24-tests-portability.patch
@@ -0,0 +1,37 @@
+diff -up util-linux-2.23.2/tests/functions.sh.kzak util-linux-2.23.2/tests/functions.sh
+--- util-linux-2.23.2/tests/functions.sh.kzak	2013-06-13 09:46:10.554651768 +0200
++++ util-linux-2.23.2/tests/functions.sh	2013-09-09 10:01:23.355469268 +0200
+@@ -483,7 +483,7 @@ function ts_scsi_debug_init {
+	modprobe scsi_debug $*
+	[ "$?" == 0 ] || ts_die "Cannot init device"
+
+-	DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
++	DEVNAME=$(grep --with-filename scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
+	[ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device"
+
+	DEVICE="/dev/${DEVNAME}"
+diff -up util-linux-2.23.2/tests/ts/cramfs/mkfs.kzak util-linux-2.23.2/tests/ts/cramfs/mkfs
+--- util-linux-2.23.2/tests/ts/cramfs/mkfs.kzak	2013-06-13 09:46:10.557651793 +0200
++++ util-linux-2.23.2/tests/ts/cramfs/mkfs	2013-09-09 10:01:23.355469268 +0200
+@@ -80,7 +80,7 @@ cd $TS_MOUNTPOINT
+
+ ts_log "list the image"
+ export TZ='GMT-1'
+-ls -laR --time-style=long-iso . >> $TS_OUTPUT
++ls -laR --time-style=long-iso . | sed 's:\. : :g' >> $TS_OUTPUT
+ echo >> $TS_OUTPUT
+
+ ts_log "list checksums from new data"
+diff -up util-linux-2.23.2/tests/ts/libmount/context-utab.kzak util-linux-2.23.2/tests/ts/libmount/context-utab
+--- util-linux-2.23.2/tests/ts/libmount/context-utab.kzak	2013-06-13 09:46:10.561651827 +0200
++++ util-linux-2.23.2/tests/ts/libmount/context-utab	2013-09-09 10:01:23.355469268 +0200
+@@ -85,7 +85,9 @@ grep -q $DEVICE $LIBMOUNT_UTAB && \
+	echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1
+ ts_finalize_subtest
+
++
+ if [ -x "/sbin/mkfs.btrfs" ]; then
++	$TS_CMD_WIPEFS -a  $DEVICE &> /dev/null
+	ts_log "Create filesystem [btrfs]"
+	/sbin/mkfs.btrfs -L "$LABEL" $DEVICE &> /dev/null
+	udevadm settle
diff --git a/util-linux.spec b/util-linux.spec
index 9b0da48..8f01733 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -83,6 +83,8 @@ Patch1: 2.24-agetty-clocal.patch
 Patch2: 2.24-su-suppress-PAM-info-messages.patch
 # v2.24 backport: #950497 - problem umounting loop device
 Patch3: 2.24-libmount-canonicalize-for-conversion-from-loopdev.patch
+# v2.24 backport: #921498 - multiple internal testsuite failures
+Patch4: 2.24-tests-portability.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -803,6 +805,7 @@ fi
 - refresh and rename patches
 - fix #987787 - Remove lastlogin from su
 - fix #950497 - problem umounting loop device
+- fix #921498 - multiple internal testsuite failures
 
 * Thu Aug  1 2013 Karel Zak <kzak@redhat.com> 2.23.2-2
 - fix 990083 - su doesn't work with pam_ecryptfs