diff --git a/circle.yml b/circle.yml
index fb3b67114..20956c2df 100644
--- a/circle.yml
+++ b/circle.yml
@@ -32,6 +32,12 @@ test:
       cd $SRCDIR;
       go get ./tools/thingdoer;
       thingdoer tasks.yml
+    - >
+      test "$CIRCLE_NODE_INDEX" != "0" || (
+        ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage &&
+        goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true &&
+        cp coverage.* scope.tar $CIRCLE_ARTIFACTS
+      )
 
 deployment:
   hub:
diff --git a/tasks.yml b/tasks.yml
index 866f4395b..5c9df6677 100644
--- a/tasks.yml
+++ b/tasks.yml
@@ -52,15 +52,6 @@
   after: [ui-build-image]
   command: make RM= RUN_FLAGS= client-test static
 
-- name: coverage
-  after: [test]
-  command: >
-    test "$CIRCLE_NODE_INDEX" != "0" || (
-      ./tools/cover/gather_coverage.sh ./coverage $SRCDIR/coverage;
-      goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/profile.cov -service=circleci || true;
-      cp coverage.* scope.tar $CIRCLE_ARTIFACTS
-    )
-
 - name: experimental
   after: [build-image]
   command: cd experimental; ./build_on_circle.sh