diff --git a/layout/reftests/forms/textbox/accesskey-1-notref.xul b/layout/reftests/forms/textbox/accesskey-1-notref.xul
index 0b3329ad0fe2..697d10879370 100644
--- a/layout/reftests/forms/textbox/accesskey-1-notref.xul
+++ b/layout/reftests/forms/textbox/accesskey-1-notref.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -30,6 +30,6 @@
 
   <hbox align="baseline">
     <label value="test"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value="text"/>
+    <textbox value="text"/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-1.xul b/layout/reftests/forms/textbox/accesskey-1.xul
index f325346d6297..39ad15b2dd47 100644
--- a/layout/reftests/forms/textbox/accesskey-1.xul
+++ b/layout/reftests/forms/textbox/accesskey-1.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -30,6 +30,6 @@
 
   <hbox align="baseline">
     <label value="test" accesskey="s"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value="text"/>
+    <textbox value="text"/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-2-ref.xul b/layout/reftests/forms/textbox/accesskey-2-ref.xul
index 8238cbd28f33..ce6ed1ebc9bd 100644
--- a/layout/reftests/forms/textbox/accesskey-2-ref.xul
+++ b/layout/reftests/forms/textbox/accesskey-2-ref.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -31,6 +31,6 @@
   <hbox align="baseline">
     <!-- access key in LTR-overridden Arabic text -->
     <label value="&#x202d;&#x64a;&#x628;&#x631;&#x639;&#x644;&#x627;&#x202c; test" accesskey="&#x639;"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value=""/>
+    <textbox value=""/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-2.xul b/layout/reftests/forms/textbox/accesskey-2.xul
index 0da2638e8fcc..98b2c272b45f 100644
--- a/layout/reftests/forms/textbox/accesskey-2.xul
+++ b/layout/reftests/forms/textbox/accesskey-2.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -31,6 +31,6 @@
   <hbox align="baseline">
     <!-- access key in RTL Arabic text -->
     <label value="&#x627;&#x644;&#x639;&#x631;&#x628;&#x64a; test" accesskey="&#x639;"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value=""/>
+    <textbox value=""/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-3-notref.xul b/layout/reftests/forms/textbox/accesskey-3-notref.xul
index dbb909a228c8..1a81e28116c4 100644
--- a/layout/reftests/forms/textbox/accesskey-3-notref.xul
+++ b/layout/reftests/forms/textbox/accesskey-3-notref.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -31,6 +31,6 @@
   <hbox align="baseline">
     <!-- no access key, for != test -->
     <label value="&#x627;&#x644;&#x639;&#x631;&#x628;&#x64a; hello world"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value=""/>
+    <textbox value=""/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-3-ref.xul b/layout/reftests/forms/textbox/accesskey-3-ref.xul
index b83037433bac..b7907e9a6aa5 100644
--- a/layout/reftests/forms/textbox/accesskey-3-ref.xul
+++ b/layout/reftests/forms/textbox/accesskey-3-ref.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -31,6 +31,6 @@
   <hbox align="baseline">
     <!-- access key in LTR text that follows RTL text (mixed direction) -->
     <label value="&#x627;&#x644;&#x639;&#x631;&#x628;&#x64a; hello world" accesskey="d"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value=""/>
+    <textbox value=""/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-4-notref.xul b/layout/reftests/forms/textbox/accesskey-4-notref.xul
index dbb909a228c8..1a81e28116c4 100644
--- a/layout/reftests/forms/textbox/accesskey-4-notref.xul
+++ b/layout/reftests/forms/textbox/accesskey-4-notref.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -31,6 +31,6 @@
   <hbox align="baseline">
     <!-- no access key, for != test -->
     <label value="&#x627;&#x644;&#x639;&#x631;&#x628;&#x64a; hello world"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value=""/>
