diff --git a/.travis.yml b/.travis.yml
index d7d62ef05e..375d779bbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
-language: c++
-dist: trusty
+language: cpp
+dist: xenial
 
 branches:
   except:
@@ -27,8 +27,6 @@ matrix:
         - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-Wno-maybe-uninitialized"
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
             - g++-4.9
             - libsdl2-dev
@@ -41,8 +39,6 @@ matrix:
         - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS=-Wno-maybe-uninitialized"
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
             - g++-5
             - libsdl2-dev
@@ -99,7 +95,7 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
+            - llvm-toolchain-xenial-7
           packages:
             - clang-7
             - libsdl2-dev
@@ -110,6 +106,14 @@ matrix:
             - libfluidsynth-dev
             - libgtk-3-dev
 
+    - os: windows
+      env:
+        - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A Win32"
+
+    - os: windows
+      env:
+        - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A x64"
+
 before_install:
   - if [ -n "$GCC_VERSION" ]; then export CC="gcc-${GCC_VERSION}" CXX="g++-${GCC_VERSION}"; fi
   - if [ -n "$CLANG_VERSION" ]; then export CC="clang-${CLANG_VERSION}" CXX="clang++-${CLANG_VERSION}"; fi
@@ -128,7 +132,8 @@ script:
       -DFORCE_INTERNAL_GME=YES   \
       -DPK3_QUIET_ZIPDIR=YES     \
       ..
-  - make -j2 -k
+  - if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi
+  - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2; fi
 
 notifications:
   email: false