diff --git a/.gitignore b/.gitignore
index 29879a5613394a06c6cd5856c335124a0c4f07ce..a211be98530fe2e74253bcab4a72cd18bad75552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ config.cache
 /po/stamp-po
 /po/guix.pot
 /guix-build
+/tests/*.trs
diff --git a/Makefile.am b/Makefile.am
index a096c9b95d4a1983c210cc2c46ee6cadc3c9a44c..8f8cb12c856e21c267ceafc2ccfde112d37f5647 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,9 +48,12 @@ TESTS =						\
   tests/build-utils.scm				\
   tests/packages.scm
 
-TESTS_ENVIRONMENT =							\
-  NIXPKGS="$(NIXPKGS)"							\
-  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"	\
+TESTS_ENVIRONMENT =								\
+  NIXPKGS="$(NIXPKGS)";								\
+  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH";	\
+  export NIXPKGS GUILE_LOAD_COMPILED_PATH;
+
+LOG_COMPILER =					\
   $(GUILE) --no-auto-compile -L "$(top_srcdir)"
 
 EXTRA_DIST = build-aux/config.rpath $(TESTS)