diff --git a/mozilla/layout/html/tests/table/bugs/bug6184.html b/mozilla/layout/html/tests/table/bugs/bug6184.html
new file mode 100644
index 00000000000..12458b6fbb4
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug6184.html
@@ -0,0 +1,21 @@
+
+
+ |
+ The Supreme Court says
+ Wisconsin can continue using tuition vouchers to help poor parents send their
+ children to church-run schools. What's your stand? |
+
+ | hello |
+ hello |
+
+
+
+
+ | hello |
+
+ The Supreme Court says
+ Wisconsin can continue using tuition vouchers to help poor parents send their
+ children to church-run schools. What's your stand? |
+
+
+
diff --git a/mozilla/layout/html/tests/table/bugs/file_list.txt b/mozilla/layout/html/tests/table/bugs/file_list.txt
index 6c82f0418e4..ac8f202ed47 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list.txt
@@ -45,6 +45,7 @@ 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/bug6184.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/other/cell_widths.html b/mozilla/layout/html/tests/table/other/cell_widths.html
new file mode 100644
index 00000000000..051d453be09
--- /dev/null
+++ b/mozilla/layout/html/tests/table/other/cell_widths.html
@@ -0,0 +1,124 @@
+
+
+fixed width table with 100px width image in 1st cell
+
+
+
+  |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+fixed width table with 100px width table in 1st cell
+
+
+ |
+ |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+auto width table with 100px width image in 1st cell
+
+
+
+  |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+fixed width table with 100px width 1st cell containing image
+
+
+
+  |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+auto width table with 100px width 1st cell containing image
+
+
+
+  |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+small fixed width table with 100px image in 1st cell
+
+
+
+  |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+fixed width table with 100px image in 1st cell, 100px 2nd cell containing text
+
+
+
+  |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+auto width table with 100px image in 1st cell, 100px 2nd cell containing text.
+This differs from Nav4.5 but is similar to IE5
+
+
+
+  |
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text
+ a bunch of text, a bunch of text, a bunch of text, a bunch of text |
+
+
+Fixed width table with colspan=2 in 1st row, 2nd row containing 100px image, text
+
+
+ |
+ hello hello hello hello hello hello hello hello hello hello hello |
+
+
+  |
+ there there there there there there there there there there there there |
+
+
+Auto width table with colspan=2 in 1st row, 2nd row containing 100px image, text
+
+
+ |
+ hello hello hello hello hello hello hello hello hello hello hello |
+
+
+  |
+ there there there there there there there there there there there there |
+
+
+Fixed width table with colspan=2 in 1st row, 2nd row containing 100px image, 100px cell
+
+
+ |
+ hello hello hello hello hello hello hello hello hello hello hello |
+
+
+  |
+ there there there there there there there there there there there there |
+
+
+Auto width table with colspan=2 in 1st row, 2nd row containing 100px image, 100px cell
+
+
+ |
+ hello hello hello hello hello hello hello hello hello hello hello |
+
+
+  |
+ there there there there there there there there there there there there |
+
+
+
+
+
diff --git a/mozilla/layout/html/tests/table/other/file_list.txt b/mozilla/layout/html/tests/table/other/file_list.txt
index ebd0de87cf1..e84a563615b 100644
--- a/mozilla/layout/html/tests/table/other/file_list.txt
+++ b/mozilla/layout/html/tests/table/other/file_list.txt
@@ -1,3 +1,4 @@
+file://s:/mozilla/layout/html/tests/table/other/cell_widths.html
file://s:/mozilla/layout/html/tests/table/other/empty_cells.html
file://s:/mozilla/layout/html/tests/table/other/nestedTables.html
file://s:/mozilla/layout/html/tests/table/other/slashlogo.html