diff --git a/mozilla/layout/html/tests/table/bugs/file_list.txt b/mozilla/layout/html/tests/table/bugs/file_list.txt
index f498f9d1ecd..f350138d3a6 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list.txt
@@ -39,7 +39,7 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug12709.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1271.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug12908-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug12908-2.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug12012.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug12012.xul
 file:///s|/mozilla/layout/html/tests/table/bugs/bug12910.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug12910-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1296.html
@@ -47,7 +47,6 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug1302.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug13105.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug13118.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1318.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug1318.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug13169.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug13484.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug13526.html
@@ -64,7 +63,6 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug15544.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug15933.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug16012.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1647.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug1647.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug17130-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug17130-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug17138.html
@@ -73,7 +71,6 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug17548.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug17587.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug17826.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1800.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug1800.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1802.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1809.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug1818-1.html
@@ -119,7 +116,7 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug23847.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug23994.html
 #file:///s|/mozilla/layout/html/tests/table/bugs/bug24200.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug24627.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug24410.html
+#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/bug2479-1.html
@@ -137,8 +134,8 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug25367.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2516.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug25663.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2585.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug26178.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug26193.html
+#file:///s|/mozilla/layout/html/tests/table/bugs/bug26178.html
+#file:///s|/mozilla/layout/html/tests/table/bugs/bug26193.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug26553.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2684.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug2757.html
@@ -184,7 +181,6 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug3517.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug3681-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug3681-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug3718.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug3831.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug3977.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug4093.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug4284.html
@@ -227,14 +223,13 @@ file:///s|/mozilla/layout/html/tests/table/bugs/bug7121-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug7243.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug727.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug7342.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug7771.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug7604.html
+#file:///s|/mozilla/layout/html/tests/table/bugs/bug7604.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug7714.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug8032-1.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug8032-2.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug8361.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug8381.html
-file:///s|/mozilla/layout/html/tests/table/bugs/bug8411.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8411.xml
 file:///s|/mozilla/layout/html/tests/table/bugs/bug8499.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug8858.html
 file:///s|/mozilla/layout/html/tests/table/bugs/bug8950.html
@@ -251,4 +246,4 @@ 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
-file:///s|/mozilla/layout/html/tests/table/bugs/bug14489.html
\ No newline at end of file
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14489.html
diff --git a/mozilla/layout/html/tests/table/bugs/file_list2.txt b/mozilla/layout/html/tests/table/bugs/file_list2.txt
index 36e91448cd0..299b1f60513 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list2.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list2.txt
@@ -1,17 +1,163 @@
-# the following are back in file_list. They were here because of some
-# javascript glitches
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug2973.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug4427.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug4501.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug4576.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug5188.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug5797.html
-
-
-
-
-
-
-
-
-
+file:///s|/mozilla/layout/html/tests/table/bugs/bug12908-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug12012.xul
+file:///s|/mozilla/layout/html/tests/table/bugs/bug12910.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug12910-2.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/bug13105.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug13118.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1318.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1318.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug13169.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug13484.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug13526.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14007-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14007-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14159-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14159-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14159-3.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1430.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14323.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1474.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug15247.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug15544.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug15933.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug16012.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1647.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1647.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug17130-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug17130-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug17138.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug17168.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug17548.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug17587.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug17826.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1800.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1800.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1802.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1809.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1818-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1818-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1818-3.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1818-4.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1818-5.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1818-6.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug1828.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug18359.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug18440.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug18558.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug18664.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug18770.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug18955.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug19061-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug19061-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug19356.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug19526.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug19599.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2050.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug20579.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2065.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug20804.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2123.html
+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/bug22019.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug22122.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
+file:///s|/mozilla/layout/html/tests/table/bugs/bug23072.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug23151.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug23235.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug23299.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug23847.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug23994.html
+#file:///s|/mozilla/layout/html/tests/table/bugs/bug24200.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug24627.html
+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/bug2479-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2479-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2479-3.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2479-4.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2479-5.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/bug25086.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2509.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug25367.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2516.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug25663.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2585.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug26178.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug26193.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug26553.html
+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
+file:///s|/mozilla/layout/html/tests/table/bugs/bug28928.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug29157.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug29326.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug29429.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2947.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2954.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2962.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2973.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug2981-1.html
+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
+file:///s|/mozilla/layout/html/tests/table/bugs/bug30985.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug30692.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/bug3191.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3260.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug32447.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3263.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3309-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3309-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug33855.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3454.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug34538.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3517.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3681-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3681-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3718.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug3977.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4093.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4284.html
+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/bug4385.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4427.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4429.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4501.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4520.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4523.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4527.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4576.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4739.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4803.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4849.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug4849-2.html
diff --git a/mozilla/layout/html/tests/table/bugs/file_list3.txt b/mozilla/layout/html/tests/table/bugs/file_list3.txt
index 4b14eb82998..c32c3126517 100644
--- a/mozilla/layout/html/tests/table/bugs/file_list3.txt
+++ b/mozilla/layout/html/tests/table/bugs/file_list3.txt
@@ -1,8 +1,49 @@
-# the following are back in file_list. They were here because of some
-# javascript glitches
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug5835.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug625.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug6933.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug709.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug12012.html
-#file:///s|/mozilla/layout/html/tests/table/bugs/bug15933.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug5188.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug5797.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug5538.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug5798.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug5799.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug5835.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/bug625.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug6304.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/bug6404.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug647.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug650.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug6674.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug6933.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug709.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7112-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7112-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7121-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7121-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7243.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug727.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7342.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7604.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug7714.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8032-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8032-2.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8361.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8381.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8411.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8499.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8858.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug8950.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug9024.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug9072.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug9123-1.html
+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/bug9271-1.html
+file:///s|/mozilla/layout/html/tests/table/bugs/bug9271-2.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
+file:///s|/mozilla/layout/html/tests/table/bugs/bug14489.html
diff --git a/mozilla/layout/html/tests/table/bugs/rtest.bat b/mozilla/layout/html/tests/table/bugs/rtest.bat
index ffb23f0b58c..1ca3c9bd46d 100755
--- a/mozilla/layout/html/tests/table/bugs/rtest.bat
+++ b/mozilla/layout/html/tests/table/bugs/rtest.bat
@@ -5,15 +5,15 @@ if %1==baseline goto baseline
 if not exist verify mkdir verify
 s:\mozilla\dist\win32_d.obj\bin\viewer -d 1 -o s:\mozilla\layout\html\tests\table\bugs\verify\ -rd s:\mozilla\layout\html\tests\table\bugs -f s:\mozilla\layout\html\tests\table\bugs\file_list.txt
 REM file_list2 and file_list3 were added to workaround a javascript bug 
