diff --git a/.appveyor.yml b/.appveyor.yml
index 50953fd7c..29164b675 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,49 +16,39 @@ branches:
 # environment variables
 environment:
   global:
-    INTELOCLSDKROOT: C:\Program Files (x86)\Intel\OpenCL SDK\
     BOOST_COMPUTE_DEFAULT_PLATFORM: Intel(R) OpenCL
-    OPENCL_INCLUDE_DIR: C:\opencl\include
-    # Downloaded OpenCL headers version (2.1)
-    OPENCL_HEADERS_VER: 21
     # OpenCL version used in tests (2.0)
     OPENCL_VERSION: 200
     CXXFLAGS: -DBOOST_COMPUTE_MAX_CL_VERSION=%OPENCL_VERSION%
   matrix:
-     - VS_VER: 2015
-       CMAKE_GENERATOR: Visual Studio 14 2015 Win64
-       BOOST_ROOT: C:\Libraries\boost_1_59_0
-       BOOST_LIBRARYDIR: C:\Libraries\boost_1_59_0\lib64-msvc-14.0
-     - VS_VER: 2013
-       CMAKE_GENERATOR: Visual Studio 12 2013 Win64
-       BOOST_ROOT: C:\Libraries\boost_1_58_0
-       BOOST_LIBRARYDIR: C:\Libraries\boost_1_58_0\lib64-msvc-12.0
-
-image: Visual Studio 2015
-
-# build platforms
-platform:
-  - x64
-
-configuration:
-  - Debug
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      CMAKE_GENERATOR: Visual Studio 15 2017 Win64
+      BOOST_ROOT: C:\Libraries\boost_1_67_0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      CMAKE_GENERATOR: Visual Studio 14 2015 Win64
+      BOOST_ROOT: C:\Libraries\boost_1_63_0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      CMAKE_GENERATOR: Visual Studio 12 2013 Win64
+      BOOST_ROOT: C:\Libraries\boost_1_58_0
 
 before_build:
-  - appveyor DownloadFile "http://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/8539/intel_sdk_for_opencl_setup_6.0.0.1049.exe"
-  - start /wait .\intel_sdk_for_opencl_setup_6.0.0.1049.exe install --output=output.log --eula=accept
-  #- type output.log
-  - appveyor DownloadFile "http://registrationcenter-download.intel.com/akdlm/irc_nas/9022/opencl_runtime_16.1.1_x64_setup.msi"
-  - start /wait msiexec /i opencl_runtime_16.1.1_x64_setup.msi /qn  /l*v msiexec2.log
-  #- type msiexec2.log
-  - git clone --depth 1 https://github.com/KhronosGroup/OpenCL-Headers.git %OPENCL_INCLUDE_DIR%\CL
+  # Install OpenCL headers and libraries
+  - set NUGETDIR=C:\NUGET
+  - nuget install opencl-nug -Version 0.777.77 -OutputDirectory %NUGETDIR%
+  - dir %NUGETDIR%\opencl-nug.0.777.77\build\native\
+  - set OCL_ROOT=%NUGETDIR%\opencl-nug.0.777.77\build\native
+  # Install OpenCL Runtime
+  - choco install opencl-intel-cpu-runtime
+  # Check if it's working
+  - ps: appveyor DownloadFile "https://ci.appveyor.com/api/projects/oblomov/clinfo/artifacts/clinfo.exe?job=platform:+x64" -FileName clinfo.exe
+  - .\clinfo.exe
 
 build_script:
   - mkdir build && cd build
-  - cmake -G"%CMAKE_GENERATOR%" -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON -DOpenCL_INCLUDE_DIR=%OPENCL_INCLUDE_DIR%  ..
+  - cmake -G"%CMAKE_GENERATOR%" -DBOOST_COMPUTE_BUILD_TESTS=ON -DBOOST_COMPUTE_BUILD_EXAMPLES=ON ..
   - cmake --build . --config Debug
 
 test_script:
   - .\example\Debug\list_devices.exe
   - .\example\Debug\hello_world.exe
-  - ctest --output-on-failure
-  - ctest --output-on-failure
+  - ctest --output-on-failure --repeat-until-fail 2