diff --git a/hack/tfw.sh b/hack/tfw.sh
index 749adfb..37073da 100755
--- a/hack/tfw.sh
+++ b/hack/tfw.sh
@@ -5,10 +5,10 @@ set -o errtrace
 shopt -s expand_aliases
 [ "$(uname)" == "Darwin" ] && alias readlink="greadlink" || :
 
-SCRIPT_DIR="$(dirname $(readlink -f $0))"
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 TAO_PATH="${TAO_PATH:-$SCRIPT_DIR/../..}"
 BASEIMAGE_REPO="${BASEIMAGE_REPO:-baseimage-tutorial-framework}"
-TEST_REPO="${TEST_REPO:-test-tutorial-framework}"
+TEST_REPO="${TEST_REPO:-"$(basename "$(realpath "${SCRIPT_DIR}/..")")"}"
 FRONTEND_REPO="${FRONTEND_REPO:-frontend-tutorial-framework}"
 BASEIMAGE_PATH="${TAO_PATH}/${BASEIMAGE_REPO}"
 TEST_PATH="${TAO_PATH}/${TEST_REPO}"