diff --git a/tests/badsuffs/badsuffs.sh b/tests/badsuffs/badsuffs.sh
index 97b9841a..947dbe4a 100755
--- a/tests/badsuffs/badsuffs.sh
+++ b/tests/badsuffs/badsuffs.sh
@@ -5,9 +5,17 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-# Data in text files with skipped suffixes should not be indexed
-recollq Badsuffixes_unique 2> $mystderr | 
-	egrep -v '^Recoll query: ' > $mystdout
+(
+    # Data in text files with skipped suffixes should not be indexed,
+    # except that .md5 is in noContentSuffixes- -> 1 result,
+    # badsuffilename.md5
+    recollq Badsuffixes_unique
+
+    # .nosuff is added by noContentSuffixes+. No result for you
+    # notreallybad.nosuff
+    recollq nosuffUnique
+    
+) 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 40845ffd..4faf8c5f 100644
--- a/tests/badsuffs/badsuffs.txt
+++ b/tests/badsuffs/badsuffs.txt
@@ -1 +1,3 @@
-0 results 
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5]	[badsufffilename.md5]	19	bytes	
+0 results
diff --git a/tests/badsuffs1/badsuffs1.sh b/tests/badsuffs1/badsuffs1.sh
index ea9c6bfc..3878e6ec 100755
--- a/tests/badsuffs1/badsuffs1.sh
+++ b/tests/badsuffs1/badsuffs1.sh
@@ -5,7 +5,9 @@ topdir=`dirname $0`/..
 
 initvariables $0
 (
-    # File names for files with skipped suffixes should be indexed
+    # File names for files with skipped suffixes should be indexed,
+    # and file names only (except for the .md5 one because it's in
+    # noContentSuffixes-)
     recollq -S mtime Badsufffilename 
 
 ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout
diff --git a/tests/badsuffs1/badsuffs1.txt b/tests/badsuffs1/badsuffs1.txt
index 4ba5d3e9..ae02961a 100644
--- a/tests/badsuffs1/badsuffs1.txt
+++ b/tests/badsuffs1/badsuffs1.txt
@@ -1,6 +1,6 @@
 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	
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.md5]	[badsufffilename.md5]	19	bytes	
 application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.bz2]	[badsufffilename.tar.bz2]	57	bytes	
 application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tar.gz]	[badsufffilename.tar.gz]	39	bytes	
 application/x-tar	[file:///home/dockes/projets/fulltext/testrecoll/badsuffs/badsufffilename.tbz]	[badsufffilename.tbz]	19	bytes	
diff --git a/tests/config/recoll.conf b/tests/config/recoll.conf
index b1f775be..d9b3b068 100644
--- a/tests/config/recoll.conf
+++ b/tests/config/recoll.conf
@@ -9,7 +9,19 @@ systemfilecommand = xdg-mime query filetype
 indexStripChars = 1
 detectxattronly = 1
 
-topdirs = /home/dockes/projets/fulltext/testrecoll/
+topdirs = /home/dockes/projets/fulltext/testrecoll
+
+#thrQSizes = -1 -1 -1
+
+# Adding to skippedNames
+skippedNames+ = notinskippednames
+# Removing from skippedNames
+skippedNames- = recollrc
+
+# Adding to noContentSuffixes
+noContentSuffixes+ = .nosuff
+# Removing from noContentSuffixes
+noContentSuffixes- = .md5
 
 # Comics_12 causes rclppt to loop. We keep it around for general testing
 # but it takes too much time when running the test-set
@@ -44,5 +56,3 @@ indexedmimetypes = text/plain
 
 [/home/dockes/projets/fulltext/testrecoll/excltypes]
 excludedmimetypes = text/plain
-
-
diff --git a/tests/skipped/skipped.sh b/tests/skipped/skipped.sh
index 7773701a..b39cedbd 100755
--- a/tests/skipped/skipped.sh
+++ b/tests/skipped/skipped.sh
@@ -5,8 +5,27 @@ topdir=`dirname $0`/..
 
 initvariables $0
 
-recollq ShouldbeSkippedUnique 2> $mystderr | 
-	egrep -v '^Recoll query: ' > $mystdout
+(
+    # skippedPaths:
+    # shouldbeskipped.txt should be skipped because
+    # skipped/reallyskipped/ is in skippedPaths, but the query gets 1
+    # result because of rlyskipped/shouldnotbeskipped.txt
+    # 1 res: shouldnotbeskipped.txt
+    recollq ShouldbeSkippedUnique
+
+    # skippedNames
+    # recollrc is in the default skippedNames list, but should be the
+    # result here because 'recollrc' is in the local config
+    # skippedNames-
+    # 1 res: skipped/recollrc
+    recollq recollrcUnique
+
+    # skippedNames
+    # Should be skipped because notinskippednames is in skippedNames+
+    # 0 res for skipped/notinskippednames
+    recollq -q notinskippedNamesUnique
+    
+)  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 bc2b9bf2..b6ec6483 100644
--- a/tests/skipped/skipped.txt
+++ b/tests/skipped/skipped.txt
@@ -1,2 +1,5 @@
-1 results 
+1 results
 text/plain	[file:///home/dockes/projets/fulltext/testrecoll/skipped/rlyskipped/shouldnotbeskipped.txt]	[shouldnotbeskipped.txt]	48	bytes	
+1 results
+text/plain	[file:///home/dockes/projets/fulltext/testrecoll/skipped/recollrc]	[recollrc]	15	bytes	
+0 results