diff --git a/layout/reftests/text-svgglyphs/reftest.list b/layout/reftests/text-svgglyphs/reftest.list
index 2dc70130be4d..477bc220f98e 100644
--- a/layout/reftests/text-svgglyphs/reftest.list
+++ b/layout/reftests/text-svgglyphs/reftest.list
@@ -3,20 +3,20 @@ pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-basic.svg svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-invalid-ids.svg svg-glyph-invalid-ids-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,false)   != svg-glyph-positioning.svg svg-glyph-positioning-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-positioning.svg svg-glyph-positioning-ref.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true)    fails-if(winWidget) == svg-glyph-html.html svg-glyph-html-ref.svg # bug 872486
-pref(gfx.font_rendering.opentype_svg.enabled,true)    random-if(winWidget) == svg-glyph-direct.svg svg-glyph-direct-ref.svg # bug 872491
+pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-html.html svg-glyph-html-ref.svg
+pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-direct.svg svg-glyph-direct-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-invalid.html svg-glyph-invalid-ref.html
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-objectfill-solid.svg svg-glyph-objectfill-solid-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-objectstroke-solid.svg svg-glyph-objectstroke-solid-ref.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy(4,6) == svg-glyph-objectgradient.svg svg-glyph-objectgradient-ref.svg # see bug 871961#c5
+pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy(1,6) == svg-glyph-objectgradient.svg svg-glyph-objectgradient-ref.svg # see bug 871961#c5
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-objectgradient-zoom.svg svg-glyph-objectgradient-zoom-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-objectpattern.svg svg-glyph-objectpattern-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == clip.html clip-ref.html
-pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy(5,12) == svg-glyph-objectopacity.svg svg-glyph-objectopacity-ref.svg # see bug 871961#c5
+pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy(1,12) == svg-glyph-objectopacity.svg svg-glyph-objectopacity-ref.svg # see bug 871961#c5
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-objectopacity2.svg svg-glyph-objectopacity2-ref.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true)    random-if(winWidget) == svg-glyph-paintnone.svg svg-glyph-paintnone-ref.svg # bug 872491
+pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paintnone.svg svg-glyph-paintnone-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-cachedopacity.svg svg-glyph-cachedopacity-ref.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-objectvalue.svg svg-glyph-objectvalue-ref.svg
+pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy-if(cocoaWidget,255,100) == svg-glyph-objectvalue.svg svg-glyph-objectvalue-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    fails == svg-glyph-mask.svg svg-glyph-mask-ref.svg # bug 872483
-pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paint-server.svg svg-glyph-paint-server-ref.svg # bug 801467
-pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-transform.svg svg-glyph-transform-ref.svg # bug 875329
+pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paint-server.svg svg-glyph-paint-server-ref.svg
+pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-transform.svg svg-glyph-transform-ref.svg
diff --git a/layout/reftests/text-svgglyphs/resources/README b/layout/reftests/text-svgglyphs/resources/README
index 14ec605db187..99edb3a627f0 100644
--- a/layout/reftests/text-svgglyphs/resources/README
+++ b/layout/reftests/text-svgglyphs/resources/README
@@ -8,9 +8,10 @@ There are three .woff files in this directory:
 
 nosvg.woff
 ----------
-This font is Liberation Serif with the addition of a glyph with a UVS selector
-(Liberation fonts do not come with UVS glyphs; one had to be added to test that
-SVG glyphs work with UVS selectors). It contains no 'SVG ' table.
+This font is FiraSansOT-Regular, with its metrics hacked so that its ascent
+is 1000 and descent is 0. Its unitsPerEm value is 1000.
+
+It contains no 'SVG ' table.
 
 svg.woff
 --------
diff --git a/layout/reftests/text-svgglyphs/resources/glyphs-base.svg b/layout/reftests/text-svgglyphs/resources/glyphs-base.svg
index 886ee4eadf0a..51c32135c0c4 100644
--- a/layout/reftests/text-svgglyphs/resources/glyphs-base.svg
+++ b/layout/reftests/text-svgglyphs/resources/glyphs-base.svg
@@ -1,10 +1,10 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <!--
     Basic test SVG glyphs
