diff --git a/sorc/CMakeLists.txt b/sorc/CMakeLists.txt
index 548d8e6f6e..5cc8780116 100644
--- a/sorc/CMakeLists.txt
+++ b/sorc/CMakeLists.txt
@@ -136,6 +136,7 @@ if (BUILD_RRFS_UTILS)
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
     BUILD_ALWAYS TRUE
     STEP_TARGETS build
+    DEPENDS GSI
     )
 endif()
 
diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh
index 5b084c2fc6..fbe03cff33 100755
--- a/tests/WE2E/setup_WE2E_tests.sh
+++ b/tests/WE2E/setup_WE2E_tests.sh
@@ -53,8 +53,7 @@ scrfunc_fn=$( basename "${scrfunc_fp}" )
 scrfunc_dir=$( dirname "${scrfunc_fp}" )
 
 TESTS_DIR=$( dirname "${scrfunc_dir}" )
-REGIONAL_WORKFLOW_DIR=$( dirname "${TESTS_DIR}" )
-SRW_APP_DIR=$( dirname "${REGIONAL_WORKFLOW_DIR}" )
+SRW_APP_DIR=$( dirname "${TESTS_DIR}" )
 TOP_DIR=$( dirname "${SRW_APP_DIR}" )
 
 EXPTS_DIR=${TOP_DIR}/expt_dirs