diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ed07d76e9..822daab957 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -301,10 +301,15 @@ _commands:
             when: always
         - store_artifacts:
             path: << parameters.workspace >>/log/test
-        - store_test_results:
-            path: << parameters.workspace >>/test_results
         - store_artifacts:
             path: << parameters.workspace >>/test_results
+        - run:
+            name: Prepare Test Results
+            working_directory: << parameters.workspace >>
+            command: find test_results -name "Test.xml" -type f -delete
+            when: always
+        - store_test_results:
+            path: << parameters.workspace >>/test_results
 
 _steps:
   pre_checkout: &pre_checkout