diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 72dbe59..f7fee54 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -23,9 +23,8 @@
 
   <!-- Run test suites?
        0 = none
-       1 = only chapter06 critical testsuites
-       2 = all chapter06 testsuites
-       3 = all chapter05 and chapter06 testsuites
+       1 = only chapter08 critical testsuites
+       2 (or more) = all chapter08 testsuites
   -->
   <xsl:param name="testsuite" select="1"/>
 
@@ -325,12 +324,6 @@ rm -rf $PKG_DEST
         </xsl:otherwise>
       </xsl:choose>
     </xsl:if>
-    <xsl:if test="$testsuite='3' and
-            ../@id='ch-tools-glibc' and
-            @role='installation'">
-      <xsl:copy-of select="//userinput[@remap='locale-test']"/>
-      <xsl:text>&#xA;</xsl:text>
-    </xsl:if>
     <xsl:if test="../@id='ch-system-glibc' and @role='installation'">
       <xsl:choose>
         <xsl:when test="$full-locale='y'">
@@ -1131,9 +1124,7 @@ LOGLEVEL="</xsl:text>
                           not(ancestor::sect1[@id='ch-system-glibc']) and
                           not(ancestor::sect1[@id='ch-system-gmp']) and
                           not(ancestor::sect1[@id='ch-system-mpfr']) and
-                          not(ancestor::sect1[@id='ch-system-binutils']) or
-                      $testsuite = '2' and
-                          ancestor::chapter[@id='chapter-temporary-tools']">
+                          not(ancestor::sect1[@id='ch-system-binutils'])">
           <xsl:text># </xsl:text>
         </xsl:if>
         <xsl:choose>
diff --git a/jhalfs b/jhalfs
index 484789d..bce2f29 100755
--- a/jhalfs
+++ b/jhalfs
@@ -436,14 +436,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
 # Note that all customization to $JHALFSDIR have to be done before this.
 # But the LFS book is needed for BLFS tools.
   get_book
-# At this point, we should have a way to know whether we have a cross
-# or regular book... In case of cross, prohibite TEST=3
-# the position of gcc-pass2 (chapter 6 or 5) tells us (not valid for
-# cross-chap5 branch).
-  if (( TEST == 3 )) && \
-     [ -f "$BOOK/chapter06/gcc-pass2.xml" ]; then
-        TEST=2
-  fi
   extract_commands
   echo "${SD_BORDER}${nl_}"
   cd "$CWD" # the functions above change directory