diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7dd02ca4..7ef61a24 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,7 +3,7 @@ TESTS = surface-test.la client-test.la	\
 	surface-global-test.la		\
 	button-test.la keyboard-test.la
 
-TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-test
+TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-tests-env
 
 export abs_builddir
 
@@ -68,7 +68,7 @@ if BUILD_SETBACKLIGHT
 setbacklight = setbacklight
 endif
 
-EXTRA_DIST = weston-test
+EXTRA_DIST = weston-tests-env
 
 BUILT_SOURCES =					\
 	wayland-test-protocol.c			\
diff --git a/tests/weston-test b/tests/weston-tests-env
similarity index 100%
rename from tests/weston-test
rename to tests/weston-tests-env