diff --git a/mozilla/layout/reftests/bidi/bidi-000-ref.html b/mozilla/layout/reftests/bidi/bidi-000-ref.html
index 117b3af2abd..9ae628d3feb 100644
--- a/mozilla/layout/reftests/bidi/bidi-000-ref.html
+++ b/mozilla/layout/reftests/bidi/bidi-000-ref.html
@@ -10,7 +10,7 @@ body {
   font-family: serif;
   font-size: 24pt;
 }
-  </style
+  </style>
  <body>
   <p>god yzal eht revo spmuj xof nworb kciuq eht</p>
  </body>
diff --git a/mozilla/layout/reftests/bidi/bidi-004.html b/mozilla/layout/reftests/bidi/bidi-004.html
index d5615f6e37e..7f4ba97d34b 100644
--- a/mozilla/layout/reftests/bidi/bidi-004.html
+++ b/mozilla/layout/reftests/bidi/bidi-004.html
@@ -5,11 +5,11 @@
   <meta http-equiv="content-type" content="text/html; charset=utf-8";
  </head>
   <style type="text/css">
-body {
+body {   
   font-family: serif;
   font-size: 24pt;
 }
-  </style
+  </style>
  <body>
   <p lang="he" style="direction: rtl;">אַבּוּשׁ</p>
  </body>
diff --git a/mozilla/layout/reftests/bidi/bidi-006-j.html b/mozilla/layout/reftests/bidi/bidi-006-j.html
new file mode 100644
index 00000000000..0e1d402c59a
--- /dev/null
+++ b/mozilla/layout/reftests/bidi/bidi-006-j.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- Bidi reftest 006: rtl text with diacritics. This is hard to reftest
+     because if there is a bug it will typically be exhibited in the reference
+     rendering as well as in the test. The approach adopted here is to use
+     "overflow-x: hidden", so that if the diacritic is shifted to the right or
+     left it will disappear from the test rendering and be visible (even if in
+     the wrong place) in the reference rendering.
+
+     Relevant bugs:
+     378351 (Windows)
+     386573 (Mac)
+     387653 (Linux)
+     395676 (Windows)
+ -->
+<html>
+ <head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8";
+ </head>
+  <style type="text/css">
+p {   
+  font-family: sans-serif;
+  font-size: 36pt;
+  width: 9pt;
+  overflow-x: hidden;
+  text-align: justify;
+  margin: 48pt;
+}
+  </style>
+ <body>
+  <p>&#x5d9;&#x5b8;</p>
+ </body>
+</html>
diff --git a/mozilla/layout/reftests/bidi/bidi-006-ref.html b/mozilla/layout/reftests/bidi/bidi-006-ref.html
new file mode 100644
index 00000000000..0be3ba69354
--- /dev/null
+++ b/mozilla/layout/reftests/bidi/bidi-006-ref.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- Bidi reftest 006: rtl text with diacritics. This is hard to reftest
+     because if there is a bug it will typically be exhibited in the reference
+     rendering as well as in the test. The approach adopted here is to use
+     "overflow-x: hidden", so that if the diacritic is shifted to the right or
+     left it will disappear from the test rendering and be visible (even if in
+     the wrong place) in the reference rendering.
+
+     Relevant bugs:
+     378351 (Windows)
+     386573 (Mac)
+     387653 (Linux)
+     395676 (Windows)
+ -->
+<html>
+ <head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8";
+ </head>
+  <style type="text/css">
+p {   
+  font-family: sans-serif;
+  font-size: 36pt;
+  width: 9pt;
+  margin: 48pt;
+}
+  </style>
+ <body>
+  <p>&#x5d9;&#x5b8;</p>
+ </body>
+</html>
diff --git a/mozilla/layout/reftests/bidi/bidi-006.html b/mozilla/layout/reftests/bidi/bidi-006.html
new file mode 100644
index 00000000000..74d0660bc77
--- /dev/null
+++ b/mozilla/layout/reftests/bidi/bidi-006.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- Bidi reftest 006: rtl text with diacritics. This is hard to reftest
+     because if there is a bug it will typically be exhibited in the reference
+     rendering as well as in the test. The approach adopted here is to use
+     "overflow-x: hidden", so that if the diacritic is shifted to the right or
+     left it will disappear from the test rendering and be visible (even if in
+     the wrong place) in the reference rendering.
+
+     Relevant bugs:
+     378351 (Windows)
+     386573 (Mac)
+     387653 (Linux)
+     395676 (Windows)
+ -->
+<html>
+ <head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8";
+ </head>
+  <style type="text/css">
+p {   
+  font-family: sans-serif;
+  font-size: 36pt;
+  width: 9pt;
+  overflow-x: hidden;
+  margin: 48pt;
+}
+  </style>
+ <body>
+  <p>&#x5d9;&#x5b8;</p>
+ </body>
+</html>
diff --git a/mozilla/layout/reftests/bidi/reftest.list b/mozilla/layout/reftests/bidi/reftest.list
index 73ac82c786b..6bdaf1ca44b 100644
--- a/mozilla/layout/reftests/bidi/reftest.list
+++ b/mozilla/layout/reftests/bidi/reftest.list
@@ -7,5 +7,7 @@
 fails-if(MOZ_WIDGET_TOOLKIT!="windows") == bidi-004.html bidi-004-ref.html # Bug 386567 (Linux), bug 386573 (Mac)
 fails-if(MOZ_WIDGET_TOOLKIT!="windows") == bidi-004-j.html bidi-004-ref.html
 == bidi-005.html bidi-005-ref.html
+fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == bidi-006.html bidi-006-ref.html # Bug 386573
+fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == bidi-006-j.html bidi-006-ref.html # Bug 386573
 == 386339.html 386339-ref.html
 fails-if(MOZ_WIDGET_TOOLKIT!="gtk2") == 387653.html 387653-ref.html # Linux-specific bug
