Index: postlfs/filesystems/btrfs-progs.xml
===================================================================
--- postlfs/filesystems/btrfs-progs.xml	(revision cbb6df66c6534b9367e333d31f680ac7120471f4)
+++ postlfs/filesystems/btrfs-progs.xml	(revision 85ac148b6600f3bd14d5ef23290b58058ec89e5f)
@@ -10,5 +10,5 @@
   <!ENTITY btrfs-progs-size          "2.1 MB">
   <!ENTITY btrfs-progs-buildsize     "92 MB (add 2.7 GB for tests)">
-  <!ENTITY btrfs-progs-time          "0.3 SBU (add 45 SBU for tests)">
+  <!ENTITY btrfs-progs-time          "0.2 SBU (add 45-90 SBU for tests, depending on disk speed)">
 ]>
 
@@ -86,6 +86,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests),
-      <xref linkend="python2"/> (python bindings), and
+      <xref linkend="lvm2"/> (<command>dmsetup</command> is used in tests) and
       <xref linkend="reiserfs"/> (for tests)
     </para>
@@ -109,6 +108,7 @@
     <note>
       <para>
-        CONFIG_BTRFS_FS_POSIX_ACL and 
-        CONFIG_REISERFS_FS_XATTR are required for some tests.
+        CONFIG_BTRFS_FS_POSIX_ACL,
+        CONFIG_REISERFS_FS_XATTR, and
+        CONFIG_REISERFS_FS_POSIX_ACL are required for some tests.
         Other Btrfs options in the kernel are optional.
       </para>
@@ -146,13 +146,12 @@
       </para>
     </note>
-
-    <para>
-      Before running tests, build a support program:
-      <!-- and disable several that fail:-->
-    </para>
-
-<screen remap="test"><userinput>make fssum &amp;&amp;
-
-sed -i '/found/s/^/: #/' tests/convert-tests.sh &amp;&amp;</userinput></screen>
+<!-- Keeping this for now, but it seems that calling "make test" is
+     simpler and does the same thing
+    <para>
+      Before running tests, build a support program
+      and disable several that fail:
+    </para>
+
+<screen remap="test"><userinput>make fssum</userinput></screen>
 
     <para>
@@ -162,11 +161,34 @@
 
 <screen role="root" remap="test"><userinput>pushd tests
-   ./fsck-tests.sh    <!-- 43 tests  6m14s -->
-   ./mkfs-tests.sh    <!-- 20 tests  2m48s -->
-   ./cli-tests.sh     <!-- 12 tests  0m51s -->
-   ./convert-tests.sh <!-- 16 tests 13m36s -->
-   ./misc-tests.sh    <!-- 38 tests  3m18s -->
-   ./fuzz-tests.sh    <!--  8 tests  1m11s -->
+   ./fsck-tests.sh
+   ./mkfs-tests.sh
+   ./cli-tests.sh
+   ./convert-tests.sh
+   ./misc-tests.sh
+   ./fuzz-tests.sh
 popd</userinput></screen>
+-->
+    <para>
+      To test the results, run (as the
+      <systemitem class="username">root</systemitem>):
+    </para>
+
+<screen role="root" remap="test"><userinput>make test</userinput></screen>
+
+    <note>
+      <para>
+        If the above mentioned kernel options are not enabled, some tests
+        fail, and prevent all the remaining tests to run, because the test
+        disk image is not cleanly unmounted.
+      </para>
+    </note>
+
+    <para>
+      Two tests fail for unknown reasons in the
+      <command>test-libbtrfsutil</command> section. Tests take a very long
+      time, and it may be interesting to run only part of them. Running tests
+      only in one directory can be done with
+      <command>make TEST=&lt;DIR&gt; test</command>.
+    </para>
 
     <para>
@@ -191,10 +213,10 @@
       is needed if the recommended dependencies are not installed.
     </para>
-
+<!-- not anymore in the commands
     <para>
       <command>mv tests/{cli,convert,misc,fuzz}-tests/ ...</command>: Disables
       tests that fail and prevent tests from completing.
     </para>
-
+-->
     <para>
       <command>ln -s ... /usr/lib/libbtrfs.so</command>: Creates a 
Index: postlfs/security/libpwquality.xml
===================================================================
--- postlfs/security/libpwquality.xml	(revision cbb6df66c6534b9367e333d31f680ac7120471f4)
+++ postlfs/security/libpwquality.xml	(revision 85ac148b6600f3bd14d5ef23290b58058ec89e5f)
@@ -84,10 +84,10 @@
       <xref linkend="linux-pam"/>
     </para>
-
+<!-- Do not advertise python 2 since python 3 can be used
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="python2"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/libpwquality"/>
Index: postlfs/security/volume_key.xml
===================================================================
--- postlfs/security/volume_key.xml	(revision cbb6df66c6534b9367e333d31f680ac7120471f4)
+++ postlfs/security/volume_key.xml	(revision 85ac148b6600f3bd14d5ef23290b58058ec89e5f)
@@ -86,10 +86,10 @@
       <xref linkend="swig"/>
     </para>
-
+<!-- We prevent using Python2, so do not advertise it
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="python2"/>
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/volume_key"/>
