diff --git a/layout/forms/test/Makefile.in b/layout/forms/test/Makefile.in
index 7e5f80895ee3..c7c91b119f7e 100644
--- a/layout/forms/test/Makefile.in
+++ b/layout/forms/test/Makefile.in
@@ -43,6 +43,7 @@ MOCHITEST_FILES =	test_bug231389.html \
 		test_bug644542.html \
 		test_bug672810.html \
 		test_bug704049.html \
+		test_bug869314.html \
 		test_listcontrol_search.html \
 		$(NULL)
 
diff --git a/layout/forms/test/test_bug869314.html b/layout/forms/test/test_bug869314.html
new file mode 100644
index 000000000000..9116884d66ff
--- /dev/null
+++ b/layout/forms/test/test_bug869314.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=869314
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 869314</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+  <style type="text/css">
+    .selectbox {
+      background-color: #00FF00;
+    }
+  </style>
+
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=869314">Mozilla Bug 869314</a>
+<p id="display"></p>
+<div id="content">
+
+  <select id="selectbox1" name="non-native selectbox" class="selectbox">
+    <option value="item">test item</option>
+  </select>
+
+  <select id="selectbox2" name="native selectbox">
+    <option value="item">test item</option>
+  </select>
+
+  <script type="application/javascript">
+  var Cc = SpecialPowers.Cc;
+  var Ci = SpecialPowers.Ci;
+  var sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
+  var osName = sysInfo.getProperty("name");
+  if (osName == "Darwin") { // Mac OS X.
+    // This test is for Mac only. See bug for more info.
+    ok(document.getElementById("selectbox1").clientWidth >
+       document.getElementById("selectbox2").clientWidth,
+       "Non-native styled combobox does not have enough space for a " +
+       "dropmarker!");
+  } else {
+    // We need to call at least one test function to make the test harness
+    // happy.
+    ok(true, "Test wasn't ignored but should have been.");
+  }
+  </script>
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
