diff --git a/mixins.less b/mixins.less
index db60f1aea296..b093f1f0d9cf 100644
--- a/mixins.less
+++ b/mixins.less
@@ -175,6 +175,10 @@
   select,
   textarea {
     color: @textColor;
+  }
+  input,
+  select,
+  textarea {
     border-color: @borderColor;
     .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
     &:focus {
diff --git a/tests/css-tests.html b/tests/css-tests.html
index 4a9f67b0975b..c922f07db391 100644
--- a/tests/css-tests.html
+++ b/tests/css-tests.html
@@ -597,6 +597,19 @@ <h4>Fluid grid sizing</h4>
   <h1>Forms</h1>
 </div>
 
+<h4>Horizontal form errors</h4>
+<form class="form-horizontal">
+  <div class="control-group error">
+    <label class="control-label" for="inputError">Radio with error</label>
+    <div class="controls">
+      <label class="radio">
+        <input type="radio" id="inputError"> Oh hai
+      </label>
+      <span class="help-inline">Please correct the error</span>
+    </div>
+  </div>
+</form>
+
 <div class="row">
   <div class="span4">
     <h4>Prepend and append on inputs</h4>