diff --git a/.gitmodule_mirrors b/.gitmodule_mirrors
index 0e10b99a9a6..2a77bbfe044 100644
--- a/.gitmodule_mirrors
+++ b/.gitmodule_mirrors
@@ -8,4 +8,5 @@ src/erasure-code/jerasure/jerasure git://apt-mirror.front.sepia.ceph.com/jerasur
 src/erasure-code/jerasure/gf-complete git://apt-mirror.front.sepia.ceph.com/gf-complete.git
 src/rocksdb git://apt-mirror.front.sepia.ceph.com/rocksdb.git
 ceph-erasure-code-corpus git://apt-mirror.front.sepia.ceph.com/ceph-erasure-code-corpus.git
-src/gmock git://apt-mirror.front.sepia.ceph.com/gmock.git
+# FIXME: Should be changed to src/googletest
+# src/gmock git://apt-mirror.front.sepia.ceph.com/gmock.git
diff --git a/.gitmodules b/.gitmodules
index 8ed93e40d52..9ab33e2d0b0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,10 +19,13 @@
 [submodule "ceph-erasure-code-corpus"]
 	path = ceph-erasure-code-corpus
 	url = https://github.com/ceph/ceph-erasure-code-corpus.git
-[submodule "src/gmock"]
-	path = src/gmock
-	url = https://github.com/ceph/gmock.git
-        branch = ceph-release-1.7.0
+
+# FIXME: The url must be updated after googletest is forked in ceph
+#        The branch must be updated after a new release (like "release-1.7.5")
+[submodule "src/googletest"]
+	path = src/googletest
+	url = https://github.com/google/googletest
+        branch = master
 [submodule "src/spdk"]
 	path = src/spdk
 	url = https://github.com/ceph/spdk.git
diff --git a/Doxyfile b/Doxyfile
index 85b4b2cbb87..4ec24642526 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -7,7 +7,7 @@ SYMBOL_CACHE_SIZE = 2
 WARN_IF_UNDOCUMENTED = NO
 INPUT = src
 RECURSIVE = YES
-EXCLUDE = src/gmock \
+EXCLUDE = src/googletest \
 	src/test/virtualenv \
 	src/out \
 	src/tracing \
diff --git a/Makefile.am b/Makefile.am
index b1d8d949a0b..1b252c1737c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = gnu
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh ceph.spec.in ceph.spec install-deps.sh
-# the "." here makes sure check-local builds gtest and gmock before they are used
+# the "." here makes sure check-local builds googletest and googlemock before they are used
 SUBDIRS = . src man doc systemd selinux
 
 EXTRA_DIST += \
@@ -37,8 +37,8 @@ all-local::
 if WITH_DEBUG
 #	We need gtest to build the rados-api tests. We only build those in
 #	a debug build, though.
-	@cd src/gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-	@cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
+	@cd src/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+	@cd src/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
 endif
 
 CHECK_ULIMIT := true
@@ -46,8 +46,8 @@ CHECK_ULIMIT := true
 check-local:: all
 #	We build gtest this way, instead of using SUBDIRS, because with that,
 #	gtest's own tests would be run and that would slow us down.
-	@cd src/gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-	@cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
+	@cd src/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+	@cd src/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
 #	exercise cli tools
 	u=`ulimit -u` ; \
 	p=`expr $(shell ${NPROC}) / 2` ; \
@@ -73,9 +73,9 @@ check_SCRIPTS = \
 # gtest is in DIST_SUBDIRS. Take extra care to not fail when
 # effectively cleaned twice.
 clean-local::
-	@if test -e src/gmock/Makefile; then \
-	  echo "Making clean in src/gmock"; \
-	  cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \
+	@if test -e src/googletest/googlemock/Makefile; then \
+	  echo "Making clean in src/googletest/googlemock"; \
+	  cd src/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) clean; \
 	fi
 
 	@rm -rf src/test/virtualenv
diff --git a/autogen.sh b/autogen.sh
index b6f502940b7..0eb66ebe34a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -45,5 +45,5 @@ aclocal -I m4 --install
 autoconf
 autoheader
 automake -a --add-missing -Wall
