diff --git a/.travis.yml b/.travis.yml
index 7d1eaf36..95cf1647 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,20 @@ node_js:
 - 8 # EOL: December 2019
 - 6 # EOL: April 2019
 
+os:
+  - linux
+
 matrix:
   fast_finish: true
   include:
-    - node_js: 8 # Version used to deploy to npm registry
+    - node_js: 8
+      os: windows
+      env: YARN_GPG=no # starts gpg-agent that never exits
+    - node_js: 8
+      os: osx
+    - name: "Production build"
+      node_js: 8 # Version used to deploy to npm registry
+      os: linux
       env: BUILD_ENV=production
 
 cache: yarn
@@ -18,7 +28,7 @@ before_script:
   - NODE_ENV=$BUILD_ENV yarn build
 
 install:
-  - yarn --frozen-lockfile
+  - yarn --frozen-lockfile --non-interactive --network-timeout 300000
 
 notifications:
   email:
diff --git a/README.md b/README.md
index 658ca7da..17cc3bd6 100644
--- a/README.md
+++ b/README.md
@@ -26,12 +26,9 @@
 	<a href="https://yarn.pm/thelounge"><img
 		alt="npm version"
 		src="https://img.shields.io/npm/v/thelounge.svg?style=flat-square&maxAge=3600"></a>
-	<a href="https://travis-ci.org/thelounge/thelounge"><img
+	<a href="https://travis-ci.com/thelounge/thelounge"><img
 		alt="Travis CI Build Status"
-		src="https://img.shields.io/travis/thelounge/thelounge/master.svg?label=linux&style=flat-square&maxAge=60"></a>
-	<a href="https://ci.appveyor.com/project/astorije/lounge/branch/master"><img
-		alt="AppVeyor Build Status"
-		src="https://img.shields.io/appveyor/ci/astorije/lounge/master.svg?label=windows&style=flat-square&maxAge=60"></a>
+		src="https://img.shields.io/travis/com/thelounge/thelounge/master.svg?style=flat-square&maxAge=60"></a>
 	<a href="https://david-dm.org/thelounge/thelounge"><img
 		alt="Dependencies Status"
 		src="https://img.shields.io/david/thelounge/thelounge.svg?style=flat-square&maxAge=3600"></a>
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 9a401ad0..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# http://www.appveyor.com/docs/appveyor-yml
-
-# Build version format
-version: "{build}"
-
-# Do not build on tags (GitHub only)
-skip_tags: true
-
-# Do not build feature branch with open pull requests
-skip_branch_with_pr: true
-
-environment:
-  nodejs_version: '6'
-
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - yarn --frozen-lockfile
-  - yarn build
-  - yarn add mocha-appveyor-reporter
-  - ps: (gc test/mocha.opts) -replace 'dot', 'mocha-appveyor-reporter' | sc test/mocha.opts
-  - ps: (gc test/mocha-webpack.opts) -replace 'dot', 'mocha-appveyor-reporter' | sc test/mocha-webpack.opts
-
-test_script:
-  - node --version
-  - yarn --version
-  - yarn test
-
-# cache npm modules
-cache:
-  - "%LOCALAPPDATA%\\Yarn"
-
-# Don't actually build
-build: off