diff --git a/circle.yml b/circle.yml
index 7e326b2..02c2058 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,9 +14,9 @@ dependencies:
     cache_directories:
         - "~/opus"
         - "~/bin"
-        - "/usr/local/go/bin"
-        - "/usr/local/go/src/github.com/nitrous-io"
+        - "$(GOPATH)/src/github.com/nitrous-io"
         - "~/.vendor"
+        - "$(GOPATH)/bin/goop"
 test:
     override:
         - mumbledj -server=$MUMBLE_IP -port=$MUMBLE_PORT -username=circleci -password=$MUMBLE_PASSWORD -verbose=true -test=true:
diff --git a/test.go b/test.go
index 4c989c1..7a3c81f 100644
--- a/test.go
+++ b/test.go
@@ -43,7 +43,8 @@ func (t TestSettings) testYoutubeSong() {
 	//	if err := dummyClient.Connect(); err != nil {
 	//		panic(err)
 	//	}
-	if dummyUser := dj.client.Users.Find("BottleOToast"); dummyUser == nil {
+	dummyUser := dj.client.Users.Find("BottleOToast")
+	if dummyUser == nil {
 		fmt.Printf("User does not exist")
 		os.Exit(1)
 	}