-    Covers glyph ID 46
+    Covers glyph ID 47
 -->
   <!-- char = L -->
-  <g id="glyph46">
+  <g id="glyph47">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
       stroke="black" fill="red"/>
     <rect x="100" y="-1000" width="100" height="100" stroke="none"
diff --git a/layout/reftests/text-svgglyphs/resources/glyphs-invalid.svg b/layout/reftests/text-svgglyphs/resources/glyphs-invalid.svg
index f9777b0d5834..4740b4ff3be5 100644
--- a/layout/reftests/text-svgglyphs/resources/glyphs-invalid.svg
+++ b/layout/reftests/text-svgglyphs/resources/glyphs-invalid.svg
@@ -3,37 +3,37 @@
     Test handling of invalid ids
 -->
   <!-- not valid: leading space not allowed -->
-  <g id="glyph 47">
+  <g id="glyph 48">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
           fill="red"/>
   </g>
   <!-- not valid: leading zero not allowed -->
-  <g id="glyph047">
+  <g id="glyph048">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
           fill="red"/>
   </g>
   <!-- not valid: trailing garbage not allowed -->
-  <g id="glyph47xxx">
+  <g id="glyph48xxx">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
           fill="red"/>
   </g>
   <!-- not valid: trailing space not allowed -->
-  <g id="glyph47 ">
+  <g id="glyph48 ">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
           fill="red"/>
   </g>
   <!-- not valid: floating point not allowed -->
-  <g id="glyph47.0">
+  <g id="glyph48.0">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
           fill="red"/>
   </g>
   <!-- char = M -->
-  <g id="glyph47">
+  <g id="glyph48">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
           fill="lime"/>
   </g>
-  <!-- Ensure first glyph47 is picked -->
-  <g id="glyph47">
+  <!-- Ensure first glyph48 is picked -->
+  <g id="glyph48">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
           fill="red"/>
   </g>
diff --git a/layout/reftests/text-svgglyphs/resources/glyphs-objectcolor.svg b/layout/reftests/text-svgglyphs/resources/glyphs-objectcolor.svg
index 05439758ff14..cf738d0cc1ff 100644
--- a/layout/reftests/text-svgglyphs/resources/glyphs-objectcolor.svg
+++ b/layout/reftests/text-svgglyphs/resources/glyphs-objectcolor.svg
@@ -1,24 +1,24 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <!--
     Test SVG glyphs for text object pattern inheritance
-    Covers glyph ID range 48 (N) to 51 (Q)
+    Covers glyph ID range 49 (N) to 52 (Q)
 -->
 <!-- context-fill, no stroke -->
   <!-- N -->
   <rect x="100" y="-900" width="800" height="800" stroke-width="50"
-    stroke="none" fill="context-fill" id="glyph48"/>
+    stroke="none" fill="context-fill" id="glyph49"/>
 
   <!-- O -->
   <rect x="50" y="-950" width="900" height="900" stroke-width="100"
-    fill="context-fill" stroke="none" id="glyph49"/>
+    fill="context-fill" stroke="none" id="glyph50"/>
 
 <!-- context-stroke -->
   <!-- P -->
   <rect x="100" y="-900" width="800" height="800" stroke-width="50"
-    stroke="context-stroke" fill="burlywood" id="glyph50"/>
+    stroke="context-stroke" fill="burlywood" id="glyph51"/>
 
 <!-- both context-stroke and context-fill (but note swapped usage!) -->
   <!-- Q -->
   <rect x="50" y="-950" width="900" height="900" stroke-width="100"
-    fill="context-stroke" stroke="context-fill" id="glyph51"/>
+    fill="context-stroke" stroke="context-fill" id="glyph52"/>
 </svg>
