diff --git a/buildutil/tap-test b/buildutil/tap-test
index af42b623..d2dba0f4 100755
--- a/buildutil/tap-test
+++ b/buildutil/tap-test
@@ -1,14 +1,12 @@
 #! /bin/bash
 #
-# Run a test in tap mode, ensuring we have a temporary directory.  We
-# always use /var/tmp because we might want to use user xattrs, which
-# aren't available on tmpfs.
+# Run a test in tap mode, ensuring we have a temporary directory.
 #
 # The test binary is passed as $1
 
 srcd=$(cd $(dirname $1) && pwd)
 bn=$(basename $1)
-tempdir=$(mktemp -d /var/tmp/tap-test.XXXXXX)
+tempdir=$(mktemp -d /tmp/tap-test.XXXXXX)
 touch ${tempdir}/.testtmp
 function cleanup () {
     if test -n "${TEST_SKIP_CLEANUP:-}"; then
diff --git a/tests/libtest.sh b/tests/libtest.sh
index 5a38e02e..b929745f 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -72,8 +72,7 @@ fi
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
-# We need this to be in /var/tmp because /tmp has no xattr support
-TEST_DATA_DIR=`mktemp -d /var/tmp/test-flatpak-XXXXXX`
+TEST_DATA_DIR=`mktemp -d /tmp/test-flatpak-XXXXXX`
 mkdir -p ${TEST_DATA_DIR}/home
 mkdir -p ${TEST_DATA_DIR}/runtime
 mkdir -p ${TEST_DATA_DIR}/system
diff --git a/tests/testlibrary.c b/tests/testlibrary.c
index 08166b9a..1656b692 100644
--- a/tests/testlibrary.c
+++ b/tests/testlibrary.c
@@ -798,7 +798,7 @@ global_setup (void)
   g_autofree char *datadir = NULL;
   g_autofree char *homedir = NULL;
 
-  testdir = g_strdup ("/var/tmp/flatpak-test-XXXXXX");
+  testdir = g_strdup ("/tmp/flatpak-test-XXXXXX");
   g_mkdtemp (testdir);
   g_test_message ("testdir: %s", testdir);