diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d54097db..fb1903316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,7 +279,7 @@ endif(NOT ENABLE_GENERIC_ARCH)
 
 
 ################################################################################
-# Googletest - http://code.google.com/p/googletest/
+# Googletest - https://github.com/google/googletest
 ################################################################################
 enable_testing()
 if(EXISTS $ENV{GTEST_DIR})
@@ -288,7 +288,7 @@ endif(EXISTS $ENV{GTEST_DIR})
 if(GTEST_DIR)
      message(STATUS "Googletest root folder set at ${GTEST_DIR}")
      find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS ${GTEST_DIR})
-          if(LIBGTEST_DEV_DIR)
+     if(LIBGTEST_DEV_DIR)
          message (STATUS "Googletest has been found.")
      else(LIBGTEST_DEV_DIR)
          message (FATAL_ERROR " Googletest source code has not been found at ${GTEST_DIR}.")
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 9cef36e19..b9d776c94 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -39,9 +39,9 @@ if(NOT ${GTEST_DIR_LOCAL})
      if(OS_IS_MACOSX)
          ExternalProject_Add(
               gtest-${gtest_RELEASE}
-              URL http://googletest.googlecode.com/files/gtest-${gtest_RELEASE}.zip
+              GIT_REPOSITORY https://github.com/google/googletest
+              GIT_TAG release-${gtest_RELEASE}
               DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../download/gtest-${gtest_RELEASE}
-              URL_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
               SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${gtest_RELEASE}
               BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${gtest_RELEASE}
               CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -52,9 +52,9 @@ if(NOT ${GTEST_DIR_LOCAL})
      else(OS_IS_MACOSX)
          ExternalProject_Add(
               gtest-${gtest_RELEASE}
-              URL http://googletest.googlecode.com/files/gtest-${gtest_RELEASE}.zip
+              GIT_REPOSITORY https://github.com/google/googletest
+              GIT_TAG release-${gtest_RELEASE}
               DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../download/gtest-${gtest_RELEASE}
-              URL_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
               SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${gtest_RELEASE}
               BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${gtest_RELEASE}
               UPDATE_COMMAND ""