-( cd src/gmock && autoreconf -fvi; )
+( cd src/googletest/googlemock && autoreconf -fvi; )
 exit
diff --git a/configure.ac b/configure.ac
index 1e7ef67b4c7..fb806d3de28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AM_CONDITIONAL(WITH_MAN_PAGES, test -n "$SPHINX_BUILD")
 
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_CONFIG_SUBDIRS([src/gmock])
+AC_CONFIG_SUBDIRS([src/googletest/googlemock])
 
 # Environment
 AC_CANONICAL_HOST
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cec6efbe919..d91c7544165 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1010,7 +1010,7 @@ target_link_libraries(crushtool global)
 install(TARGETS crushtool DESTINATION bin)
 
 # Support/Tools
-add_subdirectory(gmock)
+add_subdirectory(googletest/googlemock)
 
 add_subdirectory(test)
 set(cephfs_srcs cephfs.cc)
diff --git a/src/Makefile.am b/src/Makefile.am
index a4cf68b797d..4e96326036f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ am__is_gnu_make = { \
 }
 
 SUBDIRS += ocf java
-DIST_SUBDIRS += gmock ocf java
+DIST_SUBDIRS += googletest/googlemock ocf java
 
 LOCAL_ALL =
 LOCAL_CLEAN =
diff --git a/src/gmock b/src/gmock
deleted file mode 160000
index 49beb3bdf05..00000000000
--- a/src/gmock
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 49beb3bdf05a728afb48dbfbeb1a693ce4c38027
diff --git a/src/googletest b/src/googletest
new file mode 160000
index 00000000000..d225acc90bc
--- /dev/null
+++ b/src/googletest
@@ -0,0 +1 @@
+Subproject commit d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index f8b50aa40c0..6af11a61dd2 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(AddCephTest)
 
 set(UNITTEST_LIBS gmock_main gmock gtest ${PTHREAD_LIBS} ${CMAKE_DL_LIBS})
-set(UNITTEST_CXX_FLAGS "-I${CMAKE_SOURCE_DIR}/src/gmock/include -I${CMAKE_BINARY_DIR}/src/gmock/include -I${CMAKE_SOURCE_DIR}/src/gmock/gtest/include -I${CMAKE_BINARY_DIR}/src/gmock/gtest/include -fno-strict-aliasing")
+set(UNITTEST_CXX_FLAGS "-I${CMAKE_SOURCE_DIR}/src/googletest/googlemock/include -I${CMAKE_BINARY_DIR}/src/googletest/googlemock/include -I${CMAKE_SOURCE_DIR}/src/googletest/googletest/include -I${CMAKE_BINARY_DIR}/src/googletest/googletest/include -fno-strict-aliasing")
 
 add_subdirectory(bench)
 add_subdirectory(cls_hello)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index b3fd506eb4c..918cad34871 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -128,14 +128,14 @@ unittests:: $(check_PROGRAMS)
 
 UNITTEST_CXXFLAGS = \
 	$(AM_CXXFLAGS) \
-	-I$(top_srcdir)/src/gmock/include \
-	-I$(top_builddir)/src/gmock/include \
-	-I$(top_srcdir)/src/gmock/gtest/include \
-	-I$(top_builddir)/src/gmock/gtest/include
+	-I$(top_srcdir)/src/googletest/googlemock/include \
+	-I$(top_builddir)/src/googletest/googlemock/include \
+	-I$(top_srcdir)/src/googletest/googletest/include \
+	-I$(top_builddir)/src/googletest/googletest/include
 UNITTEST_LDADD = \
-	$(top_builddir)/src/gmock/lib/libgmock_main.la \
-	$(top_builddir)/src/gmock/lib/libgmock.la \
-	$(top_builddir)/src/gmock/gtest/lib/libgtest.la \
+	$(top_builddir)/src/googletest/googlemock/lib/libgmock_main.la \
+	$(top_builddir)/src/googletest/googlemock/lib/libgmock.la \
+	$(top_builddir)/src/googletest/googletest/lib/libgtest.la \
 	$(PTHREAD_LIBS)
 
 if SOLARIS