diff --git a/reviewboard/datagrids/tests.py b/reviewboard/datagrids/tests.py
index d4142ce43d15f7273e619c71aedede831a4270f3..c4cdea7862760323c3f7a59e3ee26653950126b0 100644
--- a/reviewboard/datagrids/tests.py
+++ b/reviewboard/datagrids/tests.py
@@ -584,7 +584,7 @@ class UsersDataGridTests(BaseViewTestCase):
 
         self.client.login(username='doc', password='doc')
 
-        with self.assertNumQueries(6):
+        with self.assertNumQueries(10):
             response = self.client.get('/users/?columns=fullname')
 
         self.assertEqual(response.status_code, 200)
@@ -607,7 +607,7 @@ class UsersDataGridTests(BaseViewTestCase):
 
         self.client.logout()
 
-        with self.assertNumQueries(3):
+        with self.assertNumQueries(7):
             response = self.client.get('/users/?columns=fullname')
 
         self.assertEqual(response.status_code, 200)
@@ -627,7 +627,7 @@ class UsersDataGridTests(BaseViewTestCase):
 
         self.client.login(username='doc', password='doc')
 
-        with self.assertNumQueries(11):
+        with self.assertNumQueries(14):
             response = self.client.get('/users/?columns=fullname')
 
         self.assertEqual(response.status_code, 200)
@@ -658,7 +658,7 @@ class UsersDataGridTests(BaseViewTestCase):
 
         self.client.login(username='doc', password='doc')
 
-        with self.assertNumQueries(7):
+        with self.assertNumQueries(11):
             response = self.client.get('/users/?columns=fullname')
 
         self.assertEqual(response.status_code, 200)
@@ -690,7 +690,7 @@ class UsersDataGridTests(BaseViewTestCase):
         Profile.objects.all().update(is_private=True)
         self.client.logout()
 
-        with self.assertNumQueries(3):
+        with self.assertNumQueries(7):
             response = self.client.get('/users/?columns=fullname')
 
         self.assertEqual(response.status_code, 200)
@@ -712,7 +712,7 @@ class UsersDataGridTests(BaseViewTestCase):
         Profile.objects.all().update(is_private=True)
         self.client.login(username='admin', password='admin')
 
-        with self.assertNumQueries(6):
+        with self.assertNumQueries(10):
             response = self.client.get('/users/?columns=fullname')
 
         self.assertEqual(response.status_code, 200)
@@ -736,7 +736,7 @@ class UsersDataGridTests(BaseViewTestCase):
         Profile.objects.all().update(is_private=True)
         self.client.login(username='doc', password='doc')
 
-        with self.assertNumQueries(7):
+        with self.assertNumQueries(11):
             response = self.client.get('/users/?columns=fullname')
 
         self.assertEqual(response.status_code, 200)
@@ -768,7 +768,7 @@ class UsersDataGridTests(BaseViewTestCase):
         Profile.objects.all().update(is_private=True)
         self.client.login(username='doc', password='doc')
 
-        with self.assertNumQueries(9):
+        with self.assertNumQueries(11):
             response = self.client.get(
                 '/s/local-site-2/users/?columns=fullname')
 
diff --git a/reviewboard/reviews/tests/test_base_review_request_details.py b/reviewboard/reviews/tests/test_base_review_request_details.py
index 0117aa9704d61d629edbdf78e44bfb4884d8f69d..5171ae9c621b8ea5068967ea4bb9e5feaebb8129 100644
--- a/reviewboard/reviews/tests/test_base_review_request_details.py
+++ b/reviewboard/reviews/tests/test_base_review_request_details.py
@@ -35,13 +35,12 @@ class BaseReviewRequestDetailsTests(TestCase):
         # The following queries will be executed:
         #
         # 1. Diffset
-        # 2. The file list
-        # 3. The default reviewer list
+        # 2. The default reviewer list
+        # 3. The file list
         # 4. User list for all matched default reviewers
