diff --git a/ChangeLog b/ChangeLog
index d99e84aa3..7847ef33c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-22  Bart Schaefer  <schaefer@zsh.org>
+
+	* 12039: Test/comptest: Use "compinit -u" to avoid a possible
+	prompt about security of the directories; point ZDOTDIR into
+	the temporary test directory for the .zcompdump file.
+
 2000-06-22  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 12033: Completion/Core/compinit: followup to compinit-security
diff --git a/Test/comptest b/Test/comptest
index c7465dbee..d486bef5f 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -24,13 +24,14 @@ comptestinit () {
   }
 
   comptesteval \
+"export ZDOTDIR=$ZTST_testdir/Modules" \
 "module_path=( $module_path )" \
 "fpath=( $fpath )" \
 'LISTMAX=10000000
 stty columns 80 rows 24
 bindkey -e
 autoload -U compinit
-compinit $dump
+compinit -u
 zstyle ":completion:*:default" list-colors "no=<NO>" "fi=<FI>" "di=<DI>" "ln=<LN>" "pi=<PI>" "so=<SO>" "bd=<BD>" "cd=<CD>" "ex=<EX>" "mi=<MI>" "tc=<TC>" "sp=<SP>" "lc=<LC>" "ec=<EC>\n" "rc=<RC>"
 zstyle ":completion:*" group-name ""
 zstyle ":completion:*:messages" format "<MESSAGE>%d</MESSAGE>