diff --git a/ChangeLog b/ChangeLog
index 50a46525fcadee21193a2f9022934144938645f8..6ebf602df2d72d5e46bc867879907a2e603e2147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ version 0.9.5 -- unreleased
 	 . Added an examples file (Closes: Trac#23)
 	 . Applied patch from Anarcat that fixes the cp/mkdir calls to not use GNU 
 	   coreutils options, as well as some bashisms (Closes: Trac#24)
+	 . Fix test mode (Closes: Trac#25)
         mysql:
 	 . Fixed case where odd combination of configuration options caused sqldump
 	   backups to get overwritten with an empty file (Closes: #402679)
diff --git a/handlers/maildir.in b/handlers/maildir.in
index 0d88e9271ef016702574c1295bd4005a9cf22069..7a68e858a5f36fbcf07defab659d430dd8e5dbfe 100644
--- a/handlers/maildir.in
+++ b/handlers/maildir.in
@@ -62,7 +62,10 @@ srcdir=${srcdir%/}
 
 [ "$multiconnection" == "notset" ] && fatal "The maildir handler uses a very different destination format. See the example .maildir for more information"
 
-[ ! $test ] || testflags="--dry-run -v"
+if [ $test ]; then
+   testflags="--dry-run -v"
+fi
+
 rsyncflags="$testflags -e 'ssh -p $destport' -r -v --ignore-existing --delete --size-only --bwlimit=$speedlimit"
 excludes="--exclude '.Trash/\*' --exclude '.Mistakes/\*' --exclude '.Spam/\*'"