diff --git a/.travis.yml b/.travis.yml
index ae45cd4e..b4c0cb2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ install:
 - export PATH=/usr/local/bin:/usr/bin:${PATH}
 - echo ${CXX}
 - ${CXX} --version
-- which valgrind
 addons:
   apt:
     sources:
@@ -37,8 +36,10 @@ compiler:
 script: ./travis.sh
 env:
   matrix:
-#    - SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
-    - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
 notifications:
   email: false
 sudo: false
diff --git a/travis.sh b/travis.sh
index 3e4d3087..6d381e9a 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,29 +1,14 @@
 #!/usr/bin/env sh
-# This is called by `.travis.yml` via Travis CI.
-# Travis supplies $TRAVIS_OS_NAME.
-#  http://docs.travis-ci.com/user/multi-os/
-# Our .travis.yml also defines:
-#   - SHARED_LIB=ON/OFF
-#   - STATIC_LIB=ON/OFF
-#   - CMAKE_PKG=ON/OFF
-#   - BUILD_TYPE=release/debug
-#   - VERBOSE_MAKE=false/true
-#   - VERBOSE (set or not)
-
-# -e: fail on error
-# -v: show commands
-# -x: show expanded commands
 set -evx
-
 env | sort
 
 mkdir build || true
-
-( ( mkdir build/googletest || true ) &&
-  cd build/googletest &&
-  cmake -Dgtest_build_tests=ON -Dgtest_build_samples=ON ../../googletest &&
-  make && make test)
-( ( mkdir build/googlemock || true ) &&
-  cd build/googlemock &&
-  cmake -Dgmock_build_tests=ON -Dgtest_build_samples=ON ../../googlemock &&
-  make && make test)
+mkdir build/$GTEST_TARGET || true
+cd build/$GTEST_TARGET
+cmake -Dgtest_build_samples=ON \
+      -Dgmock_build_samples=ON \
+      -Dgtest_build_tests=ON \
+      -Dgmock_build_tests=ON \
+      ../../$GTEST_TARGET
+make
+make test