diff --git a/CMakeLists.txt b/CMakeLists.txt
index 235149c77..95053a349 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,10 +270,10 @@ ENDIF(INSTALL_LIBS)
 #	OPTION(INSTALL_EXTRA_LIBS "Set when you want extra libraries installed" OFF)
 #ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
 
-OPTION(BUILD_UNIT_TESTS "Build Unit Tests"	OFF)
+OPTION(BUILD_UNIT_TESTS "Build Unit Tests"	ON)
 
 IF (BUILD_UNIT_TESTS)
-	SUBDIRS(UnitTests)
+	SUBDIRS(test)
 ENDIF()
 
 set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 000000000..990d62ce4
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,3 @@
+#SUBDIRS(  gtest-1.7.0  TestBullet3OpenCL)
+SUBDIRS(  gtest-1.7.0  )
+
diff --git a/test/gtest-1.7.0/CMakeLists.txt b/test/gtest-1.7.0/CMakeLists.txt
new file mode 100644
index 000000000..0091e25ec
--- /dev/null
+++ b/test/gtest-1.7.0/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+INCLUDE_DIRECTORIES(
+	.
+	include
+)
+
+SET(gtest-1.7.0_SRCS
+	src/gtest-all.cc
+)
+
+#ADD_DEFINITIONS(-DGTEST_HAS_PTHREAD=1)
+ADD_DEFINITIONS(-D_VARIADIC_MAX=10)
+
+FILE(GLOB_RECURSE gtest-1.7.0_HDRS "*.h")
+
+ADD_LIBRARY(gtest ${gtest-1.7.0_SRCS} ${gtest-1.7.0_HDRS})