diff --git a/tests/Maildir1/Maildir1.sh b/tests/Maildir1/Maildir1.sh
index 72cdb267..dbae0159 100755
--- a/tests/Maildir1/Maildir1.sh
+++ b/tests/Maildir1/Maildir1.sh
@@ -6,7 +6,8 @@ topdir=`dirname $0`/..
 initvariables $0
 
 # This is supposed to find an html attachment
-recollq '"EMI is releasing albums for download"' > $mystdout 2> $mystderr
+recollq '"EMI is releasing albums for download"' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/Maildir1/Maildir1.txt b/tests/Maildir1/Maildir1.txt
index 41bb20f9..afbcb367 100644
--- a/tests/Maildir1/Maildir1.txt
+++ b/tests/Maildir1/Maildir1.txt
@@ -1,3 +1,2 @@
-Recoll query: ((emi PHRASE 6 is PHRASE 6 releasing PHRASE 6 albums PHRASE 6 for PHRASE 6 download))
 1 results 
 text/html	[file:///home/dockes/projets/fulltext/testrecoll/Maildir/a.tager/cur/1134632779.000001.mbox:2,S]	[00/05/05 - Mix&Match Meeting in the Zydeco room]	10825	bytes	
diff --git a/tests/andor/andor.sh b/tests/andor/andor.sh
index 72ccc51c..cf84f017 100755
--- a/tests/andor/andor.sh
+++ b/tests/andor/andor.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq 'Beatles OR Lennon Live OR Unplugged' > $mystdout 2> $mystderr
+recollq 'Beatles OR Lennon Live OR Unplugged' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/andor/andor.txt b/tests/andor/andor.txt
index bdc9bf95..893d3a56 100644
--- a/tests/andor/andor.txt
+++ b/tests/andor/andor.txt
@@ -1,4 +1,3 @@
-Recoll query: (((beatles:(wqf=11) OR lennon:(wqf=11)) AND (live:(wqf=11) OR unplugged:(wqf=11))))
 2 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]	18	bytes	
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	12	bytes	
diff --git a/tests/badsuffs/badsuffs.sh b/tests/badsuffs/badsuffs.sh
index ba657e4d..97b9841a 100755
--- a/tests/badsuffs/badsuffs.sh
+++ b/tests/badsuffs/badsuffs.sh
@@ -6,7 +6,8 @@ topdir=`dirname $0`/..
 initvariables $0
 
 # Data in text files with skipped suffixes should not be indexed
-recollq Badsuffixes_unique > $mystdout 2> $mystderr
+recollq Badsuffixes_unique 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/badsuffs/badsuffs.txt b/tests/badsuffs/badsuffs.txt
index 0d2be0ac..40845ffd 100644
--- a/tests/badsuffs/badsuffs.txt
+++ b/tests/badsuffs/badsuffs.txt
@@ -1,2 +1 @@
-Recoll query: (badsuffixes_unique:(wqf=11))
 0 results 
diff --git a/tests/badsuffs1/badsuffs1.sh b/tests/badsuffs1/badsuffs1.sh
index c692eeae..4b848c3b 100755
--- a/tests/badsuffs1/badsuffs1.sh
+++ b/tests/badsuffs1/badsuffs1.sh
@@ -6,7 +6,8 @@ topdir=`dirname $0`/..
 initvariables $0
 
 # File names for files with skipped suffixes should be indexed
-recollq Badsufffilename > $mystdout 2> $mystderr
+recollq Badsufffilename 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/badsuffs1/badsuffs1.txt b/tests/badsuffs1/badsuffs1.txt
index bd11d4a7..b4cdf004 100644
--- a/tests/badsuffs1/badsuffs1.txt
+++ b/tests/badsuffs1/badsuffs1.txt
@@ -1,4 +1,3 @@
-Recoll query: (badsufffilename:(wqf=11))
 6 results
 	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.log.gz]	[badsufffilename.log.gz]	19	bytes	
 	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5]	[badsufffilename.md5]	19	bytes	
