diff --git a/appveyor.yml b/appveyor.yml
index ce797c69a8..2ea3cb789b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,9 +19,15 @@ environment:
 test: off
 
 install:
-  - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip
-  - 7z x gmock-1.7.0.zip
-  - rename gmock-1.7.0 gmock
+  - ps: Start-FileDownload https://github.com/google/googlemock/archive/release-1.7.0.zip
+  - 7z x release-1.7.0.zip
+  - del /Q release-1.7.0.zip
+  - rename googlemock-release-1.7.0 gmock
+  - ps: Start-FileDownload https://github.com/google/googletest/archive/release-1.7.0.zip
+  - 7z x release-1.7.0.zip
+  - del /Q release-1.7.0.zip
+  - rename googletest-release-1.7.0 gtest
+  - move gtest gmock
   - ps: Start-FileDownload https://go.microsoft.com/fwlink/?LinkID=809122 -FileName dotnetsdk.exe
   - dotnetsdk.exe /install /quiet /norestart
 
diff --git a/autogen.sh b/autogen.sh
index 5b4c29f8c0..9f26642585 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,10 +31,15 @@ fi
 # directory is set up as an SVN external.
 if test ! -e gmock; then
   echo "Google Mock not present.  Fetching gmock-1.7.0 from the web..."
-  curl $curlopts -O https://googlemock.googlecode.com/files/gmock-1.7.0.zip
-  unzip -q gmock-1.7.0.zip
-  rm gmock-1.7.0.zip
-  mv gmock-1.7.0 gmock
+  curl $curlopts -L -O https://github.com/google/googlemock/archive/release-1.7.0.zip
+  unzip -q release-1.7.0.zip
+  rm release-1.7.0.zip
+  mv googlemock-release-1.7.0 gmock
+
+  curl $curlopts -L -O https://github.com/google/googletest/archive/release-1.7.0.zip
+  unzip -q release-1.7.0.zip
+  rm release-1.7.0.zip
+  mv googletest-release-1.7.0 gmock/gtest
 fi
 
 set -ex