diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90d8cf5..a4adb37 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,9 +53,9 @@ jobs:
       - checkout
       - bundle_install:
           version: << parameters.version >>
-      - run: bundle exec rake test TESTOPTS="--ci-dir=./reports"
+      - run: bundle exec rake test
       - store_test_results:
-          path: ./reports
+          path: "$CIRCLE_TEST_REPORTS/reports"
 
 workflows:
   version: 2
diff --git a/test/support/circleci.rb b/test/support/circleci.rb
index 320e9a6..5a36bfa 100644
--- a/test/support/circleci.rb
+++ b/test/support/circleci.rb
@@ -1,2 +1,6 @@
 # Generate XML test reports that can be parsed by CircleCI
-require 'minitest/ci' if ENV['CIRCLECI']
+if ENV["CIRCLECI"]
+  require 'minitest/ci'
+
+  Minitest::Ci.report_dir = "#{ENV["CIRCLE_TEST_REPORTS"]}/reports"
+end