diff --git a/mozilla/layout/reftests/forms/input-text-dynamic-height-1-ref.xul b/mozilla/layout/reftests/forms/input-text-dynamic-height-1-ref.xul
new file mode 100644
index 00000000000..7b82803e031
--- /dev/null
+++ b/mozilla/layout/reftests/forms/input-text-dynamic-height-1-ref.xul
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/"?>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml">
+  <hbox align="stretch">
+    <box style="height: 5em"/>
+    <html:input value="YO"/>
+  </hbox>
+</window>
diff --git a/mozilla/layout/reftests/forms/input-text-dynamic-height-1.xul b/mozilla/layout/reftests/forms/input-text-dynamic-height-1.xul
new file mode 100644
index 00000000000..9bbe09bb674
--- /dev/null
+++ b/mozilla/layout/reftests/forms/input-text-dynamic-height-1.xul
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/"?>
+<window title="test for bug 495959"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	onload="onLoad();">
+  <script type="application/javascript">
+<![CDATA[
+    function onLoad()
+    {
+      var adjust = document.getElementById("adjust");
+      flush();
+      adjust.style.height = "5em";
+    }
+
+    function flush() { document.documentElement.getBoundingClientRect(); }
+
+]]>
+  </script>
+  <hbox align="stretch">
+    <box id="adjust"/>
+    <html:input id="input" value="YO"/>
+  </hbox>
+</window>
diff --git a/mozilla/layout/reftests/forms/reftest.list b/mozilla/layout/reftests/forms/reftest.list
index c4b05654f49..8ebe9fc4071 100644
--- a/mozilla/layout/reftests/forms/reftest.list
+++ b/mozilla/layout/reftests/forms/reftest.list
@@ -1,3 +1,5 @@
 == input-file-width-clip-1.html input-file-width-clip-ref.html # bug 409587
 == input-text-size-1.html input-text-size-1-ref.html
 == input-text-size-2.html input-text-size-2-ref.html
+== input-text-dynamic-height-1.xul input-text-dynamic-height-1-ref.xul # bug 495959
+== textbox-align-baseline-1.xul textbox-align-baseline-1-ref.xul # bug 494901
diff --git a/mozilla/layout/reftests/forms/textbox-align-baseline-1-ref.xul b/mozilla/layout/reftests/forms/textbox-align-baseline-1-ref.xul
new file mode 100644
index 00000000000..4cb1230fe67
--- /dev/null
+++ b/mozilla/layout/reftests/forms/textbox-align-baseline-1-ref.xul
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/"?>
+<window title="textbox align=baseline reference"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:style type="text/css">
+    label, textbox {
+      -moz-appearance: none;
+      border: none 0px;
+      margin: 0px;
+      padding: 0px;
+    }
+  </html:style>
+
+  <hbox align="center">
+    <label value="test"/>
+    <textbox value="text"/>
+  </hbox>
+</window>
diff --git a/mozilla/layout/reftests/forms/textbox-align-baseline-1.xul b/mozilla/layout/reftests/forms/textbox-align-baseline-1.xul
new file mode 100644
index 00000000000..f1ada0c68b0
--- /dev/null
+++ b/mozilla/layout/reftests/forms/textbox-align-baseline-1.xul
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/"?>
+<window title="textbox align=baseline test (bug 494901)"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:style type="text/css">
+    label, textbox {
+      -moz-appearance: none;
+      border: none 0px;
+      margin: 0px;
+      padding: 0px;
+    }
+  </html:style>
+
+  <hbox align="baseline">
+    <label value="test"/>
+    <textbox value="text"/>
+  </hbox>
+</window>