diff --git a/ci_tests/cleanup_basic_grb_test.sh b/ci_tests/cleanup_basic_grb_test.sh
index 31dbb28bb551d3f72d05c430563a26d4886a3300..0d87fd44adc31c01b8a1dac5294d443a121008c5 100755
--- a/ci_tests/cleanup_basic_grb_test.sh
+++ b/ci_tests/cleanup_basic_grb_test.sh
@@ -10,9 +10,10 @@ error() {
 }
 
 check_and_uninstall() {
-    release_name=$1
-    if [[ -z ${release_name} ]]; then
+    release_name="$1"
+    if [[ -z "${release_name}" ]]; then
         # the chart was never created
+        debug "Release doesn't exist"
         return
     fi
     debug "Uninstalling ${release_name}"
@@ -20,4 +21,4 @@ check_and_uninstall() {
 }
 
 source ./ci_tests/get_release_names.sh
-check_and_uninstall ${GRB_RELEASE_NAME}
\ No newline at end of file
+check_and_uninstall "${GRB_RELEASE_NAME}"
\ No newline at end of file
diff --git a/ci_tests/run_basic_grb_test.sh b/ci_tests/run_basic_grb_test.sh
index aec9c0e9372b6d0400240d3da75902f6fa0f60f1..0308a2a7675067f5777b30903135b9d24db8cf95 100755
--- a/ci_tests/run_basic_grb_test.sh
+++ b/ci_tests/run_basic_grb_test.sh
@@ -12,8 +12,9 @@ error() {
 set -e
 
 ns=$(./helpers/get_namespace.sh)
-pushd geosphere-grb/chart
 source ci_tests/get_release_names.sh
+
+pushd geosphere-grb/chart
 helm upgrade -v 2 --install --namespace $ns -f ../../ci_tests/values-grb-g16.yaml ${GRB_RELEASE_NAME} cspp-geo-grb/
 popd