diff --git a/test/test_cursor.py b/test/test_cursor.py
index 272d3eefb..1c9be2035 100644
--- a/test/test_cursor.py
+++ b/test/test_cursor.py
@@ -1219,7 +1219,9 @@ self.assertFalse(c2.alive)
         # MongoDB 3.1.5 changed the ns for commands.
         regex = {'$regex': 'pymongo_test.(\$cmd|test)'}
 
-        if version.at_least(self.db.connection, (3, 1, 8, -1)):
+        if version.at_least(self.db.connection, (3, 5, 8, -1)):
+            query_key = "command.comment"
+        elif version.at_least(self.db.connection, (3, 1, 8, -1)):
             query_key = "query.comment"
         else:
             query_key = "query.$comment"