diff --git a/test.sh b/test.sh
index a9d1cdf..16e6f3f 100755
--- a/test.sh
+++ b/test.sh
@@ -33,9 +33,10 @@ for f in "${files[@]}"; do
 		continue
 	fi
 
-	build_dir=$(dirname $f)
-	base=${build_dir%%\/*}
-	suite=${build_dir##*\/}
+	build_dir=$(dirname "$f")
+	base="${build_dir%%\/*}"
+	suite="${build_dir##$base}"
+	suite="${suite##\/}"
 
 	if [[ -z "$suite" ]]; then
 		suite=latest