diff --git a/configure.ac b/configure.ac
index 74eb892f..d207ebba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_SUBST([WESTON_VERSION], [weston_version])
 
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 parallel-tests foreign no-dist-gzip dist-xz])
 
 AM_SILENT_RULES([yes])
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0f81458d..27295458 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,11 +11,15 @@ weston_tests =				\
 	text-test			\
 	$(xwayland_test)
 
-TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-tests-env
+AM_TESTS_ENVIRONMENT = \
+	abs_builddir='$(abs_builddir)'; export abs_builddir;
+
+LOG_COMPILER = $(srcdir)/weston-tests-env
 
 clean-local:
 	-rm -rf logs
 
+# To remove when automake 1.11 support is dropped
 export abs_builddir
 
 noinst_LTLIBRARIES =			\
diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index 159709eb..2e5fa95b 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -21,12 +21,14 @@ fi
 case $1 in
 	*.la|*.so)
 		$WESTON --backend=$BACKEND \
+			--socket=test-$(basename $1) \
 			--modules=$abs_builddir/.libs/${1/.la/.so},xwayland.so \
 			--log="$SERVERLOG" \
 			&> "$OUTLOG"
 		;;
 	*)
 		WESTON_TEST_CLIENT_PATH=$abs_builddir/$1 $WESTON \
+			--socket=test-$(basename $1) \
 			--backend=$BACKEND \
 			--log="$SERVERLOG" \
 			--modules=$abs_builddir/.libs/weston-test.so,xwayland.so \