diff --git a/Config.in b/Config.in
index c67b88f..bc8c781 100644
--- a/Config.in
+++ b/Config.in
@@ -386,7 +386,9 @@ depends on BOOK_HLFS
 		default	TEST_1
 		
 		config	TST_1
-			bool	"Only chap06 Glibc/GCC/Binutils tests"
+			bool	"Only chap06 Glibc/GCC/Binutils tests" if !BOOK_HLFS
+		config	TST_1
+			bool	"Only chap06 Glibc/Butterfly-toolchain" if BOOK_HLFS
 		config	TST_2
 			bool	"All chap06 testsuites"
 		config	TST_3
diff --git a/HLFS/hlfs.xsl b/HLFS/hlfs.xsl
index 366e3ba..6e2efd7 100644
--- a/HLFS/hlfs.xsl
+++ b/HLFS/hlfs.xsl
@@ -109,7 +109,7 @@
              <xsl:text>tar -xvf binutils-&binutils-version;.*; &#xA;</xsl:text>
           </xsl:if>
           <!-- ONLY butterfly has a testsuite -->
-          <xsl:if test="@id='ch-tools-butterfly-toolchain' and $testsuite != '0'">
+          <xsl:if test="@id='ch-system-butterfly-toolchain' and $testsuite != '0'">
             <xsl:text>tar -xvf gcc-testsuite-&gcc-version;.*; &#xA;</xsl:text>
           </xsl:if>
           <!-- END new toolchain format -->