diff --git a/tests/.gitignore b/tests/.gitignore
index 4c6b430c..166a6d45 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,3 +1,4 @@
+logs
 matrix-test
 setbacklight
 test-client
diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index 1f8281fc..9a0e632d 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -1,12 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 WESTON=$abs_builddir/../src/weston
+LOGDIR=$abs_builddir/logs
+
+mkdir -p "$LOGDIR"
+
+SERVERLOG="$LOGDIR/$1-serverlog.txt"
+OUTLOG="$LOGDIR/$1-log.txt"
+
+rm -f "$SERVERLOG"
 
 case $1 in
 	*.la|*.so)
-		$WESTON --modules=$abs_builddir/.libs/${1/.la/.so}
+		$WESTON --modules=$abs_builddir/.libs/${1/.la/.so} \
+			--log="$SERVERLOG" \
+			&> "$OUTLOG"
 		;;
 	*)
 		WESTON_TEST_CLIENT_PATH=$abs_builddir/$1 $WESTON \
-			--modules=$abs_builddir/.libs/weston-test.so
+			--log="$SERVERLOG" \
+			--modules=$abs_builddir/.libs/weston-test.so \
+			&> "$OUTLOG"
 esac