diff --git a/src/isomorphic/children/__tests__/ReactChildren-test.js b/src/isomorphic/children/__tests__/ReactChildren-test.js
index 33af1522c3..9d97007cd1 100644
--- a/src/isomorphic/children/__tests__/ReactChildren-test.js
+++ b/src/isomorphic/children/__tests__/ReactChildren-test.js
@@ -25,7 +25,7 @@ describe('ReactChildren', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should support identity for simple', () => {
diff --git a/src/isomorphic/children/__tests__/onlyChild-test.js b/src/isomorphic/children/__tests__/onlyChild-test.js
index 082c389e6b..f809f1b4ef 100644
--- a/src/isomorphic/children/__tests__/onlyChild-test.js
+++ b/src/isomorphic/children/__tests__/onlyChild-test.js
@@ -13,17 +13,15 @@
 
 describe('onlyChild', () => {
   var React;
-  var onlyChild;
   var WrapComponent;
 
   beforeEach(() => {
     React = require('react');
-    onlyChild = require('onlyChild');
     WrapComponent = class extends React.Component {
       render() {
         return (
           <div>
-            {onlyChild(this.props.children, this.props.mapFn, this)}
+            {React.Children.only(this.props.children, this.props.mapFn, this)}
           </div>
         );
       }
@@ -38,7 +36,7 @@ describe('onlyChild', () => {
           <span />
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
   });
 
@@ -49,7 +47,7 @@ describe('onlyChild', () => {
           {null}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
 
     expect(function() {
@@ -58,7 +56,7 @@ describe('onlyChild', () => {
           {undefined}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
   });
 
@@ -69,7 +67,7 @@ describe('onlyChild', () => {
           {[<span key="abc" />]}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).toThrow();
   });
 
@@ -80,7 +78,7 @@ describe('onlyChild', () => {
           {<span />}
         </WrapComponent>
       );
-      onlyChild(instance.props.children);
+      React.Children.only(instance.props.children);
     }).not.toThrow();
   });
 
@@ -90,6 +88,6 @@ describe('onlyChild', () => {
         <span />
       </WrapComponent>
     );
-    expect(onlyChild(instance.props.children)).toEqual(<span />);
+    expect(React.Children.only(instance.props.children)).toEqual(<span />);
   });
 });
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index 000b3f7c61..dbb91c9461 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -33,7 +33,7 @@ describe('ReactContextValidator', () => {
     PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   // TODO: This behavior creates a runtime dependency on propTypes. We should
diff --git a/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js b/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js
index c1b3f5db8d..58d7ab0c7f 100644
--- a/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js
+++ b/src/isomorphic/classic/__tests__/createReactClassIntegration-test.js
@@ -22,7 +22,7 @@ describe('create-react-class-integration', () => {
     PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
     createReactClass = require('create-react-class/factory')(
       React.Component,
       React.isValidElement,
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index 3d6f7b9efc..1abcfb31a0 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -30,7 +30,7 @@ describe('ReactElement', () => {
 
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
     // NOTE: We're explicitly not using JSX here. This is intended to test
     // classic JS without JSX.
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
index 365b187d24..53fbe6a1a3 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
@@ -23,7 +23,7 @@ describe('ReactElementClone', () => {
     PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     // NOTE: We're explicitly not using JSX here. This is intended to test
     // classic JS without JSX.
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
index 969b4de9b6..99a6841cd7 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
@@ -32,7 +32,7 @@ describe('ReactElementValidator', () => {
     PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
     ComponentClass = class extends React.Component {
       render() {
         return React.createElement('div');
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
index d4ea915bba..c3b69005cf 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
@@ -23,7 +23,7 @@ describe('ReactJSXElement', () => {
 
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
     Component = class extends React.Component {
       render() {
         return <div />;
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
index ff1ff2e7c8..69541571dd 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
@@ -33,7 +33,7 @@ describe('ReactJSXElementValidator', () => {
     PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     Component = class extends React.Component {
       render() {
diff --git a/src/node_modules/react-art/index.js b/src/node_modules/react-art/index.js
new file mode 100644
index 0000000000..0904d9c420
--- /dev/null
+++ b/src/node_modules/react-art/index.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactARTFiber');
diff --git a/src/node_modules/react-dom/test-utils.js b/src/node_modules/react-dom/test-utils.js
new file mode 100644
index 0000000000..ef0d67875e
--- /dev/null
+++ b/src/node_modules/react-dom/test-utils.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactTestUtils');
diff --git a/src/node_modules/react-native/index.js b/src/node_modules/react-native/index.js
new file mode 100644
index 0000000000..7897e25151
--- /dev/null
+++ b/src/node_modules/react-native/index.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactNative');
diff --git a/src/node_modules/react-noop-renderer/index.js b/src/node_modules/react-noop-renderer/index.js
new file mode 100644
index 0000000000..c690bc1d2a
--- /dev/null
+++ b/src/node_modules/react-noop-renderer/index.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactNoop');
diff --git a/src/node_modules/react-test-renderer/shallow.js b/src/node_modules/react-test-renderer/shallow.js
new file mode 100644
index 0000000000..9522341660
--- /dev/null
+++ b/src/node_modules/react-test-renderer/shallow.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactShallowRenderer');
diff --git a/src/renderers/__tests__/EventPluginHub-test.js b/src/renderers/__tests__/EventPluginHub-test.js
index a94ae72bc3..03b33abe00 100644
--- a/src/renderers/__tests__/EventPluginHub-test.js
+++ b/src/renderers/__tests__/EventPluginHub-test.js
@@ -20,7 +20,7 @@ describe('EventPluginHub', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should prevent non-function listeners, at dispatch', () => {
diff --git a/src/renderers/__tests__/ReactChildReconciler-test.js b/src/renderers/__tests__/ReactChildReconciler-test.js
index f6761ef181..4ad42d8345 100644
--- a/src/renderers/__tests__/ReactChildReconciler-test.js
+++ b/src/renderers/__tests__/ReactChildReconciler-test.js
@@ -26,7 +26,7 @@ describe('ReactChildReconciler', () => {
     jest.resetModules();
 
     React = require('react');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   function createIterable(array) {
diff --git a/src/renderers/__tests__/ReactComponent-test.js b/src/renderers/__tests__/ReactComponent-test.js
index 1ea4d6dddc..30503913da 100644
--- a/src/renderers/__tests__/ReactComponent-test.js
+++ b/src/renderers/__tests__/ReactComponent-test.js
@@ -25,7 +25,7 @@ describe('ReactComponent', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should throw on invalid render targets', () => {
diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
index af575d1530..519ab4c559 100644
--- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js
+++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
@@ -91,7 +91,7 @@ describe('ReactComponentLifeCycle', () => {
     jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
     PropTypes = require('prop-types');
   });
 
diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js
index 5640ce6196..df10b88867 100644
--- a/src/renderers/__tests__/ReactCompositeComponent-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponent-test.js
@@ -28,8 +28,9 @@ describe('ReactCompositeComponent', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
-    ReactCurrentOwner = require('ReactCurrentOwner');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactCurrentOwner = require('react')
+      .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;
+    ReactTestUtils = require('react-dom/test-utils');
     PropTypes = require('prop-types');
     shallowEqual = require('fbjs/lib/shallowEqual');
 
diff --git a/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js b/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js
index 3391470f81..bc26fcea5a 100644
--- a/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js
@@ -31,7 +31,7 @@ describe('ReactCompositeComponentDOMMinimalism', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     LowerLevelComposite = class extends React.Component {
       render() {
diff --git a/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js b/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js
index 4480a2231f..aec1d92f72 100644
--- a/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js
@@ -19,7 +19,7 @@ describe('ReactCompositeComponentNestedState-state', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should provide up to date values for props', () => {
diff --git a/src/renderers/__tests__/ReactEmptyComponent-test.js b/src/renderers/__tests__/ReactEmptyComponent-test.js
index 06ac9c483f..5368ae06a9 100644
--- a/src/renderers/__tests__/ReactEmptyComponent-test.js
+++ b/src/renderers/__tests__/ReactEmptyComponent-test.js
@@ -26,7 +26,7 @@ describe('ReactEmptyComponent', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     log = jasmine.createSpy();
 
diff --git a/src/renderers/__tests__/ReactIdentity-test.js b/src/renderers/__tests__/ReactIdentity-test.js
index 7837e7f334..9bcc07a9fd 100644
--- a/src/renderers/__tests__/ReactIdentity-test.js
+++ b/src/renderers/__tests__/ReactIdentity-test.js
@@ -20,7 +20,7 @@ describe('ReactIdentity', () => {
     jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should allow key property to express identity', () => {
diff --git a/src/renderers/__tests__/ReactMockedComponent-test.js b/src/renderers/__tests__/ReactMockedComponent-test.js
index 061094b511..7f7427e0c4 100644
--- a/src/renderers/__tests__/ReactMockedComponent-test.js
+++ b/src/renderers/__tests__/ReactMockedComponent-test.js
@@ -21,8 +21,8 @@ var ReactDOMServer;
 describe('ReactMockedComponent', () => {
   beforeEach(() => {
     React = require('react');
-    ReactTestUtils = require('ReactTestUtils');
-    ReactDOMServer = require('ReactDOMServer');
+    ReactTestUtils = require('react-dom/test-utils');
+    ReactDOMServer = require('react-dom/server');
 
     AutoMockedComponent = jest.genMockFromModule(
       'ReactMockedComponentTestComponent',
diff --git a/src/renderers/__tests__/ReactMultiChildText-test.js b/src/renderers/__tests__/ReactMultiChildText-test.js
index 199ed41d2e..53daf58135 100644
--- a/src/renderers/__tests__/ReactMultiChildText-test.js
+++ b/src/renderers/__tests__/ReactMultiChildText-test.js
@@ -14,7 +14,7 @@
 var React = require('react');
 var ReactDOM = require('react-dom');
 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 // Helpers
 var testAllPermutations = function(testCases) {
diff --git a/src/renderers/__tests__/ReactTreeTraversal-test.js b/src/renderers/__tests__/ReactTreeTraversal-test.js
index da17f4d257..89d479c2a4 100644
--- a/src/renderers/__tests__/ReactTreeTraversal-test.js
+++ b/src/renderers/__tests__/ReactTreeTraversal-test.js
@@ -12,8 +12,9 @@
 'use strict';
 
 var React = require('react');
+// TODO: can we express this test with only public API?
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 /**
  * Ensure that all callbacks are invoked, passing this unique argument.
diff --git a/src/renderers/__tests__/ReactUpdates-test.js b/src/renderers/__tests__/ReactUpdates-test.js
index cb5eeb8ddc..709497fad9 100644
--- a/src/renderers/__tests__/ReactUpdates-test.js
+++ b/src/renderers/__tests__/ReactUpdates-test.js
@@ -21,7 +21,7 @@ describe('ReactUpdates', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should batch state when updating state twice', () => {
diff --git a/src/renderers/__tests__/refs-destruction-test.js b/src/renderers/__tests__/refs-destruction-test.js
index b691851c34..84793d0d0c 100644
--- a/src/renderers/__tests__/refs-destruction-test.js
+++ b/src/renderers/__tests__/refs-destruction-test.js
@@ -23,7 +23,7 @@ describe('refs-destruction', () => {
 
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     TestComponent = class extends React.Component {
       render() {
diff --git a/src/renderers/__tests__/refs-test.js b/src/renderers/__tests__/refs-test.js
index 05727c764d..c7f3f8ce7b 100644
--- a/src/renderers/__tests__/refs-test.js
+++ b/src/renderers/__tests__/refs-test.js
@@ -13,7 +13,7 @@
 
 var React = require('react');
 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 /**
  * Counts clicks and has a renders an item for each click. Each item rendered
diff --git a/src/renderers/art/__tests__/ReactART-test.js b/src/renderers/art/__tests__/ReactART-test.js
index 8006051d14..48b718363e 100644
--- a/src/renderers/art/__tests__/ReactART-test.js
+++ b/src/renderers/art/__tests__/ReactART-test.js
@@ -15,7 +15,7 @@
 
 var React = require('react');
 var ReactDOM = require('react-dom');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 var Group;
 var Shape;
@@ -24,7 +24,7 @@ var TestComponent;
 
 var Missing = {};
 
-var ReactART = require('ReactARTFiber');
+var ReactART = require('react-art');
 var ARTSVGMode = require('art/modes/svg');
 var ARTCurrentMode = require('art/modes/current');
 
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
index c659d65123..383928e07a 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
@@ -14,7 +14,7 @@
 var React = require('react');
 var ReactDOM = require('react-dom');
 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
 var PropTypes = require('prop-types');
 
 describe('ReactDOMFiber', () => {
diff --git a/src/renderers/dom/shared/__tests__/CSSProperty-test.js b/src/renderers/dom/shared/__tests__/CSSProperty-test.js
index a3c04d706d..f724f20cd5 100644
--- a/src/renderers/dom/shared/__tests__/CSSProperty-test.js
+++ b/src/renderers/dom/shared/__tests__/CSSProperty-test.js
@@ -16,6 +16,7 @@ describe('CSSProperty', () => {
 
   beforeEach(() => {
     jest.resetModules();
+    // TODO: can we express this test with only public API?
     CSSProperty = require('CSSProperty');
   });
 
diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
index 5fcc92a825..c0607871e5 100644
--- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
@@ -21,6 +21,7 @@ describe('DOMPropertyOperations', () => {
     var ReactDOMInjection = require('ReactDOMInjection');
     ReactDOMInjection.inject();
 
+    // TODO: can we express this test with only public API?
     DOMPropertyOperations = require('DOMPropertyOperations');
     DOMProperty = require('DOMProperty');
     ReactDOMComponentTree = require('ReactDOMComponentTree');
diff --git a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
index c08384e46e..6239a6ac11 100644
--- a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
@@ -60,13 +60,14 @@ describe('ReactBrowserEventEmitter', () => {
     jest.resetModules();
     LISTENER.mockClear();
     EventListener = require('fbjs/lib/EventListener');
+    // TODO: can we express this test with only public API?
     EventPluginHub = require('EventPluginHub');
     EventPluginRegistry = require('EventPluginRegistry');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMComponentTree = require('ReactDOMComponentTree');
     ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
     TapEventPlugin = require('TapEventPlugin');
 
     var container = document.createElement('div');
diff --git a/src/renderers/dom/shared/__tests__/ReactDOM-test.js b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
index 1f54558833..b7e2db7b6c 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOM-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
@@ -13,7 +13,7 @@
 
 var React = require('react');
 var ReactDOM = require('react-dom');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 describe('ReactDOM', () => {
   // TODO: uncomment this test once we can run in phantom, which
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index 61deddb89f..394cb5a74c 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -29,7 +29,8 @@ describe('ReactDOMComponent', () => {
     ReactDOM = require('react-dom');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
     ReactDOMServer = require('react-dom/server');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
+    // TODO: can we express this test with only public API?
     inputValueTracking = require('inputValueTracking');
   });
 
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js
index bad5116766..369420522b 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js
@@ -41,6 +41,7 @@ describe('ReactDOMComponentTree', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
+    // TODO: can we express this test with only public API?
     ReactDOMComponentTree = require('ReactDOMComponentTree');
     ReactDOMServer = require('react-dom/server');
   });
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js b/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js
index e80d40d6dd..810038763d 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMEventListener-test.js
@@ -25,9 +25,10 @@ describe('ReactDOMEventListener', () => {
     jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
+    // TODO: can we express this test with only public API?
     ReactDOMComponentTree = require('ReactDOMComponentTree');
     ReactDOMEventListener = require('ReactDOMEventListener');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     handleTopLevel = jest.fn();
     ReactDOMEventListener._handleTopLevel = handleTopLevel;
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js b/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
index 65b51fff71..60303ec95e 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
@@ -19,7 +19,7 @@ describe('ReactDOMInvalidARIAHook', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     mountComponent = function(props) {
       ReactTestUtils.renderIntoDocument(<div {...props} />);
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
index fa23ebc062..de1adb46f6 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
@@ -242,11 +242,12 @@ function expectMarkupMismatch(serverElement, clientElement) {
 function resetModules() {
   jest.resetModuleRegistry();
   PropTypes = require('prop-types');
-  React = require('React');
-  ReactDOM = require('ReactDOM');
-  ReactDOMServer = require('ReactDOMServer');
+  React = require('react');
+  ReactDOM = require('react-dom');
+  ReactDOMServer = require('react-dom/server');
   ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-  ReactTestUtils = require('ReactTestUtils');
+  ReactTestUtils = require('react-dom/test-utils');
+  // TODO: can we express this test with only public API?
   ExecutionEnvironment = require('ExecutionEnvironment');
 }
 
diff --git a/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
index 87b00573a6..bc1d4a178a 100644
--- a/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
@@ -21,7 +21,7 @@ describe('ReactEventIndependence', () => {
 
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('does not crash with other react inside', () => {
diff --git a/src/renderers/dom/shared/__tests__/ReactMount-test.js b/src/renderers/dom/shared/__tests__/ReactMount-test.js
index 83e896b760..3cad1fa973 100644
--- a/src/renderers/dom/shared/__tests__/ReactMount-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactMount-test.js
@@ -24,7 +24,7 @@ describe('ReactMount', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     try {
       if (WebComponents === undefined && typeof jest !== 'undefined') {
diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index b51e662f26..79cca198f0 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -29,9 +29,9 @@ describe('ReactDOMServer', () => {
     jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
+    ReactTestUtils = require('react-dom/test-utils');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
     ReactMarkupChecksum = require('ReactMarkupChecksum');
-    ReactTestUtils = require('ReactTestUtils');
     ReactReconcileTransaction = require('ReactReconcileTransaction');
     PropTypes = require('prop-types');
 
diff --git a/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js b/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js
index 8dc2b9792d..58bfdd7fff 100644
--- a/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js
+++ b/src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js
@@ -12,6 +12,7 @@
 'use strict';
 
 describe('escapeTextContentForBrowser', () => {
+  // TODO: can we express this test with only public API?
   var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
 
   it('should escape boolean to string', () => {
diff --git a/src/renderers/dom/shared/__tests__/findDOMNode-test.js b/src/renderers/dom/shared/__tests__/findDOMNode-test.js
index 93edc2e259..5100971cf5 100644
--- a/src/renderers/dom/shared/__tests__/findDOMNode-test.js
+++ b/src/renderers/dom/shared/__tests__/findDOMNode-test.js
@@ -13,7 +13,7 @@
 
 var React = require('react');
 var ReactDOM = require('react-dom');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
 
 describe('findDOMNode', () => {
   it('findDOMNode should return null if passed null', () => {
diff --git a/src/renderers/dom/shared/__tests__/inputValueTracking-test.js b/src/renderers/dom/shared/__tests__/inputValueTracking-test.js
index 16555ad6a0..2e4bfd1e96 100644
--- a/src/renderers/dom/shared/__tests__/inputValueTracking-test.js
+++ b/src/renderers/dom/shared/__tests__/inputValueTracking-test.js
@@ -13,6 +13,7 @@
 
 var React = require('react');
 var ReactTestUtils = require('ReactTestUtils');
+// TODO: can we express this test with only public API?
 var inputValueTracking = require('inputValueTracking');
 
 describe('inputValueTracking', () => {
diff --git a/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js b/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js
index 884fc322c5..7f8495148a 100644
--- a/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js
+++ b/src/renderers/dom/shared/__tests__/quoteAttributeValueForBrowser-test.js
@@ -12,6 +12,7 @@
 'use strict';
 
 describe('quoteAttributeValueForBrowser', () => {
+  // TODO: can we express this test with only public API?
   var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser');
 
   it('should escape boolean to string', () => {
diff --git a/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js b/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js
index a0a30dfe8d..43ac5cb5b2 100644
--- a/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js
+++ b/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js
@@ -14,8 +14,9 @@
 var React = require('react');
 var PropTypes = require('prop-types');
 var ReactDOM = require('react-dom');
-var ReactTestUtils = require('ReactTestUtils');
-var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');
+var ReactTestUtils = require('react-dom/test-utils');
+var renderSubtreeIntoContainer = require('react-dom')
+  .unstable_renderSubtreeIntoContainer;
 
 describe('renderSubtreeIntoContainer', () => {
   it('should pass context when rendering subtree elsewhere', () => {
diff --git a/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js b/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js
index 102322f1b7..74dc3eae32 100644
--- a/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js
+++ b/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js
@@ -137,6 +137,7 @@ describe('ReactContextValidator', () => {
   beforeEach(() => {
     jest.resetModules();
 
+    // TODO: can we express this test with only public API?
     validateDOMNesting = require('validateDOMNesting');
   });
 
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
index 46dbcf490d..28785406e7 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
@@ -48,6 +48,8 @@ describe('BeforeInputEventPlugin', function() {
     // Modules which have dependency on BeforeInputEventPlugin are stored
     // in ModuleCache so that we can use these modules ouside test functions.
     this.ReactDOM = require('react-dom');
+
+    // TODO: can we express this test with only public API?
     this.ReactDOMComponentTree = require('ReactDOMComponentTree');
     this.SyntheticCompositionEvent = require('SyntheticCompositionEvent');
     this.SyntheticInputEvent = require('SyntheticInputEvent');
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
index f1978fad3a..d164a25051 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
@@ -13,7 +13,8 @@
 
 var React = require('react');
 var ReactDOM = require('react-dom');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactTestUtils = require('react-dom/test-utils');
+// TODO: can we express this test with only public API?
 var ChangeEventPlugin = require('ChangeEventPlugin');
 var inputValueTracking = require('inputValueTracking');
 
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
index 010e151a45..2d7a6d426f 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
@@ -20,10 +20,11 @@ describe('EnterLeaveEventPlugin', () => {
   beforeEach(() => {
     jest.resetModules();
 
-    EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');
     React = require('react');
     ReactDOM = require('react-dom');
+    // TODO: can we express this test with only public API?
     ReactDOMComponentTree = require('ReactDOMComponentTree');
+    EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');
   });
 
   it('should set relatedTarget properly in iframe', () => {
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js
index 35eca38ac9..19af12471c 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js
@@ -17,6 +17,7 @@ describe('FallbackCompositionState', () => {
   var TEXT = 'Hello world';
 
   beforeEach(() => {
+    // TODO: can we express this test with only public API?
     FallbackCompositionState = require('FallbackCompositionState');
   });
 
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
index cda04a3502..c649dda7c6 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
@@ -30,8 +30,9 @@ describe('SelectEventPlugin', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
+    ReactTestUtils = require('react-dom/test-utils');
+    // TODO: can we express this test with only public API?
     ReactDOMComponentTree = require('ReactDOMComponentTree');
-    ReactTestUtils = require('ReactTestUtils');
     SelectEventPlugin = require('SelectEventPlugin');
   });
 
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
index 007b7e54f4..9fa060766d 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
@@ -36,7 +36,7 @@ describe('SimpleEventPlugin', function() {
   beforeEach(function() {
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     onClick = jest.fn();
   });
diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js
index 97f1a47f0c..50852b52a5 100644
--- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js
+++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js
@@ -17,6 +17,7 @@ describe('SyntheticClipboardEvent', () => {
   var createEvent;
 
   beforeEach(() => {
+    // TODO: can we express this test with only public API?
     SyntheticClipboardEvent = require('SyntheticClipboardEvent');
     createEvent = function(nativeEvent) {
       var target = require('getEventTarget')(nativeEvent);
diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js
index f6ed9cc775..f743efc75d 100644
--- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js
+++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js
@@ -20,10 +20,11 @@ describe('SyntheticEvent', () => {
   var createEvent;
 
   beforeEach(() => {
+    // TODO: can we express this test with only public API?
     SyntheticEvent = require('SyntheticEvent');
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     createEvent = function(nativeEvent) {
       var target = require('getEventTarget')(nativeEvent);
diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js
index 3b433e9184..7bd3d6c7b9 100644
--- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js
+++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js
@@ -22,6 +22,7 @@ describe('SyntheticKeyboardEvent', () => {
     jest.mock('getEventCharCode');
     getEventCharCode = require('getEventCharCode');
 
+    // TODO: can we express this test with only public API?
     SyntheticKeyboardEvent = require('SyntheticKeyboardEvent');
     createEvent = function(nativeEvent) {
       var target = require('getEventTarget')(nativeEvent);
diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js
index 393ccf3fc6..793822994a 100644
--- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js
+++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js
@@ -17,6 +17,7 @@ describe('SyntheticWheelEvent', () => {
   var createEvent;
 
   beforeEach(() => {
+    // TODO: can we express this test with only public API?
     SyntheticWheelEvent = require('SyntheticWheelEvent');
 
     createEvent = function(nativeEvent) {
diff --git a/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js b/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js
index f619093b8b..8ccf36691e 100644
--- a/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js
+++ b/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+// TODO: can we express this test with only public API?
 var getEventCharCode = require('getEventCharCode');
 
 describe('getEventCharCode', () => {
diff --git a/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js b/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js
index 81b370255d..ad776a3719 100644
--- a/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js
+++ b/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+// TODO: can we express this test with only public API?
 var getEventKey = require('getEventKey');
 
 describe('getEventKey', () => {
diff --git a/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js b/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js
index 27c7d1cd2d..af35794f2e 100644
--- a/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js
+++ b/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js
@@ -13,6 +13,7 @@
 
 var getTestDocument = require('getTestDocument');
 
+// TODO: can we express this test with only public API?
 var getNodeForCharacterOffset = require('getNodeForCharacterOffset');
 
 // Create node from HTML string
diff --git a/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js b/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js
index e89f9f142b..1f703f97e5 100644
--- a/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js
+++ b/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+// TODO: can we express this test with only public API?
 var setInnerHTML = require('setInnerHTML');
 var DOMNamespaces = require('DOMNamespaces');
 
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js
index 91bb091994..82ab667059 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js
@@ -19,7 +19,7 @@ describe('ReactDOMIframe', () => {
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should trigger load events', () => {
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index d1bce20e78..f69b3c91b1 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -38,7 +38,8 @@ describe('ReactDOMInput', () => {
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
+    // TODO: can we express this test with only public API?
     inputValueTracking = require('inputValueTracking');
     spyOn(console, 'error');
   });
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
index 8a1b157cd2..7d0dda61f0 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
@@ -25,7 +25,7 @@ describe('ReactDOMOption', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should flatten children to a string', () => {
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
index efd29196dd..5aa28eff34 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
@@ -23,7 +23,7 @@ describe('ReactDOMSelect', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should allow setting `defaultValue`', () => {
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
index 254973dcc7..dda7235c27 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
@@ -25,7 +25,7 @@ describe('ReactDOMTextarea', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
 
     renderTextarea = function(component, container) {
       if (!container) {
diff --git a/src/renderers/dom/test/__tests__/ReactTestUtils-test.js b/src/renderers/dom/test/__tests__/ReactTestUtils-test.js
index 2623e0fa89..624bc9c9fe 100644
--- a/src/renderers/dom/test/__tests__/ReactTestUtils-test.js
+++ b/src/renderers/dom/test/__tests__/ReactTestUtils-test.js
@@ -20,12 +20,12 @@ let ReactTestUtils;
 
 describe('ReactTestUtils', () => {
   beforeEach(() => {
-    createRenderer = require('ReactShallowRenderer').createRenderer;
+    createRenderer = require('react-test-renderer/shallow').createRenderer;
     PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
-    ReactTestUtils = require('ReactTestUtils');
+    ReactTestUtils = require('react-dom/test-utils');
   });
 
   it('should call all of the lifecycle hooks', () => {
diff --git a/src/renderers/native/__tests__/ReactNativeEvents-test.js b/src/renderers/native/__tests__/ReactNativeEvents-test.js
index 495f51338a..5a43e47c8d 100644
--- a/src/renderers/native/__tests__/ReactNativeEvents-test.js
+++ b/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -25,7 +25,7 @@ beforeEach(() => {
   PropTypes = require('prop-types');
   RCTEventEmitter = require('RCTEventEmitter');
   React = require('react');
-  ReactNative = require('ReactNative');
+  ReactNative = require('react-native');
   ResponderEventPlugin = require('ResponderEventPlugin');
   UIManager = require('UIManager');
   createReactNativeComponentClass = require('createReactNativeComponentClass');
diff --git a/src/renderers/native/__tests__/ReactNativeMount-test.js b/src/renderers/native/__tests__/ReactNativeMount-test.js
index 2328b49065..9b4556dbaa 100644
--- a/src/renderers/native/__tests__/ReactNativeMount-test.js
+++ b/src/renderers/native/__tests__/ReactNativeMount-test.js
@@ -21,7 +21,7 @@ describe('ReactNative', () => {
     jest.resetModules();
 
     React = require('react');
-    ReactNative = require('ReactNative');
+    ReactNative = require('react-native');
     UIManager = require('UIManager');
     createReactNativeComponentClass = require('createReactNativeComponentClass');
   });
diff --git a/src/renderers/native/__tests__/createReactNativeComponentClass-test.js b/src/renderers/native/__tests__/createReactNativeComponentClass-test.js
index 2a8b794e5b..58b7614ecd 100644
--- a/src/renderers/native/__tests__/createReactNativeComponentClass-test.js
+++ b/src/renderers/native/__tests__/createReactNativeComponentClass-test.js
@@ -21,8 +21,8 @@ describe('createReactNativeComponentClass', () => {
     jest.resetModules();
 
     createReactNativeComponentClass = require('createReactNativeComponentClass');
-    React = require('React');
-    ReactNative = require('ReactNative');
+    React = require('react');
+    ReactNative = require('react-native');
   });
 
   it('should register viewConfigs', () => {
diff --git a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
index f54d5c180e..a331ffcc44 100644
--- a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
@@ -20,7 +20,8 @@ describe('ReactCoroutine', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
+    // TODO: can we express this test with only public API?
     ReactCoroutine = require('ReactCoroutine');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
diff --git a/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js b/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js
index b39352987c..7d2b5fd11b 100644
--- a/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js
@@ -17,7 +17,8 @@ var ReactFiberReconciler;
 describe('ReactFiberHostContext', () => {
   beforeEach(() => {
     jest.resetModules();
-    React = require('React');
+    React = require('react');
+    // TODO: can we express this test with only public API?
     ReactFiberReconciler = require('ReactFiberReconciler');
   });
 
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index 5bfa7066cc..7b5e891b51 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -20,7 +20,7 @@ describe('ReactIncremental', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     PropTypes = require('prop-types');
 
     ReactFeatureFlags = require('ReactFeatureFlags');
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
index 6e9581c2b0..3bec2f0f52 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -21,7 +21,7 @@ describe('ReactIncrementalErrorHandling', () => {
     jest.resetModules();
     PropTypes = require('prop-types');
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
index 6504dac2bf..e18599b66e 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
@@ -116,11 +116,12 @@ describe('ReactDebugFiberPerf', () => {
     global.performance = createUserTimingPolyfill();
 
     // Import after the polyfill is set up:
-    React = require('React');
+    React = require('react');
+    ReactNoop = require('react-noop-renderer');
+    // TODO: can we express this test with only public API?
     ReactCoroutine = require('ReactCoroutine');
-    ReactFeatureFlags = require('ReactFeatureFlags');
-    ReactNoop = require('ReactNoop');
     ReactPortal = require('ReactPortal');
+    ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
     PropTypes = require('prop-types');
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
index 55a6227022..3181061fa8 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -19,7 +19,7 @@ describe('ReactIncrementalReflection', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
index 8bc9176ef3..f72737520a 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
@@ -19,7 +19,7 @@ describe('ReactIncrementalScheduling', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
index 43aa4e4980..7e0605ecea 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -19,7 +19,7 @@ describe('ReactIncrementalSideEffects', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
index 2483732fc1..39d92961f2 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
@@ -19,7 +19,7 @@ describe('ReactIncrementalUpdates', () => {
   beforeEach(() => {
     jest.resetModuleRegistry();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
index 5e051eda34..7f1fb9f3cc 100644
--- a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
@@ -21,7 +21,7 @@ describe('ReactTopLevelFragment', function() {
   beforeEach(function() {
     jest.resetModules();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
index 99e5c59b37..24ab990946 100644
--- a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
@@ -21,7 +21,7 @@ describe('ReactTopLevelText', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
-    ReactNoop = require('ReactNoop');
+    ReactNoop = require('react-noop-renderer');
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
   });
diff --git a/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js b/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
index cc8f6c45b6..9655291bcb 100644
--- a/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
+++ b/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js
@@ -17,6 +17,7 @@ describe('EventPluginRegistry', () => {
 
   beforeEach(() => {
     jest.resetModuleRegistry();
+    // TODO: can we express this test with only public API?
     EventPluginRegistry = require('EventPluginRegistry');
 
     createPlugin = function(properties) {
diff --git a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
index 336f76fde5..4a83a8bb35 100644
--- a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
+++ b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
@@ -383,6 +383,7 @@ describe('ResponderEventPlugin', () => {
   beforeEach(() => {
     jest.resetModules();
 
+    // TODO: can we express this test with only public API?
     EventPluginHub = require('EventPluginHub');
     EventPluginUtils = require('EventPluginUtils');
     ResponderEventPlugin = require('ResponderEventPlugin');
diff --git a/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js b/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
index ceb8c98be5..327e529011 100644
--- a/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
+++ b/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
@@ -15,6 +15,7 @@ var ReactErrorUtils;
 
 describe('ReactErrorUtils', () => {
   beforeEach(() => {
+    // TODO: can we express this test with only public API?
     ReactErrorUtils = require('ReactErrorUtils');
   });