diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index 5c0d51605..0ae74531c 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -174,7 +174,9 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">make -k check</userinput></screen>
 
-    <para>Four tests named <quote>Run property ...</quote> are known to
+    <para>Seven gold tests are known to fail with gcc-11.1.0</para>
+
+    <para>Four ld tests named <quote>Run property ...</quote> are known to
     fail.</para>
 
     <para>Install the package:</para>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index b32935b00..96be76734 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -142,7 +142,7 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
     <para>Six tests related to get_time are known to fail.  These are
     apparently related to the en_HK locale.</para>
 
-    <para>Additionally, the test constexpr-52830 is known to fail.</para>
+    <para>Additionally, three tests in constexpr-52830 are known to fail.</para>
 
 <!--<para>Additionally the following tests related to the following files
     are known to fail with glibc-2.33: asan_test.C, co-ret-17-void-ret-coro.C, 
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index b7269d50f..c6d800fb2 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -181,8 +181,11 @@ esac</userinput></screen>
       </listitem>
 
       <listitem>
+        <!-- FIXME This currently tests SSBD and STIBP which do not exist
+         on non-intel, should be fixed in glibc-2.34
+         https://sourceware.org/pipermail/libc-alpha/2021-January/122171.html -->
         <para><emphasis>elf/tst-cpu-features-cpuinfo</emphasis>
-        may fail on some architectures.</para>
+        will fail on non-intel CPUs with this version of glibc.</para>
       </listitem>
 
       <listitem>
diff --git a/chapter08/tar.xml b/chapter08/tar.xml
index e638221c6..2adad5790 100644
--- a/chapter08/tar.xml
+++ b/chapter08/tar.xml
@@ -72,7 +72,9 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>One test, capabilities: binary store/restore, is known to fail.</para>
+    <para>One test, capabilities: binary store/restore, is known to fail if it is
+    run (LFS lacks selinux), but will be skipped if the host kernel does
+    not support extended attributes on the filesystem used for building LFS.</para>
 
     <para>Install the package:</para>