diff --git a/RNTester/e2e/__tests__/Button-test.js b/RNTester/e2e/__tests__/Button-test.js
new file mode 100644
index 0000000000..47e211ab79
--- /dev/null
+++ b/RNTester/e2e/__tests__/Button-test.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+react_native
+ * @format
+ */
+
+/* global element, by, expect */
+
+describe('Button', () => {
+  beforeAll(async () => {
+    await element(by.id('explorer_search')).replaceText('<Button>');
+    await element(
+      by.label('<Button> Simple React Native button component.'),
+    ).tap();
+  });
+
+  afterAll(async () => {
+    //TODO - remove app state persistency, till then, we must go back to main screen,
+    await element(by.label('Back')).tap();
+  });
+
+  it('Simple button should be tappable', async () => {
+    await element(by.label('Press Me')).tap();
+    await expect(element(by.text('Simple has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
+
+  it('Adjusted color button should be tappable', async () => {
+    await element(by.label('Press Purple')).tap();
+    await expect(element(by.text('Purple has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
+
+  it("Two buttons with JustifyContent:'space-between' should be tappable", async () => {
+    await element(by.label('This looks great!')).tap();
+    await expect(element(by.text('Left has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+
+    await element(by.label('Ok!')).tap();
+    await expect(element(by.text('Right has been pressed!'))).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
+
+  it('Disabled button should not interact', async () => {
+    await element(by.label('I Am Disabled')).tap();
+    await expect(
+      element(by.text('Disabled has been pressed!')),
+    ).toBeNotVisible();
+  });
+});
diff --git a/RNTester/e2e/__tests__/Switch-test.js b/RNTester/e2e/__tests__/Switch-test.js
new file mode 100644
index 0000000000..e6a8bc287b
--- /dev/null
+++ b/RNTester/e2e/__tests__/Switch-test.js
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+react_native
+ * @format
+ */
+
+/* global element, by, expect */
+
+const jestExpect = require('expect');
+
+describe('Switch', () => {
+  beforeAll(async () => {
+    await element(by.id('explorer_search')).replaceText('<Switch>');
+    await element(by.label('<Switch> Native boolean input')).tap();
+  });
+
+  afterAll(async () => {
+    await element(by.label('Back')).tap();
+  });
+
+  it('Switch that starts on should switch', async () => {
+    const testID = 'on-off-initial-off';
+    const indicatorID = 'on-off-initial-off-indicator';
+
+    await expect(element(by.id(testID))).toHaveValue('0');
+    await expect(element(by.id(indicatorID))).toHaveText('Off');
+    await element(by.id(testID)).tap();
+    await expect(element(by.id(testID))).toHaveValue('1');
+    await expect(element(by.id(indicatorID))).toHaveText('On');
+  });
+
+  it('Switch that starts off should switch', async () => {
+    const testID = 'on-off-initial-on';
+    const indicatorID = 'on-off-initial-on-indicator';
+
+    await expect(element(by.id(testID))).toHaveValue('1');
+    await expect(element(by.id(indicatorID))).toHaveText('On');
+    await element(by.id(testID)).tap();
+    await expect(element(by.id(testID))).toHaveValue('0');
+    await expect(element(by.id(indicatorID))).toHaveText('Off');
+  });
+
+  it('disabled switch should not toggle', async () => {
+    const onTestID = 'disabled-initial-on';
+    const offTestID = 'disabled-initial-off';
+    const onIndicatorID = 'disabled-initial-on-indicator';
+    const offIndicatorID = 'disabled-initial-off-indicator';
+
+    await expect(element(by.id(onTestID))).toHaveValue('1');
+    await expect(element(by.id(onIndicatorID))).toHaveText('On');
+
+    try {
+      await element(by.id(onTestID)).tap();
+      throw new Error('Does not match');
+    } catch (err) {
+      jestExpect(err.message.message).toEqual(
+        jestExpect.stringContaining(
+          'Cannot perform action due to constraint(s) failure',
+        ),
+      );
+    }
+    await expect(element(by.id(onTestID))).toHaveValue('1');
+    await expect(element(by.id(onIndicatorID))).toHaveText('On');
+
+    await expect(element(by.id(offTestID))).toHaveValue('0');
+    await expect(element(by.id(offIndicatorID))).toHaveText('Off');
+    try {
+      await element(by.id(offTestID)).tap();
+      throw new Error('Does not match');
+    } catch (err) {
+      jestExpect(err.message.message).toEqual(
+        jestExpect.stringContaining(
+          'Cannot perform action due to constraint(s) failure',
+        ),
+      );
+    }
+    await expect(element(by.id(offTestID))).toHaveValue('0');
+    await expect(element(by.id(offIndicatorID))).toHaveText('Off');
+  });
+});
diff --git a/RNTester/js/SwitchExample.js b/RNTester/js/SwitchExample.js
index eeca71fa64..8c698e3705 100644
--- a/RNTester/js/SwitchExample.js
+++ b/RNTester/js/SwitchExample.js
@@ -11,10 +11,37 @@
 'use strict';
 
 const React = require('react');
-const ReactNative = require('react-native');
-const {Switch, Text, View} = ReactNative;
+const {Switch, Text, View} = require('react-native');
 
-class BasicSwitchExample extends React.Component<{}, $FlowFixMeState> {
+type OnOffIndicatorProps = $ReadOnly<{|on: boolean, testID: string|}>;
+function OnOffIndicator({on, testID}: OnOffIndicatorProps) {
+  return <Text testID={testID}>{on ? 'On' : 'Off'}</Text>;
+}
+
+type ExampleRowProps = $ReadOnly<{|children: React.Node|}>;
+function ExampleRow({children}: ExampleRowProps) {
+  return (
+    <View
+      style={{
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        marginBottom: 10,
+      }}>
+      {children}
+    </View>
+  );
+}
+
+type SimpleSwitchExampleState = $ReadOnly<{|
+  trueSwitchIsOn: boolean,
+  falseSwitchIsOn: boolean,
+|}>;
+
+class BasicSwitchExample extends React.Component<
+  {||},
+  SimpleSwitchExampleState,
+> {
   state = {
     trueSwitchIsOn: true,
     falseSwitchIsOn: false,
@@ -23,26 +50,72 @@ class BasicSwitchExample extends React.Component<{}, $FlowFixMeState> {
   render() {
     return (
       <View>
-        <Switch
-          onValueChange={value => this.setState({falseSwitchIsOn: value})}
-          style={{marginBottom: 10}}
-          value={this.state.falseSwitchIsOn}
-        />
-        <Switch
-          onValueChange={value => this.setState({trueSwitchIsOn: value})}
-          value={this.state.trueSwitchIsOn}
-        />
+        <ExampleRow>
+          <Switch
+            testID="on-off-initial-off"
+            onValueChange={value => this.setState({falseSwitchIsOn: value})}
+            value={this.state.falseSwitchIsOn}
+          />
+          <OnOffIndicator
+            on={this.state.falseSwitchIsOn}
+            testID="on-off-initial-off-indicator"
+          />
+        </ExampleRow>
+        <ExampleRow>
+          <Switch
+            testID="on-off-initial-on"
+            onValueChange={value => this.setState({trueSwitchIsOn: value})}
+            value={this.state.trueSwitchIsOn}
+          />
+          <OnOffIndicator
+            on={this.state.trueSwitchIsOn}
+            testID="on-off-initial-on-indicator"
+          />
+        </ExampleRow>
       </View>
     );
   }
 }
 
-class DisabledSwitchExample extends React.Component<{}> {
+class DisabledSwitchExample extends React.Component<
+  {||},
+  SimpleSwitchExampleState,
+> {
+  state = {
+    trueSwitchIsOn: true,
+    falseSwitchIsOn: false,
+  };
+
   render() {
     return (
       <View>
-        <Switch disabled={true} style={{marginBottom: 10}} value={true} />
-        <Switch disabled={true} value={false} />
+        <ExampleRow>
+          <Switch
+            testID="disabled-initial-off"
+            disabled={true}
+            onValueChange={value => this.setState({falseSwitchIsOn: value})}
+            value={this.state.falseSwitchIsOn}
+          />
+
+          <OnOffIndicator
+            on={this.state.falseSwitchIsOn}
+            testID="disabled-initial-off-indicator"
+          />
+        </ExampleRow>
+
+        <ExampleRow>
+          <Switch
+            testID="disabled-initial-on"
+            disabled={true}
+            onValueChange={value => this.setState({trueSwitchIsOn: value})}
+            value={this.state.trueSwitchIsOn}
+          />
+
+          <OnOffIndicator
+            on={this.state.trueSwitchIsOn}
+            testID="disabled-initial-on-indicator"
+          />
+        </ExampleRow>
       </View>
     );
   }