diff --git a/.travis.yml b/.travis.yml
index 2646ebe..3f5f28e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,12 +55,15 @@ matrix:
     - os: osx
       osx_image: xcode6.4
       compiler: gcc
-      env: SOURCES=homebrew
+      env:
+        - SOURCES=homebrew
+        - HOMEBREW_GCC='homebrew/versions/gcc48'
 
 install:
   - |
     if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-        brew install cmake boost python gcc open-mpi
+        brew install cmake boost python open-mpi
+        brew reinstall ${HOMEBREW_GCC}
         pip install virtualenv
     elif [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
         pip install --user virtualenv
diff --git a/modules/cc.cmake b/modules/cc.cmake
index e624ca7..a4f6882 100644
--- a/modules/cc.cmake
+++ b/modules/cc.cmake
@@ -25,8 +25,6 @@
 #   export: "'CC={0}'.format(arguments['--cc'])"
 #   define: "'-DEXTRA_CFLAGS=\"{0}\"'.format(arguments['--extra-cc-flags'])"
 
-enable_language(C)
-
 if(NOT DEFINED CMAKE_C_COMPILER_ID)
     message(FATAL_ERROR "CMAKE_C_COMPILER_ID variable is not defined!")
 endif()
diff --git a/modules/cxx.cmake b/modules/cxx.cmake
index c44209c..3c2c612 100644
--- a/modules/cxx.cmake
+++ b/modules/cxx.cmake
@@ -25,14 +25,12 @@
 #   export: "'CXX={0}'.format(arguments['--cxx'])"
 #   define: "'-DEXTRA_CXXFLAGS=\"{0}\"'.format(arguments['--extra-cxx-flags'])"
 
-enable_language(CXX)
-
-if(NOT DEFINED CMAKE_C_COMPILER_ID)
-    message(FATAL_ERROR "CMAKE_C_COMPILER_ID variable is not defined!")
+if(NOT DEFINED CMAKE_CXX_COMPILER_ID)
+    message(FATAL_ERROR "CMAKE_CXX_COMPILER_ID variable is not defined!")
 endif()
 
-if(NOT CMAKE_C_COMPILER_WORKS)
-    message(FATAL_ERROR "CMAKE_C_COMPILER_WORKS is false!")
+if(NOT CMAKE_CXX_COMPILER_WORKS)
+    message(FATAL_ERROR "CMAKE_CXX_COMPILER_WORKS is false!")
 endif()
 
 if(DEFINED EXTRA_CXXFLAGS)
diff --git a/modules/fc.cmake b/modules/fc.cmake
index d798ddb..22f6d58 100644
--- a/modules/fc.cmake
+++ b/modules/fc.cmake
@@ -29,8 +29,6 @@
 #   export: "'FC={0}'.format(arguments['--fc'])"
 #   define: "'-DEXTRA_FCFLAGS=\"{0}\"'.format(arguments['--extra-fc-flags'])"
 
-enable_language(Fortran)
-
 set(CMAKE_Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/modules)
 include_directories(${PROJECT_BINARY_DIR}/modules)
 
diff --git a/test/cxx_accelerate/cmake/autocmake.yml b/test/cxx_accelerate/cmake/autocmake.yml
index 5aea2c9..c0a9749 100644
--- a/test/cxx_accelerate/cmake/autocmake.yml
+++ b/test/cxx_accelerate/cmake/autocmake.yml
@@ -1,6 +1,8 @@
 name: example
 min_cmake_version: 2.8
-language: CXX
+language:
+- CXX
+- C
 default_build_type: debug
 modules:
 - cxx:
diff --git a/test/extra_cmake_options/cmake/autocmake.yml b/test/extra_cmake_options/cmake/autocmake.yml
index 7b24802..c6cf288 100644
--- a/test/extra_cmake_options/cmake/autocmake.yml
+++ b/test/extra_cmake_options/cmake/autocmake.yml
@@ -1,5 +1,6 @@
 name: example
 min_cmake_version: 2.8
+language: CXX
 default_build_type: debug
 modules:
 - cxx: