diff --git a/layout/reftests/mathml/dir-9-ref.html b/layout/reftests/mathml/dir-9-ref.html
new file mode 100644
index 000000000000..6bf11e512d87
--- /dev/null
+++ b/layout/reftests/mathml/dir-9-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head><title>Test dir=rtl</title></head>
+  <body>
+    <p>ms lquote="A" rquote="B":
+      <math>
+	<ms lquote="B" rquote="A">___</ms>
+      </math>
+    </p>
+  </body>
+</html>
diff --git a/layout/reftests/mathml/dir-9.html b/layout/reftests/mathml/dir-9.html
new file mode 100644
index 000000000000..224574c0c96b
--- /dev/null
+++ b/layout/reftests/mathml/dir-9.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head><title>Test dir=rtl</title></head>
+  <body>
+    <p>ms lquote="A" rquote="B":
+      <math dir="rtl">
+	<ms lquote="A" rquote="B">___</ms>
+      </math>
+    </p>
+  </body>
+</html>
diff --git a/layout/reftests/mathml/quotes-1-ref.xhtml b/layout/reftests/mathml/quotes-1-ref.xhtml
index d8ec774cf1d0..ff3ac0e4ffbc 100644
--- a/layout/reftests/mathml/quotes-1-ref.xhtml
+++ b/layout/reftests/mathml/quotes-1-ref.xhtml
@@ -7,9 +7,12 @@ p { height:2em; }
 </head>
 <body>
 <p>:L_R</p>
-<p>:L_&#x201D;</p>
-<p>:&#x201C;_R</p>
-<p>:L_&#x201D;</p>
-<p>:&#x201C;_R</p>
+<p>:L_"</p>
+<p>:"_R</p>
+<p>:L_"</p>
+<p>:"_R</p>
+<p>:"_"</p>
+<p>:"_"</p>
+<p>:"_"</p>
 </body>
 </html>
diff --git a/layout/reftests/mathml/quotes-1.xhtml b/layout/reftests/mathml/quotes-1.xhtml
index fda39117d92e..e833966f8ac0 100644
--- a/layout/reftests/mathml/quotes-1.xhtml
+++ b/layout/reftests/mathml/quotes-1.xhtml
@@ -11,6 +11,9 @@ p { height:2em; }
 <p>:<ms id="m2" xmlns="http://www.w3.org/1998/Math/MathML">_</ms></p>
 <p>:<ms id="m3" xmlns="http://www.w3.org/1998/Math/MathML" lquote="_">_</ms></p>
 <p>:<ms id="m4" xmlns="http://www.w3.org/1998/Math/MathML" rquote="_">_</ms></p>
+<p>:<ms id="m5" xmlns="http://www.w3.org/1998/Math/MathML" lquote="_" rquote="_">_</ms></p>
+<p>:<ms id="m6" xmlns="http://www.w3.org/1998/Math/MathML" lquote="_">_</ms></p>
+<p>:<ms id="m7" xmlns="http://www.w3.org/1998/Math/MathML" rquote="_">_</ms></p>
 <script>
 function doTest() {
   var m1 = document.getElementById("m1");
@@ -21,6 +24,13 @@ function doTest() {
   m3.setAttribute("lquote", "L");
   var m4 = document.getElementById("m4");
   m4.setAttribute("rquote", "R");
+  var m5 = document.getElementById("m5");
+  m5.removeAttribute("lquote");
+  m5.removeAttribute("rquote");
+  var m6 = document.getElementById("m6");
+  m6.removeAttribute("lquote");
+  var m7 = document.getElementById("m7");
+  m7.removeAttribute("rquote");
   document.documentElement.removeAttribute('class');
 }
 window.addEventListener("MozReftestInvalidate", doTest, false);
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index 26a40fbaf541..c1eb1e21e040 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -6,6 +6,7 @@
 fails == dir-6.html dir-6-ref.html
 == dir-7.html dir-7-ref.html
 fails == dir-8.html dir-8-ref.html
+fails == dir-9.html dir-9-ref.html # Bug 787215
 == mirror-op-1.html mirror-op-1-ref.html
 != mirror-op-2.html mirror-op-2-ref.html
 != mirror-op-3.html mirror-op-3-ref.html
@@ -71,7 +72,7 @@ fails-if(winWidget) == mfenced-10.html mfenced-10-ref.html
 == mstyle-2.xhtml mstyle-2-ref.xhtml
 == mstyle-3.xhtml mstyle-3-ref.xhtml
 == mstyle-4.xhtml mstyle-4-ref.xhtml
-fails == mstyle-5.xhtml mstyle-5-ref.xhtml # See bug 569125#c29
+fails == mstyle-5.xhtml mstyle-5-ref.xhtml # Bug 787215
 == scale-stretchy-1.xhtml scale-stretchy-1-ref.xhtml
 != scale-stretchy-2.xhtml scale-stretchy-2-ref.xhtml
 == scale-stretchy-3.xhtml scale-stretchy-3-ref.xhtml
@@ -107,5 +108,5 @@ fails == mstyle-5.xhtml mstyle-5-ref.xhtml # See bug 569125#c29
 == whitespace-trim-1.html whitespace-trim-1-ref.html
 == whitespace-trim-2.html whitespace-trim-2-ref.html
 == whitespace-trim-3.html whitespace-trim-3-ref.html
-fails == whitespace-trim-4.html whitespace-trim-4-ref.html # Bug 560100
+fails == whitespace-trim-4.html whitespace-trim-4-ref.html # Bug 787215
 == whitespace-trim-5.html whitespace-trim-5-ref.html
