2 files changed, 4 insertions, 3 deletions

diff --git a/tests/setup.sh b/tests/setup.sh
index 1e06107..e3c6c17 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -15,13 +15,14 @@
 # run_test 'repo index' 'cgit_url "/" | tidy -e'
 # run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
 
+unset CDPATH
 
 mkrepo() {
         name=$1
         count=$2
         dir=$PWD
         test -d "$name" && return
-        printf "Creating testrepo %s\n" $name
+        printf "Creating testrepo %s\n" "$name"
         mkdir -p "$name"
         cd "$name"
         git init
@@ -40,7 +41,7 @@ mkrepo() {
                 git commit -m "add a+b"
                 git branch "1+2"
         fi
-        cd $dir
+        cd "$dir"
 }
 
 setup_repos()
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index e608104..6ee70b3 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -25,7 +25,7 @@ run_test 'find `cgit` signature' '
 '
 
 run_test 'find initial commit' '
-        root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1)
+        root=$(git --git-dir="$PWD/trash/repos/foo/.git" rev-list HEAD | tail -1)
 '
 
 run_test 'generate patch for initial commit' '