diff --git a/ChangeLog b/ChangeLog
index e309b19f..19527f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-23  Eric Blake  <ebb9@byu.net>
+
+	Run more tests under Solaris.
+	* tests/local.at (AT_CHECK_AUTOCONF): Don't skip entire test
+	group when passing over syntax checks.
+
 2009-07-23  Romain Lenglet  <romain.lenglet@laposte.net>
 
 	Clean up temporary files generated by Erlang macros.
diff --git a/tests/local.at b/tests/local.at
index 9280e237..ed7e509a 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -210,8 +210,8 @@ cp "$abs_top_srcdir/tests/statesave.m4" aclocal.m4
 # were running too fast.
 m4_define([AT_CHECK_AUTOCONF],
 [AT_CHECK_M4([autoconf --force $1], [$2], [$3], [$4])
-if test -s configure; then
-  AT_CHECK_SHELL_SYNTAX(configure)
+if test -s configure && test "$ac_cv_sh_n_works" = yes; then
+  AT_CHECK_SHELL_SYNTAX([configure])
 fi
 ])