diff --git a/package.json b/package.json
index bd41b2d7ec9a4a..93ba7a50e516e9 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,14 @@
     "node-libs-browser": "^0.5.2",
     "query-string": "^2.4.0",
     "raven-js": "^1.1.20",
-    "react": "^0.13.3",
-    "react-bootstrap": "^0.26.4",
+    "react": "0.14.0",
+    "react-addons-pure-render-mixin": "^0.14.0",
+    "react-bootstrap": "^0.27.0",
     "react-document-title": "^1.0.2",
-    "react-lazy-load": "^1.0.4",
-    "react-router": "^0.13.3",
-    "react-sticky": "^2.5.2",
+    "react-dom": "^0.14.0",
+    "react-lazy-load": "benvinegar/react-lazy-load#64fd716d9fb243e43b1b8040f7fba52f2191f2cb",
+    "react-router": "benvinegar/react-router#46998d030de3802ace768a673b07272586f7bf99",
+    "react-sticky": "^3.0.0",
     "reflux": "^0.3.0",
     "select2": "^3.5.1",
     "style-loader": "^0.12.4",
diff --git a/src/sentry/static/sentry/app/components/alertMessage.jsx b/src/sentry/static/sentry/app/components/alertMessage.jsx
index 6591d69ef6b665..e82ed633a0e3e0 100644
--- a/src/sentry/static/sentry/app/components/alertMessage.jsx
+++ b/src/sentry/static/sentry/app/components/alertMessage.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import AlertActions from '../actions/alertActions';
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var AlertMessage = React.createClass({
   mixins: [PureRenderMixin],
diff --git a/src/sentry/static/sentry/app/components/alerts.jsx b/src/sentry/static/sentry/app/components/alerts.jsx
index 3abb9cba1a30b1..17b23d191f63f9 100644
--- a/src/sentry/static/sentry/app/components/alerts.jsx
+++ b/src/sentry/static/sentry/app/components/alerts.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import Reflux from "reflux";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 import AlertStore from '../stores/alertStore';
 import AlertMessage from './alertMessage';
diff --git a/src/sentry/static/sentry/app/components/assigneeSelector.jsx b/src/sentry/static/sentry/app/components/assigneeSelector.jsx
index 65457dbe596807..2be3c67d47993c 100644
--- a/src/sentry/static/sentry/app/components/assigneeSelector.jsx
+++ b/src/sentry/static/sentry/app/components/assigneeSelector.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDOM from "react-dom";
 import Reflux from "reflux";
 import classNames from "classnames";
 import api from "../api";
@@ -87,7 +88,7 @@ var AssigneeSelector = React.createClass({
   },
 
   onDropdownOpen() {
-    this.refs.filter.getDOMNode().focus();
+    ReactDOM.findDOMNode(this.refs.filter).focus();
   },
 
   onDropdownClose() {
@@ -118,7 +119,7 @@ var AssigneeSelector = React.createClass({
 
   componentDidUpdate(prevProps, prevState) {
     // XXX(dcramer): fix odd dedraw issue as of Chrome 45.0.2454.15 dev (64-bit)
-    var node = jQuery(this.refs.container.getDOMNode());
+    var node = jQuery(ReactDOM.findDOMNode(this.refs.container));
     node.hide().show(0);
   },
 
diff --git a/src/sentry/static/sentry/app/components/autoSelectText.jsx b/src/sentry/static/sentry/app/components/autoSelectText.jsx
index 07fe971604a83f..8179c1a9ab2f18 100644
--- a/src/sentry/static/sentry/app/components/autoSelectText.jsx
+++ b/src/sentry/static/sentry/app/components/autoSelectText.jsx
@@ -1,19 +1,20 @@
-import jQuery from "jquery";
 import React from "react";
+import jQuery from "jquery";
+import ReactDOM from "react-dom";
 
 const AutoSelectText = React.createClass({
   componentDidMount() {
-    let ref = this.refs.element.getDOMNode();
+    let ref = ReactDOM.findDOMNode(this.refs.element);
     jQuery(ref).bind('click', this.selectText);
   },
 
   componentWillUnmount() {
-    let ref = this.refs.element.getDOMNode();
+    let ref = ReactDOM.findDOMNode(this.refs.element);
     jQuery(ref).unbind('click', this.selectText);
   },
 
   selectText() {
-    var node = this.refs.element.getDOMNode().firstChild;
+    var node = ReactDOM.findDOMNode(this.refs.element).firstChild;
     if (document.selection) {
       let range = document.body.createTextRange();
       range.moveToElementText(node);
diff --git a/src/sentry/static/sentry/app/components/clippedBox.jsx b/src/sentry/static/sentry/app/components/clippedBox.jsx
index fee68c695e12c1..79f354668e7b7d 100644
--- a/src/sentry/static/sentry/app/components/clippedBox.jsx
+++ b/src/sentry/static/sentry/app/components/clippedBox.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDOM from "react-dom";
 
 var ClippedBox = React.createClass({
   propTypes: {
@@ -20,7 +21,7 @@ var ClippedBox = React.createClass({
   },
 
   componentDidMount() {
-    var renderedHeight = this.getDOMNode().offsetHeight;
+    var renderedHeight = ReactDOM.findDOMNode(this).offsetHeight;
 
     if (renderedHeight > this.props.clipHeight ) {
       /*eslint react/no-did-mount-set-state:0*/
diff --git a/src/sentry/static/sentry/app/components/dropdownLink.jsx b/src/sentry/static/sentry/app/components/dropdownLink.jsx
index 8b6839989442fc..7a885083cc9d3b 100644
--- a/src/sentry/static/sentry/app/components/dropdownLink.jsx
+++ b/src/sentry/static/sentry/app/components/dropdownLink.jsx
@@ -1,6 +1,6 @@
-import joinClasses from "react/lib/joinClasses";
-import classNames from "classnames";
 import React from "react";
+import ReactDOM from "react-dom";
+import classNames from "classnames";
 
 require("bootstrap/js/dropdown");
 
@@ -21,11 +21,11 @@ var DropdownLink = React.createClass({
   },
 
   isOpen() {
-    return this.getDOMNode().classList.contains("open");
+    return ReactDOM.findDOMNode(this).classList.contains("open");
   },
 
   close() {
-    this.getDOMNode().classList.remove("open");
+    ReactDOM.findDOMNode(this).classList.remove("open");
   },
 
   onToggle(e) {
@@ -51,14 +51,14 @@ var DropdownLink = React.createClass({
     });
 
     return (
-      <span className={joinClasses(this.props.topLevelClasses, topLevelClasses)}>
-        <a className={joinClasses(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
+      <span className={classNames(this.props.topLevelClasses, topLevelClasses)}>
+        <a className={classNames(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
           {this.props.title}
           {this.props.caret &&
             <i className="icon-arrow-down" />
           }
         </a>
-        <ul className={joinClasses(this.props.menuClasses, "dropdown-menu")}>
+        <ul className={classNames(this.props.menuClasses, "dropdown-menu")}>
           {this.props.children}
         </ul>
       </span>
diff --git a/src/sentry/static/sentry/app/components/flotChart.jsx b/src/sentry/static/sentry/app/components/flotChart.jsx
index 71d07341a27c18..3518d48a5e0595 100644
--- a/src/sentry/static/sentry/app/components/flotChart.jsx
+++ b/src/sentry/static/sentry/app/components/flotChart.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import ReactDOM from 'react-dom';
 import jQuery from 'jquery';
 import moment from 'moment';
 
@@ -113,7 +114,7 @@ var FlotChart = React.createClass({
       lines: { show: false }
     };
 
-    var chart = this.refs.chartNode.getDOMNode();
+    var chart = ReactDOM.findDOMNode(this.refs.chartNode);
     jQuery.plot(chart, series, plotOptions);
   },
 
diff --git a/src/sentry/static/sentry/app/components/group/chart.jsx b/src/sentry/static/sentry/app/components/group/chart.jsx
index 9fb6a9913906ac..9df426bf8768c3 100644
--- a/src/sentry/static/sentry/app/components/group/chart.jsx
+++ b/src/sentry/static/sentry/app/components/group/chart.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import BarChart from "../../components/barChart";
 import PropTypes from "../../proptypes";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var GroupChart = React.createClass({
   mixins: [PureRenderMixin],
diff --git a/src/sentry/static/sentry/app/components/linkWithConfirmation.jsx b/src/sentry/static/sentry/app/components/linkWithConfirmation.jsx
index b672a72b0037be..8c01f5579daa46 100644
--- a/src/sentry/static/sentry/app/components/linkWithConfirmation.jsx
+++ b/src/sentry/static/sentry/app/components/linkWithConfirmation.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import Modal from "react-bootstrap/lib/Modal";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var LinkWithConfirmation = React.createClass({
   mixins: [PureRenderMixin],
diff --git a/src/sentry/static/sentry/app/components/loadingIndicator.jsx b/src/sentry/static/sentry/app/components/loadingIndicator.jsx
index 92959cfd4a4dea..84a44a77f35d98 100644
--- a/src/sentry/static/sentry/app/components/loadingIndicator.jsx
+++ b/src/sentry/static/sentry/app/components/loadingIndicator.jsx
@@ -1,4 +1,3 @@
-import joinClasses from "react/lib/joinClasses";
 import classNames from "classnames";
 import React from "react";
 
@@ -22,7 +21,7 @@ var LoadingIndicator = React.createClass({
     });
 
     return (
-      <div className={joinClasses(this.props.className, className)}>
+      <div className={classNames(this.props.className, className)}>
         <div className="loading-mask"></div>
         <div className="loading-indicator"></div>
         <div className="loading-message">{this.props.children}</div>
diff --git a/src/sentry/static/sentry/app/components/menuItem.jsx b/src/sentry/static/sentry/app/components/menuItem.jsx
index b85d493398d409..15c42bb9e720f4 100644
--- a/src/sentry/static/sentry/app/components/menuItem.jsx
+++ b/src/sentry/static/sentry/app/components/menuItem.jsx
@@ -1,6 +1,5 @@
 import React from "react";
 import Router from "react-router";
-import joinClasses from "react/lib/joinClasses";
 import classNames from "classnames";
 
 var MenuItem = React.createClass({
@@ -73,7 +72,7 @@ var MenuItem = React.createClass({
 
     return (
       <li {...this.props} role="presentation" title={null} href={null}
-        className={joinClasses(this.props.className, classNames(classes))}>
+        className={classNames(this.props.className, classes)}>
         {children}
       </li>
     );
diff --git a/src/sentry/static/sentry/app/components/mutedBox.jsx b/src/sentry/static/sentry/app/components/mutedBox.jsx
index 1c5fc239c208dc..1c6dd445812c41 100644
--- a/src/sentry/static/sentry/app/components/mutedBox.jsx
+++ b/src/sentry/static/sentry/app/components/mutedBox.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var MutedBox = React.createClass({
   mixins: [PureRenderMixin],
diff --git a/src/sentry/static/sentry/app/components/projectHeader/projectSelector.jsx b/src/sentry/static/sentry/app/components/projectHeader/projectSelector.jsx
index 0c59fe100bb798..163991e5daedc8 100644
--- a/src/sentry/static/sentry/app/components/projectHeader/projectSelector.jsx
+++ b/src/sentry/static/sentry/app/components/projectHeader/projectSelector.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDOM from "react-dom";
 import Router from "react-router";
 import jQuery from "jquery";
 import ConfigStore from "../../stores/configStore";
@@ -132,7 +133,7 @@ var ProjectSelector = React.createClass({
   },
 
   onOpen(evt) {
-    this.refs.filter.getDOMNode().focus();
+    ReactDOM.findDOMNode(this.refs.filter).focus();
   },
 
   onClose() {
@@ -143,7 +144,7 @@ var ProjectSelector = React.createClass({
 
   componentDidUpdate(prevProps, prevState) {
     // XXX(dcramer): fix odd dedraw issue as of Chrome 45.0.2454.15 dev (64-bit)
-    var node = jQuery(this.refs.container.getDOMNode());
+    var node = jQuery(ReactDOM.findDOMNode(this.refs.container));
     node.hide().show(0);
   },
 
diff --git a/src/sentry/static/sentry/app/components/searchBar.jsx b/src/sentry/static/sentry/app/components/searchBar.jsx
index 69a3e753c4c4b6..be6f3d2d222545 100644
--- a/src/sentry/static/sentry/app/components/searchBar.jsx
+++ b/src/sentry/static/sentry/app/components/searchBar.jsx
@@ -1,5 +1,6 @@
 import React from "react";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import ReactDOM from "react-dom";
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var SearchBar = React.createClass({
   contextTypes: {
@@ -24,7 +25,7 @@ var SearchBar = React.createClass({
   },
 
   blur() {
-    this.refs.searchInput.getDOMNode().blur();
+    ReactDOM.findDOMNode(this.refs.searchInput).blur();
   },
 
   onSubmit(evt) {
diff --git a/src/sentry/static/sentry/app/components/selectInput.jsx b/src/sentry/static/sentry/app/components/selectInput.jsx
index 1df3eeeddefa78..9b67584ea9e5bf 100644
--- a/src/sentry/static/sentry/app/components/selectInput.jsx
+++ b/src/sentry/static/sentry/app/components/selectInput.jsx
@@ -23,12 +23,12 @@ var SelectInput = React.createClass({
   },
 
   create() {
-    this.select2 = jQuery(this.refs.select.getDOMNode()).select2();
+    this.select2 = jQuery(this.refs.select).select2();
     this.select2.on('change', this.onChange);
   },
 
   destroy() {
-    jQuery(this.refs.select.getDOMNode()).select2('destroy');
+    jQuery(this.refs.select).select2('destroy');
   },
 
   onChange(...args) {
diff --git a/src/sentry/static/sentry/app/components/timeSince.jsx b/src/sentry/static/sentry/app/components/timeSince.jsx
index 0b435b2ba2115f..521c3376d870a5 100644
--- a/src/sentry/static/sentry/app/components/timeSince.jsx
+++ b/src/sentry/static/sentry/app/components/timeSince.jsx
@@ -1,7 +1,12 @@
 import React from "react";
 import moment from "moment";
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var TimeSince = React.createClass({
+  mixins: [
+    PureRenderMixin
+  ],
+
   propTypes: {
     date: React.PropTypes.any.isRequired,
     suffix: React.PropTypes.string
@@ -31,10 +36,6 @@ var TimeSince = React.createClass({
     this.forceUpdate();
   },
 
-  shouldComponentUpdate(nextProps, nextState) {
-    return this.props.date !== nextProps.date;
-  },
-
   render() {
     var date = this.props.date;
 
diff --git a/src/sentry/static/sentry/app/index.js b/src/sentry/static/sentry/app/index.js
index f20498d7ecc321..cd920224b931c0 100644
--- a/src/sentry/static/sentry/app/index.js
+++ b/src/sentry/static/sentry/app/index.js
@@ -38,6 +38,7 @@ export default {
   moment: require("moment"),
   Raven: require("raven-js"),
   React: require("react"),
+  ReactDOM: require("react-dom"),
   Router: require("react-router"),
 
   Sentry: {
diff --git a/src/sentry/static/sentry/app/mixins/tooltip.jsx b/src/sentry/static/sentry/app/mixins/tooltip.jsx
index 1d54e6ee131f1a..d67ce6b3ff0a42 100644
--- a/src/sentry/static/sentry/app/mixins/tooltip.jsx
+++ b/src/sentry/static/sentry/app/mixins/tooltip.jsx
@@ -1,3 +1,4 @@
+import ReactDOM from "react-dom";
 import $ from "jquery";
 import "bootstrap/js/tooltip";
 
@@ -10,18 +11,18 @@ export default function (options) {
 
     componentWillUnmount() {
       this.removeTooltips();
-      $(this.getDOMNode()).unbind();
+      $(ReactDOM.findDOMNode(this)).unbind();
     },
 
     attachTooltips() {
-      $(this.getDOMNode()).tooltip(
+      $(ReactDOM.findDOMNode(this)).tooltip(
         Object.prototype.toString.call(options) === '[object Function]' ?
           options.call(this) : options
       );
     },
 
     removeTooltips() {
-      $(this.getDOMNode())
+      $(ReactDOM.findDOMNode(this))
         .tooltip("destroy") // destroy tooltips on parent ...
         .find(options.selector)
           .tooltip("destroy"); // ... and descendents
diff --git a/src/sentry/static/sentry/app/views/groupActivity/noteInput.jsx b/src/sentry/static/sentry/app/views/groupActivity/noteInput.jsx
index 87219c4ed38cc4..2efaa8bd9ceca2 100644
--- a/src/sentry/static/sentry/app/views/groupActivity/noteInput.jsx
+++ b/src/sentry/static/sentry/app/views/groupActivity/noteInput.jsx
@@ -6,7 +6,7 @@ import IndicatorStore from "../../stores/indicatorStore";
 import {logException} from "../../utils/logging";
 import {getItem, setItem} from "../../utils/localStorage";
 
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 const localStorageKey = 'noteinput:latest';
 const DEFAULT_ERROR_JSON = {detail: 'Unknown error. Please try again.'};
 
diff --git a/src/sentry/static/sentry/app/views/organizationStats/projectTable.jsx b/src/sentry/static/sentry/app/views/organizationStats/projectTable.jsx
index ee431e3e541574..888b65238bc385 100644
--- a/src/sentry/static/sentry/app/views/organizationStats/projectTable.jsx
+++ b/src/sentry/static/sentry/app/views/organizationStats/projectTable.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import ConfigStore from "../../stores/configStore";
 import Count from "../../components/count";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var getPercent = (item, total) => {
   if (total === 0) {
diff --git a/src/sentry/static/sentry/app/views/projectEvents/actions.jsx b/src/sentry/static/sentry/app/views/projectEvents/actions.jsx
index bd51686feb353b..fa5d7cbe29dfdc 100644
--- a/src/sentry/static/sentry/app/views/projectEvents/actions.jsx
+++ b/src/sentry/static/sentry/app/views/projectEvents/actions.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var EventActions = React.createClass({
   mixins: [
diff --git a/src/sentry/static/sentry/app/views/ruleEditor/index.jsx b/src/sentry/static/sentry/app/views/ruleEditor/index.jsx
index 62e2fbb2c53fbf..193382c3c827d5 100644
--- a/src/sentry/static/sentry/app/views/ruleEditor/index.jsx
+++ b/src/sentry/static/sentry/app/views/ruleEditor/index.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDOM from "react-dom";
 import $ from "jquery";
 import api from "../../api";
 import IndicatorStore from '../../stores/indicatorStore';
@@ -31,13 +32,13 @@ var RuleEditor = React.createClass({
 
   componentDidUpdate() {
     if (this.state.error) {
-      $(document.body).scrollTop($(this.refs.form.getDOMNode()).offset().top);
+      $(document.body).scrollTop($(ReactDOM.findDOMNode(this.refs.form)).offset().top);
     }
   },
 
   onSubmit(e) {
     e.preventDefault();
-    var form = $(this.refs.form.getDOMNode());
+    var form = $(ReactDOM.findDOMNode(this.refs.form));
     var conditions = [];
     form.find('.rule-condition-list .rule-form').each((_, el) => {
       conditions.push(this.serializeNode(el));
@@ -46,8 +47,8 @@ var RuleEditor = React.createClass({
     form.find('.rule-action-list .rule-form').each((_, el) => {
       actions.push(this.serializeNode(el));
     });
-    var actionMatch = $(this.refs.actionMatch.getDOMNode()).val();
-    var name = $(this.refs.name.getDOMNode()).val();
+    var actionMatch = $(ReactDOM.findDOMNode(this.refs.actionMatch)).val();
+    var name = $(ReactDOM.findDOMNode(this.refs.name)).val();
     var data = {
       actionMatch: actionMatch,
       actions: actions,
diff --git a/src/sentry/static/sentry/app/views/ruleEditor/ruleNode.jsx b/src/sentry/static/sentry/app/views/ruleEditor/ruleNode.jsx
index aff4a85fd38186..dc497a3750f6f2 100644
--- a/src/sentry/static/sentry/app/views/ruleEditor/ruleNode.jsx
+++ b/src/sentry/static/sentry/app/views/ruleEditor/ruleNode.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDOM from "react-dom";
 import $ from "jquery";
 
 var RuleNode = React.createClass({
@@ -10,7 +11,7 @@ var RuleNode = React.createClass({
   },
 
   componentDidMount() {
-    let $html = $(this.refs.html.getDOMNode());
+    let $html = $(ReactDOM.findDOMNode(this.refs.html));
 
     $html.find('select, input, textarea').each((_, el) => {
       let $el = $(el);
diff --git a/src/sentry/static/sentry/app/views/stream/actionLink.jsx b/src/sentry/static/sentry/app/views/stream/actionLink.jsx
index f234a054a96866..10b6a14a215011 100644
--- a/src/sentry/static/sentry/app/views/stream/actionLink.jsx
+++ b/src/sentry/static/sentry/app/views/stream/actionLink.jsx
@@ -1,5 +1,5 @@
 import Modal from "react-bootstrap/lib/Modal";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 import React from "react";
 import SelectedGroupStore from "../../stores/selectedGroupStore";
 import TooltipMixin from "../../mixins/tooltip";
diff --git a/src/sentry/static/sentry/app/views/stream/actions.jsx b/src/sentry/static/sentry/app/views/stream/actions.jsx
index c77dc061b9ad99..085c29517d2ca3 100644
--- a/src/sentry/static/sentry/app/views/stream/actions.jsx
+++ b/src/sentry/static/sentry/app/views/stream/actions.jsx
@@ -5,7 +5,7 @@ import ActionLink from "./actionLink";
 import DropdownLink from "../../components/dropdownLink";
 import IndicatorStore from "../../stores/indicatorStore";
 import MenuItem from "../../components/menuItem";
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 import SelectedGroupStore from "../../stores/selectedGroupStore";
 
 var StreamActions = React.createClass({
diff --git a/src/sentry/static/sentry/app/views/stream/searchBar.jsx b/src/sentry/static/sentry/app/views/stream/searchBar.jsx
index 888403013f5dff..860910509d1924 100644
--- a/src/sentry/static/sentry/app/views/stream/searchBar.jsx
+++ b/src/sentry/static/sentry/app/views/stream/searchBar.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDOM from "react-dom";
 import Reflux from "reflux";
 import _ from "underscore";
 import classNames from "classnames";
@@ -8,7 +9,7 @@ import MemberListStore from "../../stores/memberListStore";
 
 import api from "../../api";
 
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 import SearchDropdown from "./searchDropdown";
 
@@ -109,7 +110,7 @@ var SearchBar = React.createClass({
   },
 
   blur() {
-    this.refs.searchInput.getDOMNode().blur();
+    ReactDOM.findDOMNode(this.refs.searchInput).blur();
   },
 
   onSubmit(evt) {
@@ -155,7 +156,7 @@ var SearchBar = React.createClass({
   },
 
   getCursorPosition() {
-    return this.refs.searchInput.getDOMNode().selectionStart;
+    return ReactDOM.findDOMNode(this.refs.searchInput).selectionStart;
   },
 
   /**
@@ -217,7 +218,7 @@ var SearchBar = React.createClass({
       this.setState(
         { query: this.state.query + ' ' },
         () => {
-          this.refs.searchInput.getDOMNode().setSelectionRange(cursor + 1, cursor + 1);
+          ReactDOM.findDOMNode(this.refs.searchInput).setSelectionRange(cursor + 1, cursor + 1);
           this.updateAutoCompleteItems();
         }
       );
@@ -376,7 +377,7 @@ var SearchBar = React.createClass({
       query: newQuery
     }, () => {
       // setting a new input value will lose focus; restore it
-      var node = this.refs.searchInput.getDOMNode();
+      var node = ReactDOM.findDOMNode(this.refs.searchInput);
       node.focus();
 
       // then update the autocomplete box with new contextTypes
diff --git a/src/sentry/static/sentry/app/views/stream/searchDropdown.jsx b/src/sentry/static/sentry/app/views/stream/searchDropdown.jsx
index 7b8c9af2579c11..c5c411fd5b6ca7 100644
--- a/src/sentry/static/sentry/app/views/stream/searchDropdown.jsx
+++ b/src/sentry/static/sentry/app/views/stream/searchDropdown.jsx
@@ -3,7 +3,7 @@ import classNames from "classnames";
 
 import LoadingIndicator from "../../components/loadingIndicator";
 
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 var SearchDropdown = React.createClass({
   mixins: [PureRenderMixin],
diff --git a/src/sentry/static/sentry/app/views/stream/sortOptions.jsx b/src/sentry/static/sentry/app/views/stream/sortOptions.jsx
index 1edc8a0f4ad860..338554f432e558 100644
--- a/src/sentry/static/sentry/app/views/stream/sortOptions.jsx
+++ b/src/sentry/static/sentry/app/views/stream/sortOptions.jsx
@@ -1,4 +1,4 @@
-var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
+import PureRenderMixin from 'react-addons-pure-render-mixin';
 import React from "react";
 import DropdownLink from "../../components/dropdownLink";
 import MenuItem from "../../components/menuItem";
diff --git a/src/sentry/static/sentry/app/views/stream/streamSearchBar.jsx b/src/sentry/static/sentry/app/views/stream/streamSearchBar.jsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/src/sentry/static/sentry/app/views/stream/tagFilter.jsx b/src/sentry/static/sentry/app/views/stream/tagFilter.jsx
index e8aca9c7596d31..253a048af161ec 100644
--- a/src/sentry/static/sentry/app/views/stream/tagFilter.jsx
+++ b/src/sentry/static/sentry/app/views/stream/tagFilter.jsx
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDOM from "react-dom";
 import _ from "underscore";
 
 var StreamTagFilter = React.createClass({
@@ -39,14 +40,14 @@ var StreamTagFilter = React.createClass({
       this.setState({
         value: nextProps.value
       }, () => {
-        let select = this.refs.select.getDOMNode();
+        let select = this.refs.select;
         $(select).select2('val', this.state.value);
       });
     }
   },
 
   componentDidMount() {
-    let select = this.refs.select.getDOMNode();
+    let select = ReactDOM.findDOMNode(this.refs.select);
 
     let selectOpts = {
       placeholder: '--',
@@ -84,7 +85,7 @@ var StreamTagFilter = React.createClass({
   },
 
   componentWillUnmount() {
-    let select = this.refs.select.getDOMNode();
+    let select = ReactDOM.findDOMNode(this.refs.select);
     $(select).select2('destroy');
   },
 
@@ -103,6 +104,9 @@ var StreamTagFilter = React.createClass({
   },
 
   render() {
+    // NOTE: need to specify empty onChange handler on <select> - even though this
+    //       will get overridden by select2 - because React will complain with
+    //       a warning
     let tag = this.props.tag;
     return (
       <div className="stream-tag-filter">
@@ -110,7 +114,7 @@ var StreamTagFilter = React.createClass({
 
         {this.props.tag.predefined ?
 
-          <select ref="select" value={this.props.value}>
+          <select ref="select" value={this.props.value} onChange={function(){}}>
             <option key="empty"></option>
             {this.props.tag.values.map((val) => {
               return (
diff --git a/src/sentry/templates/sentry/bases/react.html b/src/sentry/templates/sentry/bases/react.html
index 2b48e67fdd672c..1ef5c6d87c6b5d 100644
--- a/src/sentry/templates/sentry/bases/react.html
+++ b/src/sentry/templates/sentry/bases/react.html
@@ -17,7 +17,7 @@
   <script>
   $(function(){
     Router.run(Sentry.routes, Router.HistoryLocation, function(Handler) {
-      React.render(React.createFactory(Handler)({
+      ReactDOM.render(React.createFactory(Handler)({
       }), document.getElementById('blk_router'));
     });
   });
diff --git a/tests/js/spec/views/stream/searchBar.spec.jsx b/tests/js/spec/views/stream/searchBar.spec.jsx
index a5a64d63ff693d..6be2d688cb640b 100644
--- a/tests/js/spec/views/stream/searchBar.spec.jsx
+++ b/tests/js/spec/views/stream/searchBar.spec.jsx
@@ -1,4 +1,5 @@
 import React from "react/addons";
+import ReactDOM from "react-dom";
 import api from "app/api";
 import SearchBar from "app/views/stream/searchBar";
 import SearchDropdown from "app/views/stream/searchDropdown";
@@ -133,7 +134,7 @@ describe("SearchBar", function() {
         var wrapper = React.render(<this.ContextStubbedSearchBar />, document.body).refs.wrapped;
         wrapper.state.dropdownVisible = true;
 
-        var input = React.findDOMNode(wrapper.refs.searchInput);
+        var input = ReactDOM.findDOMNode(wrapper.refs.searchInput);
 
         input.focus();
 
diff --git a/tests/karma.conf.js b/tests/karma.conf.js
index 68d68dd56094a4..d734f3c03c69db 100644
--- a/tests/karma.conf.js
+++ b/tests/karma.conf.js
@@ -25,7 +25,8 @@ module.exports = function(config) {
       cache: true,
       resolve: {
         alias: {
-          "app": appPrefix
+          "app": appPrefix,
+          "react-router": path.join(__dirname, "..", "node_modules", "react-router", "build", "lib")
         },
         modulesDirectories: ["node_modules"],
         extensions: ["", ".jsx", ".js", ".json"]
diff --git a/webpack.config.js b/webpack.config.js
index 7e16d49071aefd..570ee74dbad947 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,7 +23,6 @@ var config = {
       "moment",
       "moment-timezone",
       "raven-js",
-      "react/addons",
       "react-document-title",
       "react-router",
       "react-bootstrap",
@@ -81,6 +80,7 @@ var config = {
     alias: {
       "flot": path.join(__dirname, staticPrefix, "vendor", "jquery-flot"),
       "flot-tooltip": path.join(__dirname, staticPrefix, "vendor", "jquery-flot-tooltip"),
+      "react-router": path.join(__dirname, "node_modules", "react-router", "build", "lib")
     },
     modulesDirectories: [path.join(__dirname, staticPrefix), "node_modules"],
     extensions: ["", ".jsx", ".js", ".json"]