diff --git a/mozilla/layout/html/tests/table/bugs/bug12287.xul b/mozilla/layout/html/tests/table/bugs/bug12287.xul
new file mode 100644
index 00000000000..50b3fecbef7
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug12287.xul
@@ -0,0 +1,16 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
+
+<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:html="http://www.w3.org/TR/REC-html40" align="vertical"
+  style="width: 300px">
+<box style="height:300px; border: 3px solid blue" align="vertical">
+<html:table flex="1" style="height:100px; border: 5px solid red; padding:3px">
+     <html:tr><html:td>Row 1 of 3</html:td></html:tr> 
+         <html:tr><html:td>Row 2 of 3</html:td></html:tr> 
+         <html:tr><html:td>Row 3 of 3</html:td></html:tr> 
+</html:table>
+</box>
+</window>
+
diff --git a/mozilla/layout/html/tests/table/bugs/file_list.txt b/mozilla/layout/html/tests/table/bugs/file_list.txt
index da6f0cb8962..35f065ed3cd 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list.txt
@@ -12,6 +12,7 @@ file:///s:/mozilla/layout/html/tests/table/bugs/bug1188.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug11944.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug12008.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug1220.html
+file:///s:/mozilla/layout/html/tests/table/bugs/bug12287.xul
 file:///s:/mozilla/layout/html/tests/table/bugs/bug1224.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug12268.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug12384.html
diff --git a/mozilla/layout/html/tests/table/core/captions.html b/mozilla/layout/html/tests/table/core/captions.html
new file mode 100644
index 00000000000..881738f20c7
--- /dev/null
+++ b/mozilla/layout/html/tests/table/core/captions.html
@@ -0,0 +1,8 @@
+<table width=100% height=100% border stylex="border:10px solid black;padding:10px">
+ <caption>
+  <nobr>caption is considered part of % width, not so in Nav4.6, 
+        caption is not considered part of %height
+  </nobr>
+ </caption>
+ <tr><td style="padding:10px;">FOO</td></tr>
+</table>
diff --git a/mozilla/layout/html/tests/table/core/file_list.txt b/mozilla/layout/html/tests/table/core/file_list.txt
index bc194b13be2..82e890e5cc1 100644
--- a/mozilla/layout/html/tests/table/core/file_list.txt
+++ b/mozilla/layout/html/tests/table/core/file_list.txt
@@ -1,5 +1,6 @@
 file:///s:/mozilla/layout/html/tests/table/core/backgrounds.html
 file:///s:/mozilla/layout/html/tests/table/core/bloomberg.html
+file:///s:/mozilla/layout/html/tests/table/core/captions.html
 file:///s:/mozilla/layout/html/tests/table/core/cell_heights.html
 file:///s:/mozilla/layout/html/tests/table/core/columns.html
 file:///s:/mozilla/layout/html/tests/table/core/col_span.html