diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df5b3c245d..de415a8844 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ check-code:
   
 test-code-8:
   stage: test
-  needs: []
+  needs: ["check-code"]
   script:
    - "ecr_login"
    - "ecr_pull vm_base_intel latest"
@@ -36,11 +36,12 @@ test-code-8:
       - "pkix/build/reports"
       - "mail/build/reports"
       - "util/build/reports"
-      - "tls/build/reports"  
-  
+      - "tls/build/reports"
+      - "mls/build/reports"
+
 test-code-11:
   stage: test
-  needs: []
+  needs: ["check-code"]
   script:
    - "ecr_login"
    - "ecr_pull vm_base_intel latest"
@@ -54,10 +55,12 @@ test-code-11:
       - "pkix/build/reports"
       - "mail/build/reports"
       - "util/build/reports"
-      - "tls/build/reports"  
-  
+      - "tls/build/reports"
+      - "mls/build/reports"
+
 test-code-17:
   stage: test
+  needs: ["check-code"]
   script:
    - "ecr_login"
    - "ecr_pull vm_base_intel latest"
@@ -71,10 +74,12 @@ test-code-17:
       - "pkix/build/reports"
       - "mail/build/reports"
       - "util/build/reports"
-      - "tls/build/reports"  
+      - "tls/build/reports"
+      - "mls/build/reports"
+
 test-code-21:
   stage: test
-  needs: []
+  needs: ["check-code"]
   script:
     - "ecr_login"
     - "ecr_pull vm_base_intel latest"
@@ -88,4 +93,5 @@ test-code-21:
       - "pkix/build/reports"
       - "mail/build/reports"
       - "util/build/reports"
-      - "tls/build/reports"
\ No newline at end of file
+      - "tls/build/reports"
+      - "mls/build/reports"
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 67a90e804e..be980c4f7b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -248,6 +248,12 @@ subprojects {
     tasks.withType(JavaCompile).configureEach {
         options.debug = true;
     }
+
+    tasks.withType(Test).configureEach {
+        reports {
+            junitXml.outputLocation = layout.buildDirectory.dir("test-results")
+        }
+    }
 }
 
 test.dependsOn([':core:test', ':prov:test', ':prov:test11', ':prov:test17', ':prov:test21', ':pkix:test', 'pg:test', ':tls:test', 'mls:test', 'mail:test', 'jmail:test'])