diff --git a/dom/html/nsTextEditorState.h b/dom/html/nsTextEditorState.h
index 104012c1af8d..7fb5ca48a7a0 100644
--- a/dom/html/nsTextEditorState.h
+++ b/dom/html/nsTextEditorState.h
@@ -48,8 +48,6 @@ class HTMLInputElement;
  *   <input type=email>
  *   <input type=password>
  *   <textarea>
- * and also XUL controls such as <textbox> which use one of these elements
- * behind the scenes.
  *
  * This class is held as a member of HTMLInputElement and nsHTMLTextAreaElement.
  * The public functions in this class include the public APIs which content/
diff --git a/dom/tests/mochitest/bugs/test_bug335976.xhtml b/dom/tests/mochitest/bugs/test_bug335976.xhtml
index 601f93339465..e5c1e3330c2a 100644
--- a/dom/tests/mochitest/bugs/test_bug335976.xhtml
+++ b/dom/tests/mochitest/bugs/test_bug335976.xhtml
@@ -11,11 +11,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=335976
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=335976">Mozilla Bug 335976</a>
 <p id="display"></p>
 
-<iframe srcdoc="&lt;html xmlns='http://www.w3.org/1999/xhtml'&gt;&lt;body&gt; &lt;textbox xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'/&gt; &lt;/body&gt;&lt;/html&gt;" style="width: 95%; height: 150px;"></iframe>
+<iframe srcdoc="&lt;html xmlns='http://www.w3.org/1999/xhtml'&gt;&lt;body&gt; &lt;input&gt; &lt;/body&gt;&lt;/html&gt;" style="width: 95%; height: 150px;"></iframe>
 
 <div id="rootish" style="background: yellow">
   <div>
-    <textbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
+    <input/>
   </div>
 </div>
 
@@ -29,7 +29,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=335976
 
 function lookAtTextboxesIn(root, numExpected) 
 {
-  var textboxes = root.getElementsByTagName("textbox");
+  var textboxes = root.getElementsByTagName("input");
   var threw;
   var i;
   var n;
diff --git a/dom/tests/mochitest/chrome/window_focus_docnav.xul b/dom/tests/mochitest/chrome/window_focus_docnav.xul
index 1f27f5721579..b79f203b292d 100644
--- a/dom/tests/mochitest/chrome/window_focus_docnav.xul
+++ b/dom/tests/mochitest/chrome/window_focus_docnav.xul
@@ -6,15 +6,15 @@
 
 <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
 
-<textbox id="textbox1"/>
-<textbox id="textbox2"/>
+<input xmlns="http://www.w3.org/1999/xhtml" id="textbox1"/>
+<input xmlns="http://www.w3.org/1999/xhtml" id="textbox2"/>
 
 <panel id="panel" onpopupshown="runTests(this, 1);"
                   onpopuphidden="noChildrenTest()">
-  <textbox id="p1textbox" value="Popup1"/>
+  <input xmlns="http://www.w3.org/1999/xhtml" id="p1textbox" value="Popup1"/>
 </panel>
 <panel id="panel2" onpopupshown="runTests(this, 2);" onpopuphidden="document.getElementById('panel').hidePopup()">
-  <textbox id="p2textbox" value="Popup2"/>
+  <input xmlns="http://www.w3.org/1999/xhtml" id="p2textbox" value="Popup2"/>
 </panel>
 
 <browser id="browser" type="content" src="focus_frameset.html" width="500" height="400"/>
@@ -39,12 +39,12 @@ function noChildrenTest()
   let textbox2 = document.getElementById("textbox2");
 
   textbox2.focus();
-  next(window, textbox1.inputField, "Focus forward when no child documents");
-  next(window, textbox1.inputField, "Focus forward again when no child documents");
+  next(window, textbox1, "Focus forward when no child documents");
+  next(window, textbox1, "Focus forward again when no child documents");
 
   textbox2.focus();
-  previous(window, textbox1.inputField, "Focus backward when no child documents");
-  previous(window, textbox1.inputField, "Focus backward again when no child documents");
+  previous(window, textbox1, "Focus backward when no child documents");
+  previous(window, textbox1, "Focus backward again when no child documents");
 
   done();
 }
@@ -82,10 +82,10 @@ function runTests(panel, popupCount)
   var childwin = document.getElementById("browser").contentWindow;
 
   if (popupCount) {
-    next(window, document.getElementById("p1textbox").inputField, "First into popup 1 with " + popupCount);
+    next(window, document.getElementById("p1textbox"), "First into popup 1 with " + popupCount);
 
     if (popupCount == 2) {
-      next(window, document.getElementById("p2textbox").inputField, "First into popup 2 with " + popupCount);
+      next(window, document.getElementById("p2textbox"), "First into popup 2 with " + popupCount);
     }
   }
 
@@ -95,13 +95,13 @@ function runTests(panel, popupCount)
 
   if (popupCount) {
     if (popupCount == 2) {
-      previous(window, document.getElementById("p2textbox").inputField, "First back from popup 2 with " + popupCount);
+      previous(window, document.getElementById("p2textbox"), "First back from popup 2 with " + popupCount);
     }
 
-    previous(window, document.getElementById("p1textbox").inputField, "First back from popup 1 with " + popupCount);
+    previous(window, document.getElementById("p1textbox"), "First back from popup 1 with " + popupCount);
   }
 
-  previous(window, document.getElementById("textbox1").inputField, "First back with " + popupCount);
+  previous(window, document.getElementById("textbox1"), "First back with " + popupCount);
 
   if (panel == document.getElementById("panel"))
     document.getElementById("panel2").openPopup(null, "after_start", 100, 20);
diff --git a/dom/xslt/tests/XSLTMark/XSLTMark.xul b/dom/xslt/tests/XSLTMark/XSLTMark.xul
index 3fae5c94be62..288e49fffb80 100644
--- a/dom/xslt/tests/XSLTMark/XSLTMark.xul
+++ b/dom/xslt/tests/XSLTMark/XSLTMark.xul
@@ -19,7 +19,7 @@
   <groupbox orient="horizontal">
     <caption label="test description file" />
     <label value=""/><!-- needed, otherwise groupbox is broken :-( -->
-    <textbox id="config" persist="value" readonly="true"/>
+    <input xmlns="http://www.w3.org/1999/xhtml" id="config" persist="value" readonly="true"/>
     <button label="browse..." oncommand="view.browseForConfig();" />
   </groupbox>
   <groupbox orient="horizontal">
@@ -40,7 +40,7 @@
   </groupbox>
 </hbox>
 <hbox>
-  <textbox id="currentStatus" readonly="true" flex="1"/>
+  <input xmlns="http://www.w3.org/1999/xhtml" id="currentStatus" readonly="true" flex="1"/>
   <progressmeter id="currentProgress" mode="normal" value="0" flex="2"/>
   <progressmeter id="totalProgress" mode="normal" value="0" flex="2"/>
 </hbox>
diff --git a/dom/xul/test/test_bug418216.xul b/dom/xul/test/test_bug418216.xul
index ad1d79a880db..56e487faf2e8 100644
--- a/dom/xul/test/test_bug418216.xul
+++ b/dom/xul/test/test_bug418216.xul
@@ -34,9 +34,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=418216
   ]]></script>
 
 <box id="container">
-<textbox id="item">
+<box id="item">
     <observes element="broadcaster" attribute="disabled"/>
-</textbox>
+</box>
 </box>
 
 <broadcasterset>