diff --git a/tests/weston-tests-env b/tests/weston-tests-env
old mode 100644
new mode 100755
index 27b40de2..1f8281fc
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -1,4 +1,12 @@
 #!/bin/sh
 
-../src/weston --modules=$abs_builddir/.libs/${1/.la/.so}
+WESTON=$abs_builddir/../src/weston
 
+case $1 in
+	*.la|*.so)
+		$WESTON --modules=$abs_builddir/.libs/${1/.la/.so}
+		;;
+	*)
+		WESTON_TEST_CLIENT_PATH=$abs_builddir/$1 $WESTON \
+			--modules=$abs_builddir/.libs/weston-test.so
+esac