diff --git a/junit-report/src/plugin-resources/junit.jsl b/junit-report/src/plugin-resources/junit.jsl
index 883fdd58..996ac92f 100644
--- a/junit-report/src/plugin-resources/junit.jsl
+++ b/junit-report/src/plugin-resources/junit.jsl
@@ -77,18 +77,11 @@
       <body>
         <section name="Summary">
           <junit:nav/>
-          <x:set var="testCount" select="sum(testsuite/@tests)"/>
-          <x:set var="errorCount" select="sum(testsuite/@errors)"/>
-          <x:set var="failureCount" select="sum(testsuite/@failures)"/>
-          <x:set var="timeCount" select="sum(testsuite/@time)"/>
-          <x:set var="successRate" select="($testCount - ($failureCount + $errorCount)) div $testCount"/>
-         
-          <j:set var="testCount">${testCount}</j:set>
-          <j:set var="errorCount">${errorCount}</j:set>
-          <j:set var="failureCount">${failureCount}</j:set>
-          <j:set var="timeCount">${timeCount}</j:set>
-          <j:set var="successRate">${successRate}</j:set>
-          
+          <j:set var="testCount"><x:expr select="sum(testsuite/@tests)"/></j:set>
+          <j:set var="errorCount"><x:expr select="sum(testsuite/@errors)"/></j:set>
+          <j:set var="failureCount"><x:expr select="sum(testsuite/@failures)"/></j:set>
+          <j:set var="timeCount"><x:expr select="sum(testsuite/@time)"/></j:set>
+          <j:set var="successRate"><x:expr select="($testCount - ($failureCount + $errorCount)) div $testCount"/></j:set>
           <table>
             <tr>
               <th>Tests</th>
@@ -133,16 +126,10 @@
             <j:forEach var="testsuite" items="${testsuites}">
               <j:set var="package" value="${testsuite.attribute('package').value}"/>
               <x:set var="quotedPackage" select='"${package}"'/>
-              <x:set var="testCount" select="sum(./testsuite[./@package = $quotedPackage]/@tests)"/>
-              <x:set var="errorCount" select="sum(./testsuite[./@package = $quotedPackage]/@errors)"/>
-              <x:set var="failureCount" select="sum(./testsuite[./@package = $quotedPackage]/@failures)"/>
-              <x:set var="timeCount" select="sum(./testsuite[./@package = $quotedPackage]/@time)"/>
-        
-              <j:set var="testCount">${testCount}</j:set>
-              <j:set var="errorCount">${errorCount}</j:set>
-              <j:set var="failureCount">${failureCount}</j:set>
-              <j:set var="timeCount">${timeCount}</j:set>
-    
+              <j:set var="testCount"><x:expr select="sum(./testsuite[./@package = $quotedPackage]/@tests)"/></j:set>
+              <j:set var="errorCount"><x:expr select="sum(./testsuite[./@package = $quotedPackage]/@errors)"/></j:set>
+              <j:set var="failureCount"><x:expr select="sum(./testsuite[./@package = $quotedPackage]/@failures)"/></j:set>
+              <j:set var="timeCount"><x:expr select="sum(./testsuite[./@package = $quotedPackage]/@time)"/></j:set>
     
               <tr>
                 <td>
