diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0294477181..35b85c9ebc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -330,6 +330,7 @@ create_coverage_reports:
       folder_list=$(ls -d build_test_app*);
       for each_folder in $folder_list ;
       do
+      lcov --gcov-tool ${PWD}/${each_folder}/esp_cov_files/gcov --capture --directory ${each_folder}/esp_cov_files --output-file ${each_folder}/${each_folder}.info;
       cp ${each_folder}/*.info cov_infos;
       done
     - ls -la cov_infos/
diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 2c2deca640..f12c67e5f5 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -113,6 +113,7 @@
       if [[ "${GCOV_BUILD_OPTS}" != "" ]]; then
         echo coverage enabled
         rsync -a --prune-empty-dirs --include '*/' --include '*.gcno' --exclude '*' _build/ ${DIST_INSTALLED_DIR}/_build
+        cp `which ${CONF_HOST}-gcov` ${DIST_INSTALLED_DIR}/bin/gcov
       fi
     - *dist_archive
 
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 0f3903a088..58374b9536 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -10,7 +10,7 @@
   artifacts:
     paths:
       - $TEST_RUN_DIR/debug_backend_tests.log
-      - $TEST_RUN_DIR/${CI_JOB_NAME}.info
+      - $TEST_RUN_DIR/esp_cov_files
     reports:
       junit:
         - $TEST_RUN_DIR/results/*
@@ -47,9 +47,9 @@
           break;
         fi
       done < "$input"
-    - mkdir ${TEST_RUN_DIR}/${DIST_INSTALLED_DIR}/esp_cov_files
-    - rsync -a --prune-empty-dirs --include '*/' ${command_arg} --exclude '*' ${TEST_RUN_DIR}/${DIST_INSTALLED_DIR}/_build ${TEST_RUN_DIR}/${DIST_INSTALLED_DIR}/esp_cov_files
-    - lcov --capture --directory ${TEST_RUN_DIR}/${DIST_INSTALLED_DIR}/esp_cov_files --output-file ${TEST_RUN_DIR}/${CI_JOB_NAME}.info
+    - mkdir ${TEST_RUN_DIR}/esp_cov_files
+    - rsync -a --prune-empty-dirs --include '*/' ${command_arg} --exclude '*' ${TEST_RUN_DIR}/${DIST_INSTALLED_DIR}/_build ${TEST_RUN_DIR}/esp_cov_files
+    - cp ${PWD}/${TEST_RUN_DIR}/${DIST_INSTALLED_DIR}/bin/gcov ${TEST_RUN_DIR}/esp_cov_files
 
 .tests_armhf_master_template:
   extends: .tests_armhf_template