diff --git a/src/Tab.js b/src/Tab.js
index 100e2a16cd..e29124c1be 100644
--- a/src/Tab.js
+++ b/src/Tab.js
@@ -15,7 +15,11 @@ const Tab = React.createClass({
      */
     onAnimateOutEnd: React.PropTypes.func,
     disabled: React.PropTypes.bool,
-    title: React.PropTypes.node
+    title: React.PropTypes.node,
+    /**
+     * tabClassName is used as className for the associated NavItem
+     */
+    tabClassName: React.PropTypes.string
   },
 
   getDefaultProps() {
diff --git a/src/Tabs.js b/src/Tabs.js
index de56b36eb9..2b96aaa279 100644
--- a/src/Tabs.js
+++ b/src/Tabs.js
@@ -88,7 +88,6 @@ const Tabs = React.createClass({
       React.PropTypes.number,
       React.PropTypes.object
     ]),
-    className: React.PropTypes.string,
     /**
      * Render without clearfix if horizontally positioned
      */