diff --git a/archive/perl-modules.xml b/archive/perl-modules.xml
index f997a681d4..9302aaed0d 100644
--- a/archive/perl-modules.xml
+++ b/archive/perl-modules.xml
@@ -204,7 +204,7 @@
     here at the top level to slightly reduce the complexity of the XML
     source for this page.</para>
 
-    <para>Where a module is shown as '(for the testsuite)' it is required if
+    <para>Where a module is shown as '(for the test suite)' it is required if
     you wish to run the test for the module which uses it.</para>
 
     <para> In all cases, only
@@ -258,10 +258,10 @@
 MD5 sum: &Archive-Zip-md5sum;</literallayout>
         <itemizedlist>
           <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz">Test::MockModule</ulink> - This uses the <xref linkend="perl-build-install"/>
-(https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz) (for the test suite)</literallayout>
             <itemizedlist>
               <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz">SUPER</ulink>
-(https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz) (for the test suite)</literallayout>
                 <itemizedlist>
                   <listitem>
                     <para>
@@ -541,7 +541,7 @@ MD5 sum: &Data-Dump-md5sum;</literallayout>
     <para>This module provides three simple routines for generating unique IDs.
     It uses the standard <xref linkend="perl-standard-install"/>.</para>
 
-    <para>Although the final test fails and reports an Error, the testsuite
+    <para>Although the final test fails and reports an Error, the test suite
     returns a status of 0. This error can safely be ignored.</para>
 
     <!-- Data-Uniqid -->
@@ -586,7 +586,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
         <itemizedlist>
           <!-- Both DateTime::Locale and DateTime::TimeZone now need
           namespace::autoclean, Specio and Params::ValidationCompiler.
