diff --git a/.travis.yml b/.travis.yml
index 4957987f..9ae5cb2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ addons:
     - valgrind
 os:
   - linux
+  - osx
 language: cpp
 compiler:
   - gcc
diff --git a/travis.sh b/travis.sh
index 71a003f7..ccaf3b5f 100755
--- a/travis.sh
+++ b/travis.sh
@@ -18,14 +18,17 @@ set -vex
 env | sort
 
 mkdir build
-cd build
-cmake ../googletest
-make
 
-# Python is not available in Travis for osx.
-#  https://github.com/travis-ci/travis-ci/issues/2320
+mkdir build/googletest
+( cd build/googletest && cmake ../../googletest )
 if [ "$TRAVIS_OS_NAME" != "osx" ]
 then
-  make
-  # valgrind --error-exitcode=42 --leak-check=full ./src/test_lib_json/jsoncpp_test
+( cd build/googletest && make )
+fi
+
+mkdir build/googlemock
+( cd build/googlemock && cmake ../../googlemock )
+if [ "$TRAVIS_OS_NAME" != "osx" ]
+then
+  ( cd build/googlemock && make )
 fi