diff --git a/xfstests.zsh b/xfstests.zsh
index cbe13d8..cdd02f0 100755
--- a/xfstests.zsh
+++ b/xfstests.zsh
@@ -29,7 +29,8 @@ DATE=$(date +%Y-%m-%d-%H:%M:%S%z)
 TODAY=$(date +%Y/%m/%d)
 NOW=$(date +%H:%M:%S%z)
 REMOTE_RESULTS=xfstests-dev/results/
-RESULTS=$RESULT_BASE/date/$TODAY/${SERVER[-1]}/$NOW
+RESULTS=$RESULT_BASE/date/$TODAY/${SERVER[-1]}/
+TMP_RESULTS=/tmp/xfstests/${SERVER[-1]}/$NOW
 TAG=$(kernel-tag.zsh ${CLIENT[-1]})
 if [ ! -z $TAG ]; then
 	TAGRES=$RESULT_BASE/tags/$TAG/${SERVER[-1]}
@@ -67,13 +68,13 @@ run_xfs_tests() {
 					 --version $2 \
 					 --opts $OPTIONS \
 					 --user $USER $testargs" | python $COLOR $1 $2
-	mkdir -p $RESULTS
-	scp -q ${CLIENT[-1]}:$REMOTE_RESULTS/$1/$2/result.xml $RESULTS/$1-$2.xml
+	scp -q ${CLIENT[-1]}:$REMOTE_RESULTS/$1/$2/result.xml $TMP_RESULTS/$1-$2.xml
 }
 
 #
 # Run tests
 #
+mkdir -p $TMP_RESULTS
 for proto in $PROTO; do
 	for vers in $VERSION; do
 		case $vers in
@@ -86,8 +87,10 @@ done
 
 wait
 
+mkdir -p $RESULTS
+tar -cJf $RESULTS/$NOW.tar.xz -C $(dirname $TMP_RESULTS) $NOW/
 if [ ! -z "$TAG" ]; then
 	mkdir -p $TAGRES
-	ln -s $RESULTS $TAGRES/$DATE
+	ln $RESULTS/$NOW.tar.xz $TAGRES/$DATE.tar.xz
 fi
-optirun report-xfstests.py $RESULTS
+optirun report-xfstests.py $RESULTS/$NOW.tar.xz & disown