diff --git a/lib/test-driver/log2html.xsl b/lib/test-driver/log2html.xsl
index d41584f6b90e..0123fc537606 100644
--- a/lib/test-driver/log2html.xsl
+++ b/lib/test-driver/log2html.xsl
@@ -52,7 +52,12 @@
     <xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable>
 
     <xsl:if test="line|nest">
-      <a href="javascript:" class="logTreeToggle"></a>
+      <a href="javascript:" class="logTreeToggle">
+        <xsl:choose>
+          <xsl:when test="$collapsed"><xsl:text>+</xsl:text></xsl:when>
+          <xsl:otherwise><xsl:text>-</xsl:text></xsl:otherwise>
+        </xsl:choose>
+      </a>
       <xsl:text> </xsl:text>
     </xsl:if>
     
@@ -66,7 +71,7 @@
 
           <!-- Is this the last line?  If so, mark it as such so that it
                can be rendered differently. -->
-          <xsl:variable  name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
+          <xsl:variable name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
         
           <li class='{$class}'>
             <span class='lineconn' />
diff --git a/lib/test-driver/treebits.js b/lib/test-driver/treebits.js
index 271ec9e40314..9754093dfd07 100644
--- a/lib/test-driver/treebits.js
+++ b/lib/test-driver/treebits.js
@@ -1,15 +1,5 @@
 $(document).ready(function() {
 
-    /* Set the appearance of the toggle depending on whether the
-       corresponding subtree is initially shown or hidden. */
-    $(".logTreeToggle").map(function() {
-        if ($(this).siblings("ul:hidden").length == 0) {
-            $(this).text("-");
-        } else {
-            $(this).text("+");
-        }
-    });
-
     /* When a toggle is clicked, show or hide the subtree. */
     $(".logTreeToggle").click(function() {
         if ($(this).siblings("ul:hidden").length != 0) {