diff --git a/.gitmodules b/.gitmodules
index e69de29bb..a4a68a061 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ext/googletest"]
+	path = ext/googletest
+	url = https://github.com/google/googletest.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d13e17ee5..df474ba09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ else()
 endif()
 
 set (libs)
-include_directories (BEFORE SYSTEM ./ext/gtest/include)
+include_directories (BEFORE SYSTEM ./ext/googletest/googletest/include)
 
 if (UNIX)
     if (NOT APPLE)
diff --git a/ext/googletest b/ext/googletest
new file mode 160000
index 000000000..2fe3bd994
--- /dev/null
+++ b/ext/googletest
@@ -0,0 +1 @@
+Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 1f78ae069..23c9028e7 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,13 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 include_directories(
-    ../../ext/gtest
-    ../../ext/gtest/include
-    ../../ext/gmock
-    ../../ext/gmock/include)
+    ../../ext/googletest/googletest
+    ../../ext/googletest/googletest/include
+    ../../ext/googletest/googlemock
+    ../../ext/googletest/googlemock/include)
     
-add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
-add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
+add_library(gtest STATIC ../../ext/googletest/googletest/src/gtest-all.cc)
+add_library(gmock STATIC ../../ext/googletest/googlemock/src/gmock-all.cc)
 
 if (UNIX)
     # ignore warnings in gtest and gmock
diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
index 096ba3d50..86ce8365a 100644
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -56,8 +56,8 @@ endif()
 include_directories(
     ../../
     ../../lib/
-    ../../../ext/gtest/include
-    ../../../ext/gmock/include
+    ../../../ext/googletest/googletest/include
+    ../../../ext/googletest/googlemock/include
 )
 
 if (UNIX)