diff --git a/.cirrus.yml b/.cirrus.yml
index 5c5dc8b9..743637be 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -49,6 +49,11 @@ build_task:
     - regular_mvn_build_deploy_analyze
   cleanup_before_cache_script:
     - cleanup_maven_repository
+  on_failure:
+    junit_result_artifacts:
+      path: "**/target/surefire-reports/**.xml"
+      format: junit
+      type: text/xml
 
 mend_scan_task:
   depends_on:
@@ -101,8 +106,12 @@ qa_task:
   cleanup_before_cache_script:
     - cleanup_maven_repository
   on_failure:
-    reports_artifacts:
-      path: "**/target/**/logs/*"
+    server_logs_artifacts:
+      path: "**/target/**/logs/**.log"
+    junit_result_artifacts:
+      path: "**/target/surefire-reports/**.xml"
+      format: junit
+      type: text/xml
 
 promote_task:
   depends_on:
diff --git a/its/it-tests/src/test/java/com/sonar/scanner/lib/it/ProxyTest.java b/its/it-tests/src/test/java/com/sonar/scanner/lib/it/ProxyTest.java
index 5b5c3d5a..aea6696c 100644
--- a/its/it-tests/src/test/java/com/sonar/scanner/lib/it/ProxyTest.java
+++ b/its/it-tests/src/test/java/com/sonar/scanner/lib/it/ProxyTest.java
@@ -121,7 +121,7 @@ private static ServletContextHandler proxyHandler(boolean needProxyAuth) {
     return contextHandler;
   }
 
-  private static final SecurityHandler basicAuth(String username, String password, String realm) {
+  private static SecurityHandler basicAuth(String username, String password, String realm) {
 
     HashLoginService l = new HashLoginService(realm);