diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97a09e630..7c63b41f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -604,7 +604,7 @@ system_test:
     - rake systemtest
   artifacts:
     paths:
-      - tests/system/test-results/**/*.log
+      - tests/system/test-results/
     expire_in: 1 week
     when: always
 
diff --git a/rakelib/50_system_tests.rake b/rakelib/50_system_tests.rake
index 14b772ce4..9ace1bd2e 100644
--- a/rakelib/50_system_tests.rake
+++ b/rakelib/50_system_tests.rake
@@ -147,6 +147,9 @@ desc 'Run system tests
 task :systemtest => [PYTEST, DOCKER_COMPOSE, OPEN_API_GENERATOR_PYTHON_DIR, *GRPC_PYTHON_API_FILES, *volume_files, "systemtest:setup_version_envvars"] do
     opts = []
 
+    # Used in GitLab CI.
+    opts.append('--junit-xml=test-results/junit.xml')
+
     if !ENV["TEST"].nil?
         opts.append "-k", ENV["TEST"]
     end