diff --git a/package.json b/package.json
index 3027c7e772..df46fd3a29 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "jest": "^15.1.1",
     "react": "^15.0.0-rc.1",
     "react-dom": "^15.0.0-rc.1",
+    "react-test-renderer": "^15.5.4",
     "run-sequence": "^1.1.2",
     "through2": "^2.0.1",
     "vinyl-buffer": "^1.0.0",
diff --git a/src/component/base/__tests__/DraftEditor.react-test.js b/src/component/base/__tests__/DraftEditor.react-test.js
index 8dc9672b8a..10fb433597 100644
--- a/src/component/base/__tests__/DraftEditor.react-test.js
+++ b/src/component/base/__tests__/DraftEditor.react-test.js
@@ -14,10 +14,11 @@
 
 jest
   .unmock('DraftEditor.react')
+  .unmock('react-test-renderer/shallow')
   .unmock('generateRandomKey');
 
 var React = require('React');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactShallowRenderer = require('react-test-renderer/shallow');
 
 var DraftEditor = require('DraftEditor.react');
 
@@ -25,7 +26,7 @@ describe('DraftEditor.react', () => {
   var shallow;
 
   beforeEach(function() {
-    shallow = ReactTestUtils.createRenderer();
+    shallow = new ReactShallowRenderer();
   });
 
   describe('Basic rendering', () => {
diff --git a/src/component/contents/__tests__/DraftEditorBlock.react-test.js b/src/component/contents/__tests__/DraftEditorBlock.react-test.js
index 9a6991c992..9f45989bcc 100644
--- a/src/component/contents/__tests__/DraftEditorBlock.react-test.js
+++ b/src/component/contents/__tests__/DraftEditorBlock.react-test.js
@@ -39,11 +39,11 @@ var {BOLD, NONE, ITALIC} = SampleDraftInlineStyle;
 
 var mockGetDecorations = jest.fn();
 
-var DecoratorSpan = React.createClass({
+class DecoratorSpan extends React.Component {
   render() {
     return <span>{this.props.children}</span>;
-  },
-});
+  }
+}
 
 var DraftEditorBlock = require('DraftEditorBlock.react');
 
@@ -61,13 +61,14 @@ class Decorator {
 }
 
 var mockLeafRender = jest.fn(() => <span />);
+class MockEditorLeaf extends React.Component {
+  render() {
+    return mockLeafRender();
+  }
+}
 jest.setMock(
   'DraftEditorLeaf.react',
-  React.createClass({
-    render: function() {
-      return mockLeafRender();
-    },
-  }),
+  MockEditorLeaf,
 );
 
 var DraftEditorLeaf = require('DraftEditorLeaf.react');