---
 tests/help/help-version.sh |    1 +
 tests/other-fs-tmpdir      |    3 +++
 2 files changed, 4 insertions(+)

Index: tests/help/help-version.sh
===================================================================
--- tests/help/help-version.sh.orig
+++ tests/help/help-version.sh
@@ -241,6 +241,7 @@ parted_setup () { args="-s $tmp_in mklab
 for i in $built_programs; do
   # Skip these.
   case $i in chroot|stty|tty|false|chcon|runcon|coreutils) continue;; esac
+  case $i in df) continue;; esac
 
   rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out $bigZ_in $zin $zin2
   echo z |gzip > $zin
Index: tests/other-fs-tmpdir
===================================================================
--- tests/other-fs-tmpdir.orig
+++ tests/other-fs-tmpdir
@@ -43,6 +43,9 @@ for d in $CANDIDATE_TMP_DIRS; do
 
 done
 
+# Autobuild hack
+test -f /bin/uname.bin && other_partition_tmpdir=
+
 if test -z "$other_partition_tmpdir"; then
   skip_ \
 "requires a writable directory on a different file system,