diff --git a/.travis.yml b/.travis.yml
index 846a8143750..8fb9c16ec7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 ---
-dist: trusty
 language: node_js
+os:
+  - linux
+  - windows
+# dist: trusty
 node_js:
   - 8
   - 10
diff --git a/appveyor.cleanup-cache.txt b/appveyor.cleanup-cache.txt
deleted file mode 100644
index d48a91fdf35..00000000000
--- a/appveyor.cleanup-cache.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Edit this file to trigger a cache rebuild.
-http://help.appveyor.com/discussions/questions/1310-delete-cache
-
-----
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 5f5143167d6..00000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-image: Visual Studio 2017
-
-environment:
-  APPVEYOR_SAVE_CACHE_ON_ERROR: true
-  APPVEYOR_BUILD_WORKER_CLOUD: 'GCE'
-  matrix:
-    - nodejs_version: 10
-      test_suite: 'simple'
-    - nodejs_version: 10
-      test_suite: 'installs'
-    - nodejs_version: 10
-      test_suite: 'kitchensink'
-    - nodejs_version: 10
-      test_suite: 'kitchensink-eject'
-    - nodejs_version: 8
-      test_suite: 'simple'
-    - nodejs_version: 8
-      test_suite: 'installs'
-    - nodejs_version: 8
-      test_suite: 'kitchensink'
-    - nodejs_version: 8
-      test_suite: 'kitchensink-eject'
-cache:
-  - '%APPDATA%\npm-cache -> appveyor.cleanup-cache.txt'
-  - '%LOCALAPPDATA%\Yarn\Cache -> appveyor.cleanup-cache.txt'
-
-clone_depth: 50
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - test_suite: 'installs'
-
-platform:
-  - x64
-
-install:
-  - ps: Install-Product node $env:nodejs_version $env:platform
-  - ps: |
-      (New-Object Net.WebClient).DownloadFile("https://nightly.yarnpkg.com/latest.msi", "$env:temp\yarn.msi")
-      cmd /c start /wait msiexec.exe /i $env:temp\yarn.msi /quiet /qn /norestart
-
-build: off
-
-skip_commits:
-  files:
-    - '**/*.md'
-
-test_script:
-  - node --version
-  - npm --version
-  - yarn --version
-  - yarn cache dir
-  - bash tasks/e2e-%test_suite%.sh