diff --git a/mozilla/layout/html/tests/formctls/base/button_no_margin.html b/mozilla/layout/html/tests/formctls/base/button_no_margin.html
new file mode 100644
index 00000000000..8dd0250ba62
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_no_margin.html
@@ -0,0 +1,16 @@
+<html>
+<title>
+Tests HTML buttons with margins, quirks mode
+</title>
+<body>
+<div>
+<button>This is text</button>
+</div>
+<div>
+<button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+<div>
+This is text <button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/formctls/base/button_no_margin_strict.html b/mozilla/layout/html/tests/formctls/base/button_no_margin_strict.html
new file mode 100644
index 00000000000..3e0bed33383
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_no_margin_strict.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<title>
+Tests HTML buttons with margins, quirks mode
+</title>
+<body>
+<div>
+<button>This is text</button>
+</div>
+<div>
+<button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+<div>
+This is text <button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/formctls/base/button_with_margin.html b/mozilla/layout/html/tests/formctls/base/button_with_margin.html
new file mode 100644
index 00000000000..93771a44f17
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_with_margin.html
@@ -0,0 +1,16 @@
+<html>
+<title>
+Tests HTML buttons with margins, quirks mode
+</title>
+<body>
+<div>
+<button style="margin: 200px">This is text</button>
+</div>
+<div>
+<button style="margin: 200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+<div>
+This is text <button style="margin:200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/formctls/base/button_with_margin_strict.html b/mozilla/layout/html/tests/formctls/base/button_with_margin_strict.html
new file mode 100644
index 00000000000..f01c8724da0
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_with_margin_strict.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<title>
+Tests HTML buttons with margins, quirks mode
+</title>
+<body>
+<div>
+<button style="margin: 200px">This is text</button>
+</div>
+<div>
+<button style="margin: 200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+<div>
+This is text <button style="margin:200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
+</div>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/formctls/base/rtest.lst b/mozilla/layout/html/tests/formctls/base/rtest.lst
index 382f867f240..1b362671c10 100644
--- a/mozilla/layout/html/tests/formctls/base/rtest.lst
+++ b/mozilla/layout/html/tests/formctls/base/rtest.lst
@@ -35,3 +35,7 @@ select_strict.html
 fieldset_strict.html 
 legend_strict.html
 isindex_strict.html
+button_no_margin.html
+button_no_margin_strict.html
+button_with_margin.html
+button_with_margin_strict.html
