diff --git a/package.json b/package.json
index 61dbeeed0..8e71cc67e 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "q": "^1.0.1",
     "react": "0.13.3",
     "react-a11y": "pivotal-cf/react-a11y#dist",
-    "react-bootstrap": "0.23.3",
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
     "react-fa": "^3.0.0",
     "require-dir": "^0.3.0",
     "run-sequence": "^1.0.2",
diff --git a/spec/pivotal-ui-react/tooltip/tooltip_spec.js b/spec/pivotal-ui-react/tooltip/tooltip_spec.js
index 1e579f6c0..77cffebaa 100644
--- a/spec/pivotal-ui-react/tooltip/tooltip_spec.js
+++ b/spec/pivotal-ui-react/tooltip/tooltip_spec.js
@@ -1,9 +1,18 @@
 require('../spec_helper');
+import {itPropagatesAttributes} from '../support/shared_examples';
 
 describe('tooltip', function() {
+  var props = {
+    className: 'test-class',
+    id: 'test-id',
+    style: {
+      opacity: '0.5'
+    }
+  };
+
   beforeEach(function() {
     var Tooltip = require('../../../src/pivotal-ui-react/tooltip/tooltip').Tooltip;
-    React.render((<Tooltip><div className="tooltip-text">Hello World</div></Tooltip>), root);
+    React.render((<Tooltip {...props}><div className="tooltip-text">Hello World</div></Tooltip>), root);
   });
 
   afterEach(function() {
@@ -13,4 +22,6 @@ describe('tooltip', function() {
   it('works', function() {
     expect('.tooltip-text').toExist();
   });
+
+  itPropagatesAttributes('#root #test-id', props);
 });
diff --git a/src/pivotal-ui-react/alerts/package.json b/src/pivotal-ui-react/alerts/package.json
index 3bf88f392..98534d02f 100644
--- a/src/pivotal-ui-react/alerts/package.json
+++ b/src/pivotal-ui-react/alerts/package.json
@@ -3,7 +3,7 @@
   "description": "React components to display flash messages to the user",
   "homepage": "http://styleguide.pivotal.io/react.html#alerts_react",
   "dependencies": {
-    "react-bootstrap": "0.23.3",
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
     "pui-css-alerts": "1.10.0",
     "pui-css-iconography": "1.10.0",
     "pui-react-media": "1.10.0"
diff --git a/src/pivotal-ui-react/collapse/package.json b/src/pivotal-ui-react/collapse/package.json
index 98b16bb1b..1915d02a9 100644
--- a/src/pivotal-ui-react/collapse/package.json
+++ b/src/pivotal-ui-react/collapse/package.json
@@ -3,7 +3,7 @@
   "description": "React components providing accordions for showing and hiding content",
   "homepage": "http://styleguide.pivotal.io/react.html#collapse_react",
   "dependencies": {
-    "react-bootstrap": "0.23.3",
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
     "classnames": "^1.2.0",
     "pui-css-collapse": "1.10.0",
     "pui-css-iconography": "1.10.0",
diff --git a/src/pivotal-ui-react/dropdowns/package.json b/src/pivotal-ui-react/dropdowns/package.json
index 6241fd728..72c5b704e 100644
--- a/src/pivotal-ui-react/dropdowns/package.json
+++ b/src/pivotal-ui-react/dropdowns/package.json
@@ -3,7 +3,7 @@
   "description": "A React dropdown component",
   "homepage": "http://styleguide.pivotal.io/react.html#dropdown_react",
   "dependencies": {
-    "react-bootstrap": "0.23.3",
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
     "pui-css-dropdowns": "1.10.0",
     "pui-css-iconography": "1.10.0",
     "pui-css-buttons": "1.10.0",
diff --git a/src/pivotal-ui-react/grids/package.json b/src/pivotal-ui-react/grids/package.json
index 11c6f55e5..60e259779 100644
--- a/src/pivotal-ui-react/grids/package.json
+++ b/src/pivotal-ui-react/grids/package.json
@@ -5,6 +5,6 @@
   "dependencies": {
     "pui-css-grids": "1.10.0",
     "classnames": "^1.2.0",
-    "react-bootstrap": "0.23.3"
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist"
   }
 }
diff --git a/src/pivotal-ui-react/overlay-trigger/package.json b/src/pivotal-ui-react/overlay-trigger/package.json
index f0bc8ffd8..a45b3cdce 100644
--- a/src/pivotal-ui-react/overlay-trigger/package.json
+++ b/src/pivotal-ui-react/overlay-trigger/package.json
@@ -2,7 +2,7 @@
   "version": "1.10.0",
   "description": "A React component for displaying a tooltip or popover on user action",
   "dependencies": {
-    "react-bootstrap": "0.23.3"
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist"
   },
   "homepage": "http://styleguide.pivotal.io/react.html#tooltips_react"
 }
diff --git a/src/pivotal-ui-react/tabs/package.json b/src/pivotal-ui-react/tabs/package.json
index 82eecc418..eb895d4bb 100644
--- a/src/pivotal-ui-react/tabs/package.json
+++ b/src/pivotal-ui-react/tabs/package.json
@@ -3,7 +3,7 @@
   "description": "React components for tab-based content toggling",
   "homepage": "http://styleguide.pivotal.io/react.html#tabs_react",
   "dependencies": {
-    "react-bootstrap": "0.23.3",
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
     "pui-css-tabs": "1.10.0"
   }
 }
diff --git a/src/pivotal-ui-react/tooltip/package.json b/src/pivotal-ui-react/tooltip/package.json
index e75467b4b..15217ff70 100644
--- a/src/pivotal-ui-react/tooltip/package.json
+++ b/src/pivotal-ui-react/tooltip/package.json
@@ -3,7 +3,7 @@
   "description": "A React component that provides styled tooltips",
   "homepage": "http://styleguide.pivotal.io/react.html#tooltips_react",
   "dependencies": {
-    "react-bootstrap": "0.23.3",
+    "react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
     "pui-css-tooltips": "1.10.0"
   }
 }