diff --git a/circle.yml b/circle.yml
index 017b07f3..d87ea088 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,11 +14,12 @@ dependencies:
     - go version
 
 test:
+  pre:
+    - git clean -fxd
+    - go clean -i -r ./cmd/...
   override:
     # First install latest versions of all dependencies
     - go get -v -t -d ./...
-    # Remove oldcrap object files from CircleCI's "source cache"
-    - go clean -i -r ./cmd/...
     # Build the binaries with those
     - go build -v ./cmd/...
     # And run the tests