diff --git a/.travis.yml b/.travis.yml
index c00012d..3358230 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,12 @@ env:
 node_js: node
 addons:
   firefox: latest
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
+  chrome: stable
 script:
-  - xvfb-run polymer test --module-resolution=node --npm
+  - xvfb-run --auto-servernum polymer test --module-resolution=node --npm
   - >-
     if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then polymer test
     --module-resolution=node --npm -s 'default'; fi
-dist: trusty
+dist: xenial
+services:
+  - xvfb