diff --git a/.travis.yml b/.travis.yml
index a288e8261f..a45bd0b483 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,18 @@
 language: cpp
 
 sudo: required
-dist: trusty
 
 cache: ccache
 
 matrix:
   include:
-    - env: VERSION=6 BITS=32
+    - env: VERSION=7 BITS=64
       compiler: gcc
       os: linux
-    - env: VERSION=5 BITS=32
+    - env: VERSION=7 BITS=32
+      compiler: gcc
+      os: linux
+    - env: VERSION=6 BITS=32
       compiler: gcc
       os: linux
     - env: VERSION=4.9 BITS=32
@@ -19,9 +21,6 @@ matrix:
     - env: VERSION=3.8 BITS=32
       compiler: clang
       os: linux
-    - env: VERSION=4.9 BITS=64
-      compiler: gcc
-      os: linux
 
 before_install:
   - ./travis.sh before_install
diff --git a/appveyor.yml b/appveyor.yml
index e77a6736ca..b2693109a7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,11 +3,18 @@
 # finished, which could be a bit annoying.
 version: 1.{build}-{branch}
 
+image: Visual Studio 2017
+
 environment:
   matrix:
+  - platform: Win32
+    target: AppVeyor
+    visualstudio_string: vs2017
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - platform: Win32
     target: AppVeyor
     visualstudio_string: vs2015
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 matrix:
   fast_finish: true