diff --git a/tf-a-builder/builders.sh b/tf-a-builder/builders.sh
index 94e6d26..41d633e 100755
--- a/tf-a-builder/builders.sh
+++ b/tf-a-builder/builders.sh
@@ -42,18 +42,15 @@
 # Several test descriptions are pending to be included in OpenCI, so for the moment
 # blocklist these.
 # 1. coverity-tf-misra: https://projects.linaro.org/browse/TFC-10
-# 2. tf-l3-code-coverage: Missing library in Open CI, introduced by
-#    https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git/commit/?id=024efd51f025b8446e87c9adf99bd770dc769d99
-# 3. fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug: Pending TFC ticket
-# 4. Failure at LAVA job https://tf.validation.linaro.org/scheduler/job/142122
+# 2. fvp-tbb-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug: Pending TFC ticket
+# 3. Failure at LAVA job https://tf.validation.linaro.org/scheduler/job/142122
 #    TFC ticket https://projects.linaro.org/browse/TFC-70
-# 5. Failure at LAVA job https://tf.validation.linaro.org/scheduler/job/142101
+# 4. Failure at LAVA job https://tf.validation.linaro.org/scheduler/job/142101
 #    TFC ticket https://projects.linaro.org/browse/TFC-70
 
 blocklist="blocklist.txt"
 cat << EOF > "${blocklist}"
 coverity-tf-misra
-tf-l3-code-coverage
 fvp-tbb-mbedtls-upcounter,fvp-fwu,nil,nil,nil:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug
 fvp-mb-256-optee-romlib,nil,nil,nil,nil:fvp-optee.mb-linux.rootfs+ftpm-romlib-fip.ftpm-aemv8a
 fvp-linux-as-bl33,nil,nil,nil,nil:fvp-linux.bl33-dtb-aemv8a.linux.bl33-debug
@@ -72,7 +69,8 @@
 # Path to root of CI repository
 ci_root="${WORKSPACE}/tf-a-ci-scripts"
 
-export tfa_downloads="https://downloads.trustedfirmware.org/tf-a"
+export tf_downloads="https://downloads.trustedfirmware.org"
+export tfa_downloads="${tf_downloads}/tf-a"
 
 # Fetch required firmware/binaries and place it at proper location
 export nfs_volume="${WORKSPACE}/nfs"
@@ -103,6 +101,9 @@
      lt-vexpress64-openembedded_minimal-armv8-gcc-5.2_20170127-761.img.gz \
      https://releases.linaro.org/openembedded/juno-lsk/latest/lt-vexpress64-openembedded_minimal-armv8-gcc-5.2_20170127-761.img.gz
 
+# export trace code coverage variable
+export coverage_trace_plugin="${tf_downloads}/coverage-plugin/qa-tools/coverage-tool/coverage-plugin/coverage_trace.so"
+
 # FIXME: create temporal /arm softlinks.
 # Reason behind is described at
 #        https://git.trustedfirmware.org/ci/dockerfiles.git/commit/?id=4e2c2c94e434bc8a9b25f5da7c6018a43db8cb2f