diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cf0a7816462749235324e0ed3ca386a25e31164..ab91b4a9c3d25ff9816126c14d89881799001005 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ build:
     - cd build
     - cmake ..
     - cmake --build .
-    - ctest -V >& test.log
+    - ctest -j4 -V >& test.log
     - gzip -9 test.log
   artifacts:
     paths:
@@ -24,11 +24,7 @@ build:
     when: on_failure
     reports:
       junit:
-        - */junit*.xml
-        - */*/junit*.xml
-        - */*/*/junit*.xml
-        - */*/*/*/junit*.xml
-        - */*/*/*/*/junit*.xml
+        - build/test_outputs/junit*.xml
 
 # code_quality:
 #   image: docker:stable
diff --git a/CMakeModules/CorsikaUtilities.cmake b/CMakeModules/CorsikaUtilities.cmake
index abcebea9fb5ea9b960e374c5ae42b8d5c6165b03..c2a7df5c94be91d95fadd19703260736ac4eeaa6 100644
--- a/CMakeModules/CorsikaUtilities.cmake
+++ b/CMakeModules/CorsikaUtilities.cmake
@@ -86,5 +86,6 @@ endmacro(CORSIKA_ADD_FILES_ABSOLUTE)
 #
 
 function (CORSIKA_ADD_TEST name)
-  add_test (NAME ${name} COMMAND ${name} -o junit-${name}.xml -r junit)
+  file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test_outputs/)
+  add_test (NAME ${name} COMMAND ${name} -o ${PROJECT_BINARY_DIR}/test_outputs/junit-${name}.xml -r junit)
 endfunction (CORSIKA_ADD_TEST)