diff --git a/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
index 6b97bf9f..29ab6890 100644
--- a/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
+++ b/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
@@ -36,7 +36,7 @@ THE SOFTWARE.
         </j:when>
         <j:otherwise>
           <a href="${p.nearestRunUrl}" class="model-link inside">
-            <img src="${imagesURL}/24x24/${b.buildStatusUrl}" tooltip="${p.tooltip} ${it.number!=b.number?(it.isBuilding()?'- pending' : '- skipped'):''}" alt="${p.tooltip}" style="${it.number!=b.number?'opacity:0.5':''}" height="24" width="24"/>
+            <img src="${imagesURL}/24x24/${b.buildStatusUrl}" tooltip="${h.xmlEscape(p.tooltip)} ${it.number!=b.number?(it.isBuilding()?'- pending' : '- skipped'):''}" alt="${p.tooltip}" style="${it.number!=b.number?'opacity:0.5':''}" height="24" width="24"/>
             <j:if test="${empty(o.x) and empty(o.y)}">
               ${p.combination.toString(o.z)}
             </j:if>
diff --git a/src/main/resources/lib/hudson/matrix-project/matrix.jelly b/src/main/resources/lib/hudson/matrix-project/matrix.jelly
index 74dba4fe..5c81ab92 100644
--- a/src/main/resources/lib/hudson/matrix-project/matrix.jelly
+++ b/src/main/resources/lib/hudson/matrix-project/matrix.jelly
@@ -63,7 +63,7 @@ THE SOFTWARE.
               </j:if>
               <j:forEach begin="1" end="${o.repeatX(loop.index)}">
                 <j:forEach var="v" items="${x.values}">
-                  <td class="matrix-header" colspan="${o.width(loop.index)}" tooltip="${x.name}">
+                  <td class="matrix-header" colspan="${o.width(loop.index)}" tooltip="${h.xmlEscape(x.name)}">
                     ${v}
                   </td>
                 </j:forEach>
@@ -76,7 +76,7 @@ THE SOFTWARE.
             <tr>
               <j:forEach var="y" items="${o.y}" varStatus="loop">
                 <j:if test="${r.drawYHeader(loop.index)!=null}">
-                  <td class="matrix-leftcolumn" rowspan="${o.height(loop.index)}" tooltip="${y.name}">
+                  <td class="matrix-leftcolumn" rowspan="${o.height(loop.index)}" tooltip="${h.xmlEscape(y.name)}">
                     ${r.drawYHeader(loop.index)}
                   </td>
                 </j:if>