diff --git a/.circleci/template.yml b/.circleci/template.yml
index ff72352a19a..f314fd7e223 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -563,7 +563,7 @@ jobs:
       store_results:
         type: boolean
         description: Collect and store test results in JUnit XML format for Insights
-        default: false
+        default: true
     environment:
       TESTSPEC: <<parameters.spec>>
       PRESET: <<parameters.preset>>
@@ -776,7 +776,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: mysql_redis_25
           executor: otp_25_mysql_redis
@@ -785,7 +784,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: dynamic_domains_mysql_redis_25
           spec: dynamic_domains.spec
@@ -795,7 +793,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: pgsql_mnesia_24
           executor: otp_24_pgsql_redis
@@ -804,7 +801,6 @@ workflows:
           requires:
             - otp_24_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: pgsql_mnesia_25
           executor: otp_25_pgsql_redis
@@ -813,7 +809,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: dynamic_domains_pgsql_mnesia_25
           spec: dynamic_domains.spec
@@ -823,7 +818,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: dynamic_domains_pgsql_mnesia_24
           spec: dynamic_domains.spec
@@ -833,7 +827,6 @@ workflows:
           requires:
             - otp_24_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: mssql_mnesia_25
           executor: otp_25_mssql_redis
@@ -843,7 +836,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: dynamic_domains_mssql_mnesia_25
           spec: dynamic_domains.spec
@@ -854,7 +846,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: riak_mnesia_24
           executor: otp_24_riak_redis
@@ -864,7 +855,6 @@ workflows:
           requires:
             - otp_24_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: ldap_mnesia_24
           executor: otp_24_ldap_redis
@@ -874,7 +864,6 @@ workflows:
           requires:
             - otp_24_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: ldap_mnesia_25
           executor: otp_25_ldap_redis
@@ -884,7 +873,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       - big_tests_in_docker:
           name: elasticsearch_and_cassandra_25
           executor: otp_25_elasticsearch_cassandra
@@ -894,7 +882,6 @@ workflows:
           requires:
             - otp_25_docker
           filters: *all_tags
-          store_results: true
       # ============= DOCKER IMAGE BUILD & UPLOAD =============
       - docker_image:
           name: docker_build_and_ship
diff --git a/big_tests/src/cth_surefire.erl b/big_tests/src/cth_surefire.erl
index 26ea4a9de8f..19c884f0c85 100644
--- a/big_tests/src/cth_surefire.erl
+++ b/big_tests/src/cth_surefire.erl
@@ -390,10 +390,11 @@ to_xml(#testcase{ group = Group, classname = CL, log = L, url = U,
 	 passed ->
 	     [];
 	 {skipped,Reason} ->
-	     ["<skipped type=\"skip\" message=\"Test ",N," in ",CL,
-	      " skipped!\">", sanitize(Reason),"</skipped>"];
+	     ["<skipped type=\"skip\" message=\"Test ", N, " in ", CL, maybe_group(Group),
+              " skipped!\">", sanitize(Reason),"</skipped>"];
 	 {fail,Reason} ->
-	     ["<failure message=\"Test ",N," in ",CL," failed!\" type=\"crash\">",
+	     ["<failure message=\"Test ", N, " in ", CL, maybe_group(Group),
+              " failed!\" type=\"crash\">",
 	      sanitize(Reason),"</failure>"]
      end,"</testcase>"];
 to_xml(#testsuite{ package = P, hostname = H, errors = E, failures = F,
@@ -417,6 +418,11 @@ to_xml(#state{ test_suites = TestSuites, axis = Axis, properties = Props }) ->
     ["<testsuites>",properties_to_xml(Axis,Props),
      [to_xml(TestSuite) || TestSuite <- TestSuites],"</testsuites>"].
 
+maybe_group("") ->
+    [];
+maybe_group(Group) ->
+    [" (group: ", Group, ")"].
+
 properties_to_xml([],[]) ->
     [];
 properties_to_xml(Axis,Props) ->