diff --git a/tests/calc.at b/tests/calc.at
index 95a6e5e7..992b911c 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -763,8 +763,8 @@ AT_JAVA_IF(
   [AT_PARSER_CHECK([calc input],        0, [AT_PARAM_IF([m4_n([$3])])], [stderr])])
 AT_LANG_MATCH([c\|c++\|java],
   [AT_GLR_IF([],
-    [AT_CHECK([grep -v 'Return for a new token:' stderr | wc -l],
-              [0],
+    [AT_CHECK([grep -c -v 'Return for a new token:' stderr],
+              [ignore],
               [m4_n([AT_DEBUG_IF([$4], [0])])])])])
 ])
 
diff --git a/tests/local.at b/tests/local.at
index 33a8afa8..97ff0e8b 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -1601,7 +1601,7 @@ $9
 # (C90 and C++98) guarantee: 32767.  In that case, GCC's -pedantic
 # will issue an error.
 #
-# There is no "" around `wc` since some indent the result.
+# There is no "" around `wc` since some wc indent the result.
 m4_bmatch([$4], [%define lr.type canonical-lr],
 [if test 32767 -lt `wc -l < input.c`; then
   CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic / /'`