diff --git a/test/test_collection.py b/test/test_collection.py
index fc19a579d..46dc51031 100644
--- a/test/test_collection.py
+++ b/test/test_collection.py
@@ -422,8 +422,8 @@ class TestCollection(unittest.TestCase):
                 "coordinates": [[[40,5], [40,6], [41,6], [41,5], [40,5]]]}
         query = {"geo": {"$within": {"$geometry": poly}}}
 
-        self.assertTrue(
-            db.test.find(query).explain()['cursor'].startswith('S2Cursor'))
+        cursor = db.test.find(query).explain()['cursor']
+        self.assertTrue('S2Cursor' in cursor or 'geo_2dsphere' in cursor)
 
         db.test.drop_indexes()
 
diff --git a/test/test_database.py b/test/test_database.py
index 1d362a62a..6f1f835ae 100644
--- a/test/test_database.py
+++ b/test/test_database.py
@@ -392,7 +392,7 @@ class TestDatabase(unittest.TestCase):
         user_info = db.command("usersInfo", "amalia")
         self.assertTrue(user_info["users"])
         amalia_user = user_info["users"][0]
-        self.assertEqual(amalia_user["name"], "amalia")
+        self.assertEqual(amalia_user["user"], "amalia")
         self.assertEqual(amalia_user["customData"], {"secret": "koalas"})
 
         db.remove_user("amalia")
diff --git a/test/test_ssl.py b/test/test_ssl.py
index 547ccac84..1356feb5d 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -405,10 +405,8 @@ class TestSSL(unittest.TestCase):
                            "--auth to test MONGODB-X509")
         # Give admin all necessary priviledges.
         client['$external'].add_user(MONGODB_X509_USERNAME, roles=[
-            {'name': 'readWriteAnyDatabase',
-                'db': 'admin', 'hasRole': True, 'canDelegate': False},
-            {'name': 'userAdminAnyDatabase',
-                'db': 'admin', 'hasRole': True, 'canDelegate': False}])
+            {'role': 'readWriteAnyDatabase', 'db': 'admin'},
+            {'role': 'userAdminAnyDatabase', 'db': 'admin'}])
         client = MongoClient(host, port, ssl=True, ssl_certfile=CLIENT_PEM)
         coll = client.pymongo_test.test
         self.assertRaises(OperationFailure, coll.count)