diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh
index fdb6452101..8ae10b1b5d 100755
--- a/scripts/generic-ci-tests.sh
+++ b/scripts/generic-ci-tests.sh
@@ -168,7 +168,18 @@ case "$TEST_SUITE" in
         cp -R $HOME/firefox/ firefox/
         export SELENIUM_FIREFOX_PATH=firefox/firefox
 
-        PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS --with-flaky --with-xunit"
+        case "$NUMBER_OF_BOKCHOY_THREADS" in
+
+            "1"|1)
+                XUNIT_ARG=" --with-xunit"
+                ;;
+
+            *)
+                XUNIT_ARG=" --with-xunitmp"
+                ;;
+        esac
+
+        PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS --with-flaky $XUNIT_ARG"
 
         case "$SHARD" in