diff --git a/.travis.yml b/.travis.yml
index 82afaed9..175033a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,18 +3,6 @@ language: cpp
 matrix:
   include:
 
-    - os: osx
-      compiler: gcc
-      name: macOS - gcc@5 - opencv@2
-      env:
-        - MATRIX_EVAL="brew install gcc@5 opencv@2 && CC=gcc-5 && CXX=g++-5 && OpenCV_DIR=/usr/local/opt/opencv@2"
-
-    - os: osx
-      compiler: gcc
-      name: macOS - gcc@5 - opencv@3
-      env:
-        - MATRIX_EVAL="brew install gcc@5 opencv@3 && CC=gcc-5 && CXX=g++-5 && OpenCV_DIR=/usr/local/opt/opencv@3"
-
     - os: osx
       compiler: gcc
       name: macOS - native gcc (llvm backend) - opencv@2
diff --git a/appveyor.yml b/appveyor.yml
index 2012a310..005e72b3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,9 +13,6 @@ environment:
       VCPKG_ROOT: C:\projects\vcpkg
       VCPKG_DEFAULT_TRIPLET: x64-windows
       USE_CUDA: yes
-      CUDACXX: C:\CUDA\bin\nvcc.exe
-      CUDA_PATH: C:\CUDA\
-      CUDA_PATH_V10_0: C:\CUDA\
     - platform: Win64
       COMPILER: vs
       VCPKG_ROOT: C:\projects\vcpkg
@@ -33,12 +30,15 @@ install:
   - if [%COMPILER%]==[cygwin] SET PATH=%PATH:C:\Program Files\Git\usr\bin;=%
   - git submodule -q update --init --recursive
   - cd %WORKSPACE%\
-  - if [%USE_CUDA%]==[yes] curl -L https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_411.31_windows -o cuda_10.0.130_411.31_windows.exe
-  - if [%USE_CUDA%]==[yes] mkdir C:\CUDATEMP
-  - if [%USE_CUDA%]==[yes] mkdir C:\CUDA
-  - if [%USE_CUDA%]==[yes] 7z x cuda_10.0.130_411.31_windows.exe -oC:\CUDATEMP
-  - if [%USE_CUDA%]==[yes] cd C:\CUDATEMP
-  - if [%USE_CUDA%]==[yes] FOR /D %%G in ("*") DO xcopy C:\CUDATEMP\%%G\* C:\CUDA\ /s /y
+  - if [%USE_CUDA%]==[yes] curl -L https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.105_418.96_win10.exe -o setup.exe
+  - if [%USE_CUDA%]==[yes] .\setup.exe -s nvcc_10.1 cuobjdump_10.1 nvprune_10.1 cupti_10.1 gpu_library_advisor_10.1 memcheck_10.1 nvdisasm_10.1 nvprof_10.1 visual_profiler_10.1 visual_studio_integration_10.1 cublas_10.1 cublas_dev_10.1 cudart_10.1 cufft_10.1 cufft_dev_10.1 curand_10.1 curand_dev_10.1 cusolver_10.1 cusolver_dev_10.1 cusparse_10.1 cusparse_dev_10.1 nvgraph_10.1 nvgraph_dev_10.1 npp_10.1 npp_dev_10.1 nvrtc_10.1 nvrtc_dev_10.1 nvml_dev_10.1 occupancy_calculator_10.1 fortran_examples_10.1
+  - if [%USE_CUDA%]==[yes] set CUDACXX=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin
+  - if [%USE_CUDA%]==[yes] set CMAKE_CUDA_COMPILER=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin
+  - if [%USE_CUDA%]==[yes] set CUDA_TOOLKIT_ROOT_DIR=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
+  - if [%USE_CUDA%]==[yes] set CUDA_PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
+  - if [%USE_CUDA%]==[yes] set CUDA_PATH_V10_1=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1
+  - if [%USE_CUDA%]==[yes] set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\nvvm\bin;%PATH%
+  - if [%USE_CUDA%]==[yes] set PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin;%PATH%
   - cd %WORKSPACE%\
   - mkdir cygwin-downloads
   - ps: if($env:COMPILER -eq "cygwin") { Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile $env:WORKSPACE\cygwin-setup.exe }