diff --git a/RNTester/RNTester.xcodeproj/project.pbxproj b/RNTester/RNTester.xcodeproj/project.pbxproj
index ad636c816..f25ba253c 100644
--- a/RNTester/RNTester.xcodeproj/project.pbxproj
+++ b/RNTester/RNTester.xcodeproj/project.pbxproj
@@ -1911,7 +1911,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				BUNDLE_CONFIG = "$(SRCROOT)/../rn-cli.config.js";
+				BUNDLE_CONFIG = "$(SRCROOT)/../metro.config.js";
 				DEVELOPMENT_TEAM = VYK7DLU38Z;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../third-party/boost_1_63_0",
@@ -1932,7 +1932,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				BUNDLE_CONFIG = "$(SRCROOT)/../rn-cli.config.js";
+				BUNDLE_CONFIG = "$(SRCROOT)/../metro.config.js";
 				DEVELOPMENT_TEAM = VYK7DLU38Z;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../third-party/boost_1_63_0",
diff --git a/package.json b/package.json
index 81ee755b2..ea4e06c0b 100644
--- a/package.json
+++ b/package.json
@@ -135,8 +135,8 @@
     "react": "16.8.3",
     "react-test-renderer": "16.8.3",
     "shelljs": "^0.7.8",
-    "yargs": "^9.0.0",
-    "ws": "^6.1.4"
+    "ws": "^6.1.4",
+    "yargs": "^9.0.0"
   },
   "detox": {
     "test-runner": "jest",
diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh
index e4d871c7f..16c959513 100755
--- a/scripts/react-native-xcode.sh
+++ b/scripts/react-native-xcode.sh
@@ -94,8 +94,8 @@ if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
 fi
 
 # check and assign NODE_BINARY env
-# shellcheck disable=SC1091
-source './node-binary.sh'
+# shellcheck source=/dev/null
+source "$REACT_NATIVE_DIR/scripts/node-binary.sh"
 
 [ -z "$NODE_ARGS" ] && export NODE_ARGS=""
 
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index c39f4455b..165292127 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -64,6 +64,23 @@ try {
     }
   }
 
+  if (argv.js) {
+    if (
+      tryExecNTimes(
+        () => {
+          return exec('npm install --save-dev flow-bin').code;
+        },
+        numberOfRetries,
+        () => exec('sleep 10s'),
+      )
+    ) {
+      echo('Failed to install Flow');
+      echo('Most common reason is npm registry connectivity, try again');
+      exitCode = 1;
+      throw Error(exitCode);
+    }
+  }
+
   if (exec('yarn pack').code) {
     echo('Failed to pack react-native');
     exitCode = 1;
@@ -92,23 +109,10 @@ try {
     exitCode = 1;
     throw Error(exitCode);
   }
+  cp('metro.config.js', 'EndToEndTest/.');
   cd('EndToEndTest');
   echo('Installing React Native package');
   exec(`npm install ${PACKAGE}`);
-  if (
-    tryExecNTimes(
-      () => {
-        return exec('npm install --save-dev flow-bin').code;
-      },
-      numberOfRetries,
-      () => exec('sleep 10s'),
-    )
-  ) {
-    echo('Failed to install Flow');
-    echo('Most common reason is npm registry connectivity, try again');
-    exitCode = 1;
-    throw Error(exitCode);
-  }
   echo('Installing node_modules');
   if (
     tryExecNTimes(
@@ -291,7 +295,7 @@ try {
       throw Error(exitCode);
     }
     describe('Test: Flow check');
-    if (exec('./node_modules/.bin/flow check').code) {
+    if (exec(path.join(ROOT, '/node_modules/.bin/flow') + ' check').code) {
       echo('Flow check failed.');
       exitCode = 1;
       throw Error(exitCode);