diff --git a/tests/local.at b/tests/local.at
index 5753ade9..9ede293d 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -19,7 +19,7 @@
 # 02111-1307, USA.
 
 # We want a recent Autotest.
-m4_version_prereq([2.57])
+m4_version_prereq([2.58])
 
 
 ## ------------------------------- ##
diff --git a/tests/testsuite.at b/tests/testsuite.at
index a7510021..d54975d7 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -18,11 +18,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# Initializes Autotest, imports macros etc.  It will trigger a warning
-# with Autoconf 2.58, because it includes this file automatically, but
-# it causes no real problem.
-m4_include([local.at])
-
 
 # Testing resistance to user bugs.
 m4_include([input.at])