diff --git a/.travis.yml b/.travis.yml
index 92da83fa543..0358a206dc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,11 @@ language: cpp
 
 os:
 - linux
+- osx
+
+compiler:
+  - gcc
+  #- clang
 
 env:
   matrix:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f3da26d0d4..d6a9704b2b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,9 +74,12 @@ set(FlatBuffers_Sample_Text_SRCS
 if(APPLE)
   set(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
-elseif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+elseif(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra")
+elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+  set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror -Wextra")
 endif()
 
 if(FLATBUFFERS_CODE_COVERAGE)