diff --git a/kokoro/linux/32-bit/Dockerfile b/kokoro/linux/32-bit/Dockerfile
index c914b96..1278889 100644
--- a/kokoro/linux/32-bit/Dockerfile
+++ b/kokoro/linux/32-bit/Dockerfile
@@ -96,7 +96,7 @@
 RUN composer config -g -- disable-tls true
 RUN composer config -g -- secure-http false
 RUN cd /tmp && \
-  git clone https://github.com/protocolbuffers/protobuf.git && \
+  git clone https://github.com/google/protobuf.git && \
   cd protobuf/php && \
   git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \
   ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \
diff --git a/kokoro/linux/64-bit/Dockerfile b/kokoro/linux/64-bit/Dockerfile
index 88dc3d7..3a279e6 100644
--- a/kokoro/linux/64-bit/Dockerfile
+++ b/kokoro/linux/64-bit/Dockerfile
@@ -127,7 +127,7 @@
 ENV MVN mvn --batch-mode
 
 RUN cd /tmp && \
-  git clone https://github.com/protocolbuffers/protobuf.git && \
+  git clone https://github.com/google/protobuf.git && \
   cd protobuf && \
   git reset --hard 129a6e2aca95dcfb6c3e717d7b9cca1f104fde39 && \
   ./autogen.sh && \
@@ -180,7 +180,7 @@
 RUN composer config -g -- secure-http false
 RUN cd /tmp && \
   rm -rf protobuf && \
-  git clone https://github.com/protocolbuffers/protobuf.git && \
+  git clone https://github.com/google/protobuf.git && \
   cd protobuf && \
   git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \
   cd php && \
diff --git a/tests.sh b/tests.sh
index 1e24177..4953413 100755
--- a/tests.sh
+++ b/tests.sh
@@ -105,7 +105,7 @@
   export PATH="`pwd`/src:$PATH"
 
   export GOPATH="$HOME/gocode"
-  mkdir -p "$GOPATH/src/github.com/google"
+  mkdir -p "$GOPATH/src/github.com/protocolbuffers"
   rm -f "$GOPATH/src/github.com/protocolbuffers/protobuf"
   ln -s "`pwd`" "$GOPATH/src/github.com/protocolbuffers/protobuf"
   export PATH="$GOPATH/bin:$PATH"