diff --git a/industrial_ci/src/tests/source_tests.sh b/industrial_ci/src/tests/source_tests.sh
index 2afd50780..dde78c49a 100644
--- a/industrial_ci/src/tests/source_tests.sh
+++ b/industrial_ci/src/tests/source_tests.sh
@@ -172,17 +172,21 @@ function run_source_tests {
 
     ici_step "setup_rosdep" ici_setup_rosdep
 
-    extend=${UNDERLAY:?}
+    extend="${UNDERLAY:?}"
+
+    local dependency_sources=()  # source folders to be ignored for rosdep install
+    dependency_sources+=("${UNDERLAY:?}")
 
     if [ -n "$UPSTREAM_WORKSPACE" ]; then
-        ici_with_ws "$upstream_ws" ici_build_workspace "upstream" "$extend" "$upstream_ws" "${UNDERLAY:?}"
+        ici_with_ws "$upstream_ws" ici_build_workspace "upstream" "$extend" "$upstream_ws" "${dependency_sources[@]}"
         extend="$(ici_extend_space "$upstream_ws")"
+        dependency_sources+=("$upstream_ws")
     fi
 
     if [ "${CLANG_TIDY:-false}" != false ]; then
         TARGET_CMAKE_ARGS="$TARGET_CMAKE_ARGS -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
     fi
-    ici_with_ws "$target_ws" ici_build_workspace "target" "$extend" "$target_ws" "${UNDERLAY:?}" "$(ici_extend_space "$upstream_ws")"
+    ici_with_ws "$target_ws" ici_build_workspace "target" "$extend" "$target_ws" "${dependency_sources[@]}"
 
     if [ "$NOT_TEST_BUILD" != "true" ]; then
         ici_with_ws "$target_ws" ici_test_workspace "target" "$extend" "$target_ws"
@@ -206,8 +210,9 @@ function run_source_tests {
     fi
 
     extend="$(ici_extend_space "$target_ws")"
+    dependency_sources+=("$target_ws")
     if [ -n "$DOWNSTREAM_WORKSPACE" ]; then
-        ici_with_ws "$downstream_ws" ici_build_workspace "downstream" "$extend" "$downstream_ws" "${UNDERLAY:?}" "$(ici_extend_space "$upstream_ws")" "$(ici_extend_space "$target_ws")"
+        ici_with_ws "$downstream_ws" ici_build_workspace "downstream" "$extend" "$downstream_ws" "${dependency_sources[@]}"
         #extend="$(ici_extend_space "$downstream_ws")"
 
         if [ "$NOT_TEST_DOWNSTREAM" != "true" ]; then