diff --git a/.travis.yml b/.travis.yml
index da36f1b..10d0bfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,22 +3,13 @@ language: csharp
 env:
   - HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis
 
-sudo: required #false
-dist: trusty
+sudo: required
+dist: xenial
 dotnet: 2.2.103
 mono:
-- latest
+  - latest
 os:
-- linux
-
-addons:
-  apt:
-    sources:
-    - sourceline: 'deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main'
-      key_url: 'https://packages.microsoft.com/keys/microsoft.asc'
-    packages:
-    - dotnet-hostfxr-1.0.1
-    - dotnet-sharedframework-microsoft.netcore.app-1.1.2
+  - linux
 
 branches:
   except:
@@ -26,3 +17,7 @@ branches:
 
 script:
   - ./build.sh Test quick
+
+global:
+  - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+  - DOTNET_CLI_TELEMETRY_OPTOUT=1
diff --git a/appveyor.yml b/appveyor.yml
index 1b5ba37..aca3afb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,3 +16,7 @@ test: off
 deploy: off
 shallow_clone: true
 clone_depth: 1
+
+environment:
+   - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+   - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true