diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml
index 01ddc97cd2..3c547bd45b 100644
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@@ -111,23 +111,18 @@
     <para role="optional">
       <xref linkend="cogl"/>,
       <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libdrm"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="qt4"/>,
-      <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
-      <ulink url="http://www.valgrind.org">Valgrind</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to provide extended test suite
-    coverage)</bridgehead>
-    <para role="optional">
       <xref linkend="gs"/> (for testing the postscript backend),
       <xref linkend="gtk2"/> (for testing the PDF backend),
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libdrm"/>,
       <xref linkend="librsvg"/> (for testing the SVG backend),
       <ulink url="http://libspectre.freedesktop.org">libspectre</ulink> (for
-      testing the PDF backend) and
-      <xref linkend="poppler"/> (for testing the PDF backend).
+      testing the PDF backend),
+      <xref linkend="mesalib"/>,
+      <xref linkend="poppler"/> (for testing the PDF backend),
+      <xref linkend="qt4"/>,
+      <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
+      <ulink url="http://www.valgrind.org">Valgrind</ulink>.
     </para>
 
     <note>
@@ -161,12 +156,13 @@ patch -p1 &lt; ../cairo-&cairo-version;-expose-snapshot-1.patch &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k check</command>.
-    </para>
-
-    <para>
-      Note that the tests take a long time to run and many of them fail for
-      unknown reasons.
+      Note that the tests take a long time to run, many of them fail for unknown
+      reasons and it has been known to cause a kernel panic. <!-- I suspect that
+      the panic was due to a bug in the xf86-video-ati driver but I can't be
+      sure as the system locked up hard. cairo-1.12.0 has exposed bugs in other
+      parts of Xorg https://bugs.freedesktop.org/show_bug.cgi?id=47266 Andy
+      2012-04-22 --> If you want to run the tests issue:
+      <command>make -k check</command>.
     </para>
 
     <para>