diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index 0b22f29349..48bce92a3a 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -1004,6 +1004,13 @@ commands:
             # Put manually specified tests and automatically detected tests together, removing duplicates
             tests=$(echo <<parameters.tests>> | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
             echo "Tests to be repeated: ${tests}"
+            
+            # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+            target=<<parameters.target>>
+            testtag=""
+            if [[ $target == "test-compression" ]]; then
+              testtag="compression"
+            fi
 
             # Run each test class as many times as requested.
             exit_code="$?"
@@ -1031,7 +1038,7 @@ commands:
                 fi
 
                 # Prepare the -Dtest.methods argument, which is optional
-                if [ $method == "" ]; then
+                if [[ $method == "" ]]; then
                   methods_arg=""
                 else
                   methods_arg="-Dtest.methods=$method"
@@ -1056,7 +1063,7 @@ commands:
                   mv stdout.txt $dest/${test}.txt
 
                   # move the XML output files
-                  source=build/test/output
+                  source=build/test/output/${testtag}
                   dest=/tmp/results/repeated_utests/output/${status}/${i}
                   mkdir -p $dest
                   if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1064,7 +1071,7 @@ commands:
                   fi
 
                   # move the log files
-                  source=build/test/logs
+                  source=build/test/logs/${testtag}
                   dest=/tmp/results/repeated_utests/logs/${status}/${i}
                   mkdir -p $dest
                   if [[ -d $source && -n "$(ls $source)" ]]; then
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43a507ba9f..84da5cfb0a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -181,6 +181,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-compression
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -207,7 +214,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -232,7 +239,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -240,7 +247,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -353,6 +360,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS_LONG} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=long-testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -379,7 +393,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -404,7 +418,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -412,7 +426,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -525,6 +539,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -551,7 +572,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -576,7 +597,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -584,7 +605,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1157,6 +1178,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_UPGRADE_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1183,7 +1211,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1208,7 +1236,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1216,7 +1244,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1588,6 +1616,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1614,7 +1649,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1639,7 +1674,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1647,7 +1682,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index b4983f9b8a..cf4e5f4fcb 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -181,6 +181,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-compression
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -207,7 +214,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -232,7 +239,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -240,7 +247,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -353,6 +360,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS_LONG} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=long-testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -379,7 +393,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -404,7 +418,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -412,7 +426,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -525,6 +539,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -551,7 +572,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -576,7 +597,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -584,7 +605,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1157,6 +1178,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_UPGRADE_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1183,7 +1211,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1208,7 +1236,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1216,7 +1244,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1588,6 +1616,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1614,7 +1649,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1639,7 +1674,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1647,7 +1682,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index baeb67190a..f611444ec2 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -181,6 +181,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-compression
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -207,7 +214,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -232,7 +239,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -240,7 +247,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -353,6 +360,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS_LONG} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=long-testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -379,7 +393,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -404,7 +418,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -412,7 +426,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -525,6 +539,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -551,7 +572,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -576,7 +597,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -584,7 +605,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1157,6 +1178,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_UPGRADE_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1183,7 +1211,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1208,7 +1236,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1216,7 +1244,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1588,6 +1616,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1614,7 +1649,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1639,7 +1674,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1647,7 +1682,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES
index 38a2fa39ef..85f8d70369 100644
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@ -181,6 +181,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-compression
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -207,7 +214,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -232,7 +239,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -240,7 +247,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -353,6 +360,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS_LONG} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=long-testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -379,7 +393,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -404,7 +418,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -412,7 +426,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -525,6 +539,13 @@ jobs:
           tests=$(echo ${REPEATED_UTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=testsome
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -551,7 +572,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -576,7 +597,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -584,7 +605,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1157,6 +1178,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_UPGRADE_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1183,7 +1211,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1208,7 +1236,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1216,7 +1244,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1588,6 +1616,13 @@ jobs:
           tests=$(echo ${REPEATED_JVM_DTESTS} | sed -e "s/<nil>//" | sed -e "s/ //" | tr "," "\n" | tr " " "\n" | sort -n | uniq -u)
           echo "Tests to be repeated: ${tests}"
 
+          # Prepare the testtag for the target, used by the test macro in build.xml to group the output files
+          target=test-jvm-dtest-some
+          testtag=""
+          if [[ $target == "test-compression" ]]; then
+            testtag="compression"
+          fi
+
           # Run each test class as many times as requested.
           exit_code="$?"
           for test in $tests; do
@@ -1614,7 +1649,7 @@ jobs:
               fi
 
               # Prepare the -Dtest.methods argument, which is optional
-              if [ $method == "" ]; then
+              if [[ $method == "" ]]; then
                 methods_arg=""
               else
                 methods_arg="-Dtest.methods=$method"
@@ -1639,7 +1674,7 @@ jobs:
                 mv stdout.txt $dest/${test}.txt
 
                 # move the XML output files
-                source=build/test/output
+                source=build/test/output/${testtag}
                 dest=/tmp/results/repeated_utests/output/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then
@@ -1647,7 +1682,7 @@ jobs:
                 fi
 
                 # move the log files
-                source=build/test/logs
+                source=build/test/logs/${testtag}
                 dest=/tmp/results/repeated_utests/logs/${status}/${i}
                 mkdir -p $dest
                 if [[ -d $source && -n "$(ls $source)" ]]; then