diff --git a/docs/changelog.rst b/docs/changelog.rst
index 436671ec..b5bf486c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Fix tests for pymongo 2.8+ #877
 - No module named 'django.utils.importlib' (Django dev) #872
 - Field Choices Now Accept Subclasses of Documents
 - Ensure Indexes before Each Save #812
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index d3e37267..ab156f68 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -495,9 +495,12 @@ class IndexesTest(unittest.TestCase):
 
         self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
 
-        def invalid_index():
-            BlogPost.objects.hint('tags')
-        self.assertRaises(TypeError, invalid_index)
+        if pymongo.version >= '2.8':
+            self.assertEqual(BlogPost.objects.hint('tags').count(), 10)
+        else:
+            def invalid_index():
+                BlogPost.objects.hint('tags')
+            self.assertRaises(TypeError, invalid_index)
 
         def invalid_index_2():
             return BlogPost.objects.hint(('tags', 1))