diff --git a/.gitignore b/.gitignore
index 12c9bc83d919b9c81255a1ae01e6a51528f189d2..04f6aa78fea761c54c35fc9bce58a005d63b5aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 *.log
 *.xml
 docs/index.md
+timestamp
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d5b45312de97ea1b4062aabcb7a617ef39ef8e7..0e2ce26d9e8a16d6637e3a7d4415efa20ce751f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,5 +29,5 @@ run_functional_test:
         when: always
         paths:
             - test-coverage.xml
-            - memory-report.xml
+            - /tmp/memory-report.xml
             - timestamp
diff --git a/gitlab-ci/functional-test.sh b/gitlab-ci/functional-test.sh
index c8e620201e493febe53652e187e245758b151b2d..1e7f4efadfd510b13e793ec85d8b2908f51da66c 100755
--- a/gitlab-ci/functional-test.sh
+++ b/gitlab-ci/functional-test.sh
@@ -21,13 +21,14 @@ function check_result()
 # building twamp
 twamp_clean
 twamp_make
+ln -s ${PWD}/twampd /usr/sbin/twampd
 
 echo "Running functional Tests"
 supervisorctl update
 supervisorctl restart all
+sleep 5
 supervisorctl status all
-ubus wait_for usp.raw usp
-supervisorctl status all
+ubus wait_for bbfdm
 
 echo "TWAMP light Test"
 result=`python3 /opt/dev/twampy/twampy.py sender -c 1 127.0.0.1:862`
diff --git a/gitlab-ci/iopsys-supervisord.conf b/gitlab-ci/iopsys-supervisord.conf
index a1e51be624a0581152cf2ba040d825f0608ec873..5d2427b2706c0dea65abaca6bd379aa188341999 100644
--- a/gitlab-ci/iopsys-supervisord.conf
+++ b/gitlab-ci/iopsys-supervisord.conf
@@ -16,5 +16,5 @@ command=/bin/bash -c "/usr/sbin/bbfdmd"
 [program:twampd]
 autorestart=false
 priority=4
-command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/builds/bbf/twamp-light/memory-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=definite,reachable --errors-for-leak-kinds=definite,reachable --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /builds/bbf/twamp-light/twampd"
+command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=definite,reachable --errors-for-leak-kinds=definite,reachable --error-exitcode=1 --track-origins=yes --leak-resolution=high --show-error-list=yes --child-silent-after-fork=yes /usr/sbin/twampd"