diff --git a/circle.yml b/circle.yml
index 45684ad990e0bd94ea2919f5c9c81749951f4614..77971ec6c4f1d241bdc252c89c3cb7a96a113588 100644
--- a/circle.yml
+++ b/circle.yml
@@ -34,6 +34,6 @@ dependencies:
 test:
   override:
     - make test_go_expensive:
-        pwd: "$GOPATH/src/$IMPORT_PATH"
+        pwd: "../.go_workspace/src/$IMPORT_PATH"
     - make test_sharness_expensive:
-        pwd: "$GOPATH/src/$IMPORT_PATH"
+        pwd: "../.go_workspace/src/$IMPORT_PATH"