diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS
index f52a1f74..a987cff7 100644
--- a/test/pacman/tests/TESTS
+++ b/test/pacman/tests/TESTS
@@ -88,6 +88,8 @@ TESTS += test/pacman/tests/query007.py
 TESTS += test/pacman/tests/query010.py
 TESTS += test/pacman/tests/query011.py
 TESTS += test/pacman/tests/query012.py
+TESTS += test/pacman/tests/querycheck001.py
+TESTS += test/pacman/tests/querycheck002.py
 TESTS += test/pacman/tests/reason001.py
 TESTS += test/pacman/tests/remove001.py
 TESTS += test/pacman/tests/remove002.py
diff --git a/test/pacman/tests/querycheck001.py b/test/pacman/tests/querycheck001.py
new file mode 100644
index 00000000..8ed4b266
--- /dev/null
+++ b/test/pacman/tests/querycheck001.py
@@ -0,0 +1,15 @@
+self.description = "Query--check files, all there"
+
+pkg = pmpkg("dummy")
+pkg.files = [
+    "usr/lib/libdummy.so.0",
+    "usr/lib/libdummy.so -> libdummy.so.0",
+    "usr/share/dummy/C/",
+    "usr/share/dummy/C/msgs",
+    "usr/share/dummy/en -> C"]
+self.addpkg2db("local",pkg)
+
+self.args = "-Qk"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PACMAN_OUTPUT=warning.*(No such file or directory)")
diff --git a/test/pacman/tests/querycheck002.py b/test/pacman/tests/querycheck002.py
new file mode 100644
index 00000000..579d4d1a
--- /dev/null
+++ b/test/pacman/tests/querycheck002.py
@@ -0,0 +1,15 @@
+self.description = "Query--check mtree, no mtree"
+
+pkg = pmpkg("dummy")
+pkg.files = [
+    "usr/lib/libdummy.so.0",
+    "usr/lib/libdummy.so -> libdummy.so.0",
+    "usr/share/dummy/C/",
+    "usr/share/dummy/C/msgs",
+    "usr/share/dummy/en -> C"]
+self.addpkg2db("local",pkg)
+
+self.args = "-Qkk"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=dummy: no mtree file")