diff --git a/cicd_tests/test_fib.sh b/cicd_tests/test_fib.sh
index ce72f61e46bd7f6c362e585e993b38f0f9f2b96c..ddf8f7117bba1bab7a942382da7846f485ed706f 100755
--- a/cicd_tests/test_fib.sh
+++ b/cicd_tests/test_fib.sh
@@ -3,9 +3,10 @@
 set -e
 trap clean EXIT
 
-cd $CICD_MODULE_WORK_DIR/cfi_umbrella
+pushd $CICD_MODULE_WORK_DIR/cfi_umbrella
 source set_env_vars
-cd ./irdb-libs/tools/selective_cfi/tests/cicd_tests/fib_src
+popd
+cd ./scfi/tests/cicd_tests/fib_src
 
 source ../../cfi_smokescreen_configs.sh
 
diff --git a/cicd_tests/test_foo.sh b/cicd_tests/test_foo.sh
index 962b06ba31af20bc00824351eda7b035506fa53f..cf971d2942179653217c39cd4b00d85163493fa7 100755
--- a/cicd_tests/test_foo.sh
+++ b/cicd_tests/test_foo.sh
@@ -3,9 +3,10 @@
 set -e
 trap clean EXIT
 
-cd $CICD_MODULE_WORK_DIR/cfi_umbrella
+pushd $CICD_MODULE_WORK_DIR/cfi_umbrella
 source set_env_vars
-cd ./irdb-libs/tools/selective_cfi/tests/cicd_tests/foo_src
+popd
+cd ./scfi/tests/cicd_tests/foo_src
 
 source ../../cfi_smokescreen_configs.sh