diff --git a/tests/setup.sh b/tests/setup.sh
index b9475a3..f5774e3 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -41,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' '