diff --git a/src/filters/rclocrtesseract.py b/src/filters/rclocrtesseract.py
index bd88aefc..b5925389 100755
--- a/src/filters/rclocrtesseract.py
+++ b/src/filters/rclocrtesseract.py
@@ -192,13 +192,22 @@ def _pdftesseract(config, path):
             _deb("pdftoppm created empty files. "
                  "Suspecting full file system, failing")
             return False, ""
-        
+
+    nenv = os.environ.copy()
+    cnthreads = config.getConfParam("tesseractnthreads")
+    if cnthreads:
+        try:
+            nthreads = int(cnthreads)
+            nenv['OMP_THREAD_LIMIT'] = cnthreads
+        except:
+            pass
+
     for f in sorted(ppmfiles):
         out = b''
         try:
             out = subprocess.check_output(
                 [tesseractcmd, f, f, "-l", tesseractlang],
-                stderr=subprocess.STDOUT)
+                stderr=subprocess.STDOUT, env=nenv)
         except Exception as e:
             _deb("%s failed: %s" % (tesseractcmd,e))
 
diff --git a/src/testmains/qresultstore.cpp b/src/query/qresultstore.cpp
similarity index 100%
rename from src/testmains/qresultstore.cpp
rename to src/query/qresultstore.cpp
diff --git a/src/testmains/qresultstore.h b/src/query/qresultstore.h
similarity index 100%
rename from src/testmains/qresultstore.h
rename to src/query/qresultstore.h
diff --git a/src/testmains/rclqdocmem.cpp b/src/testmains/trqrstore.cpp
similarity index 100%
rename from src/testmains/rclqdocmem.cpp
rename to src/testmains/trqrstore.cpp