diff --git a/run_tests.sh b/run_tests.sh
index 9c46841..aadf696 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -51,7 +51,7 @@ EOF
 	fi
 }
 
-if [[ -n "$@" ]]; then
+if [[ $# -gt 0 ]]; then
 	for i in "$@"; do
 		if [ ! -f "$i" ]; then
 			echo "No $i found"
diff --git a/t/testrunner b/t/testrunner
index 90b8b2f..8679aa4 100755
--- a/t/testrunner
+++ b/t/testrunner
@@ -18,4 +18,4 @@ else
 fi
 
 RESULTS=${RESULTS} FORMAT=JUNIT ./run_tests.sh
-WORKSPACE=${RESULTS}/tmp py.test-3 --junit-xml=${RESULTS}/reports/test_dlgcnt.xml ./tests/test_dlgcnt.py
+WORKSPACE="${RESULTS}/tmp" py.test-3 --junit-xml="${RESULTS}/reports/test_dlgcnt.xml" ./tests/test_dlgcnt.py