+    <textbox value=""/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-4-ref.xul b/layout/reftests/forms/textbox/accesskey-4-ref.xul
index 8dd49c509fae..df787415fed7 100644
--- a/layout/reftests/forms/textbox/accesskey-4-ref.xul
+++ b/layout/reftests/forms/textbox/accesskey-4-ref.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -31,6 +31,6 @@
   <hbox align="baseline">
     <!-- access key in English text following LTR-overridden Arabic -->
     <label value="&#x202d;&#x64a;&#x628;&#x631;&#x639;&#x644;&#x627;&#x202c; hello world" accesskey="w"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value=""/>
+    <textbox value=""/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/accesskey-4.xul b/layout/reftests/forms/textbox/accesskey-4.xul
index 15bde9d21353..d63bafbc58b1 100644
--- a/layout/reftests/forms/textbox/accesskey-4.xul
+++ b/layout/reftests/forms/textbox/accesskey-4.xul
@@ -9,7 +9,7 @@
       padding-top: 0px;
       font-size: 36px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -20,7 +20,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -31,6 +31,6 @@
   <hbox align="baseline">
     <!-- access key in English text following RTL Arabic -->
     <label value="&#x627;&#x644;&#x639;&#x631;&#x628;&#x64a; hello world" accesskey="w"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value=""/>
+    <textbox value=""/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/align-baseline-1-ref.xul b/layout/reftests/forms/textbox/align-baseline-1-ref.xul
index 3ea9ba0010f9..646e412de3b1 100644
--- a/layout/reftests/forms/textbox/align-baseline-1-ref.xul
+++ b/layout/reftests/forms/textbox/align-baseline-1-ref.xul
@@ -8,7 +8,7 @@
       margin-top: 12px;
       padding-top: 8px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -21,6 +21,6 @@
 
   <hbox id="container" align="center">
     <label value="test"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value="text"/>
+    <textbox value="text"/>
   </hbox>
 </window>
diff --git a/layout/reftests/forms/textbox/align-baseline-1.xul b/layout/reftests/forms/textbox/align-baseline-1.xul
index f704393b70e8..711e1858acf0 100644
--- a/layout/reftests/forms/textbox/align-baseline-1.xul
+++ b/layout/reftests/forms/textbox/align-baseline-1.xul
@@ -8,7 +8,7 @@
       margin-top: 0px;
       padding-top: 0px;
     }
