diff --git a/industrial_ci/src/tests/source_tests.sh b/industrial_ci/src/tests/source_tests.sh
index a00b278dc..62bdab15b 100644
--- a/industrial_ci/src/tests/source_tests.sh
+++ b/industrial_ci/src/tests/source_tests.sh
@@ -173,10 +173,12 @@ function run_source_tests {
     ici_step "setup_rosdep" ici_setup_rosdep
 
     extend=${UNDERLAY:?}
+    export ROSDEP_SOURCE_FOLDERS=("${UNDERLAY:?}")  # source folders to be ignored for rosdep install
 
     if [ -n "$UPSTREAM_WORKSPACE" ]; then
         ici_with_ws "$upstream_ws" ici_build_workspace "upstream" "$extend" "$upstream_ws"
         extend="$(ici_extend_space "$upstream_ws")"
+        ROSDEP_SOURCE_FOLDERS+=("$extend")
     fi
 
     if [ "${CLANG_TIDY:-false}" != false ]; then
@@ -206,6 +208,7 @@ function run_source_tests {
     fi
 
     extend="$(ici_extend_space "$target_ws")"
+    ROSDEP_SOURCE_FOLDERS+=("$extend")
     if [ -n "$DOWNSTREAM_WORKSPACE" ]; then
         ici_with_ws "$downstream_ws" ici_build_workspace "downstream" "$extend" "$downstream_ws"
         #extend="$(ici_extend_space "$downstream_ws")"
diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh
index 8d2d1fa28..e5392d47d 100644
--- a/industrial_ci/src/workspace.sh
+++ b/industrial_ci/src/workspace.sh
@@ -386,7 +386,7 @@ function ici_build_workspace {
     fi
 
     ici_step "setup_${name}_workspace" ici_prepare_sourcespace "$ws/src" "${sources[@]}"
-    ici_step "install_${name}_dependencies" ici_install_dependencies "$extend" "$ROSDEP_SKIP_KEYS" "$ws/src"
+    ici_step "install_${name}_dependencies" ici_install_dependencies "$extend" "$ROSDEP_SKIP_KEYS" "$ws/src" "${ROSDEP_SOURCE_FOLDERS[@]}"
     ici_step "build_${name}_workspace" builder_run_build "$extend" "$ws" "${args[@]}"
 }