diff --git a/appveyor.yml b/appveyor.yml
index 4c2e364..2db28f6 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,40 +24,39 @@
 shallow_clone: true
 
 os:
-  - Visual Studio 2015
+  - Visual Studio 2017
 
-cache:
-  - C:\projects\thrift\buildcache -> build\appveyor\MSVC-appveyor-install.bat
-  - C:\ProgramData\chocolatey\lib -> build\appveyor\MSVC-appveyor-install.bat
-  - C:\msys64\var\cache\pacman    -> build\appveyor\MSYS-appveyor-install.bat
+matrix:
+  allow_failures:
+      - PROFILE: CYGWIN
+  fast_finish: true
 
 environment:
   matrix:
-   - PROFILE: MSVC2010
-     PLATFORM: x86
-     CONFIGURATION: Debug
-     BOOST_VERSION: 1.54.0
-     LIBEVENT_VERSION: 2.0.22
-     QT_VERSION: 5.6
-     ZLIB_VERSION: 1.2.8
-     DISABLED_TESTS: StressTestNonBlocking
-
-   - PROFILE: MSVC2015
+   - PROFILE: MSVC2017
      PLATFORM: x64
      CONFIGURATION: Release
-     BOOST_VERSION: 1.64.0
-     LIBEVENT_VERSION: 2.0.22
+     BOOST_VERSION: 1.65.1
+     LIBEVENT_VERSION: 2.1.8
      PYTHON_VERSION: 3.6
-     QT_VERSION: 5.8
+     QT_VERSION: 5.10
      ZLIB_VERSION: 1.2.11
      DISABLED_TESTS: StressTestNonBlocking
 
    - PROFILE: MINGW
      PLATFORM: x64
-     CONFIGURATION: Release
+     CONFIGURATION: RelWithDebInfo
+     DISABLED_TESTS: StressTestNonBlocking
 
-matrix:
-  fast_finish: true
+   - PROFILE: CYGWIN
+     PLATFORM: x64
+     CONFIGURATION: RelWithDebInfo
+     DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
+
+   - PROFILE: CYGWIN
+     PLATFORM: x86
+     CONFIGURATION: RelWithDebInfo
+     DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
 
 install:
   - cd %APPVEYOR_BUILD_FOLDER%