4 files changed, 6 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 877c2fc5..26b59108 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -67,5 +67,4 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
 	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
 
 TESTS=Everything-1.0.typelib GIMarshallingTests-1.0.typelib
-TESTS_ENVIRONMENT=$(srcdir)/gi-tester
-
+LOG_COMPILER=$(srcdir)/gi-tester
diff --git a/tests/gi-tester b/tests/gi-tester
index a7be6904..6f31a0d7 100755
--- a/tests/gi-tester
+++ b/tests/gi-tester
@@ -47,7 +47,7 @@ case $targetname in
     fi
     ;;
 *)
-    echo $"Usage: [TESTARGS=<args>] gi-tester <targetname>"
+    echo $"Usage: [TESTARGS=<args>] gi-tester <targetname>" $1
     exit 1
     ;;
 esac
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 999116de..7a154b38 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -199,8 +199,8 @@ PYTESTS = \
 XFAIL_TESTS = Typedefs-1.0.gir
 TESTS = Headeronly-1.0.gir $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) $(PYTESTS)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \
-	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-	$(top_srcdir)/tests/gi-tester
+	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
+LOG_COMPILER = $(top_srcdir)/tests/gi-tester
 
 EXTRA_DIST += \
 	$(PYTESTS) \
diff --git a/tests/scanner/annotationparser/Makefile.am b/tests/scanner/annotationparser/Makefile.am
index 1a65125c..3003df85 100644
--- a/tests/scanner/annotationparser/Makefile.am
+++ b/tests/scanner/annotationparser/Makefile.am
@@ -5,8 +5,8 @@ TESTS = \
 	test_patterns.py
 
 TESTS_ENVIRONMENT = builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \
-	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-	$(top_srcdir)/tests/gi-tester
+	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
+LOG_COMPILER = $(top_srcdir)/tests/gi-tester
 
 EXTRA_DIST = \
 	$(TESTS)				\