diff --git a/layout/reftests/text-svgglyphs/resources/glyphs-objectopacity.svg b/layout/reftests/text-svgglyphs/resources/glyphs-objectopacity.svg
index db61c5db5c01..7fc479e22bd1 100644
--- a/layout/reftests/text-svgglyphs/resources/glyphs-objectopacity.svg
+++ b/layout/reftests/text-svgglyphs/resources/glyphs-objectopacity.svg
@@ -1,25 +1,25 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <!--
     Test SVG glyphs for text object opacity inheritance
-    Covers glyph ID range 52 (R) to 59 (Y)
+    Covers glyph ID range 53 (R) to 60 (Y)
 -->
   <!-- R -->
   <rect x="100" y="-900" width="800" height="800" stroke-width="50"
     fill="context-fill" stroke="context-stroke"
     fill-opacity="context-fill-opacity"
-    stroke-opacity="context-stroke-opacity" id="glyph52"/>
+    stroke-opacity="context-stroke-opacity" id="glyph53"/>
 
   <!-- S -->
   <rect x="100" y="-900" width="800" height="800" stroke-width="50"
     fill="context-fill" stroke="context-stroke"
     fill-opacity="context-stroke-opacity"
-    stroke-opacity="context-fill-opacity" id="glyph53"/>
+    stroke-opacity="context-fill-opacity" id="glyph54"/>
 
   <!-- T -->
   <rect x="100" y="-900" width="800" height="800" stroke-width="50"
     fill="context-stroke" stroke="context-fill"
     fill-opacity="context-fill-opacity"
