diff --git a/mozilla/layout/html/tests/table/bugs/bug22246-2.html b/mozilla/layout/html/tests/table/bugs/bug22246-2.html
index a3911d6814a..d03c7c528a3 100644
--- a/mozilla/layout/html/tests/table/bugs/bug22246-2.html
+++ b/mozilla/layout/html/tests/table/bugs/bug22246-2.html
@@ -1,4 +1,4 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <body onload="document.getElementsByTagName('td')[1].setAttribute('ROWSPAN','2');">
 &nbsp;
diff --git a/mozilla/layout/html/tests/table/bugs/bug22246-2a.html b/mozilla/layout/html/tests/table/bugs/bug22246-2a.html
new file mode 100644
index 00000000000..f25a8658dde
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug22246-2a.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<body onload="document.getElementsByTagName('td')[1].setAttribute('ROWSPAN','2');">
+&nbsp;
+
+<table BORDER CELLSPACING=2 CELLPADDING=2 >
+<tbody>
+<tr>
+<td>1</td>
+<td COLSPAN="2">colspan 2 rowspan 2</td>
+<td >3</td>
+</tr>
+<tr>
+<td>4</td>
+<td>5</td>
+<td>6</td>
+<td>7</td>
+<td>8</td>
+</tr>
+<tr>
+<td>9</td>
+<td>10</td>
+<td>11</td>
+<td>12</td>
+<td>13</td>
+</tr>
+</tbody>
+</table>
+
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug22246-3.html b/mozilla/layout/html/tests/table/bugs/bug22246-3.html
index a08d04cfd42..e006d7554a3 100644
--- a/mozilla/layout/html/tests/table/bugs/bug22246-3.html
+++ b/mozilla/layout/html/tests/table/bugs/bug22246-3.html
@@ -1,4 +1,4 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <body onload=
  "document.getElementsByTagName('td')[1].setAttribute('COLSPAN','3');
diff --git a/mozilla/layout/html/tests/table/bugs/bug22246-3a.html b/mozilla/layout/html/tests/table/bugs/bug22246-3a.html
new file mode 100644
index 00000000000..5f0e5dd781d
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug22246-3a.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<body onload=
+ "document.getElementsByTagName('td')[1].setAttribute('COLSPAN','3');
+  document.getElementsByTagName('td')[1].setAttribute('ROWSPAN','2');">
+&nbsp;
+
+<table BORDER CELLSPACING=2 CELLPADDING=2 >
+<tbody>
+<tr>
+<td>1</td>
+<td COLSPAN="2">colspan 3 rowspan 2</td>
+<td >3</td>
+</tr>
+<tr>
+<td>4</td>
+<td>5</td>
+<td>6</td>
+<td>7</td>
+<td>8</td>
+</tr>
+<tr>
+<td>9</td>
+<td>10</td>
+<td>11</td>
+<td>12</td>
+<td>13</td>
+</tr>
+</tbody>
+</table>
+
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug24880-1.html b/mozilla/layout/html/tests/table/bugs/bug24880-1.html
new file mode 100644
index 00000000000..15243da6099
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug24880-1.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<head>
+   <title>Table Test</title>
+</head>
+<body>
+&nbsp;
+<table BORDER CELLSPACING=2 CELLPADDING=2 >
+<tbody>
+<tr VALIGN=TOP>
+<td VALIGN=TOP COLSPAN="0">Colspan=0</td>
+</tr>
+<tr VALIGN=TOP>
+<td VALIGN=TOP>Cell 2</td>
+<td VALIGN=TOP>Cell 3</td>
+<td VALIGN=TOP>Cell 4</td>
+</tr>
+</tbody>
+</table>
+<BR>
+<table BORDER CELLSPACING=2 CELLPADDING=2 >
+<tbody>
+<tr VALIGN=TOP>
+<td VALIGN=TOP>Cell 2</td>
+<td VALIGN=TOP>Cell 3</td>
+<td VALIGN=TOP>Cell 4</td>
+</tr>
+<tr VALIGN=TOP>
+<td VALIGN=TOP COLSPAN="0">Colspan=0</td>
+</tr>
+<tr VALIGN=TOP>
+<td VALIGN=TOP>Cell 5</td>
+<td VALIGN=TOP>Cell 6</td>
+<td VALIGN=TOP>Cell 7</td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug24880.html b/mozilla/layout/html/tests/table/bugs/bug24880.html
index ee2386eba3f..05ee1abfbef 100644
--- a/mozilla/layout/html/tests/table/bugs/bug24880.html
+++ b/mozilla/layout/html/tests/table/bugs/bug24880.html
@@ -1,4 +1,4 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
    <title>Table Test</title>
