diff --git a/mocks/ReactElementTestChild.js b/mocks/ReactElementTestChild.js
new file mode 100644
index 0000000000..39c8795462
--- /dev/null
+++ b/mocks/ReactElementTestChild.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactElementTestChild
+ */
+
+'use strict';
+
+var React = require('React');
+
+var Child = React.createClass({
+  render: function() {
+    return React.createElement('div');
+  },
+});
+
+module.exports = Child;
diff --git a/mocks/ReactMockedComponentTestComponent.js b/mocks/ReactMockedComponentTestComponent.js
new file mode 100644
index 0000000000..aae3e20a64
--- /dev/null
+++ b/mocks/ReactMockedComponentTestComponent.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactMockedComponentTestComponent
+ */
+
+'use strict';
+
+var React = require('React');
+
+var ReactMockedComponentTestComponent = React.createClass({
+  getDefaultProps: function() {
+    return {bar: 'baz'};
+  },
+
+  getInitialState: function() {
+    return {foo: 'bar'};
+  },
+
+  hasCustomMethod: function() {
+    return true;
+  },
+
+  render: function() {
+    return <span />;
+  },
+
+});
+
+module.exports = ReactMockedComponentTestComponent;
diff --git a/package.json b/package.json
index 5abb0a59b8..38f88b4bbe 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     ],
     "testPathDirs": [
       "<rootDir>/eslint-rules",
+      "<rootDir>/mocks",
       "<rootDir>/src",
       "node_modules/fbjs"
     ],
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index 617ceed237..a3f42e7059 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -369,23 +369,14 @@ describe('ReactElement', function() {
 });
 
 describe('comparing jsx vs .createFactory() vs .createElement()', function() {
-  var Child, mocks;
+  var Child;
 
   beforeEach(function() {
     jest.resetModuleRegistry();
-    mocks = require('mocks');
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactTestUtils = require('ReactTestUtils');
-
-    var metaData = mocks.getMetadata(React.createClass({
-      render: function() {
-        return React.createElement('div');
-      },
-    }));
-
-    Child = mocks.generateFromMetadata(metaData);
-
+    Child = jest.genMockFromModule('ReactElementTestChild');
   });
 
 
diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
index 5242273b37..18e43f6577 100644
--- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
@@ -15,8 +15,6 @@ describe('DOMPropertyOperations', function() {
   var DOMPropertyOperations;
   var DOMProperty;
 
-  var mocks;
-
   beforeEach(function() {
     jest.resetModuleRegistry();
     var ReactDefaultInjection = require('ReactDefaultInjection');
@@ -24,8 +22,6 @@ describe('DOMPropertyOperations', function() {
 
     DOMPropertyOperations = require('DOMPropertyOperations');
     DOMProperty = require('DOMProperty');
-
-    mocks = require('mocks');
   });
 
   describe('createMarkupForProperty', function() {
diff --git a/src/renderers/shared/reconciler/__tests__/ReactComponent-test.js b/src/renderers/shared/reconciler/__tests__/ReactComponent-test.js
index 1244d4e762..31ea0f19ad 100644
--- a/src/renderers/shared/reconciler/__tests__/ReactComponent-test.js
+++ b/src/renderers/shared/reconciler/__tests__/ReactComponent-test.js
@@ -15,11 +15,8 @@ var React;
 var ReactDOM;
 var ReactTestUtils;
 
-var mocks;
-
 describe('ReactComponent', function() {
   beforeEach(function() {
-    mocks = require('mocks');
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/shared/reconciler/__tests__/ReactMockedComponent-test.js b/src/renderers/shared/reconciler/__tests__/ReactMockedComponent-test.js
index 5d10bbdbf7..fb0f482dbf 100644
--- a/src/renderers/shared/reconciler/__tests__/ReactMockedComponent-test.js
+++ b/src/renderers/shared/reconciler/__tests__/ReactMockedComponent-test.js
@@ -14,43 +14,17 @@
 var React;
 var ReactTestUtils;
 
-var mocks;
-
-var OriginalComponent;
 var AutoMockedComponent;
 var MockedComponent;
 
 describe('ReactMockedComponent', function() {
 
   beforeEach(function() {
-    mocks = require('mocks');
-
     React = require('React');
     ReactTestUtils = require('ReactTestUtils');
 
-    OriginalComponent = React.createClass({
-      getDefaultProps: function() {
-        return {bar: 'baz'};
-      },
-
-      getInitialState: function() {
-        return {foo: 'bar'};
-      },
-
-      hasCustomMethod: function() {
-        return true;
-      },
-
-      render: function() {
-        return <span />;
-      },
-
-    });
-
-    var metaData = mocks.getMetadata(OriginalComponent);
-
-    AutoMockedComponent = mocks.generateFromMetadata(metaData);
-    MockedComponent = mocks.generateFromMetadata(metaData);
+    AutoMockedComponent = jest.genMockFromModule('ReactMockedComponentTestComponent');
+    MockedComponent = jest.genMockFromModule('ReactMockedComponentTestComponent');
 
     ReactTestUtils.mockComponent(MockedComponent);
   });
diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js
index ce84a23dda..00a6b5c0ce 100644
--- a/src/test/__tests__/ReactTestUtils-test.js
+++ b/src/test/__tests__/ReactTestUtils-test.js
@@ -16,13 +16,9 @@ var ReactDOM;
 var ReactDOMServer;
 var ReactTestUtils;
 
-var mocks;
-
 describe('ReactTestUtils', function() {
 
   beforeEach(function() {
-    mocks = require('mocks');
-
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactDOMServer = require('ReactDOMServer');