-    stroke-opacity="context-stroke-opacity" id="glyph54"/>
+    stroke-opacity="context-stroke-opacity" id="glyph55"/>
 
   <!-- U -->
   <!--  Test for bug where explicit `inherit' would fail for
@@ -27,23 +27,23 @@
   <g style="fill-opacity : context-stroke-opacity; stroke-opacity : context-fill-opacity">
     <rect x="100" y="-900" width="800" height="800" stroke-width="50"
       fill="context-stroke" stroke="context-fill"
-      fill-opacity="inherit" stroke-opacity="inherit" id="glyph55"/>
+      fill-opacity="inherit" stroke-opacity="inherit" id="glyph56"/>
   </g>
 
   <!-- W -->
   <rect x="100" y="-900" width="800" height="800" stroke-width="50"
     fill="darkorchid" stroke="goldenrod"
     fill-opacity="context-fill-opacity"
-    stroke-opacity="context-stroke-opacity" id="glyph57"/>
+    stroke-opacity="context-stroke-opacity" id="glyph58"/>
 
   <!-- X -->
   <rect x="100" y="-900" width="800" height="800" stroke-width="50"
     fill="darkorchid" stroke="goldenrod"
     fill-opacity="context-stroke-opacity"
-    stroke-opacity="context-fill-opacity" id="glyph58"/>
+    stroke-opacity="context-fill-opacity" id="glyph59"/>
 
   <style type="text/css"><![CDATA[
-  #glyph59 {
+  #glyph60 {
     fill-opacity : context-fill-opacity;
     stroke-opacity : context-stroke-opacity;
   }
@@ -52,7 +52,7 @@
   }
   ]]></style>
   <!-- Y -->
-  <g id="glyph59">
+  <g id="glyph60">
     <rect x="100" y="-900" width="800" height="300" stroke="red" stroke-width="50"/>
     <rect x="100" y="-400" width="800" height="300" stroke="red" stroke-width="50" id="ychild" />
   </g>
diff --git a/layout/reftests/text-svgglyphs/resources/glyphs-objectstroke.svg b/layout/reftests/text-svgglyphs/resources/glyphs-objectstroke.svg
index 65b55f477213..44afb2f600ae 100644
--- a/layout/reftests/text-svgglyphs/resources/glyphs-objectstroke.svg
+++ b/layout/reftests/text-svgglyphs/resources/glyphs-objectstroke.svg
@@ -1,25 +1,25 @@
 <svg xmlns="http://www.w3.org/2000/svg">
 <!--
     Test SVG glyphs for text object stroke value inheritance
-    Covers glyph ID range 67 (a) to 70 (d)
+    Covers glyph ID range 68 (a) to 71 (d)
 -->
   <!-- a -->
   <rect x="100" y="-900" width="800" height="800" stroke="powderblue"
     stroke-width="50" stroke-dashoffset="35"
-    stroke-dasharray="50 50" id="glyph67" />
+    stroke-dasharray="50 50" id="glyph68" />
 
   <!-- b -->
   <rect x="100" y="-900" width="800" height="800" stroke="chartreuse"
     stroke-width="50" stroke-dashoffset="35"
-    stroke-dasharray="context-value" id="glyph68" />
+    stroke-dasharray="context-value" id="glyph69" />
 
   <!-- c -->
   <rect x="100" y="-900" width="800" height="800" stroke="sienna"
     stroke-width="50" stroke-dasharray="50 50"
-    stroke-dashoffset="context-value" id="glyph69" />
+    stroke-dashoffset="context-value" id="glyph70" />
 
   <!-- d -->
   <rect x="100" y="-900" width="800" height="800" stroke="olivedrab"
     stroke-width="context-value" stroke-dasharray="context-value"
-    stroke-dashoffset="context-value" id="glyph70" />
+    stroke-dashoffset="context-value" id="glyph71" />
 </svg>
diff --git a/layout/reftests/text-svgglyphs/resources/glyphs-paintservers.svg b/layout/reftests/text-svgglyphs/resources/glyphs-paintservers.svg
index adf2e7bf5856..7f5a95ac095a 100644
--- a/layout/reftests/text-svgglyphs/resources/glyphs-paintservers.svg
+++ b/layout/reftests/text-svgglyphs/resources/glyphs-paintservers.svg
@@ -19,10 +19,10 @@
   </defs>
 
   <!-- char 'e' -->
-  <rect id="glyph71" x="250" y="-750" width="500" height="500"
+  <rect id="glyph72" x="250" y="-750" width="500" height="500"
     fill="url(#grad)" />
 
   <!-- char 'f' -->
-  <rect id="glyph72" x="250" y="-750" width="500" height="500"
+  <rect id="glyph73" x="250" y="-750" width="500" height="500"
     fill="url(#grad2)" />
 </svg>
diff --git a/layout/reftests/text-svgglyphs/resources/glyphs-transforms.svg b/layout/reftests/text-svgglyphs/resources/glyphs-transforms.svg
index cf8a4f6a06cf..ff3d9ffb76ea 100644
--- a/layout/reftests/text-svgglyphs/resources/glyphs-transforms.svg
+++ b/layout/reftests/text-svgglyphs/resources/glyphs-transforms.svg
@@ -19,18 +19,18 @@
   </defs>
 
   <!-- char 'g' -->
-  <rect id="glyph73" x="250" y="-750" width="500" height="500" fill="red" />
+  <rect id="glyph74" x="250" y="-750" width="500" height="500" fill="red" />
 
   <!-- char 'h' -->
-  <rect id="glyph74" x="25" y="-75" width="50" height="50" transform="scale(10)" fill="red" />
+  <rect id="glyph75" x="25" y="-75" width="50" height="50" transform="scale(10)" fill="red" />
 
   <!-- char 'i' -->
-  <g id="glyph75">
+  <g id="glyph76">
     <use xlink:href="#small" transform="scale(5)" />
   </g>
 
   <!-- char 'j' -->
-  <g id="glyph76">
+  <g id="glyph77">
     <g transform="translate(300,-300) scale(0.4)">
       <rect x="0" y="-1000" width="1000" height="1000" fill="blue" />
     </g>
@@ -40,7 +40,7 @@
   </g>
 
   <!-- char 'k' -->
-  <g id="glyph77" transform="scale(0.5)">
+  <g id="glyph78" transform="scale(0.5)">
     <g transform="scale(0.5)">
       <use xlink:href="#small" transform="scale(20)" />
     </g>
@@ -48,20 +48,20 @@
 
   <!-- char 'l' -->
   <g transform="scale(2)">
-    <g id="glyph78">
+    <g id="glyph79">
       <use xlink:href="#small" transform="scale(5)" />
     </g>
   </g>
 
-  <g id="glyph79"> <!-- char 'm' -->
-    <g id="glyph80" transform="scale(5)"> <!-- char 'n' -->
-      <g id="glyph81"> <!-- char 'o' -->
-        <use id="glyph82" xlink:href="#small" /> <!-- char 'p' -->
+  <g id="glyph80"> <!-- char 'm' -->
+    <g id="glyph81" transform="scale(5)"> <!-- char 'n' -->
+      <g id="glyph82"> <!-- char 'o' -->
+        <use id="glyph83" xlink:href="#small" /> <!-- char 'p' -->
       </g>
     </g>
   </g>
 
   <!-- char 'q' -->
-  <use id="glyph83" xlink:href="#small" />
+  <use id="glyph84" xlink:href="#small" />
 
 </svg>
diff --git a/layout/reftests/text-svgglyphs/resources/nosvg.woff b/layout/reftests/text-svgglyphs/resources/nosvg.woff
index 3840aaf8a36b..ad53341871df 100644
Binary files a/layout/reftests/text-svgglyphs/resources/nosvg.woff and b/layout/reftests/text-svgglyphs/resources/nosvg.woff differ
diff --git a/layout/reftests/text-svgglyphs/resources/rubbish.woff b/layout/reftests/text-svgglyphs/resources/rubbish.woff
index 52d75fc96576..3c83e02a30ac 100644
Binary files a/layout/reftests/text-svgglyphs/resources/rubbish.woff and b/layout/reftests/text-svgglyphs/resources/rubbish.woff differ
diff --git a/layout/reftests/text-svgglyphs/resources/svg.woff b/layout/reftests/text-svgglyphs/resources/svg.woff
index 75f7df6329c5..6deee1460d26 100644
Binary files a/layout/reftests/text-svgglyphs/resources/svg.woff and b/layout/reftests/text-svgglyphs/resources/svg.woff differ
diff --git a/layout/reftests/text-svgglyphs/svg-glyph-positioning-ref.svg b/layout/reftests/text-svgglyphs/svg-glyph-positioning-ref.svg
index 4348ab71995f..10e8ff11613b 100644
--- a/layout/reftests/text-svgglyphs/svg-glyph-positioning-ref.svg
+++ b/layout/reftests/text-svgglyphs/svg-glyph-positioning-ref.svg
@@ -1,4 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg">
+  <!-- The "L" glyph in Fira Sans has been hacked to have an advance of
+       exactly 500/1000 em, or 100px at a font size of 200px. -->
   <!-- L -->
   <rect x="20" y="20" width="160" height="160" stroke-width="10"
     stroke="black" fill="red" />
@@ -6,14 +8,14 @@
     fill="turquoise" />
 
   <!-- L -->
-  <rect x="170" y="20" width="160" height="160" stroke-width="10"
+  <rect x="120" y="20" width="160" height="160" stroke-width="10"
     stroke="black" fill="red" />
-  <rect x="170" y="0" width="20" height="20" stroke="none"
+  <rect x="120" y="0" width="20" height="20" stroke="none"
     fill="turquoise" />
 
   <!-- L -->
-  <rect x="320" y="20" width="160" height="160" stroke-width="10"
+  <rect x="220" y="20" width="160" height="160" stroke-width="10"
     stroke="black" fill="red" />
-  <rect x="320" y="0" width="20" height="20" stroke="none"
+  <rect x="220" y="0" width="20" height="20" stroke="none"
     fill="turquoise" />
 </svg>