diff --git a/tests/weston-tests-env b/tests/weston-tests-env
index 0b9ff1e..ab2d6c0 100755
--- a/tests/weston-tests-env
+++ b/tests/weston-tests-env
@@ -55,11 +55,11 @@
 		WESTON_BUILD_DIR=$abs_builddir \
 		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
 		$WESTON --backend=$MODDIR/$BACKEND \
+			${CONFIG} \
 			--shell=$SHELL_PLUGIN \
 			--socket=test-${TEST_NAME} \
 			--modules=$MODDIR/${TEST_FILE/.la/.so},$XWAYLAND_PLUGIN \
 			--log="$SERVERLOG" \
-			${CONFIG} \
 			&> "$OUTLOG"
 		;;
 	ivi-*.weston)
@@ -67,26 +67,26 @@
 
 		WESTON_BUILD_DIR=$abs_builddir \
 		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
-		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \
-			--socket=test-${TEST_NAME} \
-			--backend=$MODDIR/$BACKEND \
+		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
+		$WESTON --backend=$MODDIR/$BACKEND \
 			--config=$abs_builddir/tests/weston-ivi.ini \
 			--shell=$SHELL_PLUGIN \
-			--log="$SERVERLOG" \
+			--socket=test-${TEST_NAME} \
 			--modules=$TEST_PLUGIN \
+			--log="$SERVERLOG" \
 			$($abs_builddir/$TESTNAME --params) \
 			&> "$OUTLOG"
 		;;
 	*)
 		WESTON_BUILD_DIR=$abs_builddir \
 		WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
-		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \
-			--socket=test-${TEST_NAME} \
-			--backend=$MODDIR/$BACKEND \
-			--shell=$SHELL_PLUGIN \
-			--log="$SERVERLOG" \
-			--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
+		WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \
+		$WESTON --backend=$MODDIR/$BACKEND \
 			${CONFIG} \
+			--shell=$SHELL_PLUGIN \
+			--socket=test-${TEST_NAME} \
+			--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
+			--log="$SERVERLOG" \
 			$($abs_builddir/$TEST_FILE --params) \
 			&> "$OUTLOG"
 esac