diff --git a/mozilla/layout/html/tests/table/bugs/bug25004.html b/mozilla/layout/html/tests/table/bugs/bug25004.html
new file mode 100644
index 00000000000..a4adaaaa8cd
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug25004.html
@@ -0,0 +1,33 @@
+<html>
+<body bgcolor="#c0c0c0">
+
+<table width="100%" border="5">
+  <tr>
+    <td>
+                        <table border="3">
+        <tr>
+                                        <td width="1000">&nbsp;</td>
+        </tr>
+      </table>
+                </td>
+    <td>This is some text</td>
+  </tr>
+</table>
+
+<br>
+
+<table border="5">
+  <tr>
+    <td>
+                        <table border="3">
+        <tr>
+                                        <td width="1000">&nbsp;</td>
+        </tr>
+      </table>
+                </td>
+    <td>This is some text</td>
+  </tr>
+</table>
+
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug27993-1.html b/mozilla/layout/html/tests/table/bugs/bug27993-1.html
new file mode 100644
index 00000000000..5ce335e916a
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug27993-1.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html><head><title>Testcase for bug 27993</title></head>
+<body bgcolor="#FFFFFF">
+
+<TABLE width="748" border="1">
+  <TR>
+    <TD width="174" colspan="0">R1C1 colspan=0</TD>
+    <TD width="398" colspan="0">R1C2 colspan=0</TD>
+  </TR>
+  
+  <TR>
+    <TD width="748" colspan="2">R2C1 colspan=2</TD>
+  </TR>
+</TABLE>
+
+</body></html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug27993-2.html b/mozilla/layout/html/tests/table/bugs/bug27993-2.html
new file mode 100644
index 00000000000..d587fb58a5c
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug27993-2.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><title>Testcase for bug 27993</title></head>
+<body bgcolor="#FFFFFF">
+
+<TABLE width="748" border="1">
+  <TR>
+    <TD width="174" colspan="0">R1C1 colspan=0</TD>
+    <TD width="398" colspan="0">R1C2 colspan=0</TD>
+  </TR>
+  
+  <TR>
+    <TD width="748" colspan="2">R2C1 colspan=2</TD>
+  </TR>
+</TABLE>
+
+</body></html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug30332-1.html b/mozilla/layout/html/tests/table/bugs/bug30332-1.html
new file mode 100644
index 00000000000..c1f53e7827d
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug30332-1.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.72 [en] (Win98; I) [Netscape]">
+   <title>ROWSPAN = "0" Test Case</title>
+</head>
+
+<body>
+
+BAD:<br><br>
+  <center>
+    <table BORDER = "5" COLS=1 WIDTH="100%" >
+      <tr>
+        <td ROWSPAN = "0">One</td>
+      </tr>
+
+      <tr>
+        <td>Two</td>
+      </tr>
+    </table>
+  </center>
+
+<br>
+<br>
+
+GOOD:<br><br>
+  <center>
+    <table BORDER = "5"COLS=1 WIDTH="100%" >
+      <tr>
+        <td>One</td>
+      </tr>
+
+      <tr>
+        <td>Two</td>
+      </tr>
+    </table>
+  </center>
+
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug30332-2.html b/mozilla/layout/html/tests/table/bugs/bug30332-2.html
new file mode 100644
index 00000000000..444d64906a5
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug30332-2.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.72 [en] (Win98; I) [Netscape]">
+   <title>ROWSPAN = "0" Test Case</title>
+</head>
+
+<body>
+
+BAD:<br><br>
+  <center>
+    <table BORDER = "5" COLS=1 WIDTH="100%" >
+      <tr>
+        <td ROWSPAN = "0">One</td>
+      </tr>
+
+      <tr>
+        <td>Two</td>
+      </tr>
+    </table>
+  </center>
+
+<br>
+<br>
+
+GOOD:<br><br>
+  <center>
+    <table BORDER = "5"COLS=1 WIDTH="100%" >
+      <tr>
+        <td>One</td>
+      </tr>
+
+      <tr>
+        <td>Two</td>
+      </tr>
+    </table>
+  </center>
+
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/table/bugs/bug9879-1.html b/mozilla/layout/html/tests/table/bugs/bug9879-1.html
new file mode 100644
index 00000000000..e83b7766f92
--- /dev/null
+++ b/mozilla/layout/html/tests/table/bugs/bug9879-1.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<TABLE BORDER=1>
+ <TR>
+  <TD ROWSPAN=0>rowspan 0</TD>
+  <TD COLSPAN=0>colspan 0</TD>
+ </TR>
+ <TR>
+  <TD>5</TD>
+  <TD>6</TD>
+ </TR>
+</TABLE>
+
+<BR>
+
+<TABLE BORDER=1>
+ <TR>
+  <TD COLSPAN=0>colspan 0</TD>
+  <TD>3</TD>
+ </TR>
+ <TR>
+  <TD>4</TD><TD>5</TD><TD>6</TD>
+ </TR>
+</TABLE>
+
+<BR>
+  
+<TABLE BORDER=1>
+ <TR>
+  <TD>1</TD>
+  <TD ROWSPAN=2 COLSPAN=0>rowspan 0 colspan 0</TD>
+ </TR>
+ <TR>
+  <TD>4</TD><TD>6</TD>
+ </TR>
+</TABLE>
+
+<BR>
+
+<TABLE BORDER=1>
+ <TR>
+  <TD>1</TD>
+  <TD ROWSPAN=2>2</TD>
+ </TR>
+ <TR>
+  <TD ALIGN=center COLSPAN=0>3</TD>
+ </TR>
+</TABLE>  
+
+<BR>
+
+<table border>
+<tr>
+ <td>auto</td>
+ <td rowspan=0>rowspan 0</td>
+ <td>auto</td>
+</tr>
+<tr>
+ <td>auto</td>
+ <td>auto</td>
+ <td>auto</td>
+</tr>
+</table>
+
diff --git a/mozilla/layout/html/tests/table/bugs/bug9879.html b/mozilla/layout/html/tests/table/bugs/bug9879.html
index 0e3d3b616f7..26da14ed287 100644
--- a/mozilla/layout/html/tests/table/bugs/bug9879.html
+++ b/mozilla/layout/html/tests/table/bugs/bug9879.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <TABLE BORDER=1>
  <TR>
   <TD ROWSPAN=0>rowspan 0</TD>
diff --git a/mozilla/layout/html/tests/table/bugs/file_list.txt b/mozilla/layout/html/tests/table/bugs/file_list.txt
index cc9e12e68a4..73664e96856 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list.txt
@@ -96,9 +96,10 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug21299.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug21518.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug21918.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug22122.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug22246-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug22246-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug22246-2a.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug22246-3.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug22246-3a.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2267.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug22513.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2296.html
@@ -114,6 +115,7 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug24410.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug24503.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2469.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug24880.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug24880-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug25004.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug25074.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2509.html
@@ -127,6 +129,8 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug2684.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2757.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2763.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2773.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug27993-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug27993-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug28341.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2886.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2886-2.html
@@ -143,6 +147,8 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug2981-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug28933.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2997.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug30273.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug30332-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug30332-2.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/bug30559.html
@@ -219,6 +225,7 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug9123-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug963.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug965.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug9879.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug9879-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug16252.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug13196.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug14489.html
