diff --git a/aio/aio-builds-setup/scripts/travis-preverify-pr.sh b/aio/aio-builds-setup/scripts/travis-preverify-pr.sh
index a0a45716c4..29c84ac4e4 100755
--- a/aio/aio-builds-setup/scripts/travis-preverify-pr.sh
+++ b/aio/aio-builds-setup/scripts/travis-preverify-pr.sh
@@ -4,6 +4,12 @@ set -eux -o pipefail
 # Set up env
 source "`dirname $0`/env.sh"
 
+# Build `scripts-js/`
+cd "$SCRIPTS_JS_DIR"
+yarn install
+yarn build
+cd -
+
 # Preverify PR
 AIO_GITHUB_ORGANIZATION="angular" \
 AIO_GITHUB_TEAM_SLUGS="angular-core,aio-contributors" \
diff --git a/aio/scripts/deploy-preview.sh b/aio/scripts/deploy-preview.sh
index 9e11604aa0..21aed29417 100755
--- a/aio/scripts/deploy-preview.sh
+++ b/aio/scripts/deploy-preview.sh
@@ -2,6 +2,7 @@
 
 # WARNING: NGBUILDS_IO_KEY should NOT be printed.
 set +x -eu -o pipefail
+exec 3>&1
 
 
 readonly INPUT_DIR=dist/
@@ -9,6 +10,8 @@ readonly OUTPUT_FILE=/tmp/snapshot.tar.gz
 readonly AIO_BUILDS_DOMAIN=ngbuilds.io
 readonly UPLOAD_URL=https://$AIO_BUILDS_DOMAIN/create-build/$TRAVIS_PULL_REQUEST/$TRAVIS_PULL_REQUEST_SHA
 readonly DEPLOYED_URL=https://pr$TRAVIS_PULL_REQUEST-$TRAVIS_PULL_REQUEST_SHA.$AIO_BUILDS_DOMAIN
+readonly PREVERIFY_SCRIPT=aio-builds-setup/scripts/travis-preverify-pr.sh
+
 readonly skipBuild=$([[ "$1" == "--skip-build" ]] && echo "true" || echo "");
 readonly relevantChangedFilesCount=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -P "^(?:aio|packages)/(?!.*[._]spec\.[jt]s$)" | wc -l)
 
@@ -21,7 +24,7 @@ if [[ $relevantChangedFilesCount -eq 0 ]]; then
 fi
 
 # Do not deploy unless this PR meets certain preconditions.
-readonly preverifyExitCode=$(./aio-builds-setup/scripts/travis-preverify-pr.sh && echo 0 || echo $?)
+readonly preverifyExitCode=$($PREVERIFY_SCRIPT > /dev/fd/3 && echo 0 || echo $?)
 case $preverifyExitCode in
   0)
     # Preconditions met: Deploy
@@ -49,7 +52,6 @@ fi
 tar --create --gzip --directory "$INPUT_DIR" --file "$OUTPUT_FILE" .
 
 # Deploy to staging
