diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js
index c80520fad..662246770 100644
--- a/Libraries/Components/RefreshControl/RefreshControl.js
+++ b/Libraries/Components/RefreshControl/RefreshControl.js
@@ -152,7 +152,7 @@ const RefreshControl = React.createClass({
     return (
       <NativeRefreshControl
         {...this.props}
-        ref={ref => this._nativeRef = ref}
+        ref={ref => {this._nativeRef = ref;}}
         onRefresh={this._onRefresh}
       />
     );
diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
new file mode 100644
index 000000000..e5cd5b83a
--- /dev/null
+++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2015-present, 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.
+ *
+ * @flow
+ */
+'use strict';
+
+const React = require('React');
+
+const requireNativeComponent = require('requireNativeComponent');
+
+const RCTRefreshControl = requireNativeComponent('RCTRefreshControl');
+
+class RefreshControlMock extends React.Component {
+  static latestRef: ?RefreshControlMock;
+  componentDidMount() {
+    RefreshControlMock.latestRef = this;
+  }
+  render() {
+    return <RCTRefreshControl />;
+  }
+}
+
+module.exports = RefreshControlMock;
diff --git a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
new file mode 100644
index 000000000..16a62ee39
--- /dev/null
+++ b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2013-present, 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.
+ *
+ * @flow
+ */
+'use strict';
+
+const React = require('React');
+const View = require('View');
+
+const requireNativeComponent = require('requireNativeComponent');
+
+const RCTScrollView = requireNativeComponent('RCTScrollView');
+
+class ScrollViewMock extends React.Component {
+  render() {
+    return (
+      <RCTScrollView>
+        {this.props.refreshControl}
+        <View>
+          {this.props.children}
+        </View>
+      </RCTScrollView>
+    );
+  }
+}
+
+module.exports = ScrollViewMock;
diff --git a/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js b/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js
new file mode 100644
index 000000000..dd34d6a68
--- /dev/null
+++ b/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2013-present, 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.
+ *
+ * @flow
+ */
+'use strict';
+
+const ListViewDataSource = require('ListViewDataSource');
+const React = require('React');
+const ScrollView = require('ScrollView');
+const StaticRenderer = require('StaticRenderer');
+const View = require('View');
+
+class ListViewMock extends React.Component {
+  static latestRef: ?ListViewMock;
+  static defaultProps = {
+    renderScrollComponent: (props) => <ScrollView {...props} />,
+  }
+  componentDidMount() {
+    ListViewMock.latestRef = this;
+  }
+  render() {
+    const {dataSource, renderFooter, renderHeader} = this.props;
+    const rows = [renderHeader && renderHeader()];
+    const allRowIDs = dataSource.rowIdentities;
+    for (let sectionIdx = 0; sectionIdx < allRowIDs.length; sectionIdx++) {
+      const sectionID = dataSource.sectionIdentities[sectionIdx];
+      const rowIDs = allRowIDs[sectionIdx];
+      for (let rowIdx = 0; rowIdx < rowIDs.length; rowIdx++) {
+        const rowID = rowIDs[rowIdx];
+        rows.push(
+          <StaticRenderer
+            key={rowID}
+            shouldUpdate={true}
+            render={this.props.renderRow.bind(
+              null,
+              dataSource.getRowData(sectionIdx, rowIdx),
+              sectionID,
+              rowID
+            )}
+          />
+        );
+      }
+    }
+    renderFooter && rows.push(renderFooter());
+    return (
+      <View>
+        {this.props.renderScrollComponent({children: rows})}
+      </View>
+    );
+  }
+  static DataSource = ListViewDataSource;
+}
+
+module.exports = ListViewMock;
diff --git a/jest/setup.js b/jest/setup.js
index cab0eb220..e55970205 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -33,17 +33,13 @@ jest
   .mock('TextInput', () => mockComponent('TextInput'))
   .mock('Modal', () => mockComponent('Modal'))
   .mock('View', () => mockComponent('View'))
-  .mock('ScrollView', () => mockComponent('ScrollView'))
+  .mock('RefreshControl', () => require.requireMock('RefreshControlMock'))
+  .mock('ScrollView', () => require.requireMock('ScrollViewMock'))
   .mock(
     'ActivityIndicator',
     () => mockComponent('ActivityIndicator'),
   )
-  .mock('ListView', () => {
-    const RealListView = require.requireActual('ListView');
-    const ListView = mockComponent('ListView');
-    ListView.prototype.render = RealListView.prototype.render;
-    return ListView;
-  })
+  .mock('ListView', () => require.requireMock('ListViewMock'))
   .mock('ListViewDataSource', () => {
     const DataSource = require.requireActual('ListViewDataSource');
     DataSource.prototype.toJSON = function() {