diff --git a/aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf b/aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf
index 65f38a633c..a889f6dcba 100644
--- a/aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf
+++ b/aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf
@@ -27,6 +27,10 @@ server {
   disable_symlinks on from=$document_root;
   index            index.html;
 
+  gzip            on;
+  gzip_comp_level 7;
+  gzip_types      *;
+
   access_log {{$AIO_NGINX_LOGS_DIR}}/access.log;
   error_log  {{$AIO_NGINX_LOGS_DIR}}/error.log;
 
diff --git a/aio/scripts/deploy-preview.sh b/aio/scripts/deploy-preview.sh
index 48119de1ff..ea8820eeec 100755
--- a/aio/scripts/deploy-preview.sh
+++ b/aio/scripts/deploy-preview.sh
@@ -34,6 +34,6 @@ if [ $httpCode -lt 200 ] || ([ $httpCode -ge 400 ] && [ $httpCode -ne 409 ]); th
 fi
 
 # Run PWA-score tests
-yarn test-pwa-score -- "$DEPLOYED_URL" "$MIN_PWA_SCORE_PREVIEW"
+yarn test-pwa-score -- "$DEPLOYED_URL" "$MIN_PWA_SCORE"
 
 cd -
diff --git a/aio/scripts/deploy-staging.sh b/aio/scripts/deploy-staging.sh
index 0792e037de..dcaab1469d 100755
--- a/aio/scripts/deploy-staging.sh
+++ b/aio/scripts/deploy-staging.sh
@@ -19,6 +19,6 @@ firebase deploy --message "Commit: $TRAVIS_COMMIT" --non-interactive --token "$F
 # Run PWA-score tests
 # TODO(gkalpak): Figure out why this fails and re-enable.
 sleep 10
-yarn test-pwa-score -- "$DEPLOYED_URL" "$MIN_PWA_SCORE_STAGING" || true
+yarn test-pwa-score -- "$DEPLOYED_URL" "$MIN_PWA_SCORE" || true
 
 cd -
diff --git a/scripts/ci/env.sh b/scripts/ci/env.sh
index d529cb376a..336cb86fab 100755
--- a/scripts/ci/env.sh
+++ b/scripts/ci/env.sh
@@ -59,10 +59,7 @@ if [[ ${TRAVIS:-} ]]; then
       setEnvVar KARMA_JS_BROWSERS `node -e "console.log(require('/home/travis/build/angular/angular/browser-providers.conf').browserstackAliases.CI_OPTIONAL.join(','))"`
       ;;
     aio)
-      # Due to network latency/server performance, the min accepted PWA score
-      # on previews is a little lower than on staging.
-      setEnvVar MIN_PWA_SCORE_PREVIEW 93
-      setEnvVar MIN_PWA_SCORE_STAGING 95
+      setEnvVar MIN_PWA_SCORE 95
       ;;
   esac
 else