Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ general/genlib/enchant.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -153,5 +153,5 @@
       </para>
 
-<screen><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF"
+<screen remap="test"><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF"
 <literal>Tel me more abot linux
 Ther ar so many commads</literal>
Index: general/genlib/keyutils.xml
===================================================================
--- general/genlib/keyutils.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ general/genlib/keyutils.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -84,5 +84,5 @@
     <systemitem class="username">root</systemitem> user: </para>
 
-<screen role="root"><userinput>sed -i '/find/s:/usr/bin/::' tests/Makefile &amp;&amp;
+<screen role="root" remap="test"><userinput>sed -i '/find/s:/usr/bin/::' tests/Makefile &amp;&amp;
 make -k test </userinput></screen> 
 
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ general/prog/openjdk.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -245,5 +245,5 @@
     </para>
 
-<screen><userinput>export JT_JAVA=$(echo $PWD/build/*/jdk) &amp;&amp;
+<screen remap="test"><userinput>export JT_JAVA=$(echo $PWD/build/*/jdk) &amp;&amp;
 jtreg/bin/jtreg -jdk:$JT_JAVA -automatic -ignore:quiet -v1 \
     test/jdk:tier1 test/langtools:tier1 &amp;&amp;
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ general/prog/rust.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -314,5 +314,5 @@
     </para>
 
-<screen><command>grep 'running .* tests' rustc-testlog | awk '{ sum += $2 } END { print sum }'</command></screen>
+<screen remap="test"><userinput>grep 'running .* tests' rustc-testlog | awk '{ sum += $2 } END { print sum }'</userinput></screen>
 
     <para>
@@ -321,5 +321,5 @@
     </para>
 
-<screen><command>grep '^test result:' rustc-testlog | awk  '{ sum += $6 } END { print sum }'</command></screen>
+<screen remap="test"><userinput>grep '^test result:' rustc-testlog | awk  '{ sum += $6 } END { print sum }'</userinput></screen>
 
     <para>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ multimedia/libdriv/sdl.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -113,5 +113,5 @@
     test programs:</para>
 
-<screen><userinput>cd test &amp;&amp;
+<screen remap="test"><userinput>cd test &amp;&amp;
 ./configure &amp;&amp;
 make</userinput></screen>
Index: postlfs/filesystems/btrfs-progs.xml
===================================================================
--- postlfs/filesystems/btrfs-progs.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ postlfs/filesystems/btrfs-progs.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -121,5 +121,5 @@
     disable several that fail:</para>
 
-<screen><userinput>make fssum &amp;&amp;
+<screen remap="test"><userinput>make fssum &amp;&amp;
 
 sed -i '/found/s/^/: #/' tests/convert-tests.sh &amp;&amp;
@@ -135,5 +135,5 @@
     class="username">root</systemitem> user): </para>
 
-<screen><userinput>pushd tests
+<screen remap="test"><userinput>pushd tests
    ./fsck-tests.sh
    ./mkfs-tests.sh
Index: postlfs/filesystems/mdadm.xml
===================================================================
--- postlfs/filesystems/mdadm.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ postlfs/filesystems/mdadm.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -110,10 +110,10 @@
     tests fail and build the supporting programs:</para>
 
-<screen><userinput>sed -i 's# if.* == "1"#&amp; -a -e $targetdir/log#' test &amp;&amp;
+<screen remap="test"><userinput>sed -i 's# if.* == "1"#&amp; -a -e $targetdir/log#' test &amp;&amp;
 make test</userinput></screen>
 
     <para>Run the tests as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>./test --keep-going --logdir=test-logs --save-logs</userinput></screen>
+<screen role="root" remap="test"><userinput>./test --keep-going --logdir=test-logs --save-logs</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ postlfs/security/cracklib.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -151,5 +151,5 @@
     unprivileged user by issuing the following command:</para>
 
-<screen><userinput>make test</userinput></screen>
+<screen remap="test"><userinput>make test</userinput></screen>
 
     <important>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ server/databases/mariadb.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -177,6 +177,6 @@
       A more extensive set of tests can be run with the following:</para>
 
-<screen><userinput>pushd mysql-test
-./mtr --parallel &lt;N&gt; --mem --force
+<screen remap="test"><userinput>pushd mysql-test
+./mtr --parallel <replaceable>&lt;N&gt;</replaceable> --mem --force
 popd</userinput></screen>
 
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ server/major/bind.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -146,5 +146,5 @@
     messages do not affect the tests.</para></note>
 
-<screen role="root"><userinput>bin/tests/system/ifconfig.sh up</userinput></screen>
+<screen role="root" remap="test"><userinput>bin/tests/system/ifconfig.sh up</userinput></screen>
 
     <para>The test suite may indicate some skipped tests depending on
@@ -158,5 +158,5 @@
     test interfaces:</para>
 
-<screen role="root"><userinput>bin/tests/system/ifconfig.sh down</userinput></screen>
+<screen role="root" remap="test"><userinput>bin/tests/system/ifconfig.sh down</userinput></screen>
 
     <para>Finally, install the package as the <systemitem
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ x/lib/fltk.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -141,5 +141,5 @@
     class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make -C test          docdir=/usr/share/doc/fltk-&fltk-version; install-linux &amp;&amp;
+<screen role="root" remap="doc"><userinput>make -C test          docdir=/usr/share/doc/fltk-&fltk-version; install-linux &amp;&amp;
 make -C documentation docdir=/usr/share/doc/fltk-&fltk-version; install-linux</userinput></screen>
 
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 8a4d9f9f5fa053fa7a4c66661a68677733d825d3)
+++ xsoft/other/inkscape.xml	(revision e7d4e823f98b98c14fa9c503042d6640769fa058)
@@ -172,5 +172,5 @@
     </para>
 
-<screen><userinput>bash download-gtest.sh</userinput></screen>
+<screen remap="test"><userinput>bash download-gtest.sh</userinput></screen>
 
     <para>
