diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index 531e711846f70..01d2e9eeae0e9 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -27,6 +27,7 @@
     "README.md",
     "index.js",
     "shallow.js",
+    "stack.js",
     "cjs/"
   ]
 }
diff --git a/packages/react-test-renderer/stack.js b/packages/react-test-renderer/stack.js
new file mode 100644
index 0000000000000..795f00d9ae558
--- /dev/null
+++ b/packages/react-test-renderer/stack.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  throw Error('test renderer is not available in production mode.');
+} else {
+  module.exports = require('./cjs/react-test-renderer-stack.development');
+}
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 7d90027c59339..58b7dc14ad607 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -361,7 +361,7 @@ const bundles = [
   },
   {
     babelOpts: babelOptsReact,
-    bundleTypes: [FB_DEV],
+    bundleTypes: [FB_DEV, NODE_DEV],
     config: {
       destDir: 'build/',
       moduleName: 'ReactTestRenderer',
@@ -374,7 +374,7 @@ const bundles = [
     isRenderer: true,
     label: 'test-stack',
     manglePropertiesOnProd: false,
-    name: 'react-test-renderer-stack',
+    name: 'react-test-renderer/stack',
     paths: [
       'src/renderers/native/**/*.js',
       'src/renderers/shared/**/*.js',
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index a0ff8930ab3b4..ceb52dfa68d35 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -100,7 +100,7 @@ if (__DEV__) {
     return mixin;
   };
 
-  // TODO (bvaughn) Remove both of these deprecation warnings before 16.0.0
+  // TODO (bvaughn) Remove all of these accessors before 16.0.0
   if (canDefineProperty) {
     Object.defineProperty(React, 'checkPropTypes', {
       get() {
@@ -113,7 +113,7 @@ if (__DEV__) {
             '(https://fb.me/migrating-from-react-proptypes)',
         );
         warnedForCheckPropTypes = true;
-        return ReactPropTypes;
+        return checkPropTypes;
       },
     });