diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e959dc..06a95b7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,14 +12,17 @@ jobs:
             - 'vendor-{{ checksum "Gopkg.lock" }}'
       - run:
           name: Install dep
-          command: 'if [[ ! -x /go/bin/dep ]]; then curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh; fi'
+          command: |
+            if [[ ! -x "${GOPATH}/bin/dep" ]]; then
+                curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+            fi
       - save_cache:
           key: dep
           paths:
             - /go/bin/dep
       - run:
           name: Install the project's dependencies
-          command: '${GOPATH}/bin/dep ensure'
+          command: '"${GOPATH}/bin/dep" ensure'
       - save_cache:
           key: 'vendor-{{ checksum "Gopkg.lock" }}'
           paths:
@@ -45,19 +48,24 @@ jobs:
       - image: golang:1.11
     working_directory: '/go/src/github.com/sei40kr/zsh-fast-alias-tips'
     steps:
+      - checkout
       - restore_cache:
           keys:
             - goreleaser
       - run:
           name: Install goreleaser
-          command: 'if [[ ! -x /go/bin/goreleaser ]]; then curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh; fi'
+          command: |
+            if [[ ! -x "${GOPATH}/bin/goreleaser" ]]; then
+                curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh
+                mv bin/goreleaser "${GOPATH}/bin/goreleaser"
+            fi
       - save_cache:
           key: goreleaser
           paths:
             - /go/bin/goreleaser
       - run:
           name: Release the Go binary
-          command: './bin/goreleaser'
+          command: '"${GOPATH}/bin/goreleaser"'
 
 workflows:
   version: 2