diff --git a/.travis.yml b/.travis.yml
index fa2dbf58f..0a56d8782 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,6 +89,16 @@ matrix:
   - compiler: gcc
     os: osx
     env: TESTID=classic BREW_INSTALLS=valgrind
+  # CESM Driver, started failing when travis upgraded to gcc5
+  - compiler: gcc
+    os: linux
+    env: TESTID='cesm'
+    addons:
+      apt_packages:
+        - libnetcdf-dev
+        - netcdf-bin
+        - netcdf-doc
+        - gfortran
 before_install:
   - source ci/vic_install_utils
   - source ci/${TESTID}.travis
diff --git a/vic/drivers/python/setup.py b/vic/drivers/python/setup.py
index 68e00de93..19d8ce13e 100644
--- a/vic/drivers/python/setup.py
+++ b/vic/drivers/python/setup.py
@@ -124,7 +124,7 @@ def make_cffi_headers():
                  'zwtvmoist_zwt',
                  'zwtvmoist_moist']
 
-    args = ['gcc', '-std=c99', '-E',
+    args = [os.environ.get('CC') or 'gcc', '-std=c99', '-E',
             '-P', os.path.join(vic_root_abs_path, 'vic', 'drivers',
                                'python', 'src', 'globals.c'),
             '-I%s' % os.path.join(vic_root_abs_path, 'vic', 'drivers',