diff --git a/bin/common_gradle.sh b/bin/common_gradle.sh
index f009ac9259d..8accffb404a 100755
--- a/bin/common_gradle.sh
+++ b/bin/common_gradle.sh
@@ -155,7 +155,7 @@ is_released_binary() {
 find_module_jar_at() {
   DIR=$1
   MODULE=$2
-  REGEX="^${MODULE}.jar$"
+  REGEX="^${MODULE}-[0-9\\.]*((-[a-zA-Z]*(-[0-9]*)?)|(-SNAPSHOT))?.jar$"
   if [ -d ${DIR} ]; then
     cd ${DIR}
     for f in *.jar; do
diff --git a/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh b/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh
index 4a70df9771e..c20165f6050 100644
--- a/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh
+++ b/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh
@@ -20,7 +20,7 @@
 # * limitations under the License.
 # */
 # load test helpers
-. ./bk_test_helpers_gradle
+. ./bk_test_helpers
 
 #------------------------------------------------------------------------------
 # suite tests
diff --git a/tests/scripts/src/test/bash/gradle/bk_test_helpers b/tests/scripts/src/test/bash/gradle/bk_test_helpers
index 33ae13c08fa..c2fb838ce64 100644
--- a/tests/scripts/src/test/bash/gradle/bk_test_helpers
+++ b/tests/scripts/src/test/bash/gradle/bk_test_helpers
@@ -24,13 +24,13 @@
 BK_ARGV0=`basename "$0"`
 
 # path to shUnit2 library. can be overridden by setting BK_SHUNIT_INC.
-BK_SHUNIT=${BK_SHUNIT_INC:-../../../build/libs/lib/shunit2-2.1.7/shunit2}
+BK_SHUNIT=${BK_SHUNIT_INC:-../../../../build/libs/lib/shunit2-2.1.7/shunit2}
 
 # path to bk bin directory.
 TESTDIR=`dirname "$0"`
-BK_BINDIR=`cd ${TESTDIR}/../../../../../bin;pwd`
-BK_HOMEDIR=`cd ${TESTDIR}/../../../../..;pwd`
-BK_CONFDIR=`cd ${TESTDIR}/../../../../../conf;pwd`
+BK_BINDIR=`cd ${TESTDIR}/../../../../../../bin;pwd`
+BK_HOMEDIR=`cd ${TESTDIR}/../../../../../..;pwd`
+BK_CONFDIR=`cd ${TESTDIR}/../../../../../../conf;pwd`
 
 #
 # test helper functions