diff --git a/.travis.yml b/.travis.yml
index 5d5c6f396..26fe52278 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,12 @@ cache:
 addons:
   apt:
     sources:
+      - george-edison55-precise-backports
       - ubuntu-toolchain-r-test
       - deadsnakes
     packages:
+      - cmake-data
+      - cmake
       - g++-4.9
       - g++-4.8
       - g++-4.8-multilib
@@ -55,7 +58,8 @@ matrix:
           fi
       script:
         - pyvenv-3.5 venv
-        - export CXX=`g++-4.9`
+        - export CXX=$(which g++-4.9)
+        - export CC=$(which gcc-4.9)
         - cmake -DPYBIND11_PYTHON_VERSION=3.5 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.5m -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.5m.so -DPYTHON_EXECUTABLE:FILEPATH=`pwd`/venv/bin/python3.5
         - make -j 2
         - source venv/bin/activate
@@ -63,6 +67,9 @@ matrix:
         - CTEST_OUTPUT_ON_FAILURE=TRUE make test
     - os: osx
       compiler: clang
+      before_install:
+        - brew update
+        - brew outdated cmake || brew upgrade cmake
       script:
         - cmake -DPYBIND11_PYTHON_VERSION=2.7
         - make -j 2
diff --git a/example/run_test.py b/example/run_test.py
index 802b851b5..79e37c463 100755
--- a/example/run_test.py
+++ b/example/run_test.py
@@ -55,6 +55,10 @@ reference = sanitize(open(name + '.ref', 'r').read())
 if 'NumPy missing' in output:
     print('Test "%s" could not be run.' % name)
     exit(0)
+elif 'no CUDA-capable device is detected' in output or \
+     'CUDA driver version is insufficient' in output:
+    print('Test "%s" could not be run (missing CUDA device).' % name)
+    exit(0)
 elif output == reference:
     print('Test "%s" succeeded.' % name)
     exit(0)