diff --git a/tests/boolean/boolean.sh b/tests/boolean/boolean.sh
index bafa1660..c27b05af 100755
--- a/tests/boolean/boolean.sh
+++ b/tests/boolean/boolean.sh
@@ -5,8 +5,10 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq 'boolean_uniqueterm One OR Two -Three' > $mystdout 2> $mystderr
+recollq 'boolean_uniqueterm One OR Two -Three' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
-diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+diff -w ${myname}.txt 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 checkresult
diff --git a/tests/boolean/boolean.txt b/tests/boolean/boolean.txt
index a2c8db73..6798d861 100644
--- a/tests/boolean/boolean.txt
+++ b/tests/boolean/boolean.txt
@@ -1,4 +1,3 @@
-Recoll query: (((boolean_uniqueterm:(wqf=11) AND (one:(wqf=11) OR two:(wqf=11))) AND_NOT three:(wqf=11)))
 3 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/boolean/12.txt]	[12.txt]	27	bytes	
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/boolean/2.txt]	[2.txt]	23	bytes	
diff --git a/tests/cjk/cjk.sh b/tests/cjk/cjk.sh
index 2781e5b3..68dbf282 100755
--- a/tests/cjk/cjk.sh
+++ b/tests/cjk/cjk.sh
@@ -7,8 +7,11 @@ initvariables $0
 
 # We need an UTF-8 locale here for recollq arg transcoding
 LANG=en_US.UTF-8
-recollq 'まず'  > $mystdout 2> $mystderr
-recollq 'ます'  >> $mystdout 2> $mystderr
+export LANG
+recollq 'まず'  2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
+recollq 'ます'  2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
diff --git a/tests/delete/delete.sh b/tests/delete/delete.sh
index 3cae7f01..52d42d27 100755
--- a/tests/delete/delete.sh
+++ b/tests/delete/delete.sh
@@ -10,12 +10,14 @@ tstfile=${tstdata}/delete/tobedeleted.txt
 # Create file to be deleted, index, query
 echo "DeletedFileUnique" > $tstfile
 recollindex >> $mystderr 2>&1 
-recollq DeletedFileUnique > $mystdout 2> $mystderr
+recollq DeletedFileUnique 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 # Delete file and query again
 rm -f ${tstdata}/delete/tobedeleted.txt
 recollindex  >> $mystderr 2>&1 
-recollq DeletedFileUnique >> $mystdout 2>> $mystderr
+recollq DeletedFileUnique 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/delete/delete.txt b/tests/delete/delete.txt
index 121a973e..b965b338 100644
--- a/tests/delete/delete.txt
+++ b/tests/delete/delete.txt
@@ -1,5 +1,3 @@
-Recoll query: (deletedfileunique:(wqf=11))
 1 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/delete/tobedeleted.txt]	[tobedeleted.txt]	18	bytes	
-Recoll query: (deletedfileunique:(wqf=11))
 0 results 
diff --git a/tests/dirwithblanks/dirwithblanks.sh b/tests/dirwithblanks/dirwithblanks.sh
index 59bf5101..5c159a0c 100755
--- a/tests/dirwithblanks/dirwithblanks.sh
+++ b/tests/dirwithblanks/dirwithblanks.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq DirWithBlanksUnique > $mystdout 2> $mystderr
+recollq DirWithBlanksUnique 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/dirwithblanks/dirwithblanks.txt b/tests/dirwithblanks/dirwithblanks.txt
index a5958346..2d9bc6d4 100644
--- a/tests/dirwithblanks/dirwithblanks.txt
+++ b/tests/dirwithblanks/dirwithblanks.txt
@@ -1,3 +1,2 @@
-Recoll query: (dirwithblanksunique:(wqf=11))
 1 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/dir with blanks/dwb.txt]	[dwb.txt]	20	bytes	
