diff --git a/tests/andor/andor.sh b/tests/andor/andor.sh
index 3b15b55b..14c4eacf 100755
--- a/tests/andor/andor.sh
+++ b/tests/andor/andor.sh
@@ -4,9 +4,15 @@ topdir=`dirname $0`/..
 . $topdir/shared.sh
 
 initvariables $0
+xrun()
+{
+    echo $*
+    $*
+}
 
-recollq 'andorhuniique Beatles OR Lennon Live OR Unplugged' 2> $mystderr | 
-	egrep -v '^Recoll query: ' > $mystdout
+(
+    recollq 'andorhuniique 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/langparser/langparser.sh b/tests/langparser/langparser.sh
new file mode 100755
index 00000000..e7006c0b
--- /dev/null
+++ b/tests/langparser/langparser.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+topdir=`dirname $0`/..
+. $topdir/shared.sh
+
+initvariables $0
+xrun()
+{
+    echo $*
+    $*
+}
+
+(
+    echo "Expect 2 bu.txt leli.txt"
+    recollq 'andorhuniique Beatles OR Lennon Live OR Unplugged' 
+    echo "Expect 2 bu.txt leli.txt"
+    recollq 'andorhuniique (Beatles OR Lennon) AND (Live OR Unplugged)' 
+    echo "Expect 2 bu.txt leli.txt"
+    recollq '(Beatles OR Lennon) Live OR Unplugged andorhuniique' 
+    echo "Expect 2 bu.txt leli.txt"
+    recollq 'Beatles OR Lennon (Live OR Unplugged) andorhuniique' 
+    echo "Expect 1 bu.txt"
+    recollq 'Beatles OR Lennon -Lennon (Live OR Unplugged) andorhuniique' 
+    echo "Expect 1 leli.txt"
+    recollq 'Beatles OR Lennon Lennon Live andorhuniique' 
+    echo "Expect 1 leli.txt"
+    recollq 'Beatles OR Lennon Live andorhuniique' 
+    echo "Expect 1 lb.txt"
+    recollq '(Beatles AND Live) OR (Beatles AND Lennon) andorhuniique' 
+    echo "Expect 1 lb.txt"
+    recollq '(Beatles Live) OR (Beatles AND Lennon) andorhuniique' 
+    echo "Expect 1 leli.txt"
+    recollq '(Beatles AND Live) OR (Lennon AND Unplugged OR Live) andorhuniique' 
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html Fields Test File"' 
+    echo "Expect 0"
+    recollq 'title:"Html Fields File"' 
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html Fields File"o' 
+    echo "Expect 0"
+    recollq 'title:"Html File Fields"' 
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html File Fields"p'
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html File Fields"p -nosuchtermexists'
+    echo "Expect 0 htmlfield1.html"
+    recollq 'title:"Html File Fields"p nosuchtermexists'
+    echo "Expect 1 htmlfield1.html"
+    recollq 'ThisIsTheFieldHtmlTestFile title:"Html File Fields"p -nosuchtermexists'
+    echo "Expect 2 htmlfield.html htmlfield1.html"
+    recollq 'Beatles OR ThisIsTheFieldHtmlTestFile title:"Html File Fields"p'
+    echo "Expect 1 htmlfield1.html"
+    recollq 'ThisIsTheFieldHtmlTestFile OR title:"Html File Fields"p'
+
+    # Size tests. Note that the search code handles < and > as <= and
+    # >= for now. So size>267 succeeds...
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html File Fields"p size=267'
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html File Fields"p size>= 267'
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html File Fields"p size <=267'
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html File Fields"p size <= 300'
+    echo "Expect 1 htmlfield1.html"
+    recollq 'title:"Html File Fields"p size >= 200'
+    echo "Expect 0"
+    recollq 'title:"Html File Fields"p size=268'
+    echo "Expect 0"
+    recollq 'title:"Html File Fields"p size>268'
+    echo "Expect 0"
+    recollq 'title:"Html File Fields"p size<266'
+
+)  2> $mystderr | egrep -v '^Recoll query: ' > $mystdout
+
+diff -w ${myname}.txt $mystdout > $mydiffs 2>&1
+
+checkresult
diff --git a/tests/langparser/langparser.txt b/tests/langparser/langparser.txt
new file mode 100644
index 00000000..dc64f225
--- /dev/null
+++ b/tests/langparser/langparser.txt
@@ -0,0 +1,83 @@
+Expect 2 bu.txt leli.txt
+2 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]	32	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	26	bytes	
+Expect 2 bu.txt leli.txt
+2 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]	32	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	26	bytes	
+Expect 2 bu.txt leli.txt
+2 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]	32	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	26	bytes	
+Expect 2 bu.txt leli.txt
+2 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]	32	bytes	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	26	bytes	
+Expect 1 bu.txt
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/bu.txt]	[bu.txt]	32	bytes	
+Expect 1 leli.txt
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	26	bytes	
+Expect 1 leli.txt
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	26	bytes	
+Expect 1 lb.txt
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/lb.txt]	[lb.txt]	29	bytes	
+Expect 1 lb.txt
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/lb.txt]	[lb.txt]	29	bytes	
+Expect 1 leli.txt
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/andor/leli.txt]	[leli.txt]	26	bytes	
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 0
+0 results
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 0
+0 results
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 0 htmlfield1.html
+0 results
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 2 htmlfield.html htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 1 htmlfield1.html
+2 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield.html]	[htmlfield.html]	137	bytes	
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 1 htmlfield1.html
+1 results
+text/html	[file:///home/dockes/projets/fulltext/testrecoll/html/htmlfield1.html]	[HTML fields test file: été à noël]	267	bytes	
+Expect 0
+0 results
+Expect 0
+0 results
+Expect 0
+0 results