diff --git a/test/run b/test/run
index b798676f..498d98b7 100755
--- a/test/run
+++ b/test/run
@@ -44,7 +44,7 @@ while [[ $# > 0 ]]; do
         --timeout=*) timeout=${1/--timeout=};;
         --tool=*) set_tool "${1#/--tool=}";;
         --tool) shift; set_tool "$1";;
-        */completion/*.exp|*/unit/*.exp)
+        completion/*.exp|*/completion/*.exp|unit/*.exp|*/unit/*.exp)
             arg=${1%/*}
             set_tool "${arg##*/}"
             args+=("${1##*/}")