diff --git a/ChangeLog b/ChangeLog
index d0f80147..9e6afbd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-13  Akim Demaille  <akim@epita.fr>
+
+	* lib/autotest/general.m4 (AT_INIT): Let --keywords also match
+	test group titles.
+	* tests/atspecific.m4 (AT_CHECK_AU_MACRO): AT_KEYWORDS(autoupdate).
+	Remove all the other keywords.
+
 2001-09-10  Akim Demaille  <akim@epita.fr>
 
 	* lib/autotest/general.m4 (AT_INIT): Remove the diversion HELP and
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index eb647171..ada4acc3 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -212,8 +212,9 @@ while test $[@%:@] -gt 0; do
         at_tests_selected=$at_help_all
         for at_keyword in `IFS=,; set X $[1]; shift; echo ${1+$[@]}`
         do
+          # It is on purpose that we match the test group titles too.
           at_tests_selected=`echo "$at_tests_selected" |
-                             egrep -i "^[[^;]]*;[[^;]]*;[[^;]]*;.*$at_keyword"`
+                             egrep -i "^[[^;]]*;[[^;]]*;.*$at_keyword"`
         done
         at_tests_selected=`echo "$at_tests_selected" | sed 's/;.*//'`
         at_tests="$at_tests$at_tests_selected "
diff --git a/tests/atspecific.m4 b/tests/atspecific.m4
index 5c2a04f7..6fe738b8 100644
--- a/tests/atspecific.m4
+++ b/tests/atspecific.m4
@@ -161,7 +161,6 @@ AT_CHECK_ENV
 # New macros are not expected to depend upon obsolete macros.
 m4_define([AT_CHECK_MACRO],
 [AT_SETUP([$1])
-AT_KEYWORDS([$1])
 
 AT_CONFIGURE_AC([m4_default([$2], [$1])])
 
@@ -189,7 +188,7 @@ AT_CLEANUP()dnl
 # Remove config.hin to avoid `autoheader: config.hin is unchanged'.
 m4_define([AT_CHECK_AU_MACRO],
 [AT_SETUP([$1])
-AT_KEYWORDS([$1])
+AT_KEYWORDS([autoupdate])
 
 AT_CONFIGURE_AC([$1])
 
diff --git a/tests/semantics.at b/tests/semantics.at
index a36e4750..4fff3f67 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -201,7 +201,6 @@ AT_CHECK_MACRO([AC_CHECK_TYPES],
 # Check that we properly dispatch properly to the old implementation
 # or to the new one.
 AT_SETUP([AC_CHECK_TYPES: backward compatibility])
-AT_KEYWORDS([AC_CHECK_TYPES])
 
 AT_DATA([configure.ac],
 [[AC_INIT
@@ -330,7 +329,7 @@ AT_CLEANUP(path)
 ## ---------------- ##
 
 AT_SETUP([[AC_C_BIGENDIAN]])
-AT_KEYWORDS([AC_C_BIGENDIAN,cross])
+AT_KEYWORDS([cross])
 
 # Make sure that AC_C_BIGENDIAN behave the same whether we are
 # cross-compiling or not.
diff --git a/tests/tools.at b/tests/tools.at
index 2f2d6a24..0de403c7 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -137,7 +137,6 @@ AT_CLEANUP
 # autoconf --trace: user macros
 # -----------------------------
 AT_SETUP([autoconf --trace: user macros])
-AT_KEYWORDS([autoconf,traces])
 
 
 m4_pattern_allow([^m4_(define|shift)$])
@@ -227,7 +226,6 @@ AT_CLEANUP
 # autoconf --trace: builtins
 # --------------------------
 AT_SETUP([autoconf --trace: builtins])
-AT_KEYWORDS([autoconf,traces])
 
 AT_DATA([configure.ac],
 [[define([active], [ACTIVE])