diff --git a/ChangeLog b/ChangeLog
index f67a38fc5d..905c413715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* posix/globtest.sh (TMPDIR): Do not set.
+	(testdir): Define using ${common_objpfx}posix not $TMPDIR.
+	(testout): Likewise.
+
 2012-10-24  Andreas Jaeger  <aj@suse.de>
 
 	* io/fcntl.h: Always define mode_t, off_t, pid_t and use these
diff --git a/posix/globtest.sh b/posix/globtest.sh
index 29277a44c9..ea947b855a 100755
--- a/posix/globtest.sh
+++ b/posix/globtest.sh
@@ -42,9 +42,10 @@ LANG=C
 export LANG
 
 # Create the arena
-: ${TMPDIR=/tmp}
-testdir=$(mktemp -d $TMPDIR/globtest-dir.XXXXXX)
-testout=$(mktemp $TMPDIR/globtest-out.XXXXXX)
+testdir=${common_objpfx}posix/globtest-dir
+testout=${common_objpfx}posix/globtest-out
+rm -rf $testdir $testout
+mkdir $testdir
 
 trap 'chmod 777 $testdir/noread; rm -fr $testdir $testout' 1 2 3 15