diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37b6e782..1af0e7ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,40 +1,32 @@
 shared_configs:
   simple_job_steps: &simple_job_steps
     - checkout
-    #TODO: caching config so we don't accidentally try to re-use
-    #cache across versions of Go...
-
-    #- restore_cache:
-    #    keys:
-    #      - go-mod-v4-{{ checksum "go.sum" }}
-    #- run:
-    #    name: Install Dependencies
-    #    command: go mod download
-    #- save_cache:
-    #    key: go-mod-v4-{{ checksum "go.sum" }}
-    #    paths:
-    #      - "/go/pkg/mod"
     - run:
         name: Run tests
         command: |
-          #mkdir -p /tmp/test-reports
-          #gotestsum --junitfile /tmp/test-reports/unit-tests.xml
           make deps test
-    #- store_test_results:
-    #    path: /tmp/test-reports
 
 
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 jobs:
   build-1-12-gopath:
-    working_directory: ~/gopath/github.com/jhump/protoreflect
+    working_directory: ~/repo
     docker:
       - image: circleci/golang:1.12
     environment:
       GO111MODULE: "off"
-      GOPATH: ~/gopath
-    steps: *simple_job_steps
+    steps:
+      - checkout
+      - run:
+          name: Prepare GOPATH
+          command: |
+            mkdir -p ~/gopath/github.com/jhump/protoreflect
+            mv ~/repo/* ~/gopath/github.com/jhump/protoreflect/
+      - run:
+          name: Run tests
+          command: |
+            GOPATH=~/gopath make deps test
 
   build-1-12:
     working_directory: ~/repo