-          The latter needs Specio but only for its testsuite -->
+          The latter needs Specio but only for its test suite -->
 
           <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz">CPAN::Meta::Check</ulink>
 (https://cpan.metacpan.org/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz)</literallayout>
@@ -634,7 +634,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
                            <listitem>
                              <para>
                                <xref linkend="perl-test-requires"/>
-                               (for the testsuite)
+                               (for the test suite)
                              </para>
                            </listitem>
                         </itemizedlist> <!-- end of deps for Package-Stash-XS -->
@@ -670,11 +670,11 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
                 </para>
               </listitem>
               <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.005001.tar.gz">Sub::Quote</ulink>
-(https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.005001.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.005001.tar.gz) (for the test suite)</literallayout>
                 <itemizedlist>
                   <listitem>
                     <para>
-                      <xref linkend="perl-test-fatal"/> (for the testsuite)
+                      <xref linkend="perl-test-fatal"/> (for the test suite)
                     </para>
                   </listitem>
                 </itemizedlist>
@@ -682,7 +682,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
             </itemizedlist> <!-- end of Specio deps -->
           </listitem>
 
-          <!-- Params::ValidationCompiler needs Specio for its testsuite -->
+          <!-- Params::ValidationCompiler needs Specio for its test suite -->
           <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz">Params::ValidationCompiler</ulink>
 (https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz)</literallayout>
             <itemizedlist><!--- deps for Params::ValidationCompiler -->
@@ -698,7 +698,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
 
               <!-- Test2::Plugin::NoWarnings -->
               <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz">Test2::Plugin::NoWarnings</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz) (for the test suite)</literallayout>
                 <itemizedlist>
                   <!-- Test2::Bundle::Extended and Test2::Require::Module are from Test2-Suite -->
                   <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test2-Suite-0.000115.tar.gz">Test2::Suite</ulink>
@@ -720,10 +720,10 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
 (https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Term-Table-0.012.tar.gz)</literallayout>
                       </listitem>
                       <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz">Module::Pluggable</ulink>
-(https://cpan.metacpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz) (for the test suite)</literallayout>
                       </listitem>
                       <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz">Scope::Guard</ulink>
-(https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz) (for the test suite)</literallayout>
                       </listitem>
                     </itemizedlist> <!-- end of deps for Test2::Suite -->
                   </listitem>
@@ -745,7 +745,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
 (https://cpan.metacpan.org/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz)</literallayout>
               </listitem>
               <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz">File::ShareDir</ulink>
-(https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz) (for the test suite)</literallayout>
                 <itemizedlist><!-- File-ShareDir deps apart from File::ShareDir:Install (above) -->
                   <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz">Class::Inspector</ulink>
 (https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz)</literallayout>
@@ -753,7 +753,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
                 </itemizedlist>
               </listitem>
               <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz">Test::File::ShareDir</ulink>
-(https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz) (for the test suite)</literallayout>
                 <itemizedlist><!-- Test-File-ShareDir deps  -->
                   <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz">Class::Tiny</ulink>
 (https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz)</literallayout>
@@ -762,15 +762,15 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
 (https://cpan.metacpan.org/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.44.tar.gz)</literallayout>
                     <itemizedlist><!-- deps for File-Copy-Recursive -->
                       <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz">Path::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz) (for the test suite)</literallayout>
                       </listitem>
                       <listitem>
                         <para>
-                          <xref linkend="perl-test-exception"/> (for the testsuite)
+                          <xref linkend="perl-test-exception"/> (for the test suite)
                         </para>
                       </listitem>
                       <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz">Test::File</ulink>
-(https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz) (for the test suite)</literallayout>
                         <itemizedlist><!-- deps for Test-File -->
                           <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz">Test::utf8</ulink>
 (https://cpan.metacpan.org/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz)</literallayout>
@@ -779,7 +779,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
                       </listitem>
                       <listitem>
                         <para>
-                          <xref linkend="perl-test-warnings"/> (for the testsuite)
+                          <xref linkend="perl-test-warnings"/> (for the test suite)
                         </para>
                       </listitem>
                     </itemizedlist> <!-- end of deps for File-Copy-Recursive -->
@@ -794,7 +794,7 @@ MD5 sum: &Data-Uniqid-md5sum;</literallayout>
                   </listitem>
                 </itemizedlist>
               </listitem>
-              <!-- Test-Warnings for testsuite now pulled in for File-Copy-Recursive -->
+              <!-- Test-Warnings for test suite now pulled in for File-Copy-Recursive -->
             </itemizedlist> <!-- end of deps for DateTime::Locale -->
           </listitem>
 
@@ -921,7 +921,7 @@ MD5 sum: &DateTime-Format-Builder-md5sum;</literallayout>
           <!-- deps for Params::Validate:
           Module::Build is a dep of Module::Implementation via Module::Runtime,
           pulled in by Package::Stash in namespace::clean for
-          namespace::autoclean in DateTime, and for testsuites Test::Fatal is
+          namespace::autoclean in DateTime, and for test suites Test::Fatal is
           pulled in for Dist::CheckConflicts for Package::Stash, and
           Test::Requires by Package::Stash::XS for Package::Stash -->
           </listitem>
@@ -1078,7 +1078,7 @@ MD5 sum: &File-BaseDir-md5sum;</literallayout>
           </listitem>
           <listitem>
              <para>
-               <xref linkend="perl-ipc-system-simple"/> (for the testsuite)
+               <xref linkend="perl-ipc-system-simple"/> (for the test suite)
              </para>
           </listitem>
         </itemizedlist>
@@ -1387,7 +1387,7 @@ MD5 sum: &libwww-perl-md5sum;</literallayout>
                   </listitem>
                   <listitem>
                     <para>
-                      <xref linkend="perl-try-tiny"/> (for the testsuite)
+                      <xref linkend="perl-try-tiny"/> (for the test suite)
                     </para>
                   </listitem>
                 </itemizedlist>
@@ -1412,12 +1412,12 @@ MD5 sum: &libwww-perl-md5sum;</literallayout>
           <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz">File::Listing</ulink>
 (https://cpan.metacpan.org/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz)</literallayout>
           </listitem>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz">Test::RequiresInternet</ulink> (for the testsuite)
+          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz">Test::RequiresInternet</ulink> (for the test suite)
 (https://cpan.metacpan.org/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz)</literallayout>
           </listitem>
           <listitem>
             <para>
-              <xref linkend="perl-test-fatal"/> (for the testsuite)
+              <xref linkend="perl-test-fatal"/> (for the test suite)
             </para>
           </listitem>
         </itemizedlist>
@@ -1484,13 +1484,13 @@ MD5 sum: &Lingua-Translit-md5sum;</literallayout>
 MD5 sum: &List-AllUtils-md5sum;</literallayout>
         <itemizedlist>
           <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz">List::SomeUtils</ulink>
-(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz) (for the test suite)</literallayout>
             <itemizedlist>
               <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-0.58.tar.gz">List::SomeUtils::XS</ulink>
 (https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-0.58.tar.gz)</literallayout>
                 <itemizedlist>
                   <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/L/LE/LEEJO/Test-LeakTrace-0.18.tar.gz">Test::LeakTrace</ulink>
-(https://cpan.metacpan.org/authors/id/L/LE/LEEJO/Test-LeakTrace-0.18.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/L/LE/LEEJO/Test-LeakTrace-0.18.tar.gz) (for the test suite)</literallayout>
                   </listitem>
                 </itemizedlist>
               </listitem>
@@ -1506,7 +1506,7 @@ MD5 sum: &List-AllUtils-md5sum;</literallayout>
           </listitem>
           <listitem>
             <para>
-              <xref linkend="perl-test-warnings"/> (for the testsuite)
+              <xref linkend="perl-test-warnings"/> (for the test suite)
             </para>
           </listitem>
         </itemizedlist>
@@ -1542,7 +1542,7 @@ MD5 sum: &List-MoreUtils-md5sum;</literallayout>
 (https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz)</literallayout>
           </listitem>
           <listitem> <literallayout><ulink url="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz">Exporter::Tiny</ulink>
-(https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz) (for the testsuite)</literallayout>
+(https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz) (for the test suite)</literallayout>
           </listitem>
         </itemizedlist>
       </listitem>
@@ -1714,12 +1714,12 @@ MD5 sum: &Module-Build-md5sum;</literallayout>
           </listitem>
           <listitem>
             <para>
-              <xref linkend="perl-test-fatal"/> (for the testsuite)
+              <xref linkend="perl-test-fatal"/> (for the test suite)
             </para>
           </listitem>
           <listitem>
             <para>
-              <xref linkend="perl-test-requires"/> (for the testsuite)
+              <xref linkend="perl-test-requires"/> (for the test suite)
             </para>
           </listitem>
         </itemizedlist>
@@ -1880,7 +1880,7 @@ MD5 sum: &PerlIO-utf8_strict-md5sum;</literallayout>
         <itemizedlist>
           <listitem>
             <para>
-              <xref linkend="perl-test-exception"/> (for the testsuite)
+              <xref linkend="perl-test-exception"/> (for the test suite)
             </para>
           </listitem>
         </itemizedlist>
@@ -2066,7 +2066,7 @@ MD5 sum: &Test-Command-md5sum;</literallayout>
 <literallayout>&Test-Differences-download-http;
 MD5 sum: &Test-Differences-md5sum;</literallayout>
         <itemizedlist>
-          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz">Text::Diff (for the testsuite)</ulink>
+          <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz">Text::Diff (for the test suite)</ulink>
 (https://cpan.metacpan.org/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz)</literallayout>
             <itemizedlist>
               <listitem><literallayout><ulink url="https://cpan.metacpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz">Algorithm::Diff</ulink>
@@ -2463,7 +2463,7 @@ When scripting, pipe the <command>perl Makefile.PL</command> command through <co
           <listitem>
             <para>
               <xref linkend="wget"/> (to download two files from unicode.org
-              in the testsuite)
+              in the test suite)
             </para>
           </listitem>
         </itemizedlist>
@@ -2507,7 +2507,7 @@ MD5 sum: &URI-md5sum;</literallayout>
         <itemizedlist>
           <listitem>
             <para>
-              <xref linkend="perl-test-needs"/> (for the testsuite)
+              <xref linkend="perl-test-needs"/> (for the test suite)
             </para>
           </listitem>
         </itemizedlist>
diff --git a/general/genlib/libaio.xml b/general/genlib/libaio.xml
index 5e1fc85a69..8c8dd68b27 100644
--- a/general/genlib/libaio.xml
+++ b/general/genlib/libaio.xml
@@ -93,7 +93,7 @@
 <screen><userinput>make</userinput></screen>
 
     <para>
-      If you want to run the testsuite, fix an issue with Glibc-2.34 or
+      If you want to run the test suite, fix an issue with Glibc-2.34 or
       later:
     </para>
 
diff --git a/general/genlib/libssh2.xml b/general/genlib/libssh2.xml
index 9f21e2e9bd..7a37c687d0 100644
--- a/general/genlib/libssh2.xml
+++ b/general/genlib/libssh2.xml
@@ -82,7 +82,7 @@
     <para role="optional">
       <xref linkend="gnupg2"/>,
       <xref linkend="libgcrypt"/>, and
-      <xref linkend="openssh"/> (all three are required for the testsuite)
+      <xref linkend="openssh"/> (all three are required for the test suite)
     </para>
 
     <para condition="html" role="usernotes">
diff --git a/general/genlib/libxml2.xml b/general/genlib/libxml2.xml
index f19d54c26d..5b93c85d65 100644
--- a/general/genlib/libxml2.xml
+++ b/general/genlib/libxml2.xml
@@ -73,7 +73,7 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Optional Testsuite:
+          Optional Test Suite:
           <ulink url="https://www.w3.org/XML/Test/xmlts&testsuite-version;.tar.gz"/> - This
           enables <command>make check</command> to do complete testing.
         </para>
@@ -123,7 +123,7 @@
 make</userinput></screen>
 
     <para>
-      If you downloaded the testsuite, issue the following command:
+      If you downloaded the test suite, issue the following command:
     </para>
 
 <screen><userinput>tar xf ../xmlts&testsuite-version;.tar.gz</userinput></screen>
diff --git a/general/genlib/nspr.xml b/general/genlib/nspr.xml
index a1cbcd64b5..84267f67e7 100644
--- a/general/genlib/nspr.xml
+++ b/general/genlib/nspr.xml
@@ -89,7 +89,7 @@ sed -i 's#$(LIBRARY) ##'   config/rules.mk         &amp;&amp;
 make</userinput></screen>
 
     <para>
-      The testsuite is designed for testing changes to nss or nspr and is
+      The test suite is designed for testing changes to nss or nspr and is
       not particularly useful for checking a released version (e.g. it needs
       to be run on a non-optimized build with both nss and nspr directories
       existing alongside each other). For further details, see the User Notes
diff --git a/general/genlib/wv.xml b/general/genlib/wv.xml
index cdd9604fa5..a3eee5a7a9 100644
--- a/general/genlib/wv.xml
+++ b/general/genlib/wv.xml
@@ -95,7 +95,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not have a testsuite.
+      This package does not have a test suite.
     </para>
 
     <para>
diff --git a/general/genlib/xapian.xml b/general/genlib/xapian.xml
index f6d44366e2..eb46516d1c 100644
--- a/general/genlib/xapian.xml
+++ b/general/genlib/xapian.xml
@@ -102,7 +102,7 @@ make</userinput></screen>
       tests) failed.  To run the test suite anyway,
       issue: <command>make check</command>.
       The tests with 1.4.15 took under an hour, at 34 SBU total. Marking
-      the testsuite as usable again. I had four passes and 0 failures:
+      the test suite as usable again. I had four passes and 0 failures:
       PASS: apitest
       PASS: internaltest
       PASS: stemtest
diff --git a/general/genutils/shared-mime-info.xml b/general/genutils/shared-mime-info.xml
index bee335017e..55f988f8ce 100644
--- a/general/genutils/shared-mime-info.xml
+++ b/general/genutils/shared-mime-info.xml
@@ -77,7 +77,7 @@ xreflabel="shared-mime-info-&shared-mime-info-version;">
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Optional download, required to run the testsuite:
+          Optional download, required to run the test suite:
           <ulink url="&xdgmime-download-http;"/>
         </para>
         <para>
diff --git a/general/graphlib/harfbuzz.xml b/general/graphlib/harfbuzz.xml
index 106891036e..8d0e94150e 100644
--- a/general/graphlib/harfbuzz.xml
+++ b/general/graphlib/harfbuzz.xml
@@ -90,7 +90,7 @@
       <xref linkend="git"/>,
       <xref linkend="gtk-doc"/>,
       <ulink url="https://pypi.org/project/FontTools/">FontTools</ulink>
-      (Python 3 module, for the testsuite), and
+      (Python 3 module, for the test suite), and
       <ulink url="https://www.colm.net/open-source/ragel/">ragel</ulink>
     </para>
 
diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml
index f1aea1af5b..14c7ee3b23 100644
--- a/general/prog/gcc.xml
+++ b/general/prog/gcc.xml
@@ -203,7 +203,7 @@ make</userinput></screen>
     <para>
       If you have installed additional packages such as
       <application>Valgrind</application> and <application>GDB</application>,
-      the <application>GCC</application> part of the testsuite will run more
+      the <application>GCC</application> part of the test suite will run more
       tests than in LFS. Some of those will report FAIL and others XPASS
       (pass when expected to FAIL). As of gcc-12.2.0, about 60 FAIL occur
       in the <quote>guality</quote> suite, as well as miscellaneous failures
diff --git a/general/prog/perl-deps/perl-alien-build.xml b/general/prog/perl-deps/perl-alien-build.xml
index 0ac452ae0e..809d5fed8d 100644
--- a/general/prog/perl-deps/perl-alien-build.xml
+++ b/general/prog/perl-deps/perl-alien-build.xml
@@ -54,7 +54,7 @@
 
       <!-- the direct test dependencies are also needed at runtime
            when Alien-Build is used to build Alien-Libxml2
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
       </para>-->
 
diff --git a/general/prog/perl-deps/perl-alien-libxml2.xml b/general/prog/perl-deps/perl-alien-libxml2.xml
index 9bb5fb8a9b..45b0cc3e2d 100644
--- a/general/prog/perl-deps/perl-alien-libxml2.xml
+++ b/general/prog/perl-deps/perl-alien-libxml2.xml
@@ -52,7 +52,7 @@
         <xref linkend="perl-path-tiny"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test2-suite"/>
       </para>
diff --git a/general/prog/perl-deps/perl-b-hooks-endofscope.xml b/general/prog/perl-deps/perl-b-hooks-endofscope.xml
index 5e1df1f117..1c303d5063 100644
--- a/general/prog/perl-deps/perl-b-hooks-endofscope.xml
+++ b/general/prog/perl-deps/perl-b-hooks-endofscope.xml
@@ -51,7 +51,7 @@
         <xref linkend="perl-variable-magic"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-try-tiny"/>
       </para>
diff --git a/general/prog/perl-deps/perl-clone.xml b/general/prog/perl-deps/perl-clone.xml
index 44aeb97c08..878bd8460b 100644
--- a/general/prog/perl-deps/perl-clone.xml
+++ b/general/prog/perl-deps/perl-clone.xml
@@ -46,7 +46,7 @@
 
       <bridgehead renderas="sect4">Clone Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-b-cow"/>
 
diff --git a/general/prog/perl-deps/perl-cpan-meta-check.xml b/general/prog/perl-deps/perl-cpan-meta-check.xml
index 0308a649de..ae3b9150b0 100644
--- a/general/prog/perl-deps/perl-cpan-meta-check.xml
+++ b/general/prog/perl-deps/perl-cpan-meta-check.xml
@@ -44,7 +44,7 @@
 
       <bridgehead renderas="sect4">CPAN::Meta::Check Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (Required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (Required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-deep"/>
       </para>
diff --git a/general/prog/perl-deps/perl-datetime-locale.xml b/general/prog/perl-deps/perl-datetime-locale.xml
index 0b4fa973e4..399b538eb9 100644
--- a/general/prog/perl-deps/perl-datetime-locale.xml
+++ b/general/prog/perl-deps/perl-datetime-locale.xml
@@ -54,7 +54,7 @@
         <!-- perl-params-validationcompiler pulls in perl-specio -->
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-cpan-meta-check"/>,
         <xref linkend="perl-ipc-system-simple"/> and
diff --git a/general/prog/perl-deps/perl-datetime-timezone.xml b/general/prog/perl-deps/perl-datetime-timezone.xml
index 200c1a1785..638e2a5788 100644
--- a/general/prog/perl-deps/perl-datetime-timezone.xml
+++ b/general/prog/perl-deps/perl-datetime-timezone.xml
@@ -57,7 +57,7 @@
         <!-- perl-specio pulls in perl-try-tiny -->
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         Both <xref linkend="perl-test-fatal"/> and
         <xref linkend="perl-test-requires"/>,
diff --git a/general/prog/perl-deps/perl-datetime.xml b/general/prog/perl-deps/perl-datetime.xml
index c1e89c4a54..e253e9e8e5 100644
--- a/general/prog/perl-deps/perl-datetime.xml
+++ b/general/prog/perl-deps/perl-datetime.xml
@@ -53,7 +53,7 @@
         <!-- perl-params-validationcompiler pulls in perl-specio -->
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-cpan-meta-check"/>,
         <xref linkend="perl-test-fatal"/>,
diff --git a/general/prog/perl-deps/perl-dist-checkconflicts.xml b/general/prog/perl-deps/perl-dist-checkconflicts.xml
index 151fad912d..9c4e80ccc2 100644
--- a/general/prog/perl-deps/perl-dist-checkconflicts.xml
+++ b/general/prog/perl-deps/perl-dist-checkconflicts.xml
@@ -49,7 +49,7 @@
         <xref linkend="perl-module-runtime"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>
       </para>
diff --git a/general/prog/perl-deps/perl-eval-closure.xml b/general/prog/perl-deps/perl-eval-closure.xml
index 88e98e7a69..2223d9937b 100644
--- a/general/prog/perl-deps/perl-eval-closure.xml
+++ b/general/prog/perl-deps/perl-eval-closure.xml
@@ -43,7 +43,7 @@
 
       <bridgehead renderas="sect4">Eval::Closure Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>,
         <xref linkend="perl-test-requires"/>
diff --git a/general/prog/perl-deps/perl-ffi-checklib.xml b/general/prog/perl-deps/perl-ffi-checklib.xml
index 57cff199f3..af412c3eec 100644
--- a/general/prog/perl-deps/perl-ffi-checklib.xml
+++ b/general/prog/perl-deps/perl-ffi-checklib.xml
@@ -44,7 +44,7 @@
 
       <bridgehead renderas="sect4">FFI::CheckLib Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-capture-tiny"/>,
         <xref linkend="perl-path-tiny"/>,
diff --git a/general/prog/perl-deps/perl-file-copy-recursive.xml b/general/prog/perl-deps/perl-file-copy-recursive.xml
index bfb8b450fa..218fed18f9 100644
--- a/general/prog/perl-deps/perl-file-copy-recursive.xml
+++ b/general/prog/perl-deps/perl-file-copy-recursive.xml
@@ -45,7 +45,7 @@
 
       <bridgehead renderas="sect4">File::Copy::Recursive Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-path-tiny"/>,
         <xref linkend="perl-test-deep"/>,
diff --git a/general/prog/perl-deps/perl-http-message.xml b/general/prog/perl-deps/perl-http-message.xml
index 79075d0ef2..4bbdebe589 100644
--- a/general/prog/perl-deps/perl-http-message.xml
+++ b/general/prog/perl-deps/perl-http-message.xml
@@ -52,7 +52,7 @@
         <xref linkend="perl-uri"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-needs"/>,
         <xref linkend="perl-try-tiny"/>
diff --git a/general/prog/perl-deps/perl-http-negotiate.xml b/general/prog/perl-deps/perl-http-negotiate.xml
index a99ed4df4b..02c6b9aee5 100644
--- a/general/prog/perl-deps/perl-http-negotiate.xml
+++ b/general/prog/perl-deps/perl-http-negotiate.xml
@@ -44,7 +44,7 @@
 
       <bridgehead renderas="sect4">HTTP::Negotiate Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <!-- The required HTTP~::Headers is part of HTTP::Message -->
         <xref linkend="perl-http-message"/>
diff --git a/general/prog/perl-deps/perl-list-someutils-xs.xml b/general/prog/perl-deps/perl-list-someutils-xs.xml
index 6a56802493..cc8cd2ca18 100644
--- a/general/prog/perl-deps/perl-list-someutils-xs.xml
+++ b/general/prog/perl-deps/perl-list-someutils-xs.xml
@@ -44,7 +44,7 @@
 
       <bridgehead renderas="sect4">List::SomeUtils::XS Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-leaktrace"/>,
         <xref linkend="perl-test-warnings"/>
diff --git a/general/prog/perl-deps/perl-lwp-mediatypes.xml b/general/prog/perl-deps/perl-lwp-mediatypes.xml
index 3d82ea4302..b73a46aa38 100644
--- a/general/prog/perl-deps/perl-lwp-mediatypes.xml
+++ b/general/prog/perl-deps/perl-lwp-mediatypes.xml
@@ -44,7 +44,7 @@
 
       <bridgehead renderas="sect4">LWP::MediaTypes Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>
       </para>
diff --git a/general/prog/perl-deps/perl-module-implementation.xml b/general/prog/perl-deps/perl-module-implementation.xml
index 75ac44c708..a0ac618aad 100644
--- a/general/prog/perl-deps/perl-module-implementation.xml
+++ b/general/prog/perl-deps/perl-module-implementation.xml
@@ -51,7 +51,7 @@
         <xref linkend="perl-try-tiny"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>,
         <xref linkend="perl-test-requires"/>
diff --git a/general/prog/perl-deps/perl-namespace-autoclean.xml b/general/prog/perl-deps/perl-namespace-autoclean.xml
index e4d8734f1c..7d1ef51e89 100644
--- a/general/prog/perl-deps/perl-namespace-autoclean.xml
+++ b/general/prog/perl-deps/perl-namespace-autoclean.xml
@@ -54,7 +54,7 @@
 
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-needs"/>
 
diff --git a/general/prog/perl-deps/perl-package-stash.xml b/general/prog/perl-deps/perl-package-stash.xml
index d58a956e9a..25caedd4bf 100644
--- a/general/prog/perl-deps/perl-package-stash.xml
+++ b/general/prog/perl-deps/perl-package-stash.xml
@@ -53,7 +53,7 @@
       <!-- Note: requirements include Package::Stash::XS but it is ok without that
            and happily skips the test which would use that. -->
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-cpan-meta-check"/>,
         <xref linkend="perl-test-fatal"/>,
diff --git a/general/prog/perl-deps/perl-params-validate.xml b/general/prog/perl-deps/perl-params-validate.xml
index 0fb4cf37bd..5e0985e8bd 100644
--- a/general/prog/perl-deps/perl-params-validate.xml
+++ b/general/prog/perl-deps/perl-params-validate.xml
@@ -50,7 +50,7 @@
         <xref linkend="perl-module-implementation"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>,
         <xref linkend="perl-test-requires"/>
diff --git a/general/prog/perl-deps/perl-params-validationcompiler.xml b/general/prog/perl-deps/perl-params-validationcompiler.xml
index a8026084ad..3333ae0318 100644
--- a/general/prog/perl-deps/perl-params-validationcompiler.xml
+++ b/general/prog/perl-deps/perl-params-validationcompiler.xml
@@ -51,7 +51,7 @@
         <xref linkend="perl-specio"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-without-module"/>,
         <xref linkend="perl-test2-plugin-nowarnings"/>
diff --git a/general/prog/perl-deps/perl-specio.xml b/general/prog/perl-deps/perl-specio.xml
index 0d8c349398..feff4391f3 100644
--- a/general/prog/perl-deps/perl-specio.xml
+++ b/general/prog/perl-deps/perl-specio.xml
@@ -54,7 +54,7 @@
         <xref linkend="perl-try-tiny"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <!-- This claims to need XString, and will use it for memory
          efficiency if present, but runs fine without it. It also
@@ -69,7 +69,7 @@
       <para role="optional">
         <!-- this adds little, but it gets pulled in anyway for DateTime,
              of which Specio is a dependency -->
-        <xref linkend="perl-namespace-autoclean"/> (for the testsuite)
+        <xref linkend="perl-namespace-autoclean"/> (for the test suite)
       </para>
 
     </sect3>
diff --git a/general/prog/perl-deps/perl-sub-quote.xml b/general/prog/perl-deps/perl-sub-quote.xml
index 520cbdd656..fe63b9a9cf 100644
--- a/general/prog/perl-deps/perl-sub-quote.xml
+++ b/general/prog/perl-deps/perl-sub-quote.xml
@@ -43,7 +43,7 @@
 
       <bridgehead renderas="sect4">Sub::Quote Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>
       </para>
diff --git a/general/prog/perl-deps/perl-super.xml b/general/prog/perl-deps/perl-super.xml
index 23c9640746..54df664672 100644
--- a/general/prog/perl-deps/perl-super.xml
+++ b/general/prog/perl-deps/perl-super.xml
@@ -44,7 +44,7 @@
 
       <bridgehead renderas="sect4">SUPER Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-sub-identify"/>
       </para>
diff --git a/general/prog/perl-deps/perl-test-file-sharedir.xml b/general/prog/perl-deps/perl-test-file-sharedir.xml
index 2b158deacf..509753fa9e 100644
--- a/general/prog/perl-deps/perl-test-file-sharedir.xml
+++ b/general/prog/perl-deps/perl-test-file-sharedir.xml
@@ -57,7 +57,7 @@
         <xref linkend="perl-scope-guard"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>
       </para>
diff --git a/general/prog/perl-deps/perl-test-file.xml b/general/prog/perl-deps/perl-test-file.xml
index 7eed001a6a..985b69e5e3 100644
--- a/general/prog/perl-deps/perl-test-file.xml
+++ b/general/prog/perl-deps/perl-test-file.xml
@@ -43,7 +43,7 @@
 
       <bridgehead renderas="sect4">Test::File Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-utf8"/>
       </para>
diff --git a/general/prog/perl-deps/perl-test-mockmodule.xml b/general/prog/perl-deps/perl-test-mockmodule.xml
index 26b2dea35d..359f0775dd 100644
--- a/general/prog/perl-deps/perl-test-mockmodule.xml
+++ b/general/prog/perl-deps/perl-test-mockmodule.xml
@@ -50,7 +50,7 @@
         <xref linkend="perl-super"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-warnings"/>
       </para>
diff --git a/general/prog/perl-deps/perl-test2-plugin-nowarnings.xml b/general/prog/perl-deps/perl-test2-plugin-nowarnings.xml
index b5e25879e8..794c71e6ad 100644
--- a/general/prog/perl-deps/perl-test2-plugin-nowarnings.xml
+++ b/general/prog/perl-deps/perl-test2-plugin-nowarnings.xml
@@ -49,7 +49,7 @@
         <xref linkend="perl-test2-suite"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-ipc-run3"/>
       </para>
diff --git a/general/prog/perl-deps/perl-try-tiny.xml b/general/prog/perl-deps/perl-try-tiny.xml
index dd5425ad74..e0d431c923 100644
--- a/general/prog/perl-deps/perl-try-tiny.xml
+++ b/general/prog/perl-deps/perl-try-tiny.xml
@@ -45,7 +45,7 @@
 
       <bridgehead renderas="sect4">Try::Tiny Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Optional (can be used by the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Optional (can be used by the test suite)</bridgehead>
       <para role="optional">
         <!-- runs one more test if this is present -->
         <xref linkend="perl-capture-tiny"/>
diff --git a/general/prog/perl-modules.xml b/general/prog/perl-modules.xml
index 4e808d52ea..283324792b 100644
--- a/general/prog/perl-modules.xml
+++ b/general/prog/perl-modules.xml
@@ -65,10 +65,10 @@
       It is generally worth running the tests for perl modules, they often
       can show problems such as missing dependencies which are required to
       use the module.  Here, the editors have attempted to separate those
-      dependencies which are only required for running testsuites, but they
+      dependencies which are only required for running test suites, but they
       will not be mentioned for a module where one of its dependencies uses
-      that module for its own testsuite.  That is to say, if you intend to
-      run the testsuites, please run them for each dependency of the module.
+      that module for its own test suite.  That is to say, if you intend to
+      run the test suites, please run them for each dependency of the module.
     </para>
 
     <para>
diff --git a/general/prog/perl-modules/perl-archive-zip.xml b/general/prog/perl-modules/perl-archive-zip.xml
index 1914d7988f..c04d7b14d6 100644
--- a/general/prog/perl-modules/perl-archive-zip.xml
+++ b/general/prog/perl-modules/perl-archive-zip.xml
@@ -43,7 +43,7 @@
 
       <bridgehead renderas="sect4">Archive::Zip Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (for the test suite)</bridgehead>
       <para role="required">
         <xref linkend="unzip"/> (with its patch)
       </para>
diff --git a/general/prog/perl-modules/perl-data-uniqid.xml b/general/prog/perl-modules/perl-data-uniqid.xml
index 9c399af8f1..461456fb63 100644
--- a/general/prog/perl-modules/perl-data-uniqid.xml
+++ b/general/prog/perl-modules/perl-data-uniqid.xml
@@ -47,7 +47,7 @@
       <title>Installation of Data::Uniqid</title>
 
       <para>
-        Although the final test fails and reports an Error, the testsuite
+        Although the final test fails and reports an Error, the test suite
         returns a status of 0. The error can safely be ignored.
       </para>
 
diff --git a/general/prog/perl-modules/perl-file-slurper.xml b/general/prog/perl-modules/perl-file-slurper.xml
index 2f2be638d7..8d68076142 100644
--- a/general/prog/perl-modules/perl-file-slurper.xml
+++ b/general/prog/perl-modules/perl-file-slurper.xml
@@ -43,7 +43,7 @@
 
       <bridgehead renderas="sect4">File::Slurper Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-warnings"/>
       </para>
diff --git a/general/prog/perl-modules/perl-libwww-perl.xml b/general/prog/perl-modules/perl-libwww-perl.xml
index beb45d8758..ba120f2cd9 100644
--- a/general/prog/perl-modules/perl-libwww-perl.xml
+++ b/general/prog/perl-modules/perl-libwww-perl.xml
@@ -67,7 +67,7 @@
         <xref linkend="perl-www-robotrules"/>
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>,
         <xref linkend="perl-test-needs"/> and
diff --git a/general/prog/perl-modules/perl-perlio-utf8_strict.xml b/general/prog/perl-modules/perl-perlio-utf8_strict.xml
index 7e3ec4d51a..a9b4fc3e74 100644
--- a/general/prog/perl-modules/perl-perlio-utf8_strict.xml
+++ b/general/prog/perl-modules/perl-perlio-utf8_strict.xml
@@ -43,7 +43,7 @@
 
       <bridgehead renderas="sect4">PerlIO::utf8_strict Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-exception"/>
       </para>
diff --git a/general/prog/perl-modules/perl-test-differences.xml b/general/prog/perl-modules/perl-test-differences.xml
index 291884a213..d1743eab32 100644
--- a/general/prog/perl-modules/perl-test-differences.xml
+++ b/general/prog/perl-modules/perl-test-differences.xml
@@ -48,7 +48,7 @@
         <xref linkend="perl-text-diff"/>,
       </para>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-capture-tiny"/>
       </para>
diff --git a/general/prog/perl-modules/perl-unicode-linebreak.xml b/general/prog/perl-modules/perl-unicode-linebreak.xml
index 1bda9252e0..869999c08c 100644
--- a/general/prog/perl-modules/perl-unicode-linebreak.xml
+++ b/general/prog/perl-modules/perl-unicode-linebreak.xml
@@ -47,7 +47,7 @@
       <para role="required">
         <xref linkend="perl-mime-charset"/>, also
         <xref linkend="wget"/> (to download two files from unicode.org in the
-        testsuite)
+        test suite)
       </para>
 
       <bridgehead renderas="sect5">Optional</bridgehead>
diff --git a/general/prog/perl-modules/perl-uri.xml b/general/prog/perl-modules/perl-uri.xml
index b7cd7d1bdb..2b291542c2 100644
--- a/general/prog/perl-modules/perl-uri.xml
+++ b/general/prog/perl-modules/perl-uri.xml
@@ -50,7 +50,7 @@
 
       <bridgehead renderas="sect4">URI Dependencies</bridgehead>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-test-fatal"/>,
         <xref linkend="perl-test-needs"/>, and
diff --git a/general/prog/pyatspi2.xml b/general/prog/pyatspi2.xml
index 80d9a5d838..6f04678c72 100644
--- a/general/prog/pyatspi2.xml
+++ b/general/prog/pyatspi2.xml
@@ -99,7 +99,7 @@
 <screen><userinput>./configure --prefix=/usr --with-python=/usr/bin/python3</userinput></screen>
 
       <para>
-        This package does not come with a testsuite.
+        This package does not come with a test suite.
       </para>
 
       <para>
diff --git a/general/prog/pygobject2.xml b/general/prog/pygobject2.xml
index 3bdde92998..c65a634cb2 100644
--- a/general/prog/pygobject2.xml
+++ b/general/prog/pygobject2.xml
@@ -110,7 +110,7 @@
 make</userinput></screen>
 
       <para>
-        This package does not have a working testsuite.
+        This package does not have a working test suite.
       </para>
 
       <para>
diff --git a/general/prog/rust.xml b/general/prog/rust.xml
index 3cb8d9e702..d668c9097b 100644
--- a/general/prog/rust.xml
+++ b/general/prog/rust.xml
@@ -218,7 +218,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gdb"/> (used by the testsuite if it is present) and
+      <xref linkend="gdb"/> (used by the test suite if it is present) and
       <ulink url='https://libgit2.org/'>libgit2</ulink>
     </para>
 
@@ -347,7 +347,7 @@ python3 ./x.py build --exclude src/tools/miri</userinput></screen>
 
     <note>
       <para>
-        The testsuite will generate some messages in the
+        The test suite will generate some messages in the
         <phrase revision="sysv">system log</phrase>
         <phrase revision="systemd">systemd journal</phrase>
         for traps on invalid opcodes, and for segmentation faults.
@@ -375,7 +375,7 @@ python3 ./x.py build --exclude src/tools/miri</userinput></screen>
     </para>
 
     <para>
-      As with all large testsuites, other tests might fail on some machines -
+      As with all large test suites, other tests might fail on some machines -
       if the number of additional failures is in the single digits,
       check the log for 'failures:' and review lines above that, particularly the
       'stderr:' lines. Any mention of
@@ -514,7 +514,7 @@ cp -a install/* /</userinput></screen>
     </para>
 
     <para>
-      <command>--no-fail-fast</command>: this switch ensures that the testsuite
+      <command>--no-fail-fast</command>: this switch ensures that the test suite
       will not stop at the first error.
     </para>
 
diff --git a/general/sysutils/bluez.xml b/general/sysutils/bluez.xml
index 5c84b5a612..e860c0e114 100644
--- a/general/sysutils/bluez.xml
+++ b/general/sysutils/bluez.xml
@@ -136,7 +136,7 @@ Security Options ---&gt;
 
 <!--
     <para>
-      If you wish to run the testsuite (even if treating this package as a build
+      If you wish to run the test suite (even if treating this package as a build
       dependency), you will need to enable the following options in the kernel
       configuration and recompile the kernel if necessary:
     </para>
diff --git a/general/sysutils/notification-daemon.xml b/general/sysutils/notification-daemon.xml
index 2d38227053..e273610bfd 100644
--- a/general/sysutils/notification-daemon.xml
+++ b/general/sysutils/notification-daemon.xml
@@ -95,7 +95,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not come with a testsuite.
+      This package does not come with a test suite.
     </para>
 
     <para>
diff --git a/general/sysutils/systemd.xml b/general/sysutils/systemd.xml
index 1c40732b32..5cd5f5f633 100644
--- a/general/sysutils/systemd.xml
+++ b/general/sysutils/systemd.xml
@@ -197,7 +197,7 @@ ninja</userinput></screen>
 
     <note>
       <para>
-        For the best test results, make sure you run the testsuite from
+        For the best test results, make sure you run the test suite from
         a system that is booted by the same
         <application>systemd</application> version you are rebuilding.
       </para>
diff --git a/gnome/applications/cheese.xml b/gnome/applications/cheese.xml
index 86ea9fa8e6..5aad0a616e 100644
--- a/gnome/applications/cheese.xml
+++ b/gnome/applications/cheese.xml
@@ -149,7 +149,7 @@ meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
      <para>
-      This package does not have a working testsuite.
+      This package does not have a working test suite.
     </para>
 
     <para>
diff --git a/gnome/applications/evince.xml b/gnome/applications/evince.xml
index b32faeb5c6..913413f613 100644
--- a/gnome/applications/evince.xml
+++ b/gnome/applications/evince.xml
@@ -155,7 +155,7 @@ meson --prefix=/usr          \
 ninja</userinput></screen>
 
     <para>
-      This package does not have a working testsuite.
+      This package does not have a working test suite.
     </para>
 
     <para>
diff --git a/gnome/applications/gucharmap.xml b/gnome/applications/gucharmap.xml
index e59e2266b3..a8b60f251f 100644
--- a/gnome/applications/gucharmap.xml
+++ b/gnome/applications/gucharmap.xml
@@ -144,7 +144,7 @@ meson --prefix=/usr         \
 ninja</userinput></screen>
 
     <para>
-      This package does not have a testsuite.
+      This package does not have a test suite.
     </para>
 
     <para>
diff --git a/gnome/platform/gfbgraph.xml b/gnome/platform/gfbgraph.xml
index 9cb3e928da..be6b2c6f03 100644
--- a/gnome/platform/gfbgraph.xml
+++ b/gnome/platform/gfbgraph.xml
@@ -101,7 +101,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not have a working testsuite.
+      This package does not have a working test suite.
     </para>
 
     <para>
diff --git a/gnome/platform/gnome-video-effects.xml b/gnome/platform/gnome-video-effects.xml
index 8387297d91..27d3eab4e2 100644
--- a/gnome/platform/gnome-video-effects.xml
+++ b/gnome/platform/gnome-video-effects.xml
@@ -88,7 +88,7 @@ meson --prefix=/usr --buildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      This package does not come with a testsuite.
+      This package does not come with a test suite.
     </para>
 
     <para>
diff --git a/gnome/platform/libsecret.xml b/gnome/platform/libsecret.xml
index 210d680679..58dc005a03 100644
--- a/gnome/platform/libsecret.xml
+++ b/gnome/platform/libsecret.xml
@@ -89,7 +89,7 @@
       <xref linkend="valgrind"/> (can be used in tests)
     </para>
 
-    <bridgehead renderas="sect4">Optional (Required for the testsuite)</bridgehead>
+    <bridgehead renderas="sect4">Optional (Required for the test suite)</bridgehead>
     <para role="optional">
       <xref linkend="dbus-python"/>,
       <xref linkend="gjs"/>,
diff --git a/introduction/welcome/changelog-2010.txt b/introduction/welcome/changelog-2010.txt
index 6022b6decf..a450b1f561 100644
--- a/introduction/welcome/changelog-2010.txt
+++ b/introduction/welcome/changelog-2010.txt
@@ -722,7 +722,7 @@ February 21st, 2010
 
 February 20th, 2010
     [randy] - Modified the libxml2 instructions to remove the
-    mention of the optional testsuite as it will cause the tests to
+    mention of the optional test suite as it will cause the tests to
     fail.
 
 February 18th, 2010
diff --git a/multimedia/audioutils/pnmixer.xml b/multimedia/audioutils/pnmixer.xml
index d944a4351e..813e9f4a6e 100644
--- a/multimedia/audioutils/pnmixer.xml
+++ b/multimedia/audioutils/pnmixer.xml
@@ -95,7 +95,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr ..  &amp;&amp;
 make</userinput></screen>
 
     <para>
-      This package does not have a testsuite.
+      This package does not have a test suite.
     </para>
 
     <para>
diff --git a/multimedia/libdriv/libvpx.xml b/multimedia/libdriv/libvpx.xml
index 5a9cf0c6fa..8172569086 100644
--- a/multimedia/libdriv/libvpx.xml
+++ b/multimedia/libdriv/libvpx.xml
@@ -153,7 +153,7 @@ make</userinput></screen>
     </para>
 
     <para>
-      <command>LD_LIBRARY_PATH=.</command>: This is needed for the testsuite
+      <command>LD_LIBRARY_PATH=.</command>: This is needed for the test suite
       to use the library that was just built.
     </para>
 
diff --git a/multimedia/libdriv/v4l-utils.xml b/multimedia/libdriv/v4l-utils.xml
index f738322d66..44ea494dc5 100644
--- a/multimedia/libdriv/v4l-utils.xml
+++ b/multimedia/libdriv/v4l-utils.xml
@@ -124,7 +124,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not come with a testsuite.
+      This package does not come with a test suite.
     </para>
 
     <para>
diff --git a/networking/netlibs/libsoup.xml b/networking/netlibs/libsoup.xml
index 53cd9b1bc0..7722051a8e 100644
--- a/networking/netlibs/libsoup.xml
+++ b/networking/netlibs/libsoup.xml
@@ -132,7 +132,7 @@
     <title>Installation of libsoup</title>
 <!--
     <para>
-      First, fix a problem in the testsuite caused by
+      First, fix a problem in the test suite caused by
       <xref role="nodep" linkend="glib-networking"/>:
     </para>
 
diff --git a/networking/netlibs/nghttp2.xml b/networking/netlibs/nghttp2.xml
index fefa7b59b6..36426c196e 100644
--- a/networking/netlibs/nghttp2.xml
+++ b/networking/netlibs/nghttp2.xml
@@ -85,7 +85,7 @@
         <xref linkend="setuptools"/>, <!- -(required for the python bindings- ->
       </phrase> -->
       <ulink url="http://cunit.sourceforge.net/">CUnit</ulink> (required for
-      the testsuite),
+      the test suite),
 <!--      <ulink url="http://www.digip.org/jansson/">Jansson</ulink>, <!- -required
       to build the HPACK tools-->
       <ulink url="https://jemalloc.net/">jemalloc</ulink>,
diff --git a/networking/netlibs/serf.xml b/networking/netlibs/serf.xml
index 3dd348c112..778b300d92 100644
--- a/networking/netlibs/serf.xml
+++ b/networking/netlibs/serf.xml
@@ -130,7 +130,7 @@ scons PREFIX=/usr</userinput></screen>
 -->
 
 <!-- With Python 3, check.py is broken. It could be fixed, but since the
-     testsuite hangs anyway...
+     test suite hangs anyway...
     <para>
       To test the results, issue: <command>scons check</command>.
       The tests currently will cause a hang.
@@ -138,7 +138,7 @@ scons PREFIX=/usr</userinput></screen>
 -->
 
     <para>
-      This package does not come with a functional testsuite.
+      This package does not come with a functional test suite.
     </para>
 
     <para>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index 6d546acb1d..a624e54ba7 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -108,7 +108,7 @@
       <xref linkend="cyrus-sasl"/>,
       <xref linkend="gdb"/>,
       <xref linkend="git"/>,
-      <xref linkend="gnupg2"/> (required for ADS and testsuite),
+      <xref linkend="gnupg2"/> (required for ADS and test suite),
       <xref linkend="libaio"/>,
       <xref linkend="libarchive"/>,
       <xref linkend="libcap-pam"/>,
@@ -186,7 +186,7 @@
 <screen><userinput remap="pre">python3 -m venv pyvenv &amp;&amp;
 ./pyvenv/bin/pip3 install cryptography pyasn1 iso8601</userinput></screen>
 
-    <!-- To editors: with the following "fix", the testsuite reports "4
+    <!-- To editors: with the following "fix", the test suite reports "4
          unexpected passes" for me.  If those tests still fail on some
          systems, uncomment *and* change "knownfail" to "skip" to silence
          the related tests.  -->
@@ -1298,7 +1298,7 @@ systemctl start smbd.socket</userinput></screen>
         <term><command>smbtorture</command></term>
         <listitem>
           <para>
-            is  a testsuite that runs several tests against a SMB server
+            is  a test suite that runs several tests against a SMB server
           </para>
           <indexterm zone="samba smbtorture">
             <primary sortas="b-smbtorture">smbtorture</primary>
diff --git a/postlfs/security/gpgme.xml b/postlfs/security/gpgme.xml
index 6f004be47e..1ccf9def01 100644
--- a/postlfs/security/gpgme.xml
+++ b/postlfs/security/gpgme.xml
@@ -94,7 +94,7 @@
       <xref linkend="doxygen"/> and
       <xref linkend="graphviz"/> (for API documentation),
       <xref linkend="gnupg2"/> (required if Qt or SWIG are installed;
-        used during the testsuite),
+        used during the test suite),
       <xref linkend="clisp"/>,<!--
 gpgme can still use python 2.7, but can use python3 as well,
 so do not advertise python2
diff --git a/postlfs/security/mitkrb.xml b/postlfs/security/mitkrb.xml
index 04f448095d..2769ba2f09 100644
--- a/postlfs/security/mitkrb.xml
+++ b/postlfs/security/mitkrb.xml
@@ -89,8 +89,8 @@
       <xref linkend="keyutils"/>,
       <xref linkend="openldap"/>,<!-- Seems so that mit has its own
       implementation of rpc now.
-      <xref linkend="rpcbind"/> (used during the testsuite),-->
-      <xref linkend="valgrind"/> (used during the testsuite),
+      <xref linkend="rpcbind"/> (used during the test suite),-->
+      <xref linkend="valgrind"/> (used during the test suite),
       <xref linkend="yasm"/>,
       <ulink url="https://thrysoee.dk/editline/">libedit</ulink>,
       <ulink url="https://cmocka.org/">cmocka</ulink>,
@@ -148,7 +148,7 @@ make</userinput></screen>
       To test the build, issue as the <systemitem
       class="username">root</systemitem> user: <command>make -k -j1 check</command>.
       <!-- You need at least <xref link end="tcl"/>, which is used to drive the
-      testsuite.  Furthermore, <xref link end="dejagnu"/> must be available for
+      test suite.  Furthermore, <xref link end="dejagnu"/> must be available for
       some of the tests to run.--> If you have a former version of MIT Kerberos V5
       installed, it may happen that the test suite may pick up the installed
       versions of the libraries, rather than the newly built ones. If so, it is
diff --git a/postlfs/security/openssh.xml b/postlfs/security/openssh.xml
index 58f54c96f9..8f7b1fe142 100644
--- a/postlfs/security/openssh.xml
+++ b/postlfs/security/openssh.xml
@@ -177,7 +177,7 @@ fi</userinput></screen>
 make</userinput></screen>
 
     <para>
-      The testsuite requires an installed copy of <command>scp</command> to
+      The test suite requires an installed copy of <command>scp</command> to
       complete the multiplexing tests. To run the test suite, first copy the
       <command>scp</command> program to
       <filename class="directory">/usr/bin</filename>, making sure that you
diff --git a/pst/ps/fop.xml b/pst/ps/fop.xml
index 4a1836b661..6a048f572e 100644
--- a/pst/ps/fop.xml
+++ b/pst/ps/fop.xml
@@ -261,7 +261,7 @@ ant all javadocs &amp;&amp;
 mv build/javadocs .</userinput></screen>
 
       <para>
-        This package comes with a testsuite, but the java infrastructure
+        This package comes with a test suite, but the java infrastructure
         installed in this book does not allow running it.
       </para>
 
diff --git a/pst/typesetting/biber.xml b/pst/typesetting/biber.xml
index 5538083c76..92a9b4b4c2 100644
--- a/pst/typesetting/biber.xml
+++ b/pst/typesetting/biber.xml
@@ -236,7 +236,7 @@
       -->
     </para>
 
-    <bridgehead renderas="sect4">Recommended (required for the testsuite)</bridgehead>
+    <bridgehead renderas="sect4">Recommended (required for the test suite)</bridgehead>
     <para role="recommended">
       <xref linkend="perl-file-which"/> and
       <xref linkend="perl-test-differences"/>
diff --git a/pst/typesetting/dvisvgm.xml b/pst/typesetting/dvisvgm.xml
index f914f4cc1e..70e783713a 100644
--- a/pst/typesetting/dvisvgm.xml
+++ b/pst/typesetting/dvisvgm.xml
@@ -127,7 +127,7 @@
 <screen><userinput>sed "s/gs_error_names\[/error_names[/" -i src/Ghostscript.cpp</userinput></screen>
 
     <para>
-      The testsuite assumes that a modern version of <application>Python</application>
+      The test suite assumes that a modern version of <application>Python</application>
       has been installed as plain <command>python</command>. Changing this to use
       <command>python3</command> requires a sed to one <filename>Makefile.in</filename>
       file.
diff --git a/pst/typesetting/texlive.xml b/pst/typesetting/texlive.xml
index a7784c42a6..85fc0087d9 100644
--- a/pst/typesetting/texlive.xml
+++ b/pst/typesetting/texlive.xml
@@ -56,7 +56,7 @@
       Most of TeX Live can be built from source without a pre-existing
       installation, but <application>xindy</application> (for indexing) needs
       working versions of <command>latex</command> and
-      <command>pdflatex</command> when configure is run, and the testsuite
+      <command>pdflatex</command> when configure is run, and the test suite
       and install for <command>asy</command> (for vector graphics) will fail
       if TeX has not already been installed. Additionally,
       <application>biber</application> is not provided within the
diff --git a/pst/typesetting/xindy.xml b/pst/typesetting/xindy.xml
index a23175442e..2fb438a232 100644
--- a/pst/typesetting/xindy.xml
+++ b/pst/typesetting/xindy.xml
@@ -119,7 +119,7 @@ patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-2.patch &amp;&amp;
 make LC_ALL=POSIX</userinput></screen>
 
     <para>
-      This package does not have a testsuite.
+      This package does not have a test suite.
     </para>
 
     <para>
diff --git a/server/mail/postfix.xml b/server/mail/postfix.xml
index 66f8da1444..8868ead04e 100644
--- a/server/mail/postfix.xml
+++ b/server/mail/postfix.xml
@@ -309,7 +309,7 @@ AUXLIBS='-lssl -lcrypto'</literal></screen>
      makefiles &amp;&amp;
 make</userinput></screen>
 
-    <!-- There is a testsuite, but it fails a lot. It seems to need
+    <!-- There is a test suite, but it fails a lot. It seems to need
          the host to be specifically setup for the tests.
          Run with `make tests' and `make root_tests' -->
     <para>
diff --git a/template/template-perl-module.xml b/template/template-perl-module.xml
index bd8c505e93..47a300e1e2 100644
--- a/template/template-perl-module.xml
+++ b/template/template-perl-module.xml
@@ -69,10 +69,10 @@
         <xref linkend="perl-wibble"/> and
         <xref linkend="perl-wobble"/>
 
-      <bridgehead renderas="sect5">Recommended (required for the testsuite)</bridgehead>
+      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
       <para role="recommended">
         <xref linkend="perl-silly"/>,
-        <!-- perl-silly pulls in perl-bar-eejit for its own testsuite -->
+        <!-- perl-silly pulls in perl-bar-eejit for its own test suite -->
         <xref linkend="perl-teststuff"/>
 
       </para>
diff --git a/x/installing/libinput.xml b/x/installing/libinput.xml
index 5d7ad1dd62..a2e3199954 100644
--- a/x/installing/libinput.xml
+++ b/x/installing/libinput.xml
@@ -30,7 +30,7 @@
     </indexterm>
 
     <sect3 role="package">
-      <title>Introduction to libinput</title>
+      <title>Introduction to Libinput</title>
 
       <para>
         <application>libinput</application> is a library that handles
@@ -98,11 +98,11 @@
     </sect3>
 
     <sect3 role="kernel" id="libinput-kernel">
-      <title>kernel configuration for running the libinput testsuite</title>
+      <title>Kernel Configuration for Running the Libinput Test Suite</title>
 
       <para>
         Although libinput works with the same kernel configuration used by <xref
-        linkend="libevdev"/>, its extensive testsuite requires the presence of
+        linkend="libevdev"/>, its extensive test suite requires the presence of
         <filename>/dev/uinput</filename>  (as well as both <xref linkend="valgrind"/>
         and <xref linkend="libunwind"/>).
       </para>
@@ -118,13 +118,13 @@
     &lt;*/M&gt;   User level driver support        [CONFIG_INPUT_UINPUT]</literal></screen>
 
       <para>
-        If you build this as a module, it needs to be inserted before the testsuite
+        If you build this as a module, it needs to be inserted before the test suite
         runs.
       </para>
 
       <para>
         On an Xorg system you will also need to prevent the events generated
-        during the testsuite from interfering with your desktop.  Copy the
+        during the test suite from interfering with your desktop.  Copy the
         file <filename>test/50-litest.conf</filename> into
         <filename class="directory">${XORG_PREFIX}/share/X11/xorg.conf.d</filename>
         and restart X. For further information see
@@ -137,7 +137,7 @@
     </sect3>
 
     <sect3 role="installation">
-      <title>Installation of libinput</title>
+      <title>Installation of Libinput</title>
 
       <para>
         Install <application>libinput</application> by running the following
@@ -160,7 +160,7 @@ ninja</userinput></screen>
         <para>
           If you want to run the full tests, remove -Dtests from the
           <command>meson</command> command above. Please read "kernel
-          configuration for running the libinput testsuite" (above).
+          configuration for running the libinput test suite" (above).
         </para>
 
         <para>
diff --git a/x/lib/atk.xml b/x/lib/atk.xml
index 1c200eb9a6..83640d8797 100644
--- a/x/lib/atk.xml
+++ b/x/lib/atk.xml
@@ -105,7 +105,7 @@ meson --prefix=/usr --buildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      This package does not come with a testsuite.
+      This package does not come with a test suite.
     </para>
 
     <para>
diff --git a/x/lib/atkmm.xml b/x/lib/atkmm.xml
index c555a6f5d5..84e9e253f3 100644
--- a/x/lib/atkmm.xml
+++ b/x/lib/atkmm.xml
@@ -94,7 +94,7 @@ meson --prefix=/usr --buildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      This package does not come with a testsuite.
+      This package does not come with a test suite.
     </para>
 
     <para>
diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml
index e1cb53432c..e3b121c7c7 100644
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@@ -159,7 +159,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not have a working testsuite.
+      This package does not have a working test suite.
       <!-- The test suite can be run with 'make check', but 488 tests fail and
       59 tests pass. This seems to be due to minute changes in the expected
       output, similar to librsvg's tests. Since it's a huge chunk of the tests,
diff --git a/x/lib/clutter-gst.xml b/x/lib/clutter-gst.xml
index ad6256e580..c10c24c12f 100644
--- a/x/lib/clutter-gst.xml
+++ b/x/lib/clutter-gst.xml
@@ -114,7 +114,7 @@ Seems to work now 20151016. - Bruce
 make</userinput></screen>
 
     <para>
-      This package does not come with a testsuite.
+      This package does not come with a test suite.
     </para>
 
     <para>
diff --git a/x/lib/gtk-vnc.xml b/x/lib/gtk-vnc.xml
index 045d057e90..e133814532 100644
--- a/x/lib/gtk-vnc.xml
+++ b/x/lib/gtk-vnc.xml
@@ -109,7 +109,7 @@ meson --prefix=/usr --buildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      This package does not come with a testsuite.
+      This package does not come with a test suite.
     </para>
 
     <para>
diff --git a/x/lib/webkitgtk.xml b/x/lib/webkitgtk.xml
index 3676b1bc82..72aa519c2f 100644
--- a/x/lib/webkitgtk.xml
+++ b/x/lib/webkitgtk.xml
@@ -190,7 +190,7 @@ cmake -DCMAKE_BUILD_TYPE=Release  \
 ninja</userinput></screen>
 
     <para>
-      This package does not have a working testsuite. However, there is a
+      This package does not have a working test suite. However, there is a
       usable basic graphical web browser in the build directory,
       <application>build/bin/MiniBrowser</application>. If launching it fails,
       there is a problem with the build.
diff --git a/x/wm/fluxbox.xml b/x/wm/fluxbox.xml
index ee5fc85cc1..cbca5452ff 100644
--- a/x/wm/fluxbox.xml
+++ b/x/wm/fluxbox.xml
@@ -108,7 +108,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not have a working testsuite.
+      This package does not have a working test suite.
     </para>
 
     <para>
diff --git a/x/wm/icewm.xml b/x/wm/icewm.xml
index a3084bebf2..6c1b03fce8 100644
--- a/x/wm/icewm.xml
+++ b/x/wm/icewm.xml
@@ -122,7 +122,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \
 make</userinput></screen>
 
     <para>
-      This package does not have a working testsuite.
+      This package does not have a working test suite.
     </para>
 
     <para>
diff --git a/xsoft/other/inkscape.xml b/xsoft/other/inkscape.xml
index 2372244862..c47deefa8d 100644
--- a/xsoft/other/inkscape.xml
+++ b/xsoft/other/inkscape.xml
@@ -170,7 +170,7 @@
      With 1.0, this support is broken, so let's comment it out for now to
      prevent confusion.
     <para>
-      If you wish to run the testsuite, download the required versions of
+      If you wish to run the test suite, download the required versions of
       <application>googletest</application> and
       <application>googlemock</application> by running:
     </para>
diff --git a/xsoft/other/rxvt-unicode.xml b/xsoft/other/rxvt-unicode.xml
index a3bd9c39bf..9eaf60abe4 100644
--- a/xsoft/other/rxvt-unicode.xml
+++ b/xsoft/other/rxvt-unicode.xml
@@ -40,7 +40,7 @@
         affected by an issue in <application>perl</application> where
         the SIGFPE handler is set to SIG_IGN (i.e. the signal is ignored).
         If you are building an LFS system from within <command>urxvt</command>
-        and running the testsuites, tests in <application>bash</application> and
+        and running the test suites, tests in <application>bash</application> and
         <application>check</application> which test raising this signal will fail.
       </para>
     </note>