-        # 5. Group list for all matched default reviewers
-        # 6. Existing user ID list (m2m.add())
-        # 7. Setting new users (m2m.add())
-        with self.assertNumQueries(7):
+        # 5. Update users (m2m.add())
+        # 6. Group list for all matched default reviewers
+        with self.assertNumQueries(6):
             review_request.add_default_reviewers()
 
         self.assertEqual(list(review_request.target_people.all()),
@@ -72,13 +71,12 @@ class BaseReviewRequestDetailsTests(TestCase):
         # The following queries will be executed:
         #
         # 1. Diffset
-        # 2. The file list
-        # 3. The default reviewer list
+        # 2. The default reviewer list
+        # 3. The file list
         # 4. User list for all matched default reviewers
         # 5. Group list for all matched default reviewers
-        # 8. Existing group ID list (m2m.add())
-        # 9. Setting new groups (m2m.add())
-        with self.assertNumQueries(7):
+        # 6. Update groups (m2m.add())
+        with self.assertNumQueries(6):
             review_request.add_default_reviewers()
 
         self.assertEqual(list(review_request.target_groups.all()),
@@ -116,15 +114,13 @@ class BaseReviewRequestDetailsTests(TestCase):
         # The following queries will be executed:
         #
         # 1. Diffset
-        # 2. The file list
-        # 3. The default reviewer list
+        # 2. The default reviewer list
+        # 3. The file list
         # 4. User list for all matched default reviewers
-        # 5. Group list for all matched default reviewers
-        # 6. Existing user ID list (m2m.add())
-        # 7. Setting new users (m2m.add())
-        # 8. Existing group ID list (m2m.add())
-        # 9. Setting new groups (m2m.add())
-        with self.assertNumQueries(9):
+        # 5. Update users (m2m.add())
+        # 6. Group list for all matched default reviewers
+        # 7. Update groups (m2m.add())
+        with self.assertNumQueries(7):
             review_request.add_default_reviewers()
 
         self.assertEqual(list(review_request.target_people.all()),
diff --git a/reviewboard/reviews/tests/test_review_request_page_data.py b/reviewboard/reviews/tests/test_review_request_page_data.py
index f3b15709275fd396c2b62db48f36e96b2f3c89b9..299fd7fd004886642026def79458f02dbccd6933 100644
--- a/reviewboard/reviews/tests/test_review_request_page_data.py
+++ b/reviewboard/reviews/tests/test_review_request_page_data.py
@@ -71,7 +71,7 @@ class ReviewRequestPageDataTests(TestCase):
     def test_query_data_post_etag(self):
         """Testing ReviewRequestPageData.query_data_post_etag"""
         self._test_query_data_post_etag_with(
-            expected_num_queries=18,
+            expected_num_queries=16,
             expect_reviews=True,
             expect_file_attachments=True,
             expect_screenshots=True,
@@ -85,7 +85,7 @@ class ReviewRequestPageDataTests(TestCase):
         """
         self._test_query_data_post_etag_with(
             entry_classes=[ReviewRequestEntry],
-            expected_num_queries=18,
+            expected_num_queries=16,
             expect_draft=True,
             expect_reviews=True,
             expect_file_attachments=True,
@@ -99,7 +99,7 @@ class ReviewRequestPageDataTests(TestCase):
         """
         self._test_query_data_post_etag_with(
             entry_classes=[InitialStatusUpdatesEntry],
-            expected_num_queries=18,
+            expected_num_queries=16,
             expect_reviews=True,
             expect_file_attachments=True,
             expect_screenshots=True,
@@ -112,7 +112,7 @@ class ReviewRequestPageDataTests(TestCase):
         """
         self._test_query_data_post_etag_with(
             entry_classes=[ReviewEntry],
-            expected_num_queries=18,
+            expected_num_queries=16,
             expect_reviews=True,
             expect_file_attachments=True,
             expect_screenshots=True,
@@ -125,7 +125,7 @@ class ReviewRequestPageDataTests(TestCase):
         """
         self._test_query_data_post_etag_with(
             entry_classes=[ChangeEntry],
-            expected_num_queries=18,
+            expected_num_queries=16,
             expect_reviews=True,
             expect_file_attachments=True,
             expect_screenshots=True,