diff --git a/layout/html/tests/table/bugs/bug1271.html b/layout/html/tests/table/bugs/bug1271.html
new file mode 100644
index 000000000000..5078e4a9c702
--- /dev/null
+++ b/layout/html/tests/table/bugs/bug1271.html
@@ -0,0 +1,15 @@
+<body><table CELLSPACING=0 CELLPADDING=0 WIDTH="100%" HEIGHT="100%" >
+<tr>
+<td WIDTH="160"><img SRC="../images/corner.JPG" height=80 width=160></td>
+<td WIDTH="100%" BACKGROUND="../images/160x80.JPG"></td>
+<td><img SRC="../images/40x80.JPG" height=80 width=40></td>
+</tr>
+<tr>
+<td WIDTH="160" HEIGHT="80%" BACKGROUND="../images/160x160.JPG"></td>
+<td COLSPAN="2" ROWSPAN="2"></td>
+</tr>
+<tr>
+<td><img SRC="../images/160x40.JPG" height=40 width=160></td>
+</tr>
+</table>
+</body>
diff --git a/layout/html/tests/table/bugs/file_list.txt b/layout/html/tests/table/bugs/file_list.txt
index 6922d4501079..5ca18707bbe9 100644
--- a/layout/html/tests/table/bugs/file_list.txt
+++ b/layout/html/tests/table/bugs/file_list.txt
@@ -17,6 +17,7 @@ file:///s:/mozilla/layout/html/tests/table/bugs/bug12268.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug12384.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug1261.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug1262.html
+file:///s:/mozilla/layout/html/tests/table/bugs/bug1271.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug1296.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug1302.html
 file:///s:/mozilla/layout/html/tests/table/bugs/bug1318.html
diff --git a/layout/html/tests/table/core/cell_heights.html b/layout/html/tests/table/core/cell_heights.html
new file mode 100644
index 000000000000..028de99e3b50
--- /dev/null
+++ b/layout/html/tests/table/core/cell_heights.html
@@ -0,0 +1,112 @@
+<table height=100% bgcolor=blue border>
+ <tr>
+  <td height=20%>20%</td>
+ </tr>
+ <tr>
+  <td height=80%>80%</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=blue border>
+ <tr height=50>
+  <td>row 50</td>
+ </tr>
+ <tr>
+  <td height=50>50</td>
+ </tr>
+</table>
+<BR>
+<table width=5 bgcolor=blue border>
+ <tr>
+  <td height=5>5 5 5</td>
+ </tr>
+ <tr>
+  <td height=50>50</td>
+ </tr>
+</table>
+<table bgcolor=blue height=100 border>
+ <tr>
+  <td height=200>200</td>
+ </tr>
+ <tr>
+  <td height=50>50</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=blue border>
+ <tr>
+  <td height=200>200</td>
+ </tr>
+ <tr>
+  <td height=50>50</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=orange width=20 border>
+ <tr>
+  <td height=100 rowspan=2>100</td>
+  <td height=100>100</td>
+ </tr>
+ <tr>
+  <td height=100>100 100 100</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=yellow border>
+ <tr>
+  <td height=100%>100%</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=orange height=100% border>
+ <tr>
+  <td height=20%>20%</td>
+ </tr>
+ <tr>
+  <td height=80%>80%</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=gray border>
+ <tr>
+  <td height=5%>5%</td>
+  <td height=200>200</td>
+ </tr>
+</table>
+<BR>
+<table height=200 bgcolor=orange border>
+ <tr>
+  <td height=50%>50%</td>
+  <td height=20>20</td>
+ </tr>
+</table>
+<BR>
+<table height=100% border>
+ <tr>
+  <td height=500>500</td>
+ </tr>
+ <tr>
+  <td height=80%>80%</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=red height=100% border>
+ <tr>
+  <td height=500 rowspan=2>500</td>
+  <td>auto</td>
+ </tr>
+ <tr>
+  <td>auto</td>
+  <td>auto</td>
+ </tr>
+ <tr>
+  <td>auto</td>
+  <td>auto</td>
+ </tr>
+</table>
+<BR>
+<table bgcolor=orange border>
+ <tr>
+  <td height=400><table bgcolor=blue height=100%><tr><td>100%</td></tr></table></td>
+ </tr>
+</table>
diff --git a/layout/html/tests/table/core/file_list.txt b/layout/html/tests/table/core/file_list.txt
index ddb60aad3bb8..bbbefd26b1ed 100644
--- a/layout/html/tests/table/core/file_list.txt
+++ b/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/cell_heights.html
 file:///s:/mozilla/layout/html/tests/table/core/columns.html
 file:///s:/mozilla/layout/html/tests/table/core/col_span.html
 file:///s:/mozilla/layout/html/tests/table/core/col_span2.html
diff --git a/layout/html/tests/table/images/160x160.JPG b/layout/html/tests/table/images/160x160.JPG
new file mode 100644
index 000000000000..d899778af282
Binary files /dev/null and b/layout/html/tests/table/images/160x160.JPG differ
diff --git a/layout/html/tests/table/images/160x40.JPG b/layout/html/tests/table/images/160x40.JPG
new file mode 100644
index 000000000000..accd056e6e7f
Binary files /dev/null and b/layout/html/tests/table/images/160x40.JPG differ
diff --git a/layout/html/tests/table/images/160x80.JPG b/layout/html/tests/table/images/160x80.JPG
new file mode 100644
index 000000000000..8852f0b9849b
Binary files /dev/null and b/layout/html/tests/table/images/160x80.JPG differ
diff --git a/layout/html/tests/table/images/40x80.JPG b/layout/html/tests/table/images/40x80.JPG
new file mode 100644
index 000000000000..354028e42285
Binary files /dev/null and b/layout/html/tests/table/images/40x80.JPG differ
diff --git a/layout/html/tests/table/images/corner.JPG b/layout/html/tests/table/images/corner.JPG
new file mode 100644
index 000000000000..dfda77afb450
Binary files /dev/null and b/layout/html/tests/table/images/corner.JPG differ
