diff --git a/src/Collapse.js b/src/Collapse.js
index ddca971770..2a632f55e9 100644
--- a/src/Collapse.js
+++ b/src/Collapse.js
@@ -7,7 +7,7 @@ let capitalize = str => str[0].toUpperCase() + str.substr(1);
 
 // reading a dimension prop will cause the browser to recalculate,
 // which will let our animations work
-let triggerBrowserReflow = node => node.offsetHeight; //eslint-disable-line no-unused-expressions
+let triggerBrowserReflow = node => node.offsetHeight;
 
 const MARGINS = {
   height: ['marginTop', 'marginBottom'],
diff --git a/src/Input.js b/src/Input.js
index f4f5dfe2ab..800ab579bc 100644
--- a/src/Input.js
+++ b/src/Input.js
@@ -5,7 +5,7 @@ import deprecationWarning from './utils/deprecationWarning';
 
 class Input extends InputBase {
   render() {
-    if (this.props.type === 'static') { // eslint-disable-line react/prop-types
+    if (this.props.type === 'static') {
       deprecationWarning('Input type=static', 'StaticText');
       return <FormControls.Static {...this.props} />;
     }
diff --git a/src/NavItem.js b/src/NavItem.js
index 2be7501eee..42d36bdf2e 100644
--- a/src/NavItem.js
+++ b/src/NavItem.js
@@ -29,7 +29,7 @@ const NavItem = React.createClass({
         title,
         target,
         children,
-        'aria-controls': ariaControls,  // eslint-disable-line react/prop-types
+        'aria-controls': ariaControls,
         ...props } = this.props;
     let classes = {
           active,
diff --git a/src/Overlay.js b/src/Overlay.js
index 6d82a7f401..45337814c4 100644
--- a/src/Overlay.js
+++ b/src/Overlay.js
@@ -1,4 +1,6 @@
-/*eslint-disable object-shorthand, react/prop-types */
+/* eslint react/prop-types: [2, {ignore: ["container", "containerPadding", "target", "placement", "children"] }] */
+/* These properties are validated in 'Portal' and 'Position' components */
+
 import React, { cloneElement } from 'react';
 import Portal from './Portal';
 import Position from './Position';
diff --git a/src/PaginationButton.js b/src/PaginationButton.js
index e49e1344ca..23177025be 100644
--- a/src/PaginationButton.js
+++ b/src/PaginationButton.js
@@ -41,7 +41,7 @@ const PaginationButton = React.createClass({
 
     let {
       className,
-      ...anchorProps // eslint-disable-line object-shorthand
+      ...anchorProps
     } = this.props;
 
     return (
diff --git a/src/Popover.js b/src/Popover.js
index 5b9f974d2e..83b88029b0 100644
--- a/src/Popover.js
+++ b/src/Popover.js
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-multi-comp */
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
diff --git a/src/Portal.js b/src/Portal.js
index 4cccd243e7..1de5fd6da7 100644
--- a/src/Portal.js
+++ b/src/Portal.js
@@ -1,4 +1,3 @@
-/*eslint-disable react/prop-types */
 import React from 'react';
 import CustomPropTypes from './utils/CustomPropTypes';
 import domUtils from './utils/domUtils';
diff --git a/src/Tooltip.js b/src/Tooltip.js
index 1acb42daa4..b500244c37 100644
--- a/src/Tooltip.js
+++ b/src/Tooltip.js
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-multi-comp */
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
diff --git a/src/utils/overlayPositionUtils.js b/src/utils/overlayPositionUtils.js
index eb4a0459ec..050b68fdff 100644
--- a/src/utils/overlayPositionUtils.js
+++ b/src/utils/overlayPositionUtils.js
@@ -25,7 +25,7 @@ const utils = {
       domUtils.getOffset(target) : domUtils.getPosition(target, container);
 
     return {
-      ...offset, // eslint-disable-line object-shorthand
+      ...offset,
       height: target.offsetHeight,
       width: target.offsetWidth
     };