diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5633a48e..2dcf209d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ linux_image: &linux_image
 
 macos_image: &macos_image
   macos:
-    xcode: "11.4.0"
+    xcode: "11.7.0"
 
 setup_macos_env: &setup_macos_env
 
diff --git a/.circleci/xcode_install_go b/.circleci/xcode_install_go
index 6e8632fe..b7e21e05 100644
--- a/.circleci/xcode_install_go
+++ b/.circleci/xcode_install_go
@@ -9,15 +9,16 @@ set -o errexit
 set -o pipefail
 
 PROJECT_RELATIVE_PATH=src/github.com/codeclimate/test-reporter
-            
-# Install go
+
+# Install goSDK
+mkdir ~/gosdk && cd "$_"
+echo 'export PATH=$PATH:$HOME/gosdk/go/bin' >> "$BASH_ENV"
+echo 'export GOROOT=$HOME/gosdk/go' >> "$BASH_ENV"
 curl -O https://dl.google.com/go/go1.15.darwin-amd64.tar.gz
 tar -xzf go1.15.darwin-amd64.tar.gz
-echo 'export PATH=$PATH:$PWD/go/bin' >> "$BASH_ENV"
 
-# Set go path
-mkdir -p ~/gopath/${PROJECT_RELATIVE_PATH}
-echo 'export GOPATH=$HOME/gopath' >> "$BASH_ENV"
+# Set go path - workspace root
+mkdir -p ~/projects/go/${PROJECT_RELATIVE_PATH} && cd "$_"
+echo 'export GOPATH=$HOME/projects/go' >> "$BASH_ENV"
 . "$BASH_ENV"
-cd $GOPATH/${PROJECT_RELATIVE_PATH}
 cp -r ~/project/ $GOPATH/${PROJECT_RELATIVE_PATH}