diff --git a/circle.yml b/circle.yml
index 7587a4e3..00a51d3d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,5 +6,5 @@ test:
     override:
         - bash gofmt.sh
         - go tool vet .
-        - go test -timeout 60s -v ./...
-        - GORACE="halt_on_error=1" go test -race -timeout 120s -v ./...
+        - case $CIRCLE_NODE_INDEX in 0) go test -timeout 60s -v ./... ;; 1) GORACE="halt_on_error=1" go test -race -timeout 120s -v ./...;; esac:
+            parallel: true