diff --git a/ChangeLog b/ChangeLog
index 80bd02c5..eb086ed7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-14  Akim Demaille  <akim@epita.fr>
+
+	* examples/calc++/test: Use set -x only when VERBOSE.
+
 2005-10-13  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* NEWS: Bison now warns if it finds a stray `$' or `@' in an action.
diff --git a/examples/calc++/test b/examples/calc++/test
index b2766e0f..2f8a0454 100755
--- a/examples/calc++/test
+++ b/examples/calc++/test
@@ -2,6 +2,7 @@
 
 test -z "$VERBOSE" && {
    exec > /dev/null 2>&1
+   set -x
 }
 
 cat >input <<EOF
@@ -21,8 +22,6 @@ d := a + b * c
 EOF
 ./calc++ input
 
-set -x
-echo toto
 cat >input <<EOF
 toto := 1
 toto