diff --git a/packages/react-navigation/src/navigators/__tests__/SwitchNavigator-test.js b/packages/react-navigation/src/navigators/__tests__/SwitchNavigator-test.js
index e9717926..b399489d 100644
--- a/packages/react-navigation/src/navigators/__tests__/SwitchNavigator-test.js
+++ b/packages/react-navigation/src/navigators/__tests__/SwitchNavigator-test.js
@@ -2,7 +2,8 @@ import React from 'react';
 import { View } from 'react-native';
 import renderer from 'react-test-renderer';
 
-import SwitchNavigator from '../createContainedSwitchNavigator';
+import { createSwitchNavigator } from '@react-navigation/core';
+import { createAppContainer } from '@react-navigation/native';
 
 const A = () => <View />;
 const B = () => <View />;
@@ -10,8 +11,9 @@ const routeConfig = { A, B };
 
 describe('SwitchNavigator', () => {
   it('renders successfully', () => {
-    const MySwitchNavigator = SwitchNavigator(routeConfig);
-    const rendered = renderer.create(<MySwitchNavigator />).toJSON();
+    const MySwitchNavigator = createSwitchNavigator(routeConfig);
+    const App = createAppContainer(MySwitchNavigator);
+    const rendered = renderer.create(<App />).toJSON();
 
     expect(rendered).toMatchSnapshot();
   });
diff --git a/packages/react-navigation/src/navigators/__tests__/TabNavigator-test.js b/packages/react-navigation/src/navigators/__tests__/TabNavigator-test.js
deleted file mode 100644
index 200bc75b..00000000
--- a/packages/react-navigation/src/navigators/__tests__/TabNavigator-test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { Component } from 'react';
-import renderer from 'react-test-renderer';
-
-const {
-  createTabNavigator,
-} = require('react-navigation-deprecated-tab-navigator');
-
-class HomeScreen extends Component {
-  static navigationOptions = ({ navigation }) => ({
-    title: `Welcome ${
-      navigation.state.params ? navigation.state.params.user : 'anonymous'
-    }`,
-    gesturesEnabled: true,
-  });
-
-  render() {
-    return null;
-  }
-}
-
-const routeConfig = {
-  Home: {
-    screen: HomeScreen,
-  },
-};
-
-describe('TabNavigator', () => {
-  it('renders successfully', () => {
-    const MyTabNavigator = createTabNavigator(routeConfig);
-    const rendered = renderer.create(<MyTabNavigator />).toJSON();
-
-    expect(rendered).toMatchSnapshot();
-  });
-});
diff --git a/packages/react-navigation/src/navigators/__tests__/__snapshots__/TabNavigator-test.js.snap b/packages/react-navigation/src/navigators/__tests__/__snapshots__/TabNavigator-test.js.snap
deleted file mode 100644
index 985ea0df..00000000
--- a/packages/react-navigation/src/navigators/__tests__/__snapshots__/TabNavigator-test.js.snap
+++ /dev/null
@@ -1,209 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TabNavigator renders successfully 1`] = `
-<View
-  collapsable={false}
-  style={
-    Array [
-      Object {
-        "flex": 1,
-        "overflow": "hidden",
-      },
-      Object {
-        "flex": 1,
-      },
-    ]
-  }
->
-  <View
-    onLayout={[Function]}
-    style={
-      Object {
-        "flex": 1,
-      }
-    }
-  >
-    <View
-      collapsable={undefined}
-      onMoveShouldSetResponder={[Function]}
-      onMoveShouldSetResponderCapture={[Function]}
-      onResponderEnd={[Function]}
-      onResponderGrant={[Function]}
-      onResponderMove={[Function]}
-      onResponderReject={[Function]}
-      onResponderRelease={[Function]}
-      onResponderStart={[Function]}
-      onResponderTerminate={[Function]}
-      onResponderTerminationRequest={[Function]}
-      onStartShouldSetResponder={[Function]}
-      onStartShouldSetResponderCapture={[Function]}
-      style={
-        Object {
-          "alignItems": "stretch",
-          "flex": 1,
-          "flexDirection": "row",
-        }
-      }
-    >
-      <View
-        style={
-          Object {
-            "bottom": 0,
-            "left": 0,
-            "position": "absolute",
-            "right": 0,
-            "top": 0,
-          }
-        }
-        testID={undefined}
-      >
-        <View
-          collapsable={false}
-          removeClippedSubviews={false}
-          style={
-            Object {
-              "flex": 1,
-              "overflow": "hidden",
-            }
-          }
-        >
-          <View
-            style={
-              Object {
-                "flex": 1,
-              }
-            }
-          />
-        </View>
-      </View>
-    </View>
-  </View>
-  <View
-    collapsable={undefined}
-    style={undefined}
-  >
-    <View
-      collapsable={undefined}
-      onLayout={[Function]}
-      pointerEvents="box-none"
-      style={
-        Object {
-          "backgroundColor": "#F7F7F7",
-          "borderTopColor": "rgba(0, 0, 0, .3)",
-          "borderTopWidth": 0.5,
-          "flexDirection": "row",
-          "height": 49,
-          "paddingBottom": 0,
-          "paddingLeft": 0,
-          "paddingRight": 0,
-          "paddingTop": 0,
-        }
-      }
-    >
-      <View
-        accessibilityComponentType={undefined}
-        accessibilityLabel={undefined}
-        accessibilityTraits={undefined}
-        accessible={true}
-        collapsable={undefined}
-        hitSlop={undefined}
-        nativeID={undefined}
-        onLayout={undefined}
-        onResponderGrant={[Function]}
-        onResponderMove={[Function]}
-        onResponderRelease={[Function]}
-        onResponderTerminate={[Function]}
-        onResponderTerminationRequest={[Function]}
-        onStartShouldSetResponder={[Function]}
-        style={
-          Object {
-            "alignItems": "center",
-            "backgroundColor": "rgba(0, 0, 0, 0)",
-            "flex": 1,
-          }
-        }
-        testID={undefined}
-      >
-        <View
-          style={
-            Array [
-              Object {
-                "alignItems": "center",
-                "flex": 1,
-              },
-              Object {
-                "flexDirection": "column",
-                "justifyContent": "flex-end",
-              },
-              undefined,
-            ]
-          }
-        >
-          <View
-            style={
-              Array [
-                Object {
-                  "height": 29,
-                },
-                false,
-                Object {
-                  "flex": 1,
-                },
-              ]
-            }
-          >
-            <View
-              collapsable={undefined}
-              style={
-                Object {
-                  "alignItems": "center",
-                  "alignSelf": "center",
-                  "height": "100%",
-                  "justifyContent": "center",
-                  "minWidth": 30,
-                  "opacity": 1,
-                  "position": "absolute",
-                  "width": "100%",
-                }
-              }
-            />
-            <View
-              collapsable={undefined}
-              style={
-                Object {
-                  "alignItems": "center",
-                  "alignSelf": "center",
-                  "height": "100%",
-                  "justifyContent": "center",
-                  "minWidth": 30,
-                  "opacity": 0,
-                  "position": "absolute",
-                  "width": "100%",
-                }
-              }
-            />
-          </View>
-          <Text
-            accessible={true}
-            allowFontScaling={true}
-            collapsable={undefined}
-            ellipsizeMode="tail"
-            numberOfLines={1}
-            style={
-              Object {
-                "backgroundColor": "transparent",
-                "color": "rgba(52, 120, 246, 1)",
-                "fontSize": 10,
-                "marginBottom": 1.5,
-                "textAlign": "center",
-              }
-            }
-          >
-            Welcome anonymous
-          </Text>
-        </View>
-      </View>
-    </View>
-  </View>
-</View>
-`;
diff --git a/packages/react-navigation/src/navigators/createContainedSwitchNavigator.js b/packages/react-navigation/src/navigators/createContainedSwitchNavigator.js
deleted file mode 100644
index 8aa8a96c..00000000
--- a/packages/react-navigation/src/navigators/createContainedSwitchNavigator.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createNavigationContainer } from '@react-navigation/native';
-import { createSwitchNavigator } from '@react-navigation/core';
-
-const SwitchNavigator = (routeConfigs, config = {}) => {
-  const navigator = createSwitchNavigator(routeConfigs, config);
-  return createNavigationContainer(navigator);
-};
-
-export default SwitchNavigator;