diff --git a/src/tests/ecoc22/run_tests_and_coverage.sh b/src/tests/ecoc22/run_tests_and_coverage.sh
index 835867896020f2b94e0797bdf60c85af2228eda2..4517cc1ea7eec7027219517720c99bfea3b4250b 100755
--- a/src/tests/ecoc22/run_tests_and_coverage.sh
+++ b/src/tests/ecoc22/run_tests_and_coverage.sh
@@ -16,7 +16,6 @@
 
 PROJECTDIR=`pwd`
 
-cd $PROJECTDIR/src
 RCFILE=$PROJECTDIR/coverage/.coveragerc
 COVERAGEFILE=$PROJECTDIR/coverage/.coverage
 
@@ -26,18 +25,20 @@ cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PRO
 # Destroy old coverage file
 rm -f $COVERAGEFILE
 
+source tfs_runtime_env_vars.sh
+
 # Force a flush of Context database
 kubectl --namespace $TFS_K8S_NAMESPACE exec -it deployment/contextservice --container redis -- redis-cli FLUSHALL
 
 # Run functional tests and analyze code coverage at the same time
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ecoc22/tests/test_functional_bootstrap.py
+    src/tests/ecoc22/tests/test_functional_bootstrap.py
 
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ecoc22/tests/test_functional_create_service.py
+    src/tests/ecoc22/tests/test_functional_create_service.py
 
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ecoc22/tests/test_functional_delete_service.py
+    src/tests/ecoc22/tests/test_functional_delete_service.py
 
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ecoc22/tests/test_functional_cleanup.py
+    src/tests/ecoc22/tests/test_functional_cleanup.py
diff --git a/src/tests/ofc22/run_tests_and_coverage.sh b/src/tests/ofc22/run_tests_and_coverage.sh
index bafc920c71a640d083497e1cd6ae025d0ea7cef5..ae956925a430e0eab167bf36a49be59014a2a97b 100755
--- a/src/tests/ofc22/run_tests_and_coverage.sh
+++ b/src/tests/ofc22/run_tests_and_coverage.sh
@@ -16,30 +16,30 @@
 
 PROJECTDIR=`pwd`
 
-cd $PROJECTDIR/src
+# cd $PROJECTDIR/src
 RCFILE=$PROJECTDIR/coverage/.coveragerc
 COVERAGEFILE=$PROJECTDIR/coverage/.coverage
 
 # Configure the correct folder on the .coveragerc file
-cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PROJECTDIR+g > $RCFILE
+cat $PROJECTDIR/coverage/.coveragerc.template | sed s+~/teraflow/controller+$PROJECTDIR/src+g > $RCFILE
 
 # Destroy old coverage file
 rm -f $COVERAGEFILE
 
+source tfs_runtime_env_vars.sh
+
 # Force a flush of Context database
 kubectl --namespace $TFS_K8S_NAMESPACE exec -it deployment/contextservice --container redis -- redis-cli FLUSHALL
 
-source tfs_runtime_env_vars.sh
-
 # Run functional tests and analyze code coverage at the same time
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ofc22/tests/test_functional_bootstrap.py
+    src/tests/ofc22/tests/test_functional_bootstrap.py
 
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ofc22/tests/test_functional_create_service.py
+    src/tests/ofc22/tests/test_functional_create_service.py
 
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ofc22/tests/test_functional_delete_service.py
+    src/tests/ofc22/tests/test_functional_delete_service.py
 
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
-    tests/ofc22/tests/test_functional_cleanup.py
+    src/tests/ofc22/tests/test_functional_cleanup.py
diff --git a/src/tests/ofc22/tests/test_functional_bootstrap.py b/src/tests/ofc22/tests/test_functional_bootstrap.py
index 76c52810bb855a28f772dcc564e97e9f3ff1f92e..65b7cece1625032d8e02a5962d49d892e29d615a 100644
--- a/src/tests/ofc22/tests/test_functional_bootstrap.py
+++ b/src/tests/ofc22/tests/test_functional_bootstrap.py
@@ -198,7 +198,6 @@ def test_scenario_kpis_created(monitoring_client: MonitoringClient):
     during the service creation process.
     """
     response: KpiDescriptorList = monitoring_client.GetKpiDescriptorList(Empty())
-    LOGGER.info("Number of KPIs created: {}".format(len(response.kpi_descriptor_list)))
     # TODO: replace the magic number `16` below for a formula that adapts to the number
     # of links and devices
-    assert len(response.kpi_descriptor_list) == 16
+    assert len(response.kpi_descriptor_list) >= 16