diff --git a/Tests/BaseLib/TestFilePathStringManipulation.cpp b/Tests/BaseLib/TestFilePathStringManipulation.cpp
index 51f828a2f82c00ddadc04a3f82553ee692199152..914d5e180f1b9c9cd02871a4e07c67f4bbdf29d6 100644
--- a/Tests/BaseLib/TestFilePathStringManipulation.cpp
+++ b/Tests/BaseLib/TestFilePathStringManipulation.cpp
@@ -5,7 +5,7 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 #include "FileTools.h"
 #include "FileTools.cpp"
diff --git a/Tests/BaseLib/TestQuicksort.cpp b/Tests/BaseLib/TestQuicksort.cpp
index 68660ed0e2f55ae7a3efa5f03d782662793fbc44..a30ca43099a55a94fde2f95d04324c96e64a5139 100644
--- a/Tests/BaseLib/TestQuicksort.cpp
+++ b/Tests/BaseLib/TestQuicksort.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include "gtest.h"
+#include "gtest/gtest.h"
 #include "quickcheck/quickcheck.hh"
 #include "quicksort.h"
 
diff --git a/Tests/BaseLib/TestSwap.cpp b/Tests/BaseLib/TestSwap.cpp
index 2265a30a11f556eaaec0ee53356dcee6362500e5..faf1b6643b5ad1e7899d6826fe861f7fbb2780dc 100644
--- a/Tests/BaseLib/TestSwap.cpp
+++ b/Tests/BaseLib/TestSwap.cpp
@@ -10,7 +10,7 @@
  */
 
 // ** INCLUDES **
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 TEST(BaseLib, SwapInt) {
 	int arg0 = 5;
diff --git a/Tests/BaseLib/TestSystemTools.cpp b/Tests/BaseLib/TestSystemTools.cpp
index 16666ee91dbece3e7101d11d61314c8200c060b1..b4e7d7ace5f881228df9eec791a324e07fbca1cb 100644
--- a/Tests/BaseLib/TestSystemTools.cpp
+++ b/Tests/BaseLib/TestSystemTools.cpp
@@ -10,7 +10,7 @@
  */
 
 // ** INCLUDES **
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 #include "SystemTools.h"
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5bd64c87f07d5e6cb89d6b5fb3a225fd8470a0a3..de21e00f2b144056e6486b4d20e6ef4c1a949769 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -4,8 +4,6 @@ IF( MSVC )
 	ADD_DEFINITIONS( /D_VARIADIC_MAX=10 )
 ENDIF()
 
-ADD_SUBDIRECTORY( gtest )
-
 APPEND_SOURCE_FILES(TEST_SOURCES)
 APPEND_SOURCE_FILES(TEST_SOURCES BaseLib)
 APPEND_SOURCE_FILES(TEST_SOURCES GeoLib)
diff --git a/Tests/GeoLib/TestAABB.cpp b/Tests/GeoLib/TestAABB.cpp
index 9e2291e28c9c08fc541ef2177f1de2017f856836..dbae3c570fed931a78b9ae36acbcefc11ef2217d 100644
--- a/Tests/GeoLib/TestAABB.cpp
+++ b/Tests/GeoLib/TestAABB.cpp
@@ -10,7 +10,7 @@
  */
 
 // ** INCLUDES **
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 // std lib
 #include <cstdlib>
diff --git a/Tests/testrunner.cpp b/Tests/testrunner.cpp
index 4c1b591c278c468c1f375208136e6c39fff747c3..3d3cf4f5fb858fff5ce1c51c12e98516eeb6126b 100644
--- a/Tests/testrunner.cpp
+++ b/Tests/testrunner.cpp
@@ -11,7 +11,7 @@
  */
 
 // ** INCLUDES **
-#include "gtest.h"
+#include "gtest/gtest.h"
 
 /// Implementation of the googletest testrunner
 int main(int argc, char* argv[])
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 9181b4df1edefb8d10de307089bafe85b34cef2c..d12eec6d407f5ace9a8bb85a596db93d21603d12 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -6,4 +6,6 @@ ENDIF()
 SET_PROPERTY(TARGET logog PROPERTY FOLDER "logog")
 SET_PROPERTY(TARGET test-logog PROPERTY FOLDER "logog")
 
-ADD_SUBDIRECTORY(zlib)
\ No newline at end of file
+ADD_SUBDIRECTORY(zlib)
+
+ADD_SUBDIRECTORY(gtest)
\ No newline at end of file
diff --git a/ThirdParty/ReadMe.md b/ThirdParty/ReadMe.md
index 660bff30cd2b15605a1a12c3598a5fda1e186cd7..df64dd0c2be110cae69df90c9a957c4a2ced5060 100644
--- a/ThirdParty/ReadMe.md
+++ b/ThirdParty/ReadMe.md
@@ -22,4 +22,8 @@ Command line option parser. Is integrated directly.
 
 ## zlib ##
 
-Compression algorithms. Is integrated directly.
\ No newline at end of file
+Compression algorithms. Is integrated directly.
+
+## gtest ##
+
+Google testing framework for unit tests. Is integrated directly.
\ No newline at end of file
diff --git a/Tests/gtest/CMakeLists.txt b/ThirdParty/gtest/CMakeLists.txt
similarity index 100%
rename from Tests/gtest/CMakeLists.txt
rename to ThirdParty/gtest/CMakeLists.txt
diff --git a/Tests/gtest/gtest-all.cc b/ThirdParty/gtest/gtest-all.cc
similarity index 100%
rename from Tests/gtest/gtest-all.cc
rename to ThirdParty/gtest/gtest-all.cc
diff --git a/Tests/gtest/gtest.h b/ThirdParty/gtest/gtest.h
similarity index 100%
rename from Tests/gtest/gtest.h
rename to ThirdParty/gtest/gtest.h