diff --git a/.gitmodules b/.gitmodules
index 54f9f9f02a..b05206ecfa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "Tools/gencpp"]
 	path = Tools/gencpp
 	url = https://github.com/ros/gencpp.git
-[submodule "unittests/gtest"]
-	path = unittests/gtest
-	url = https://github.com/sjwilks/gtest.git
 [submodule "src/lib/eigen"]
 	path = src/lib/eigen
 	url = https://github.com/PX4/eigen.git
@@ -25,3 +22,6 @@
 [submodule "Tools/jMAVSim"]
 	path = Tools/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git
+[submodule "unittests/googletest"]
+	path = unittests/googletest
+	url = https://github.com/google/googletest.git
diff --git a/unittests/googletest b/unittests/googletest
new file mode 160000
index 0000000000..c99458533a
--- /dev/null
+++ b/unittests/googletest
@@ -0,0 +1 @@
+Subproject commit c99458533a9b4c743ed51537e25989ea55944908
diff --git a/unittests/gtest b/unittests/gtest
deleted file mode 160000
index cdef6e4ce0..0000000000
--- a/unittests/gtest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cdef6e4ce097f953445446e8da4cb8bb68478bc5