diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e687623..e668db4d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,12 +33,12 @@ jobs:
       - run:
           command: bin/circle-test-smoke
           no_output_timeout: 360s
-      # Generate code coverage reports
-      - run: bin/circle-test-teardown
       # Destroy testing VMs:
       - run:
           command: bin/circle-destroy-vms
           background: true
+      - deploy:
+          command: cd $SRCDIR/test; ./gen_coverage_reports.sh
       # run goveralls; copy coverage reports to artifacts dir
       - deploy:
           command: $SRCDIR/bin/circle-teardown-pre
diff --git a/bin/circle-test-teardown b/bin/circle-test-teardown
deleted file mode 100755
index d998a3c7..00000000
--- a/bin/circle-test-teardown
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd $SRCDIR/test
-test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR/test; ./gen_coverage_reports.sh)