-REM s:\mozilla\dist\win32_d.obj\bin\viewer -o s:\mozilla\layout\html\tests\table\bugs\verify\ -rd s:\mozilla\layout\html\tests\table\bugs -f s:\mozilla\layout\html\tests\table\bugs\file_list2.txt
-REM s:\mozilla\dist\win32_d.obj\bin\viewer -o s:\mozilla\layout\html\tests\table\bugs\verify\ -rd s:\mozilla\layout\html\tests\table\bugs -f s:\mozilla\layout\html\tests\table\bugs\file_list3.txt
+REM s:\mozilla\dist\win32_d.obj\bin\viewer -d 1 -o s:\mozilla\layout\html\tests\table\bugs\verify\ -rd s:\mozilla\layout\html\tests\table\bugs -f s:\mozilla\layout\html\tests\table\bugs\file_list2.txt
+REM s:\mozilla\dist\win32_d.obj\bin\viewer -d 1 -o s:\mozilla\layout\html\tests\table\bugs\verify\ -rd s:\mozilla\layout\html\tests\table\bugs -f s:\mozilla\layout\html\tests\table\bugs\file_list3.txt
 goto done
 
 :baseline
 s:\mozilla\dist\win32_d.obj\bin\viewer -d 1 -o s:\mozilla\layout\html\tests\table\bugs\ -f s:\mozilla\layout\html\tests\table\bugs\file_list.txt
 REM file_list2 and file_list3 were added to workaround a javascript bug 
-REM s:\mozilla\dist\win32_d.obj\bin\viewer -o s:\mozilla\layout\html\tests\table\bugs\ -f s:\mozilla\layout\html\tests\table\bugs\file_list2.txt
-REM s:\mozilla\dist\win32_d.obj\bin\viewer -o s:\mozilla\layout\html\tests\table\bugs\ -f s:\mozilla\layout\html\tests\table\bugs\file_list3.txt
+REM s:\mozilla\dist\win32_d.obj\bin\viewer -d 1 -o s:\mozilla\layout\html\tests\table\bugs\ -f s:\mozilla\layout\html\tests\table\bugs\file_list2.txt
+REM s:\mozilla\dist\win32_d.obj\bin\viewer -d 1 -o s:\mozilla\layout\html\tests\table\bugs\ -f s:\mozilla\layout\html\tests\table\bugs\file_list3.txt
 goto done
 
 :error
diff --git a/mozilla/layout/html/tests/table/dom/file_list.txt b/mozilla/layout/html/tests/table/dom/file_list.txt
index 6a77afff4bd..080e95ac001 100644
--- a/mozilla/layout/html/tests/table/dom/file_list.txt
+++ b/mozilla/layout/html/tests/table/dom/file_list.txt
@@ -1,8 +1,8 @@
 file:///s|/mozilla/layout/html/tests/table/dom/appendCells1.html
