diff --git a/.appveyor.yml b/.appveyor.yml
index 0748e63a..4749acc9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,11 +9,11 @@ install:
 build_script:
   - mkdir build
   - cd build
-  - cmake .. -DCLI_SINGLE_FILE_TESTS=ON -DCMAKE_GENERATOR="Visual Studio 14 2015"
+  - cmake .. -DCLI_SINGLE_FILE_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_GENERATOR="Visual Studio 14 2015"
   - cmake --build .
 
 test_script:
-  - ctest --output-on-failure
+  - ctest --output-on-failure -C RelWithDebInfo
 
 notifications:
   - provider: Webhook
diff --git a/.ci/build_cmake.sh b/.ci/build_cmake.sh
index 05d28e68..5b2d69bb 100644
--- a/.ci/build_cmake.sh
+++ b/.ci/build_cmake.sh
@@ -1,9 +1,14 @@
-if [ "$TRAVIS_OS_NAME" = "linux" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" ; fi
-if [ "$TRAVIS_OS_NAME" = "osx" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Darwin-x86_64.tar.gz" ; fi
+CMAKE_VERSION=3.9.6
+CMAKE_MVERSION=${CMAKE_VERSION%.*}
+# Non Bash version:
+# echo CMAKE_MVERSION=`$var | awk -F"." '{ print $1"."$2 }'`
+
+if [ "$TRAVIS_OS_NAME" = "linux" ] ; then CMAKE_URL="https://cmake.org/files/v${CMAKE_MVERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" ; fi
+if [ "$TRAVIS_OS_NAME" = "osx" ] ; then CMAKE_URL="https://cmake.org/files/v$CMAKE_MVERSION/cmake-$CMAKE_VERSION-Darwin-x86_64.tar.gz" ; fi
 cd "${DEPS_DIR}"
 
 if [[ ! -f "${DEPS_DIR}/cmake/bin/cmake" ]] ; then
-  echo "Downloading CMake"
+  echo "Downloading CMake $CMAKE_VERSION"
   mkdir -p cmake
   travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
 fi
diff --git a/.travis.yml b/.travis.yml
index 37cce0f3..8d13271d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,6 +60,7 @@ install:
 - if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_lcov.sh ; fi
 - cd "${DEPS_DIR}"
 - if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip install --user pathlib ; fi
+- cmake --version
 script:
 - cd "${TRAVIS_BUILD_DIR}"
 - |