diff --git a/generator/Makefile b/generator/Makefile
index dfa4ea947d358aedb1652f0059c2aed45f56918c..ab8f794ce3b2ab55d3121d0610e67a12ef8ce189 100644
--- a/generator/Makefile
+++ b/generator/Makefile
@@ -50,9 +50,12 @@ tests/jsref/%.ml:
 tests/%.ml.d: tests/%.ml
 	$(OCAMLDEP) -I $(<D) $< | $(DEPSED) > $@
 
-tests/%.cmi tests/%.log.js tests/%.unlog.js: tests/%.ml main.byte stdlib
+tests/%.cmi tests/%.unlog.js: tests/%.ml main.byte stdlib
 	./main.byte -I $(<D) $<
 
+tests/%.log.js: tests/%.ml tests/%.cmi main.byte stdlib
+	./main.byte -I $(<D) -log $<
+
 tests: $(ML_TESTS:.ml=.log.js)
 
 tests/lambda: tests/lambda/Lambda.log.js
diff --git a/generator/js_of_ast.ml b/generator/js_of_ast.ml
index 429ea2886b3fc80e3bab824e1ed45933d844faca..6a20f118fe656cfe1041f7331b31c2fb82970110 100644
--- a/generator/js_of_ast.ml
+++ b/generator/js_of_ast.ml
@@ -1,3 +1,4 @@
+open Params
 open Asttypes
 open Attributes
 open Log
@@ -246,7 +247,7 @@ type generate_mode =
   | Mode_line_token
   | Mode_logged
 
-let current_mode = Mode_unlogged
+let current_mode = if !logging then Mode_logged else Mode_unlogged
 
 
 (****************************************************************)