diff --git a/mozilla/layout/html/tests/table/bugs/bug3103.html b/mozilla/layout/html/tests/table/bugs/bug3103.html
new file mode 100644
index 00000000000..6ef667e33d3
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug3103.html
@@ -0,0 +1,19 @@
+<table border=4 height=400>
+<tr>
+        <td rowspan=2 width=200 >
+        1 Some sample text for the first column. Notice its formatting.
+        </td>
+        <td  width=400>
+        2 Here is some sample text to demonstrate the problem. Is there some
+setting in Navigator that will make this work correctly ? If so I
+haven't found it. Is this a bug ?
+        </td>
+</tr>
+<tr>
+        <td  width=400>
+        3 Here is some sample text to demonstrate the problem. Is there some
+setting in Navigator that will make this work correctly ? If so I
+haven't found it. Is this a bug ?
+        </td>
+</tr>
+</table>
diff --git a/mozilla/layout/html/tests/table/bugs/bug5838.html b/mozilla/layout/html/tests/table/bugs/bug5838.html
new file mode 100644
index 00000000000..3860cbb31fd
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug5838.html
@@ -0,0 +1,16 @@
+<table dir="rtl" border="1">
+<caption><em>A test table with merged cells</em></caption>
+<tr><th rowspan="2"></th>
+    <th colspan="2">Average</th>
+    <th rowspan="2">Red<br>eyes</th></tr>
+<tr><th>height</th>
+    <th>weight</th></tr>
+<tr><th>Males</th>
+    <td>1.9</td>
+        <td>0.003</td>
+        <td>40%</td></tr>
+<tr><th>Females
+    <td>1.7</td>
+        <td>0.002</td>
+        <td>43%</td></tr>
+</table>
diff --git a/mozilla/layout/html/tests/table/bugs/file_list.txt b/mozilla/layout/html/tests/table/bugs/file_list.txt
index 4be676ba33d..6c82f0418e4 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list.txt
@@ -32,6 +32,7 @@ file://s:/mozilla/layout/html/tests/table/bugs/bug2757.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug2962.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug3037-1.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug3037-2.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug3103.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug3105.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug3260.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug3263.html
@@ -43,6 +44,7 @@ file://s:/mozilla/layout/html/tests/table/bugs/bug4294.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug4382.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug4429.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug4520.html
+file://s:/mozilla/layout/html/tests/table/bugs/bug5838.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug641-1.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug641-2.html
 file://s:/mozilla/layout/html/tests/table/bugs/bug647.html
diff --git a/mozilla/layout/html/tests/table/marvin/file_list.txt b/mozilla/layout/html/tests/table/marvin/file_list.txt
index ec5c93f4426..1b1d27a20ec 100644
--- a/mozilla/layout/html/tests/table/marvin/file_list.txt
+++ b/mozilla/layout/html/tests/table/marvin/file_list.txt
@@ -124,4 +124,4 @@ file://s:/mozilla/layout/html/tests/table/marvin/tr_bgcolor_blue_rgb.html
 file://s:/mozilla/layout/html/tests/table/marvin/tr_valign_baseline.html
 file://s:/mozilla/layout/html/tests/table/marvin/tr_valign_bottom.html
 file://s:/mozilla/layout/html/tests/table/marvin/tr_valign_middle.html
-file://s:/mozilla/layout/html/tests/table/marvin/tr_valign_top.html
+file://s:/mozilla/layout/html/tests/table/marvin/XXXtr_valign_top.html
diff --git a/mozilla/layout/html/tests/table/other/file_list.txt b/mozilla/layout/html/tests/table/other/file_list.txt
index 884b14b6bd4..ebd0de87cf1 100644
--- a/mozilla/layout/html/tests/table/other/file_list.txt
+++ b/mozilla/layout/html/tests/table/other/file_list.txt
@@ -3,4 +3,4 @@ file://s:/mozilla/layout/html/tests/table/other/nestedTables.html
 file://s:/mozilla/layout/html/tests/table/other/slashlogo.html
 file://s:/mozilla/layout/html/tests/table/other/wa_table_thtd_rowspan.html
 file://s:/mozilla/layout/html/tests/table/other/wa_table_tr_align.html
-file://s:/mozilla/layout/html/tests/table/other/wf_table_index.html
+file://s:/mozilla/layout/html/tests/table/other/XXXwf_table_index.html