diff --git a/tests/djvu/djvu.sh b/tests/djvu/djvu.sh
index 45cec3dc..629ff977 100755
--- a/tests/djvu/djvu.sh
+++ b/tests/djvu/djvu.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq aharonov algorithm neural> $mystdout 2> $mystderr
+recollq aharonov algorithm neural 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/djvu/djvu.txt b/tests/djvu/djvu.txt
index 4e0a31a7..06ff38ff 100644
--- a/tests/djvu/djvu.txt
+++ b/tests/djvu/djvu.txt
@@ -1,3 +1,2 @@
-Recoll query: ((aharonov:(wqf=11) AND (algorithm:(wqf=11) OR algorithms OR algorithmic OR algorithme) AND neural:(wqf=11)))
 1 results 
 image/vnd.djvu	[file:///home/dockes/projets/fulltext/testrecoll/djvu/Aharonov-BarkiMeilijsonRuppin.djvu]	[Who Does What? A Novel Algorithm to Determine Function Localization]	74911	bytes	
diff --git a/tests/dvi/dvi.sh b/tests/dvi/dvi.sh
index 219794ab..f9025d8b 100755
--- a/tests/dvi/dvi.sh
+++ b/tests/dvi/dvi.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq 'krisrose' > $mystdout 2> $mystderr
+recollq 'krisrose' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/dvi/dvi.txt b/tests/dvi/dvi.txt
index 4db38585..b87fd0ee 100644
--- a/tests/dvi/dvi.txt
+++ b/tests/dvi/dvi.txt
@@ -1,3 +1,2 @@
-Recoll query: ((krisrose:(wqf=11) OR krisros))
 1 results 
 application/x-dvi	[file:///home/dockes/projets/fulltext/testrecoll/dvi/xyguide.dvi]	[xyguide.dvi]	313720	bytes	
diff --git a/tests/empty/empty.sh b/tests/empty/empty.sh
index 580474f5..f985149d 100755
--- a/tests/empty/empty.sh
+++ b/tests/empty/empty.sh
@@ -6,7 +6,8 @@ topdir=`dirname $0`/..
 initvariables $0
 
 # check indexing of an empty directory name
-recollq EmptyUniqueTerm > $mystdout 2> $mystderr
+recollq EmptyUniqueTerm 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/empty/empty.txt b/tests/empty/empty.txt
index 3e65e22b..44bcba99 100644
--- a/tests/empty/empty.txt
+++ b/tests/empty/empty.txt
@@ -1,3 +1,2 @@
-Recoll query: (emptyuniqueterm:(wqf=11))
 1 results 
 application/x-fsdirectory	[file:///home/dockes/projets/fulltext/testrecoll/emptyUniqueTerm]	[emptyUniqueTerm]	512	bytes	
diff --git a/tests/html/html.sh b/tests/html/html.sh
index af5bbf99..28f3eae7 100755
--- a/tests/html/html.sh
+++ b/tests/html/html.sh
@@ -5,9 +5,12 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq QMapConstIterator > $mystdout 2> $mystderr
-recollq Qtextedit Widget Provides Powerful Single-Page >> $mystdout 2>> $mystderr
-recollq '"This is the Mysql reference manual"'  >> $mystdout 2>> $mystderr
+recollq QMapConstIterator 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
+recollq Qtextedit Widget Provides Powerful Single-Page 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq '"This is the Mysql reference manual"' 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/html/html.txt b/tests/html/html.txt
index 404d1d37..4c3f81ff 100644
--- a/tests/html/html.txt
+++ b/tests/html/html.txt
@@ -1,10 +1,7 @@
-Recoll query: (qmapconstiterator:(wqf=11))
 1 results
 text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/qtl.html]	[Qt Template Library Classes]	2817	bytes	
-Recoll query: ((qtextedit:(wqf=11) AND widget:(wqf=11) AND provides:(wqf=11) AND powerful:(wqf=11) AND single-page:(wqf=11)))
 1 results
 text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/qtextedit.html]	[QTextEdit Class]	108921	bytes	
-Recoll query: ((this PHRASE 6 is PHRASE 6 the PHRASE 6 mysql PHRASE 6 reference PHRASE 6 manual))
 2 results
 text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/mysqlmanualSmall.html]	[MySQL 3.23, 4.0, 4.1 Reference Manual]	1480354	bytes	
 text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/mysqlmanual.html]	[MySQL 3.23, 4.0, 4.1 Reference Manual]	8136414	bytes	
diff --git a/tests/images/images.sh b/tests/images/images.sh
index 4bac7dac..804f12db 100755
--- a/tests/images/images.sh
+++ b/tests/images/images.sh
@@ -6,7 +6,8 @@ topdir=`dirname $0`/..
 initvariables $0
 
 # Image names 
