diff --git a/ChangeLog b/ChangeLog
index 7085a341..95397601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-20  Akim Demaille  <akim@epita.fr>
+
+	* tests/base.at, tests/compile.at, tests/foreign.at,
+	* tests/m4sh.at, tests/m4sugar.at, tests/mktests.sh,
+	* tests/semantics.at, tests/suite.at, tests/tools.at,
+	* tests/torture.at: Ask Autotest mode, not Autoconf mode.
+
 2001-08-20  Akim Demaille  <akim@epita.fr>
 
 	* bin/autom4te.in (handle_output): Handle @__@.
diff --git a/tests/base.at b/tests/base.at
index 0c332bce..31523e0f 100644
--- a/tests/base.at
+++ b/tests/base.at
@@ -1,4 +1,4 @@
-#							-*- autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([Autoconf base layer.])
 
diff --git a/tests/compile.at b/tests/compile.at
index 50066442..32ed8023 100644
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -1,4 +1,4 @@
-#							-*- autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([Low level compiling/preprocessing macros.])
 
diff --git a/tests/foreign.at b/tests/foreign.at
index 3c705d3b..e91d8863 100644
--- a/tests/foreign.at
+++ b/tests/foreign.at
@@ -1,4 +1,4 @@
-#							-*- autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([Compatibility with other tools.])
 
diff --git a/tests/m4sh.at b/tests/m4sh.at
index 803eac02..ce17d880 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -1,4 +1,4 @@
-#							-*- Autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([M4sh.])
 
diff --git a/tests/m4sugar.at b/tests/m4sugar.at
index 7e46d0c9..23e958b5 100644
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -1,4 +1,4 @@
-#							-*- Autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([M4sugar.])
 
diff --git a/tests/mktests.sh b/tests/mktests.sh
index 0098ddc8..b1f1ce26 100755
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -197,7 +197,8 @@ do
   # Filter out required macros.
   {
     sed 's/^ *//' <<MK_EOF
-    # Generated by $as_me, do not edit by hand.	-*- Autoconf -*-
+    # Generated by $as_me, do not edit by hand.	-*- Autotest -*-
+    # Copyright 2000, 2001 Free Software Foundation, Inc.
 
     AT_BANNER([Testing autoconf/$base macros.])
 
diff --git a/tests/semantics.at b/tests/semantics.at
index 797e0932..105e3efc 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -1,4 +1,4 @@
-#							-*- autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([Semantics.])
 
diff --git a/tests/suite.at b/tests/suite.at
index 53026335..8f5a91c4 100644
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -1,4 +1,4 @@
-# Validation suite for Autoconf                           -*- Autoconf -*-
+# Validation suite for Autoconf                           -*- Autotest -*-
 
 # Copyright 2000, 2001 Free Software Foundation, Inc.
 #
diff --git a/tests/tools.at b/tests/tools.at
index abf5720f..c826a4e4 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -1,4 +1,4 @@
-#							-*- autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([Executables (autoheader, autoupdate...).])
 
diff --git a/tests/torture.at b/tests/torture.at
index 2dcad4b8..700ac9d8 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,4 +1,4 @@
-#							-*- autoconf -*-
+#							-*- Autotest -*-
 
 AT_BANNER([[Testing config.status.