diff --git a/ChangeLog b/ChangeLog
index 44efdcb9..a88f9ce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-11-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Avoid newlines in some AT_CHECK commands.
+	* tests/standalone.at (linking libltdl without autotools): Wrap
+	lines with dnl, to avoid turning off tracing of AT_CHECK.
+	* tests/subproject.at (linking libltdl without autotools):
+	Likewise.
+
 	Replace uses of $SED $basename.
 	* libltdl/config/ltmain.m4sh (func_mode_link): Replace instances
 	of `$ECHO ... | $SED' with calls to func_basename.
diff --git a/tests/standalone.at b/tests/standalone.at
index f9ba5ed3..39b77c48 100644
--- a/tests/standalone.at
+++ b/tests/standalone.at
@@ -80,9 +80,9 @@ AT_SETUP([linking libltdl without autotools])
 
 _LTDL_PROJECT_FILES([libltdl])
 LT_AT_CHECK_LIBTOOLIZE([--copy --ltdl], [], [ignore])
-LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \
-        CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-	CONFIGURE_OPTIONS="$configure_options"])
+LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" ]dnl
+        [CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ]dnl
+	[CONFIGURE_OPTIONS="$configure_options"])
 
 LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])
 
diff --git a/tests/subproject.at b/tests/subproject.at
index 4b32f44f..0e003a38 100644
--- a/tests/subproject.at
+++ b/tests/subproject.at
@@ -110,9 +110,9 @@ AT_SETUP([linking libltdl without autotools])
 
 _LTDL_PROJECT_FILES([sub/ltdl])
 LT_AT_LIBTOOLIZE([--copy --ltdl=sub/ltdl])
-LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS"  \
-     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" SHELL="$SHELL" MAKE="${MAKE-make}" \
-     CONFIGURE_OPTIONS="$configure_options"])
+LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" ]dnl
+     [CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" SHELL="$SHELL" MAKE="${MAKE-make}" ]dnl
+     [CONFIGURE_OPTIONS="$configure_options"])
 
 LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])