-exec 3>&1
 readonly httpCode=$(
   curl --include --location --request POST --silent --write-out "\nHTTP_CODE: %{http_code}\n" \
        --header "Authorization: Token $NGBUILDS_IO_KEY" --data-binary "@$OUTPUT_FILE" "$UPLOAD_URL" \
diff --git a/scripts/ci/install-chromium.sh b/scripts/ci/install-chromium.sh
index 858b1ef847..c18f3c9f7f 100755
--- a/scripts/ci/install-chromium.sh
+++ b/scripts/ci/install-chromium.sh
@@ -82,4 +82,3 @@ fi
 if [[ "$CHROMIUM_VERSION" != "$LATEST_CHROMIUM_VERSION" ]]; then
   echo "New version of Chromium available. Update install-chromium.sh with build number: ${LATEST_CHROMIUM_VERSION}"
 fi
-
diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh
index a64d393785..7d555f9221 100755
--- a/scripts/ci/install.sh
+++ b/scripts/ci/install.sh
@@ -65,6 +65,13 @@ if [[ ${CI_MODE} == "js" || ${CI_MODE} == "e2e" || ${CI_MODE} == "e2e_2" || ${CI
   travisFoldStart "install-chromium"
     (
       ${thisDir}/install-chromium.sh
+
+      # Start xvfb for local Chrome used for testing
+      if [[ ${TRAVIS} ]]; then
+        travisFoldStart "install-chromium.xvfb-start"
+          sh -e /etc/init.d/xvfb start
+        travisFoldEnd "install-chromium.xvfb-start"
+      fi
     )
   travisFoldEnd "install-chromium"
 fi
diff --git a/scripts/ci/test-aio-e2e.sh b/scripts/ci/test-aio-e2e.sh
index 1f16f036be..4772afc2b4 100755
--- a/scripts/ci/test-aio-e2e.sh
+++ b/scripts/ci/test-aio-e2e.sh
@@ -11,13 +11,6 @@ source ${thisDir}/_travis-fold.sh
 (
   cd ${PROJECT_ROOT}/aio
 
-  # Start xvfb for local Chrome used for testing
-  if [[ ${TRAVIS} ]]; then
-    travisFoldStart "test.aio.xvfb-start"
-      sh -e /etc/init.d/xvfb start
-    travisFoldEnd "test.aio.xvfb-start"
-  fi
-
   # Run example e2e tests
   travisFoldStart "test.aio.example-e2e"
     yarn example-e2e -- --setup
diff --git a/scripts/ci/test-aio.sh b/scripts/ci/test-aio.sh
index 1d840c8de8..cd2bcfaf85 100755
--- a/scripts/ci/test-aio.sh
+++ b/scripts/ci/test-aio.sh
@@ -18,14 +18,6 @@ source ${thisDir}/_travis-fold.sh
   travisFoldEnd "test.aio.lint"
 
 
-  # Start xvfb for local Chrome used for testing
-  if [[ ${TRAVIS} ]]; then
-    travisFoldStart "test.aio.xvfb-start"
-      sh -e /etc/init.d/xvfb start
-    travisFoldEnd "test.aio.xvfb-start"
-  fi
-
-
   # Run unit tests
   travisFoldStart "test.aio.unit"
     yarn test -- --single-run
diff --git a/scripts/ci/test-e2e-2.sh b/scripts/ci/test-e2e-2.sh
index 13735842a1..65fb7f6e1b 100755
--- a/scripts/ci/test-e2e-2.sh
+++ b/scripts/ci/test-e2e-2.sh
@@ -14,13 +14,6 @@ travisFoldStart "test.e2e.buildPackages"
 travisFoldEnd "test.e2e.buildPackages"
 
 
-if [[ ${TRAVIS:-} ]]; then
-  travisFoldStart "test.e2e.xvfb-start"
-    sh -e /etc/init.d/xvfb start
-  travisFoldEnd "test.e2e.xvfb-start"
-fi
-
-
 travisFoldStart "test.e2e.integration"
   ./integration/run_tests.sh
 travisFoldEnd "test.e2e.integration"
diff --git a/scripts/ci/test-e2e.sh b/scripts/ci/test-e2e.sh
index 00cb0256b1..95b6ce1faf 100755
--- a/scripts/ci/test-e2e.sh
+++ b/scripts/ci/test-e2e.sh
@@ -14,12 +14,6 @@ travisFoldStart "test.e2e.buildPackages"
 travisFoldEnd "test.e2e.buildPackages"
 
 
-if [[ ${TRAVIS:-} ]]; then
-  travisFoldStart "test.e2e.xvfb-start"
-    sh -e /etc/init.d/xvfb start
-  travisFoldEnd "test.e2e.xvfb-start"
-fi
-
 travisFoldStart "test.e2e.publicApi"
   $(npm bin)/gulp public-api:enforce
 travisFoldEnd "test.e2e.publicApi"
diff --git a/scripts/ci/test-js.sh b/scripts/ci/test-js.sh
index b9c6d8020d..f4fa7aa09e 100755
--- a/scripts/ci/test-js.sh
+++ b/scripts/ci/test-js.sh
@@ -35,13 +35,6 @@ travisFoldStart "test.unit.rebuildHack"
 travisFoldStart "test.unit.rebuildHack"
 
 
-if [[ ${TRAVIS} ]]; then
-  travisFoldStart "test.unit.xvfb-start"
-    sh -e /etc/init.d/xvfb start
-  travisFoldEnd "test.unit.xvfb-start"
-fi
-
-
 travisFoldStart "test.unit.localChrome"
   $(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
 travisFoldEnd "test.unit.localChrome"