diff --git a/src/Tabs.js b/src/Tabs.js
index 028d223aa1..de56b36eb9 100644
--- a/src/Tabs.js
+++ b/src/Tabs.js
@@ -88,6 +88,7 @@ const Tabs = React.createClass({
       React.PropTypes.number,
       React.PropTypes.object
     ]),
+    className: React.PropTypes.string,
     /**
      * Render without clearfix if horizontally positioned
      */
@@ -271,7 +272,7 @@ const Tabs = React.createClass({
       return null;
     }
 
-    let { eventKey, title, disabled, onKeyDown, tabIndex = 0 } = child.props;
+    let { eventKey, title, disabled, onKeyDown, tabClassName, tabIndex = 0 } = child.props;
     let isActive = this.getActiveKey() === eventKey;
 
     return (
@@ -282,7 +283,8 @@ const Tabs = React.createClass({
         onKeyDown={createChainedFunction(this.handleKeyDown, onKeyDown)}
         eventKey={eventKey}
         tabIndex={isActive ? tabIndex : -1}
-        disabled={disabled }>
+        disabled={disabled }
+        className={tabClassName}>
         {title}
       </NavItem>
     );
diff --git a/test/TabsSpec.js b/test/TabsSpec.js
index e247bb3875..451385691f 100644
--- a/test/TabsSpec.js
+++ b/test/TabsSpec.js
@@ -84,13 +84,15 @@ describe('Tabs', () => {
     let instance = ReactTestUtils.renderIntoDocument(
       <Tabs activeKey={1}>
         <Tab title="Tab 1" className="custom" id="pane0id" eventKey={1}>Tab 1 content</Tab>
-        <Tab title="Tab 2" eventKey={2}>Tab 2 content</Tab>
+        <Tab title="Tab 2" tabClassName="tcustom" eventKey={2}>Tab 2 content</Tab>
       </Tabs>
     );
 
     let panes = ReactTestUtils.scryRenderedComponentsWithType(instance, Tab);
+    let navs = ReactTestUtils.scryRenderedComponentsWithType(instance, NavItem);
 
     assert.ok(React.findDOMNode(panes[0]).className.match(/\bcustom\b/));
+    assert.ok(React.findDOMNode(navs[1]).className.match(/\btcustom\b/));
     assert.equal(React.findDOMNode(panes[0]).id, 'pane0id');
   });