diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
index a618361d47df..93739a272677 100644
--- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
@@ -9,21 +9,20 @@
 
 'use strict';
 
-var BatchedBridge = require('BatchedBridge');
-var React = require('React');
-var createReactClass = require('create-react-class');
-var View = require('View');
-var ScrollView = require('ScrollView');
-var Text = require('Text');
-var StyleSheet = require('StyleSheet');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var ScrollListener = require('NativeModules').ScrollListener;
-
-var NUM_ITEMS = 100;
+const BatchedBridge = require('BatchedBridge');
+const React = require('React');
+const View = require('View');
+const ScrollView = require('ScrollView');
+const Text = require('Text');
+const StyleSheet = require('StyleSheet');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const ScrollListener = require('NativeModules').ScrollListener;
+
+const NUM_ITEMS = 100;
 
 // Shared by integration tests for ScrollView and HorizontalScrollView
 
-var scrollViewApp;
+let scrollViewApp;
 
 class Item extends React.Component {
   render() {
@@ -37,7 +36,7 @@ class Item extends React.Component {
   }
 }
 
-var getInitialState = function() {
+const getInitialState = function() {
   var data = [];
   for (var i = 0; i < NUM_ITEMS; i++) {
     data[i] = {text: 'Item ' + i + '!'};
@@ -47,90 +46,84 @@ var getInitialState = function() {
   };
 };
 
-var onScroll = function(e) {
+const onScroll = function(e) {
   ScrollListener.onScroll(
     e.nativeEvent.contentOffset.x,
     e.nativeEvent.contentOffset.y,
   );
 };
 
-var onScrollBeginDrag = function(e) {
+const onScrollBeginDrag = function(e) {
   ScrollListener.onScrollBeginDrag(
     e.nativeEvent.contentOffset.x,
     e.nativeEvent.contentOffset.y,
   );
 };
 
-var onScrollEndDrag = function(e) {
+const onScrollEndDrag = function(e) {
   ScrollListener.onScrollEndDrag(
     e.nativeEvent.contentOffset.x,
     e.nativeEvent.contentOffset.y,
   );
 };
 
-var onItemPress = function(itemNumber) {
+const onItemPress = function(itemNumber) {
   ScrollListener.onItemPress(itemNumber);
 };
 
-var ScrollViewTestApp = createReactClass({
-  displayName: 'ScrollViewTestApp',
-  getInitialState: getInitialState,
-  onScroll: onScroll,
-  onItemPress: onItemPress,
-  onScrollBeginDrag: onScrollBeginDrag,
-  onScrollEndDrag: onScrollEndDrag,
+class ScrollViewTestApp extends React.Component {
+  scrollView = React.createRef();
+  state = getInitialState();
 
-  scrollTo: function(destX, destY) {
-    this.refs.scrollView.scrollTo(destY, destX);
-  },
+  scrollTo = (destX, destY) => {
+    this.scrollView.scrollTo(destY, destX);
+  };
 
-  render: function() {
+  render() {
     scrollViewApp = this;
     var children = this.state.data.map((item, index) => (
       <Item
         key={index}
         text={item.text}
-        onPress={this.onItemPress.bind(this, index)}
+        onPress={onItemPress.bind(this, index)}
       />
     ));
     return (
       <ScrollView
-        onScroll={this.onScroll}
-        onScrollBeginDrag={this.onScrollBeginDrag}
-        onScrollEndDrag={this.onScrollEndDrag}
-        ref="scrollView">
+        onScroll={onScroll}
+        onScrollBeginDrag={onScrollBeginDrag}
+        onScrollEndDrag={onScrollEndDrag}
+        ref={this.scrollView}>
         {children}
       </ScrollView>
     );
-  },
-});
+  }
+}
 
-var HorizontalScrollViewTestApp = createReactClass({
-  displayName: 'HorizontalScrollViewTestApp',
-  getInitialState: getInitialState,
-  onScroll: onScroll,
-  onItemPress: onItemPress,
+class HorizontalScrollViewTestApp extends React.Component {
+  scrollView = React.createRef();
+  state = getInitialState();
 
-  scrollTo: function(destX, destY) {
-    this.refs.scrollView.scrollTo(destY, destX);
-  },
+  scrollTo = (destX, destY) => {
+    this.scrollView.scrollTo(destY, destX);
+  };
 
-  render: function() {
+  render() {
     scrollViewApp = this;
     var children = this.state.data.map((item, index) => (
       <Item
         key={index}
         text={item.text}
-        onPress={this.onItemPress.bind(this, index)}
+        onPress={onItemPress.bind(this, index)}
       />
     ));
     return (
-      <ScrollView horizontal={true} onScroll={this.onScroll} ref="scrollView">
+      <ScrollView horizontal={true} onScroll={onScroll} ref={this.scrollView}>
         {children}
       </ScrollView>
     );
-  },
-});
+  }
+}
 
 var styles = StyleSheet.create({
   item_container: {