diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index fe360c897..414576666 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -178,15 +178,24 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">make -k check</userinput></screen>
 
-    <para>Twelve tests fail in the <command>gold</command> testsuite when the
+    <para>Twelve tests fail in the gold testsuite when the
     <option>--enable-default-pie</option> and
     <option>--enable-default-ssp</option> options are passed to GCC.
     <!-- Caused by egrep deprecation.  Note that we don't "patch" temp grep.
          And it seems unworthy to add a sed into temp grep just for one test
          failure.  (I don't really agree to "patch" grep in the first place,
-         anyway.) -->
+         anyway.)
+         Will be fixed in 2.40 (upstream commit 67d1991). -->
     The test named <filename>ar with versioned solib</filename> is also
-    known to fail.</para>
+    known to fail.
+    <!-- https://sourceware.org/bugzilla/show_bug.cgi?id=29107 -->
+    Because of a race between the gas testsuite and the gprofng testsuite,
+    some gas tests may fail if parallel jobs are used.  If you are not
+    assured of the correctness of gas, invoke
+    <command>make check-gas</command> to run gas testsuite separately and
+    all tests should pass. Three gprofng tests result
+    <literal>ERROR</literal> and they are counted as
+    <literal>UNRESOLVED</literal> in the summary.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 0cdba2695..423f3854e 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -158,7 +158,7 @@ esac</userinput></screen>
 
     <para>You may see some test failures. The Glibc test suite is
     somewhat dependent on the host system. A few failures out of
-    over 4200 tests can generally be ignored. This is a list of the
+    over 5000 tests can generally be ignored. This is a list of the
     most common issues seen for recent versions of LFS:</para>
 
     <itemizedlist>