diff --git a/test/test_dbcore.py b/test/test_dbcore.py
index 22e0ddf11..c364e9867 100644
--- a/test/test_dbcore.py
+++ b/test/test_dbcore.py
@@ -514,6 +514,12 @@ class ParseSortedQueryTest(unittest.TestCase):
         self.assertIsInstance(s, dbcore.query.NullSort)
         self.assertEqual(len(q.subqueries), 3)
 
+    def test_leading_comma_or_query(self):
+        q, s = self.psq([u',', u'foo', u',', u'bar'])
+        self.assertIsInstance(q, dbcore.query.OrQuery)
+        self.assertIsInstance(s, dbcore.query.NullSort)
+        self.assertEqual(len(q.subqueries), 3)
+
 
 class ResultsIteratorTest(unittest.TestCase):
     def setUp(self):