diff --git a/ChangeLog b/ChangeLog
index 2ffbceec..8629a747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Enable colored Autotest testsuite output if available.
+	* tests/testsuite.at: Move AT_INIT call down to late in the
+	file, all prior code can go beforehand.
+	Call AT_COLOR_TESTS if defined.
+
 2010-06-14  Peter O'Gorman  <peter@pogma.com>
 
 	Pass resident test with --disable-shared too.
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 423e5446..39359626 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,6 @@
 # Process with autom4te to create an -*- Autotest -*- test suite.
 #
-#   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+#   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
@@ -23,8 +23,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ####
 
-AT_INIT
-
 m4_divert_push([PREPARE_TESTS])dnl
 : ${tst_dist=dist}
 : ${ACLOCAL=aclocal}
@@ -441,6 +439,11 @@ m4_pattern_allow([^dnl$])
 # We exercise these tools.
 dnl AT_TESTED([grep autoreconf autom4te automake])
 
+# Enable colored output if available.
+m4_ifdef([AT_COLOR_TESTS], [AT_COLOR_TESTS])
+
+AT_INIT
+
 ## ----------- ##
 ## The suite.  ##
 ## ----------- ##