diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13d8194..b21c902 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,6 @@ IF(MSVC)
     ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS=1")
 ELSE()
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-    # Fix for Clang on OSX
-    ADD_DEFINITIONS("-DGTEST_HAS_TR1_TUPLE=0")
 ENDIF()
 
 # Build output checks
@@ -162,6 +160,8 @@ IF(EXISTS "${CMAKE_SOURCE_DIR}/googletest/CMakeLists.txt")
     # Enable tests and add the test directory
     MESSAGE(STATUS "Tests have been enabled")
     SET(gtest_force_shared_crt ON CACHE BOOL "Always use /MD")
+    SET(BUILD_GMOCK OFF)
+    SET(BUILD_GTEST ON)
     ENABLE_TESTING()
     ADD_SUBDIRECTORY(googletest)
     ADD_SUBDIRECTORY(tests)