diff --git a/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly b/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly
index e3790230c..e54a9627b 100644
--- a/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly
+++ b/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly
@@ -41,7 +41,7 @@ THE SOFTWARE.
         <j:forEach var="p" items="${it.children}" varStatus="status">
           <tr>
             <td class="pane">
-              <a href="${p.safeName}"><span style="${p.previousResult==null?'font-weight:bold':''}"><st:out value="${p.displayName}" /></span></a>
+              <a href="${h.urlEncode(p.safeName)}"><span style="${p.previousResult==null?'font-weight:bold':''}"><st:out value="${p.displayName}" /></span></a>
               <j:forEach var="badge" items="${p.testActions}">
                 <st:include it="${badge}" page="badge.jelly" optional="true"/>
               </j:forEach>
diff --git a/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly b/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly
index 597dfa54a..b06da2627 100644
--- a/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly
+++ b/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly
@@ -81,7 +81,7 @@ THE SOFTWARE.
           <j:set var="prev" value="${prevAll.findCorrespondingResult(p.id)}" />
           <tr>
             <td class="pane">
-              <a href="${p.safeName}/" class="body.jelly"><span style="${prev==null?'font-weight:bold':''}"><st:out value="${p.displayName}" /></span></a>
+              <a href="${h.urlEncode(p.safeName)}/" class="body.jelly"><span style="${prev==null?'font-weight:bold':''}"><st:out value="${p.displayName}" /></span></a>
               <j:forEach var="badge" items="${p.testActions}">
                 <st:include it="${badge}" page="badge.jelly" optional="true"/>
               </j:forEach>
diff --git a/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly b/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly
index da919ef02..6fc9d9493 100644
--- a/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly
+++ b/src/test/resources/hudson/tasks/test/TrivialTestResult/body.jelly
@@ -85,7 +85,7 @@ THE SOFTWARE.
           <j:set var="prev" value="${p.previousResult}" />
           <tr>
             <td class="pane">
-	            <a href="${p.safeName}/"><span style='${prev==null?"font-weight:bold":""}'>${p.name}</span></a>
+	            <a href="${h.urlEncode(p.safeName)}/"><span style='${prev==null?"font-weight:bold":""}'>${p.name}</span></a>
 	          	<st:nbsp/>
 		        <j:forEach var="badge" items="${p.testActions}">
 		          <st:include it="${badge}" page="badge.jelly" optional="true"/>