-file:///s|/mozilla/layout/html/tests/table/dom/appendCols1.html
-file:///s|/mozilla/layout/html/tests/table/dom/appendCols2.html
-file:///s|/mozilla/layout/html/tests/table/dom/appendColGroup1.html
 file:///s|/mozilla/layout/html/tests/table/dom/appendCellsRebuild1.html
+file:///s|/mozilla/layout/html/tests/table/dom/appendCol1.html
+file:///s|/mozilla/layout/html/tests/table/dom/appendCol2.html
+file:///s|/mozilla/layout/html/tests/table/dom/appendColGroup1.html
 file:///s|/mozilla/layout/html/tests/table/dom/appendRowsExpand1.html
 file:///s|/mozilla/layout/html/tests/table/dom/appendTbodyExpand1.html
 file:///s|/mozilla/layout/html/tests/table/dom/deleteCellsRebuild1.html
@@ -12,11 +12,13 @@ file:///s|/mozilla/layout/html/tests/table/dom/deleteCol1.html
 file:///s|/mozilla/layout/html/tests/table/dom/deleteCol2.html
 file:///s|/mozilla/layout/html/tests/table/dom/deleteCol3.html
 file:///s|/mozilla/layout/html/tests/table/dom/deleteColGroup1.html
+file:///s|/mozilla/layout/html/tests/table/dom/deleteColGroup2.html
 file:///s|/mozilla/layout/html/tests/table/dom/deleteRowsRebuild1.html
-#file:///s|/mozilla/layout/html/tests/table/dom/deleteTbodyExpand1.html
-#file:///s|/mozilla/layout/html/tests/table/dom/deleteTbodyRebuild1.html
-#file:///s|/mozilla/layout/html/tests/table/dom/insertCellsExpand1.html
-#file:///s|/mozilla/layout/html/tests/table/dom/insertCellsExpand2.html
+file:///s|/mozilla/layout/html/tests/table/dom/deleteRowsShrink1.html
+file:///s|/mozilla/layout/html/tests/table/dom/deleteTbodyExpand1.html
+file:///s|/mozilla/layout/html/tests/table/dom/deleteTbodyRebuild1.html
+file:///s|/mozilla/layout/html/tests/table/dom/insertCellsExpand1.html
+file:///s|/mozilla/layout/html/tests/table/dom/insertCellsExpand2.html
 file:///s|/mozilla/layout/html/tests/table/dom/insertCellsRebuild1.html
 file:///s|/mozilla/layout/html/tests/table/dom/insertCellsRebuild2.html
 file:///s|/mozilla/layout/html/tests/table/dom/insertColGroups1.html
@@ -30,5 +32,4 @@ file:///s|/mozilla/layout/html/tests/table/dom/insertRowsExpand1.html
 file:///s|/mozilla/layout/html/tests/table/dom/insertRowsRebuild1.html
 file:///s|/mozilla/layout/html/tests/table/dom/insertTbodyExpand1.html
 file:///s|/mozilla/layout/html/tests/table/dom/insertTbodyRebuild1.html
-file:///s|/mozilla/layout/html/tests/table/dom/insertTbodyRebuild1.html
 
diff --git a/mozilla/layout/html/tests/table/other/file_list.txt b/mozilla/layout/html/tests/table/other/file_list.txt
index 0a95cbba6d5..ddb7259bc91 100644
--- a/mozilla/layout/html/tests/table/other/file_list.txt
+++ b/mozilla/layout/html/tests/table/other/file_list.txt
@@ -7,7 +7,7 @@ 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/ms.html
-file:///s|/mozilla/layout/html/tests/table/other/XXXwf_table_index.html
+file:///s|/mozilla/layout/html/tests/table/other/wf_table_index.html
 file:///s|/mozilla/layout/html/tests/table/other/move_row.html
 file:///s|/mozilla/layout/html/tests/table/other/move_row.html
 file:///s|/mozilla/layout/html/tests/table/other/nested2.html
diff --git a/mozilla/layout/html/tests/table/viewer_tests/file_list.txt b/mozilla/layout/html/tests/table/viewer_tests/file_list.txt
index d6fdb822891..d4af10a29d5 100644
--- a/mozilla/layout/html/tests/table/viewer_tests/file_list.txt
+++ b/mozilla/layout/html/tests/table/viewer_tests/file_list.txt
@@ -1,5 +1,4 @@
 file:///s|/mozilla/layout/html/tests/table/viewer_tests/test3.html
 file:///s|/mozilla/layout/html/tests/table/viewer_tests/test4.html
 file:///s|/mozilla/layout/html/tests/table/viewer_tests/test6.html
-file:///s|/mozilla/layout/html/tests/table/viewer_tests/test6.html