-    label, input {
+    label, textbox {
       -moz-appearance: none;
       background: inherit;
       border: none 0px;
@@ -19,7 +19,7 @@
       margin-bottom: 0px;
       padding-bottom: 0px;
     }
-    input {
+    textbox {
       margin-top: 12px;
       padding-top: 8px;
       margin-bottom: 5px;
@@ -29,6 +29,6 @@
 
   <hbox align="baseline">
     <label value="test"/>
-    <input xmlns="http://www.w3.org/1999/xhtml" value="text"/>
+    <textbox value="text"/>
   </hbox>
 </window>
diff --git a/layout/reftests/xul/accesskey-ref.xul b/layout/reftests/xul/accesskey-ref.xul
index 5b89fa7f1d7c..b3745ee1e207 100644
--- a/layout/reftests/xul/accesskey-ref.xul
+++ b/layout/reftests/xul/accesskey-ref.xul
@@ -5,19 +5,19 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <hbox align="start">
-  <label control="b1"><u>L</u>abel1</label><input xmlns="http://www.w3.org/1999/xhtml" id="b1" size="2"/>
-  <label control="b2">Labe<u>l</u>2</label><input xmlns="http://www.w3.org/1999/xhtml" id="b2" size="2"/>
-  <label control="b3">La<u>b</u>el3</label><input xmlns="http://www.w3.org/1999/xhtml" id="b3" size="2"/>
-  <label control="b4">Label4 (<u>X</u>)</label><input xmlns="http://www.w3.org/1999/xhtml" id="b4" size="2"/>
-  <label control="b5" maxwidth="50">Quite a <u>l</u>ong label. Hopefully it will wrap</label><input xmlns="http://www.w3.org/1999/xhtml" id="b5" label="Button5" size="2"/>
+  <label control="b1"><u>L</u>abel1</label><textbox id="b1" size="2"/>
+  <label control="b2">Labe<u>l</u>2</label><textbox id="b2" size="2"/>
+  <label control="b3">La<u>b</u>el3</label><textbox id="b3" size="2"/>
+  <label control="b4">Label4 (<u>X</u>)</label><textbox id="b4" size="2"/>
+  <label control="b5" maxwidth="50">Quite a <u>l</u>ong label. Hopefully it will wrap</label><textbox id="b5" label="Button5" size="2"/>
 </hbox>
 
 <hbox id="d" align="start">
-  <label control="d1"><u>L</u>abel1</label><input xmlns="http://www.w3.org/1999/xhtml" id="d1" size="2"/>
-  <label control="d2">Labe<u>l</u>2</label><input xmlns="http://www.w3.org/1999/xhtml" id="d2" size="2"/>
-  <label control="d3">La<u>b</u>el3</label><input xmlns="http://www.w3.org/1999/xhtml" id="d3" size="2"/>
-  <label control="d4">Label4 (<u>X</u>)</label><input xmlns="http://www.w3.org/1999/xhtml" id="d4" size="2"/>
-  <label control="d5" maxwidth="50">Quite a <u>l</u>ong label. Hopefully it will wrap</label><input xmlns="http://www.w3.org/1999/xhtml" id="d5" size="2"/>
+  <label control="d1"><u>L</u>abel1</label><textbox id="d1" size="2"/>
+  <label control="d2">Labe<u>l</u>2</label><textbox id="d2" size="2"/>
+  <label control="d3">La<u>b</u>el3</label><textbox id="d3" size="2"/>
+  <label control="d4">Label4 (<u>X</u>)</label><textbox id="d4" size="2"/>
+  <label control="d5" maxwidth="50">Quite a <u>l</u>ong label. Hopefully it will wrap</label><textbox id="d5" size="2"/>
 </hbox>
 
 </window>
diff --git a/layout/xul/crashtests/1379332-1.xul b/layout/xul/crashtests/1379332-1.xul
new file mode 100644
index 000000000000..8926f4f5f696
--- /dev/null
+++ b/layout/xul/crashtests/1379332-1.xul
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <hbox style="visibility: collapse; position: relative">
+    <textbox>
+      <hbox style="position: absolute; display: block; width: 10px; height: 10px">
+      </hbox>
+    </textbox>
+  </hbox>
+</window>
diff --git a/layout/xul/crashtests/crashtests.list b/layout/xul/crashtests/crashtests.list
index efc5ee909f91..8f8f23028583 100644
--- a/layout/xul/crashtests/crashtests.list
+++ b/layout/xul/crashtests/crashtests.list
@@ -61,4 +61,5 @@ load 583957-1.html
 load 617089.html
 load menulist-focused.xhtml
 load 716503.html
+load chrome://reftest/content/crashtests/layout/xul/crashtests/1379332-1.xul
 load chrome://reftest/content/crashtests/layout/xul/crashtests/1379332-2.xul
diff --git a/layout/xul/grid/reftests/column-sizing-1-ref.xul b/layout/xul/grid/reftests/column-sizing-1-ref.xul
index 526c581f44d9..df0113083feb 100644
--- a/layout/xul/grid/reftests/column-sizing-1-ref.xul
+++ b/layout/xul/grid/reftests/column-sizing-1-ref.xul
@@ -7,7 +7,7 @@
       <label value="Left" />
     </vbox>
     <vbox style="background:yellow">
-      <input xmlns="http://www.w3.org/1999/xhtml" value="Right" />
+      <textbox value="Right" />
     </vbox>
   </hbox>
 </window>
diff --git a/layout/xul/grid/reftests/column-sizing-1.xul b/layout/xul/grid/reftests/column-sizing-1.xul
index 2181bf038a1b..2a94569ba4b6 100644
--- a/layout/xul/grid/reftests/column-sizing-1.xul
+++ b/layout/xul/grid/reftests/column-sizing-1.xul
@@ -8,7 +8,7 @@
         <label value="Left" />
       </column>
       <column style="background:yellow">
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Right" />
+        <textbox value="Right" />
       </column>
     </columns>
   </grid>
diff --git a/layout/xul/grid/reftests/row-or-column-sizing-1.xul b/layout/xul/grid/reftests/row-or-column-sizing-1.xul
index ebf37ebb720f..6c64eef18009 100644
--- a/layout/xul/grid/reftests/row-or-column-sizing-1.xul
+++ b/layout/xul/grid/reftests/row-or-column-sizing-1.xul
@@ -13,7 +13,7 @@
         <label value="Upper right" />
       </row>
       <row>
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
+        <textbox value="Lower left" />
         <hbox />
       </row>
     </rows>
diff --git a/layout/xul/grid/reftests/row-or-column-sizing-2.xul b/layout/xul/grid/reftests/row-or-column-sizing-2.xul
index dbf9c94dce9c..008f82fd5112 100644
--- a/layout/xul/grid/reftests/row-or-column-sizing-2.xul
+++ b/layout/xul/grid/reftests/row-or-column-sizing-2.xul
@@ -6,7 +6,7 @@
     <columns>
       <column>
         <hbox />
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
+        <textbox value="Lower left" />
       </column>
       <column>
         <label value="Upper right" />
diff --git a/layout/xul/grid/reftests/row-or-column-sizing-3.xul b/layout/xul/grid/reftests/row-or-column-sizing-3.xul
index 14f4dfc934dc..1e8e55c294cb 100644
--- a/layout/xul/grid/reftests/row-or-column-sizing-3.xul
+++ b/layout/xul/grid/reftests/row-or-column-sizing-3.xul
@@ -19,7 +19,7 @@
         <hbox />
       </row>
       <row>
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
+        <textbox value="Lower left" />
         <hbox />
       </row>
     </rows>
diff --git a/layout/xul/grid/reftests/row-or-column-sizing-4.xul b/layout/xul/grid/reftests/row-or-column-sizing-4.xul
index 07e1b7c0a5a6..5a826fd84cdc 100644
--- a/layout/xul/grid/reftests/row-or-column-sizing-4.xul
+++ b/layout/xul/grid/reftests/row-or-column-sizing-4.xul
@@ -6,7 +6,7 @@
     <columns>
       <column>
         <hbox />
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
+        <textbox value="Lower left" />
       </column>
       <column>
         <hbox />
diff --git a/layout/xul/grid/reftests/row-sizing-1-ref.xul b/layout/xul/grid/reftests/row-sizing-1-ref.xul
index 61141647ab69..b357190524cf 100644
--- a/layout/xul/grid/reftests/row-sizing-1-ref.xul
+++ b/layout/xul/grid/reftests/row-sizing-1-ref.xul
@@ -8,7 +8,7 @@
       <label value="Top" />
     </hbox>
     <hbox style="background:yellow">
-      <input xmlns="http://www.w3.org/1999/xhtml" value="Bottom" />
+      <textbox value="Bottom" />
     </hbox>
   </vbox>
 </window>
diff --git a/layout/xul/grid/reftests/row-sizing-1.xul b/layout/xul/grid/reftests/row-sizing-1.xul
index cb74a1c1e146..0455b8da4493 100644
--- a/layout/xul/grid/reftests/row-sizing-1.xul
+++ b/layout/xul/grid/reftests/row-sizing-1.xul
@@ -9,7 +9,7 @@
         <label value="Top" />
       </row>
       <row style="background:yellow">
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Bottom" />
+        <textbox value="Bottom" />
       </row>
     </rows>
   </grid>