diff --git a/.travis.yml b/.travis.yml
index abeb6ad..61cf5e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,53 @@
 language: cpp
 
-sudo: true
-
 matrix:
   include:
     - os: linux
       compiler: gcc
       dist: trusty
+      sudo: false
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - attr
+            - fuse
+            - libfuse-dev
+            - gettext
+            - cmake3
+      env:
+        - INTEGRATION=false
+
+    - os: linux
+      compiler: clang
+      dist: trusty
+      sudo: true
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
+          packages:
+            - attr
+            - fuse
+            - libfuse-dev
+            - gettext
+            - cmake3
+            - clang-4.0
+            - clang-tidy-4.0
+      env:
+        - CC=clang-4.0 CXX=clang++-4.0 CHECK=true INTEGRATION=true
+
     - os: osx
       compiler: clang
       osx_image: xcode8.3
-
-branches:
-  only:
-    - master
-    - travis
+      sudo: true
+      env:
+        - INTEGRATION=true
 
 before_script:
   - ./ci/setup.sh
 
 script:
-  - ./ci/build.sh
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - attr
-      - clang
-      - fuse
-      - libfuse-dev
-      - gettext
-      - cmake3
+  - ./build.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7a79c2..76e617a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,7 @@ if (ENABLE_NLS)
 endif (ENABLE_NLS)
 
 if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.5) # Need 3.6 or above.
-  find_program(CLANG_TIDY_EXE NAMES "clang-tidy" DOC "Path to clang-tidy executable")
+  find_program(CLANG_TIDY_EXE NAMES "clang-tidy" "clang-tidy-4.0" DOC "Path to clang-tidy executable")
   if(NOT CLANG_TIDY_EXE)
     message(STATUS "clang-tidy not found.")
   else()
@@ -171,6 +171,8 @@ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.5) # Need 3.6 or abo
     set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-modernize-loop-convert,-cppcoreguidelines-pro-*,-readability-inconsistent-declaration-parameter-name,-google-readability-casting,-cert-err58-cpp,-google-runtime-int,-readability-named-parameter,-google-build-using-namespace,-misc-unused-parameters,-google-runtime-references")
     #set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-fix" "-checks=-*,google-readability-redundant-smartptr-get")
   endif()
+else()
+  message(STATUS "clang-tidy check skipped, need newer cmake")
 endif()
 
 if (USE_INTERNAL_TINYXML)
diff --git a/README.md b/README.md
index cf19cce..26285d6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # EncFS - an Encrypted Filesystem
 
 _Build Status_
- - Circle: [![Circle CI](https://circleci.com/gh/vgough/encfs.svg?style=svg)](https://circleci.com/gh/vgough/encfs)
  - Travis: [![Travis CI](https://travis-ci.org/vgough/encfs.svg?branch=master)](https://travis-ci.org/vgough/encfs)
 
 ## About
diff --git a/build.sh b/build.sh
index de8b847..af1b323 100755
--- a/build.sh
+++ b/build.sh
@@ -1,20 +1,33 @@
 #!/bin/bash -eu
 
-# Make sure we are in the directory this script is in.
-cd "$(dirname "$0")"
+: ${CHECK:=false}
+: ${INTEGRATION:=true}
+
+cmake --version
+
+CFG=$*
+if [[ "$CHECK" == "true" ]]; then
+  CFG="-DLINT=ON $CFG"
+fi
+
+if uname -s | grep -q Darwin; then
+  CFG="-DENABLE_NLS=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl $CFG"
+fi
 
 if [[ ! -d build ]]
 then
-	mkdir build
-	cd build
-	cmake .. $*
-	cd ..
+  mkdir build
 fi
 
-make -j2 -C build
-make test -C build
-make integration -C build
+cd build
+cmake .. ${CFG}
+make -j2
+make test
+if [[ "$INTEGRATION" == "true" ]]; then
+  make integration
+fi
+
+cd ..
 
 echo
 echo 'Everything looks good, you can install via "make install -C build".'
-
diff --git a/ci/build.sh b/ci/build.sh
deleted file mode 100755
index 4d30a46..0000000
--- a/ci/build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -eu
-
-cmake --version
-
-CFG=""
-if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  CFG="-DENABLE_NLS=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl"
-fi
-
-if [[ ! -d build ]]
-then
-  mkdir build
-fi
-
-cd build
-cmake .. ${CFG}
-make -j2
-make test
-make integration
-
-cd ..
-
diff --git a/ci/config.sh b/ci/config.sh
deleted file mode 100755
index 96c4ee3..0000000
--- a/ci/config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -x
-set -e
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX:PATH=/tmp/encfs -DCMAKE_BUILD_TYPE=Debug ..
diff --git a/ci/install-gcc.sh b/ci/install-gcc.sh
deleted file mode 100755
index c147819..0000000
--- a/ci/install-gcc.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -x
-set -e
-sudo apt-get install -y gcc-4.8 g++-4.8
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100
-sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100
diff --git a/ci/setup.sh b/ci/setup.sh
index 1482194..81bc0ce 100755
--- a/ci/setup.sh
+++ b/ci/setup.sh
@@ -1,10 +1,23 @@
 #!/bin/bash -eu
 
-if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-  sudo modprobe fuse
+: ${INTEGRATION:=false}
+: ${CHECK:=false}
+
+if [[ "$INTEGRATION" == "true" ]]; then
+  if uname -s | grep -q Linux; then
+    sudo modprobe fuse
+  elif uname -s | grep -q Darwin; then
+    brew cask install osxfuse
+  fi
 fi
 
-if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-  brew cask install osxfuse
+if [[ "$CHECK" == "true" ]]; then
+  if uname -s | grep -q Linux; then
+    wget https://cmake.org/files/v3.9/cmake-3.9.1-Linux-x86_64.tar.gz -O /tmp/cmake.tar.gz
+    tar -C /tmp/ -xf /tmp/cmake.tar.gz
+    sudo rm -f $(which cmake)
+    sudo ln -s $(ls -1 /tmp/cmake*/bin/cmake) /bin/
+  fi
 fi
 
+
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index c570296..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-machine:
-  timezone:
-    America/Los_Angeles
-
-dependencies:
-  pre:
-    - sudo apt-get install cmake libfuse-dev libgettextpo-dev
-    - bash ./ci/install-gcc.sh
-
-test:
-  override:
-    - bash ./ci/config.sh
-    - cd build && make && make test && make install
-    - /tmp/encfs/bin/encfsctl --version