diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aea39f46..89307908 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -321,9 +321,9 @@ build-VS2017-x64-shared-TRUE-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 build-VS2017-x64-shared-TRUE-no-apps:
   stage: build
@@ -340,9 +340,9 @@ build-VS2017-x64-shared-TRUE-no-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 #-------------  Job Informations:
 # Type:         Build+Test: Release
@@ -368,9 +368,9 @@ build-VS2017-x64-shared-FALSE-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 build-VS2017-x64-shared-FALSE-no-apps:
   stage: build
@@ -387,9 +387,9 @@ build-VS2017-x64-shared-FALSE-no-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 
 #-------------  Job Informations:
@@ -416,9 +416,9 @@ build-VS2015-x64-shared-TRUE-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 build-VS2015-x64-shared-TRUE-no-apps:
   stage: build
@@ -435,9 +435,9 @@ build-VS2015-x64-shared-TRUE-no-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 #-------------  Job Informations:
 # Type:         Build+Test: Release
@@ -463,9 +463,9 @@ build-VS2015-x64-shared-FALSE-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 build-VS2015-x64-shared-FALSE-no-apps:
   stage: build
@@ -482,9 +482,9 @@ build-VS2015-x64-shared-FALSE-no-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 
 Doc-publish:
diff --git a/CI/gitlab-ci/windows-template-job.yml b/CI/gitlab-ci/windows-template-job.yml
index 0d5eb8c3..c87d8922 100644
--- a/CI/gitlab-ci/windows-template-job.yml
+++ b/CI/gitlab-ci/windows-template-job.yml
@@ -22,9 +22,9 @@ build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml
 
 build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-no-apps:
   stage: build
@@ -41,7 +41,7 @@ build-{{VSVERSION}}-{{ARCHITECTURE}}-shared-{{SHARED}}-no-apps:
       - build-release/*.exe
     reports:
       junit:
-        - build-release/report.xml
-        - build-release/report-customvec.xml
-        - build-release/report-doublevec.xml
+        - build-release/unittests/report.xml
+        - build-release/unittests/report-customvec.xml
+        - build-release/unittests/report-doublevec.xml