diff --git a/elastic_recheck/tests/unit/test_load_queries.py b/elastic_recheck/tests/unit/test_load_queries.py
index cba66235..a8068450 100644
--- a/elastic_recheck/tests/unit/test_load_queries.py
+++ b/elastic_recheck/tests/unit/test_load_queries.py
@@ -30,6 +30,17 @@ class TestLoadQueries(tests.TestCase):
             self.assertIsNotNone(q['bug'])
             self.assertIsNotNone(q['query'])
 
+    def test_grenade_compat(self):
+        # grenade logs are in logs/new/ and logs/old, while devstack is in
+        # logs/. To make sure queries will work with both, one should use
+        # filename:logs*screen... (no quotes)
+        queries = loader.load("queries")
+
+        for q in queries:
+            # Use assertTrue because you can specify a custom message
+            self.assertTrue("filename:\"logs/screen-" not in q['query'],
+                            msg=("for bug %s" % q['bug']))
+
     def test_load_queries_all(self):
         queries = loader.load("queries", skip_resolved=False)
 
diff --git a/queries/1275500.yaml b/queries/1275500.yaml
index 9e7190f4..d4dda3dc 100644
--- a/queries/1275500.yaml
+++ b/queries/1275500.yaml
@@ -1,6 +1,6 @@
 query: >
   message:"Network filter not found"
   AND message:"libvirt"
-  AND filename:"logs/screen-n-cpu.txt"
+  AND filename:logs*screen-n-cpu.txt
   AND module:"nova.compute.manager"
 
diff --git a/queries/1278416.yaml b/queries/1278416.yaml
index 0d63e4ee..c351933e 100644
--- a/queries/1278416.yaml
+++ b/queries/1278416.yaml
@@ -1,4 +1,4 @@
 query: >
   message:"remove_iscsi_target"
   AND message:"os.unlink"
-  AND filename:"logs/screen-c-vol.txt"
+  AND filename:logs*screen-c-vol.txt
diff --git a/queries/1280072.yaml b/queries/1280072.yaml
index 0a8a8c44..5614eceb 100644
--- a/queries/1280072.yaml
+++ b/queries/1280072.yaml
@@ -1,4 +1,4 @@
 query: >
   message:"Backend storage for image"
   AND message:"disconnected after writing only"
-  AND filename:"logs/screen-g-api.txt"
+  AND filename:logs*screen-g-api.txt