diff --git a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
index 16a62ee39a7..b8e77a80770 100644
--- a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
+++ b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js
@@ -20,7 +20,7 @@ const RCTScrollView = requireNativeComponent('RCTScrollView');
 class ScrollViewMock extends React.Component {
   render() {
     return (
-      <RCTScrollView>
+      <RCTScrollView {...this.props}>
         {this.props.refreshControl}
         <View>
           {this.props.children}
diff --git a/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js b/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js
index dd34d6a68c4..a3e5e124537 100644
--- a/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js
+++ b/Libraries/CustomComponents/ListView/__mocks__/ListViewMock.js
@@ -14,7 +14,6 @@ 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;
@@ -48,11 +47,7 @@ class ListViewMock extends React.Component {
       }
     }
     renderFooter && rows.push(renderFooter());
-    return (
-      <View>
-        {this.props.renderScrollComponent({children: rows})}
-      </View>
-    );
+    return this.props.renderScrollComponent({...this.props, children: rows});
   }
   static DataSource = ListViewDataSource;
 }