diff --git a/mozilla/layout/html/tests/block/bugs/215857-2.html b/mozilla/layout/html/tests/block/bugs/215857-2.html
new file mode 100644
index 00000000000..13abcf16eb0
--- /dev/null
+++ b/mozilla/layout/html/tests/block/bugs/215857-2.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+   <head>
+      <title>bug 215857 part 2</title>
+   </head>
+   <body>
+      <table border="1" width="766"><tr>
+            <td width="135">
+               <script>var v = document.body.offsetHeight;</script>
+               <hr width="90%">
+               <script>var v = document.body.offsetHeight;</script>
+            </td>
+            <td></td>
+         </tr>
+      </table>
+   </body>
+</html>
diff --git a/mozilla/layout/html/tests/block/bugs/215857-3.html b/mozilla/layout/html/tests/block/bugs/215857-3.html
new file mode 100644
index 00000000000..f9931a8813f
--- /dev/null
+++ b/mozilla/layout/html/tests/block/bugs/215857-3.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html><head><title>bug 215857 part 2</title></head>
+
+   <body>
+      <table border="1" width="766"><tbody><tr>
+            <td width="135">
+               <script>var v = document.body.offsetHeight;</script>
+               <table border width="90%" cellspacing="0" cellpadding="0"><tr><td></td></tr></table>
+               <script>var v = document.body.offsetHeight;</script>
+            </td>
+            <td></td>
+         </tr>
+      </tbody></table>
+   </body></html>
diff --git a/mozilla/layout/html/tests/block/bugs/217369-1.html b/mozilla/layout/html/tests/block/bugs/217369-1.html
new file mode 100644
index 00000000000..f846467f94e
--- /dev/null
+++ b/mozilla/layout/html/tests/block/bugs/217369-1.html
@@ -0,0 +1,23 @@
+<html>
+<title>Testcase, bug 217369</title>
+<body>
+
+<table width="300">
+	<tr>
+		<td width="120" bgcolor="yellow">
+			<div style="margin: 0px; width: 120px;">
+				120px
+				<script type="text/javascript">
+					var foo = document.body.offsetHeight;
+				</script>
+			</div>
+		</td>
+		<script type="text/javascript">
+			var foo = document.body.offsetHeight;
+		</script>
+		<td bgcolor="aqua">180px</td>
+	</tr>
+</table>
+
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/block/bugs/217369-2.html b/mozilla/layout/html/tests/block/bugs/217369-2.html
new file mode 100644
index 00000000000..199d2226cf5
--- /dev/null
+++ b/mozilla/layout/html/tests/block/bugs/217369-2.html
@@ -0,0 +1,23 @@
+<html
+<title>Testcase, bug 217369</title
+><body
+
+><table width="300"
+	><tr
+		><td width="120" bgcolor="yellow"
+			><div style="margin: 0px; width: 120px;">
+				120px
+				<script type="text/javascript">
+					var foo = document.body.offsetHeight;
+				</script>
+			</div
+		></td
+		><script type="text/javascript">
+			var foo = document.body.offsetHeight;
+		</script
+		><td bgcolor="aqua">180px</td
+	></tr
+></table
+
+></body
+></html>
diff --git a/mozilla/layout/html/tests/block/bugs/39683.html b/mozilla/layout/html/tests/block/bugs/39683.html
new file mode 100644
index 00000000000..e5d9c2acefe
--- /dev/null
+++ b/mozilla/layout/html/tests/block/bugs/39683.html
@@ -0,0 +1,20 @@
+<html>
+  <head>
+    <style>
+      div {
+        border: 3px solid red;
+      }
+    </style>
+  </head>
+  <body>
+    <table border="1">
+        <td>
+          <div id="d">test test test tes tes tes test es </div>
+        </td>
+    </table>
+	<script type="text/javascript">
+	  var v = document.body.offsetHeight;
+	  document.getElementById("d").style.width = "100px";
+	</script>
+  </body>
+</html>
diff --git a/mozilla/layout/html/tests/block/bugs/file_list.txt b/mozilla/layout/html/tests/block/bugs/file_list.txt
index 24d80835950..c47798f723e 100644
--- a/mozilla/layout/html/tests/block/bugs/file_list.txt
+++ b/mozilla/layout/html/tests/block/bugs/file_list.txt
@@ -104,6 +104,7 @@ file:///s:/mozilla/layout/html/tests/block/bugs/36401-a.html
 file:///s:/mozilla/layout/html/tests/block/bugs/36401-b.html
 file:///s:/mozilla/layout/html/tests/block/bugs/36401-c.html
 file:///s:/mozilla/layout/html/tests/block/bugs/36401.html
+file:///s:/mozilla/layout/html/tests/block/bugs/39683.html
 file:///s:/mozilla/layout/html/tests/block/bugs/37083-1.html
 file:///s:/mozilla/layout/html/tests/block/bugs/37083-2.html
 file:///s:/mozilla/layout/html/tests/block/bugs/37083-3.html
@@ -208,6 +209,10 @@ file:///s:/mozilla/layout/html/tests/block/bugs/185411-2.html
 file:///s:/mozilla/layout/html/tests/block/bugs/185411-3.html
 file:///s:/mozilla/layout/html/tests/block/bugs/196919.html
 file:///s:/mozilla/layout/html/tests/block/bugs/215857.html
+file:///s:/mozilla/layout/html/tests/block/bugs/215857-2.html
+file:///s:/mozilla/layout/html/tests/block/bugs/215857-3.html
+file:///s:/mozilla/layout/html/tests/block/bugs/217369-1.html
+file:///s:/mozilla/layout/html/tests/block/bugs/217369-2.html
 file:///s:/mozilla/layout/html/tests/block/bugs/223394-1.html
 file:///s:/mozilla/layout/html/tests/block/bugs/223394-2.html
 file:///s:/mozilla/layout/html/tests/block/bugs/223394-3.html
