diff --git a/mozilla/layout/html/tests/formctls/base/button_overconstrained.html b/mozilla/layout/html/tests/formctls/base/button_overconstrained.html
new file mode 100644
index 00000000000..e731a0df2e2
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_overconstrained.html
@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <title>input problem</title>
+  </head>
+  <body>
+      <button style="">M</button><br>
+      <button style="width: 1.5em">M</button><br>
+      <button style="width: 1.5em;padding:0">M</button><br>
+      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">M</button><br>
+      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >M</button><br>
+      <hr>
+      <button style="">My Fair Button</button><br>
+      <button style="width: 1.5em">My Fair Button</button><br>
+      <button style="width: 1.5em;padding:0">My Fair Button</button><br>
+      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">My Fair Button</button><br>
+      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >My Fair Button</button><br>
+      <hr>
+      <button style="width: 40px">
+        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+             style="width: 29px; height: 20px">
+        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+             style="width: 13px; height: 20px">
+      </button><br>
+      <button style="width: 40px">
+         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+              style="width: 29px; height: 20px">
+         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+              style="width: 10px; height: 20px">
+      </button><br>
+  </body>
+</html>
+  
diff --git a/mozilla/layout/html/tests/formctls/base/button_overconstrained_strict.html b/mozilla/layout/html/tests/formctls/base/button_overconstrained_strict.html
new file mode 100644
index 00000000000..45b4f6475f1
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_overconstrained_strict.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+  <head>
+    <title>input problem</title>
+  </head>
+  <body>
+      <button style="">M</button><br>
+      <button style="width: 1.5em">M</button><br>
+      <button style="width: 1.5em;padding:0">M</button><br>
+      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">M</button><br>
+      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >M</button><br>
+      <hr>
+      <button style="">My Fair Button</button><br>
+      <button style="width: 1.5em">My Fair Button</button><br>
+      <button style="width: 1.5em;padding:0">My Fair Button</button><br>
+      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">My Fair Button</button><br>
+      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >My Fair Button</button><br>
+      <hr>
+      <button style="width: 40px">
+        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+             style="width: 29px; height: 20px">
+        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+             style="width: 13px; height: 20px">
+      </button><br>
+      <button style="width: 40px">
+         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+              style="width: 29px; height: 20px">
+         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
+              style="width: 10px; height: 20px">
+      </button><br>
+  </body>
+</html>
+  
diff --git a/mozilla/layout/html/tests/formctls/base/button_small_avail_width.html b/mozilla/layout/html/tests/formctls/base/button_small_avail_width.html
new file mode 100644
index 00000000000..f0a1c4df966
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_small_avail_width.html
@@ -0,0 +1,10 @@
+<html>
+<title>
+Tests HTML buttons and min/max-width, quirks mode
+</title>
+<body>
+<div style="width: 0px">
+<button>Some Text</button>
+</div>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/formctls/base/button_small_avail_width_strict.html b/mozilla/layout/html/tests/formctls/base/button_small_avail_width_strict.html
new file mode 100644
index 00000000000..a8f121c0eaa
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/button_small_avail_width_strict.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<title>
+Tests HTML buttons and min/max-width, standards mode
+</title>
+<body>
+<div style="width: 0px">
+<button>Some Text</button>
+</div>
+</body>
+</html>
diff --git a/mozilla/layout/html/tests/formctls/base/input_button_overconstrained.html b/mozilla/layout/html/tests/formctls/base/input_button_overconstrained.html
new file mode 100644
index 00000000000..19d8cd463f1
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/input_button_overconstrained.html
@@ -0,0 +1,19 @@
+<html>
+  <head>
+    <title>input problem</title>
+  </head>
+  <body>
+      <input type="button" style="" value="M"><br>
+      <input type="button" style="width: 1.5em" value="M"><br>
+      <input type="button" style="width: 1.5em;padding:0" value="M"><br>
+      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="M"><br>
+      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="M"><br>
+      <hr>
+      <input type="button" style="" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em;padding:0" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="My Fair Button"><br>
+  </body>
+</html>
+  
diff --git a/mozilla/layout/html/tests/formctls/base/input_button_overconstrained_strict.html b/mozilla/layout/html/tests/formctls/base/input_button_overconstrained_strict.html
new file mode 100644
index 00000000000..4eac1f35984
--- /dev/null
+++ b/mozilla/layout/html/tests/formctls/base/input_button_overconstrained_strict.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+  <head>
+    <title>input problem</title>
+  </head>
+  <body>
+      <input type="button" style="" value="M"><br>
+      <input type="button" style="width: 1.5em" value="M"><br>
+      <input type="button" style="width: 1.5em;padding:0" value="M"><br>
+      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="M"><br>
+      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="M"><br>
+      <hr>
+      <input type="button" style="" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em;padding:0" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="My Fair Button"><br>
+      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="My Fair Button"><br>
+  </body>
+</html>
+  
diff --git a/mozilla/layout/html/tests/formctls/base/rtest.lst b/mozilla/layout/html/tests/formctls/base/rtest.lst
index 7c5e0b45f82..b3951351209 100644
--- a/mozilla/layout/html/tests/formctls/base/rtest.lst
+++ b/mozilla/layout/html/tests/formctls/base/rtest.lst
@@ -40,3 +40,10 @@ button_no_margin_strict.html
 button_with_margin.html
 button_with_margin_strict.html
 button_min_max_widths.html
+button_min_max_widths_strict.html
+button_small_avail_width.html
+button_small_avail_width_strict.html
+button_overconstrained.html
+button_overconstrained_strict.html
+input_button_overconstrained.html
+input_button_overconstrained_strict.html
