2 files changed, 15 insertions, 1 deletions
diff --git a/Test/README b/Test/README
new file mode 100644
index 000000000..c5815dc87
--- /dev/null
+++ b/Test/README
@@ -0,0 +1,13 @@
+There are now different sections, expressed by the first letter in the
+scripts names:
+
+ A: basic command parsing and execution
+ B: builtins
+ C: shell commands with special syntax
+ D: substititution
+ E: options
+ V: modules
+ W: builtin interactive commands and constructs
+ X: line editing
+ Y: completion
+ Z: separate systems and user contributions
diff --git a/Test/ztst.zsh b/Test/ztst.zsh
index a4166f955..3e8bdef18 100755
--- a/Test/ztst.zsh
+++ b/Test/ztst.zsh
@@ -63,7 +63,8 @@ fi
 [[ $ZTST_srcdir = /* ]] || ZTST_srcdir="$ZTST_testdir/$ZTST_srcdir"
 
 # Set the function autoload paths to correspond to this build of zsh.
-fpath=( $ZTST_srcdir/../(Completion|Functions)/*~*/CVS(/) )
+fpath=( $ZTST_srcdir/../Functions/*~*/CVS(/)
+        $ZTST_srcdir/../Completion/*/*~*/CVS(/) )
 
 : ${TMPPREFIX:=/tmp/zsh}
 # Temporary files for redirection inside tests.