diff --git a/vars/runTestFunctionalV2.groovy b/vars/runTestFunctionalV2.groovy
index 3acfb43bf..77c996db0 100644
--- a/vars/runTestFunctionalV2.groovy
+++ b/vars/runTestFunctionalV2.groovy
@@ -56,6 +56,7 @@ Map call(Map config = [:]) {
                        'PRAGMA_SUFFIX="' + config['pragma_suffix'] + '" ' +
                        'NODE_COUNT="' + config['node_count'] + '" ' +
                        'OPERATIONS_EMAIL="' + env.OPERATIONS_EMAIL + '" ' +
+                       'COVFN_DISABLED="' + env.COVFN_DISABLED+ '" ' +
                        "WITH_VALGRIND=${stage_info.get('with_valgrind', '')} " +
                        'ci/functional/test_main.sh'
 
diff --git a/vars/unitPackages.groovy b/vars/unitPackages.groovy
index d9449b7ea..1bf40d1d4 100644
--- a/vars/unitPackages.groovy
+++ b/vars/unitPackages.groovy
@@ -21,7 +21,8 @@ String call() {
 
     Map stage_info = parseStageInfo()
     String target = stage_info['target']
-    boolean quick_build = quickBuild() || (stage_info['compiler'] == 'covc')
+//    boolean quick_build = quickBuild() || (stage_info['compiler'] == 'covc')
+    boolean quick_build = quickBuild()
 
     if (target.startsWith('centos') || target.startsWith('el')) {
         if (quick_build) {