diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e23a605
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tests/googletest"]
+	path = tests/googletest
+	url = git@github.com:google/googletest.git
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a2c2ea7..91d4840 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,17 +2,19 @@ set(target tests)
 
 file(GLOB core_sources "*.cpp")
 
-find_package(GTest REQUIRED)
+add_subdirectory(googletest)
 
 include_directories(
-	${GTEST_INCLUDE_DIRS}
+	${gtest_SOURCE_DIR}/include
+	${gtest_SOURCE_DIR}
 	${Boost_INCLUDE_DIRS}
 	${PROJECT_SOURCE_DIR}/include
 )
 
 set(libraries
+	gtest_main
+	gtest
 	${Boost_LIBRARIES}
-	${GTEST_BOTH_LIBRARIES}
 	plasp
 )
 
@@ -20,7 +22,7 @@ file(COPY data DESTINATION ${CMAKE_BINARY_DIR})
 
 add_executable(${target} ${core_sources})
 target_link_libraries(${target} ${libraries})
-GTEST_ADD_TESTS(tests "" ${core_sources})
+add_test(tests ${core_sources})
 
 add_custom_target(run-tests
 	COMMAND ${CMAKE_BINARY_DIR}/bin/tests
diff --git a/tests/googletest b/tests/googletest
new file mode 160000
index 0000000..0a43962
--- /dev/null
+++ b/tests/googletest
@@ -0,0 +1 @@
+Subproject commit 0a439623f75c029912728d80cb7f1b8b48739ca4