-recollq photovoeux > $mystdout 2> $mystderr
+recollq photovoeux 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/images/images.txt b/tests/images/images.txt
index 63da24d8..34efb97c 100644
--- a/tests/images/images.txt
+++ b/tests/images/images.txt
@@ -1,3 +1,2 @@
-Recoll query: (photovoeux:(wqf=11))
 1 results 
 image/jpeg	[file:///home/dockes/projets/fulltext/testrecoll/images/photovoeux.jpg]	[photovoeux.jpg]	136796	bytes	
diff --git a/tests/koi8r/koi8r.sh b/tests/koi8r/koi8r.sh
index c3d1d8d7..6bf9cf1a 100755
--- a/tests/koi8r/koi8r.sh
+++ b/tests/koi8r/koi8r.sh
@@ -7,7 +7,8 @@ initvariables $0
 # The question is utf-8. As recollq will use the locale to translate the cmd
 # line, need an utf-8 locale
 export LANG=uk_UA.UTF-8
-recollq 'внешнии' > $mystdout 2> $mystderr
+recollq 'внешнии' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/koi8r/koi8r.txt b/tests/koi8r/koi8r.txt
index c8151a72..3e1dfabb 100644
--- a/tests/koi8r/koi8r.txt
+++ b/tests/koi8r/koi8r.txt
@@ -1,3 +1,2 @@
-Recoll query: (внешнии:(wqf=11))
 1 results 
 text/html	[file:///home/dockes/projets/fulltext/testrecoll/ru_RU.KOI8-R/zip-drive.html]	[Устройства Zip]	8599	bytes	
diff --git a/tests/lyx/lyx.sh b/tests/lyx/lyx.sh
index c3fff9d1..03ceb059 100755
--- a/tests/lyx/lyx.sh
+++ b/tests/lyx/lyx.sh
@@ -5,9 +5,12 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq 'Bienvenue Dans Univers De Lyx' > $mystdout 2> $mystderr
-recollq 'Welcome To Lyx' >> $mystdout 2>> $mystderr
-recollq 'Udvozli Ont A LyX' >> $mystdout 2>> $mystderr
+recollq 'Bienvenue Dans Univers De Lyx' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
+recollq 'Welcome To Lyx' 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq 'Udvozli Ont A LyX' 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/lyx/lyx.txt b/tests/lyx/lyx.txt
index 47a61c86..3bd44923 100644
--- a/tests/lyx/lyx.txt
+++ b/tests/lyx/lyx.txt
@@ -1,9 +1,6 @@
-Recoll query: ((bienvenue:(wqf=11) AND dans:(wqf=11) AND univers:(wqf=11) AND de:(wqf=11) AND lyx:(wqf=11)))
 1 results 
 application/x-lyx	[file:///home/dockes/projets/fulltext/testrecoll/lyx/fr_splash.lyx]	[fr_splash.lyx]	3577	bytes	
-Recoll query: ((welcome:(wqf=11) AND to:(wqf=11) AND lyx:(wqf=11)))
 1 results 
 application/x-lyx	[file:///home/dockes/projets/fulltext/testrecoll/lyx/splash.lyx]	[splash.lyx]	2974	bytes	
-Recoll query: ((udvozli:(wqf=11) AND ont:(wqf=11) AND a:(wqf=11) AND lyx:(wqf=11)))
 1 results 
 application/x-lyx	[file:///home/dockes/projets/fulltext/testrecoll/lyx/hu_splash.lyx]	[hu_splash.lyx]	4773	bytes	
diff --git a/tests/mail/mail.sh b/tests/mail/mail.sh
index ed6115be..6783bd88 100755
--- a/tests/mail/mail.sh
+++ b/tests/mail/mail.sh
@@ -5,10 +5,14 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq Outmail_uniqueTerm          > $mystdout 2> $mystderr
-recollq '"St Pierre en Chartreuse"' >> $mystdout 2>> $mystderr
-recollq HtmlAttachment_uniqueTerm   >> $mystdout 2>> $mystderr
-recollq '"Dear Corporate Administrator"' >> $mystdout 2>> $mystderr
+recollq Outmail_uniqueTerm          2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
+recollq '"St Pierre en Chartreuse"' 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq HtmlAttachment_uniqueTerm   2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq '"Dear Corporate Administrator"' 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/mail/mail.txt b/tests/mail/mail.txt
index a8a6297c..86a4ab99 100644
--- a/tests/mail/mail.txt
+++ b/tests/mail/mail.txt
@@ -1,13 +1,9 @@
-Recoll query: (outmail_uniqueterm:(wqf=11))
 2 results
 message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/outmail]	[Re: CDNow, mkfichcom.tcl and "]	2248233	bytes	
 message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/outmail]	[Home Ip]	2248233	bytes	
-Recoll query: ((st PHRASE 4 pierre PHRASE 4 en PHRASE 4 chartreuse))
 1 results
 message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/BadHtmlInMail]	[Prochaine rando]	3637	bytes	
-Recoll query: (htmlattachment_uniqueterm:(wqf=11))
 1 results
 text/html	[file:///home/dockes/projets/fulltext/testrecoll/mail/attach]	[RECOLL: a personal text search system for Unix/Linux]	4814	bytes	
-Recoll query: ((dear PHRASE 3 corporate PHRASE 3 administrator))
 1 results
 message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/mail/badMail.edit]	[none - In payments / Out payments]	855	bytes	
diff --git a/tests/media/media.sh b/tests/media/media.sh
index a2a65348..68c74b52 100755
--- a/tests/media/media.sh
+++ b/tests/media/media.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq Maldon > $mystdout 2> $mystderr
+recollq Maldon 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/media/media.txt b/tests/media/media.txt
index 572297a3..6380c7e4 100644
--- a/tests/media/media.txt
+++ b/tests/media/media.txt
@@ -1,3 +1,2 @@
-Recoll query: (maldon:(wqf=11))
-1 results 
-audio/mpeg	[file:///home/dockes/projets/fulltext/testrecoll/media/11-maldon.mp3]	[11-maldon.mp3]	5717570	bytes	
+1 results
+audio/mpeg	[file:///home/dockes/projets/fulltext/testrecoll/media/11-maldon.mp3]	[Maldon]	5717570	bytes	
diff --git a/tests/msword/msword.sh b/tests/msword/msword.sh
index 78ad3b57..37554871 100755
--- a/tests/msword/msword.sh
+++ b/tests/msword/msword.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq '"Evenements et programme 2006"' > $mystdout 2> $mystderr
+recollq '"Evenements et programme 2006"' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/msword/msword.txt b/tests/msword/msword.txt
index f1f9c3ce..96f3a889 100644
--- a/tests/msword/msword.txt
+++ b/tests/msword/msword.txt
@@ -1,3 +1,2 @@
-Recoll query: ((evenements PHRASE 4 et PHRASE 4 programme PHRASE 4 2006))
 1 results 
 application/msword	[file:///home/dockes/projets/fulltext/testrecoll/msword/programme.doc]	[programme.doc]	58880	bytes	
diff --git a/tests/notypes/notypes.sh b/tests/notypes/notypes.sh
index e11c6000..43c1e3f5 100755
--- a/tests/notypes/notypes.sh
+++ b/tests/notypes/notypes.sh
@@ -5,8 +5,10 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq Enerve_uniqueTerm          > $mystdout 2> $mystderr
-recollq notype1_uniqueterm >> $mystdout 2>> $mystderr
+recollq Enerve_uniqueTerm          2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
+recollq notype1_uniqueterm 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/notypes/notypes.txt b/tests/notypes/notypes.txt
index fcd7dc09..b42cac7c 100644
--- a/tests/notypes/notypes.txt
+++ b/tests/notypes/notypes.txt
@@ -1,6 +1,4 @@
-Recoll query: (enerve_uniqueterm:(wqf=11))
 1 results 
 application/x-empty	[file:///home/dockes/projets/fulltext/testrecoll/notypes/�nerv�_uniqueTerm.xfy]	[énervé_uniqueTerm.xfy]	0	bytes	
-Recoll query: (notype1_uniqueterm:(wqf=11))
 1 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/notypes/notype1.xfx]	[notype1.xfx]	64	bytes	
diff --git a/tests/ooff/ooff.sh b/tests/ooff/ooff.sh
index b9377ff3..22ed1316 100755
--- a/tests/ooff/ooff.sh
+++ b/tests/ooff/ooff.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq OpenofficeWriter_uniqueterm > $mystdout 2> $mystderr
+recollq OpenofficeWriter_uniqueterm 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/ooff/ooff.txt b/tests/ooff/ooff.txt
index e94671ce..0697e7c2 100644
--- a/tests/ooff/ooff.txt
+++ b/tests/ooff/ooff.txt
@@ -1,3 +1,2 @@
-Recoll query: (openofficewriter_uniqueterm:(wqf=11))
 1 results
 application/vnd.sun.xml.writer	[file:///home/dockes/projets/fulltext/testrecoll/ooff/writer.odt]	[Ceci est le titre du document openoffice élément <> "toto"]	6637	bytes	
diff --git a/tests/pdf/pdf.sh b/tests/pdf/pdf.sh
index e71d32c9..32442311 100755
--- a/tests/pdf/pdf.sh
+++ b/tests/pdf/pdf.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq '"sequences of moveto and lineto"' OR 'ANSIX3.4' > $mystdout 2> $mystderr
+recollq '"sequences of moveto and lineto"' OR 'ANSIX3.4' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/pdf/pdf.txt b/tests/pdf/pdf.txt
index c1dc1696..a1e1697b 100644
--- a/tests/pdf/pdf.txt
+++ b/tests/pdf/pdf.txt
@@ -1,4 +1,3 @@
-Recoll query: (((sequences PHRASE 5 of PHRASE 5 moveto PHRASE 5 and PHRASE 5 lineto) OR ansix3.4:(wqf=11)))
 2 results 
 application/pdf	[file:///home/dockes/projets/fulltext/testrecoll/pdf/ThinkingInPostScript.pdf]	[Thinking In PostScript]	846435	bytes	
 application/pdf	[file:///home/dockes/projets/fulltext/testrecoll/pdf/linux unicode.pdf]	[developerWorks: Linux | Unicode : Linux Unicode programming]	72669	bytes	
diff --git a/tests/postscript/postscript.sh b/tests/postscript/postscript.sh
index 377eb301..42e23b77 100755
--- a/tests/postscript/postscript.sh
+++ b/tests/postscript/postscript.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq '"Udi Manber and Sun Wu"' > $mystdout 2> $mystderr
+recollq '"Udi Manber and Sun Wu"' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/postscript/postscript.txt b/tests/postscript/postscript.txt
index 3ad80576..f61bfc81 100644
--- a/tests/postscript/postscript.txt
+++ b/tests/postscript/postscript.txt
@@ -1,3 +1,2 @@
-Recoll query: ((udi PHRASE 5 manber PHRASE 5 and PHRASE 5 sun PHRASE 5 wu))
 1 results 
 application/postscript	[file:///home/dockes/projets/fulltext/testrecoll/postscript/glimpse.ps]	[glimpse.ps]	118970	bytes	
diff --git a/tests/ppt/ppt.sh b/tests/ppt/ppt.sh
index bf3d5b06..954b9eb2 100755
--- a/tests/ppt/ppt.sh
+++ b/tests/ppt/ppt.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq '"plurilingues et pluriculturels"' > $mystdout 2> $mystderr
+recollq '"plurilingues et pluriculturels"' 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/ppt/ppt.txt b/tests/ppt/ppt.txt
index 8900f156..d37dc11b 100644
--- a/tests/ppt/ppt.txt
+++ b/tests/ppt/ppt.txt
@@ -1,3 +1,2 @@
-Recoll query: ((plurilingues PHRASE 3 et PHRASE 3 pluriculturels))
 1 results 
 application/vnd.ms-powerpoint	[file:///home/dockes/projets/fulltext/testrecoll/ppt/portfolio.ppt]	[portfolio.ppt]	86016	bytes	
diff --git a/tests/rfc2231/rfc2231.sh b/tests/rfc2231/rfc2231.sh
index 8da28734..a7ae9442 100755
--- a/tests/rfc2231/rfc2231.sh
+++ b/tests/rfc2231/rfc2231.sh
@@ -6,11 +6,16 @@ topdir=`dirname $0`/..
 initvariables $0
 
 # These one are name/filenamefor an inline part, no result
-recollq EnerveUniqueNameTerm > $mystdout 2> $mystderr
-recollq EnerveUniqueFileNameTerm >> $mystdout 2>> $mystderr
+recollq EnerveUniqueNameTerm 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
+
+recollq EnerveUniqueFileNameTerm 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 # This one for actual attachment
-recollq EpatantUniquenameterm      >> $mystdout 2>> $mystderr
-recollq EpatantUniquefilenameterm      >> $mystdout 2>> $mystderr
+recollq EpatantUniquenameterm      2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq EpatantUniquefilenameterm      2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/rfc2231/rfc2231.txt b/tests/rfc2231/rfc2231.txt
index a1488238..c89fea32 100644
--- a/tests/rfc2231/rfc2231.txt
+++ b/tests/rfc2231/rfc2231.txt
@@ -1,10 +1,6 @@
-Recoll query: (enerveuniquenameterm:(wqf=11))
-0 results 
-Recoll query: (enerveuniquefilenameterm:(wqf=11))
-0 results 
-Recoll query: (epatantuniquenameterm:(wqf=11))
-0 results 
-Recoll query: (epatantuniquefilenameterm:(wqf=11))
-2 results 
-application/octet-stream	[file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder]	[épatantuniquefilenameterm.bin]	42579	bytes	
+0 results
+0 results
+0 results
+2 results
 message/rfc822	[file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder]	[vrai attach]	42579	bytes	
+application/octet-stream	[file:///home/dockes/projets/fulltext/testrecoll/rfc2231/thunder]	[épatantuniquefilenameterm.bin]	42579	bytes	
diff --git a/tests/rtf/rtf.sh b/tests/rtf/rtf.sh
index 9b8562e0..33cfdbfe 100755
--- a/tests/rtf/rtf.sh
+++ b/tests/rtf/rtf.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq EQUK0401319A > $mystdout 2> $mystderr
+recollq EQUK0401319A 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/rtf/rtf.txt b/tests/rtf/rtf.txt
index e62bcd62..795c445f 100644
--- a/tests/rtf/rtf.txt
+++ b/tests/rtf/rtf.txt
@@ -1,3 +1,2 @@
-Recoll query: (equk0401319a:(wqf=11))
 1 results 
 text/rtf	[file:///home/dockes/projets/fulltext/testrecoll/rtf/JO28102004plaisance.rtf]	[J]	117216	bytes	
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 9482591e..20e17061 100644
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -7,6 +7,8 @@ fi
 
 . shared.sh
 
+recollindex -z
+
 # Yes, we could/should use the $toptmp from shared.sh here, but what if
 # this is unset ?
 toptmp=${TMPDIR:-/tmp}/recolltsttmp
diff --git a/tests/scribus/scribus.sh b/tests/scribus/scribus.sh
index 430b613c..e3237471 100755
--- a/tests/scribus/scribus.sh
+++ b/tests/scribus/scribus.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq Scribus_sla_uniqueterm OR Chaturbhuja > $mystdout 2> $mystderr
+recollq Scribus_sla_uniqueterm OR Chaturbhuja 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/scribus/scribus.txt b/tests/scribus/scribus.txt
index ff730b11..7553a9c7 100644
--- a/tests/scribus/scribus.txt
+++ b/tests/scribus/scribus.txt
@@ -1,4 +1,3 @@
-Recoll query: ((scribus_sla_uniqueterm:(wqf=11) OR chaturbhuja:(wqf=11)))
 2 results 
 application/x-scribus	[file:///home/dockes/projets/fulltext/testrecoll/scribus/Document-1.sla]	[Ceci est le titre du document]	53847	bytes	
 application/x-scribus	[file:///home/dockes/projets/fulltext/testrecoll/scribus/Prova_Scribus-1.scd]	[Prova_Scribus-1.scd]	34995	bytes	
diff --git a/tests/skipped/skipped.sh b/tests/skipped/skipped.sh
index 18418379..7773701a 100755
--- a/tests/skipped/skipped.sh
+++ b/tests/skipped/skipped.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq ShouldbeSkippedUnique > $mystdout 2> $mystderr
+recollq ShouldbeSkippedUnique 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/skipped/skipped.txt b/tests/skipped/skipped.txt
index 31be0574..bc2b9bf2 100644
--- a/tests/skipped/skipped.txt
+++ b/tests/skipped/skipped.txt
@@ -1,3 +1,2 @@
-Recoll query: (shouldbeskippedunique:(wqf=11))
 1 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/skipped/rlyskipped/shouldnotbeskipped.txt]	[shouldnotbeskipped.txt]	48	bytes	
diff --git a/tests/special/special.sh b/tests/special/special.sh
index cbd6e4a5..7726df61 100755
--- a/tests/special/special.sh
+++ b/tests/special/special.sh
@@ -5,12 +5,21 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq uppercase_uniqueterm  > $mystdout 2> $mystderr
+# Needs utf-8 locale
+LANG=en_US.UTF-8
+export LANG
+
+recollq uppercase_uniqueterm 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 # The term is the lowercase utf8 version of the term in casefolding.txt
-recollq 'àstrangewordþ'         >> $mystdout 2>> $mystderr
-recollq '"Modernite/efficience/pertinence"' >> $mystdout 2>> $mystderr
-recollq  dom.popup_allowed_events    >> $mystdout 2>> $mystderr
-recollq  toto@jean-23.fr   >> $mystdout 2>> $mystderr
+recollq 'àstrangewordþ'          2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq '"Modernite/efficience/pertinence"'  2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq  dom.popup_allowed_events     2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+recollq  toto@jean-23.fr    2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
 
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
diff --git a/tests/special/special.txt b/tests/special/special.txt
index 057a2fc1..f2769ae3 100644
--- a/tests/special/special.txt
+++ b/tests/special/special.txt
@@ -1,15 +1,10 @@
-Recoll query: (uppercase_uniqueterm:(wqf=11))
 1 results
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/UPPERCASE_uniqueTERM.txt]	[UPPERCASE_uniqueTERM.txt]	1	bytes	
-Recoll query: (astrangewordþ:(wqf=11))
 1 results
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/casefolding.txt]	[casefolding.txt]	59	bytes	
-Recoll query: ((modernite PHRASE 3 efficience PHRASE 3 pertinence))
 1 results
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/di li gence.txt]	[di li gence.txt]	6216	bytes	
-Recoll query: ((dom.popup_allowed_events:(wqf=11) OR dom.popup_allowed_ev))
 1 results
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/strangewords.txt]	[strangewords.txt]	41	bytes	
-Recoll query: ((toto@jean-23 PHRASE 4 fr))
 1 results
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/special/strangewords.txt]	[strangewords.txt]	41	bytes	
diff --git a/tests/stemming/stemming.sh b/tests/stemming/stemming.sh
new file mode 100755
index 00000000..579e7dec
--- /dev/null
+++ b/tests/stemming/stemming.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+
+recollq stemmingunique floor 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
+recollq stemmingunique Floor 2>> $mystderr | 
+	egrep -v '^Recoll query: ' >> $mystdout
+
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+checkresult
diff --git a/tests/stemming/stemming.txt b/tests/stemming/stemming.txt
new file mode 100644
index 00000000..dac219a2
--- /dev/null
+++ b/tests/stemming/stemming.txt
@@ -0,0 +1,5 @@
+2 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/stemming/a.txt]	[a.txt]	21	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/stemming/b.txt]	[b.txt]	22	bytes	
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/stemming/a.txt]	[a.txt]	21	bytes	
diff --git a/tests/txt/txt.sh b/tests/txt/txt.sh
index 474afcec..2b2ed29e 100755
--- a/tests/txt/txt.sh
+++ b/tests/txt/txt.sh
@@ -6,7 +6,8 @@ topdir=`dirname $0`/..
 initvariables $0
 
 # Should find the file where its unaccented and the other
-recollq Anemometre > $mystdout 2> $mystderr
+recollq Anemometre 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/txt/txt.txt b/tests/txt/txt.txt
index 6d012c61..1ce7c9ca 100644
--- a/tests/txt/txt.txt
+++ b/tests/txt/txt.txt
@@ -1,4 +1,3 @@
-Recoll query: (anemometre:(wqf=11))
 2 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/txt/liste.txt]	[liste.txt]	1165	bytes	
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/txt/liste1.txt]	[liste1.txt]	893	bytes	
diff --git a/tests/utf8/utf8.sh b/tests/utf8/utf8.sh
index 0cdfa42b..076b23b8 100755
--- a/tests/utf8/utf8.sh
+++ b/tests/utf8/utf8.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq "etonne precite" > $mystdout 2> $mystderr
+recollq "etonne precite" 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/utf8/utf8.txt b/tests/utf8/utf8.txt
index 96045371..a368935e 100644
--- a/tests/utf8/utf8.txt
+++ b/tests/utf8/utf8.txt
@@ -1,3 +1,2 @@
-Recoll query: (((etonnant OR etonne:(wqf=11) OR etonnement OR etonnes OR etonn) AND (precite:(wqf=11) OR precit)))
 1 results 
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/utf8/frenchUtf.txt]	[frenchUtf.txt]	87	bytes	
diff --git a/tests/xls/xls.sh b/tests/xls/xls.sh
index 28d8a66a..cc9de9c8 100755
--- a/tests/xls/xls.sh
+++ b/tests/xls/xls.sh
@@ -5,7 +5,8 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq Excel_UniqueTerm > $mystdout 2> $mystderr
+recollq Excel_UniqueTerm 2> $mystderr | 
+	egrep -v '^Recoll query: ' > $mystdout
 
 diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
 
diff --git a/tests/xls/xls.txt b/tests/xls/xls.txt
index 3cf85312..8f552644 100644
--- a/tests/xls/xls.txt
+++ b/tests/xls/xls.txt
@@ -1,3 +1,2 @@
-Recoll query: (excel_uniqueterm:(wqf=11))
 1 results 
 application/vnd.ms-excel	[file:///home/dockes/projets/fulltext/testrecoll/xls/landis1.xls]	[landis1.xls]	8704	bytes