diff --git a/reviewboard/webapi/tests/test_change.py b/reviewboard/webapi/tests/test_change.py
index fca079c81d8ab6a8238d256c0dae050dcb42d824..2dbd695eecc6d6e5181344f5425352edfb8de89a 100644
--- a/reviewboard/webapi/tests/test_change.py
+++ b/reviewboard/webapi/tests/test_change.py
@@ -22,7 +22,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_changes(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/changes/ API"""
         review_request = self.create_review_request(publish=True)
 
@@ -56,7 +56,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_change(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/changes/<id>/ API"""
         def write_fields(obj, index):
             for field, data in test_data.iteritems():
@@ -233,7 +233,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(screenshot_data['screenshot']['id'], screenshot3.pk)
 
     @add_fixtures(['test_site'])
-    def test_get_change_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET review-requests/<id>/changes/<id>/ API
         with Not Modified response
         """
diff --git a/reviewboard/webapi/tests/test_default_reviewer.py b/reviewboard/webapi/tests/test_default_reviewer.py
index 6a162f01abc39e054dbfdcb376c2708104d2922f..e595571ffadc6d8a1e260754bc64500baba4583f 100644
--- a/reviewboard/webapi/tests/test_default_reviewer.py
+++ b/reviewboard/webapi/tests/test_default_reviewer.py
@@ -20,7 +20,7 @@ class ResourceListTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_users', 'test_scmtools'])
-    def test_get_default_reviewers(self):
+    def test_get(self):
         """Testing the GET default-reviewers/ API"""
         user = User.objects.get(username='doc')
         group = Group.objects.create(name='group1')
@@ -58,7 +58,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(repos[0]['title'], repository.name)
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_default_reviewers_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET default-reviewers/ API with a local site"""
         local_site = LocalSite.objects.get(name=self.local_site_name)
         DefaultReviewer.objects.create(name='default1', file_regex='.*',
@@ -87,7 +87,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(default_reviewers[0]['file_regex'], '.*')
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_default_reviewers_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET default-reviewers/ API
         with a local site and Permission Denied error
         """
@@ -95,7 +95,7 @@ class ResourceListTests(BaseWebAPITestCase):
                     expected_status=403)
 
     @add_fixtures(['test_users', 'test_scmtools'])
-    def test_get_default_reviewers_with_repositories(self):
+    def test_get_with_repositories(self):
         """Testing the GET default-reviewers/?repositories= API"""
         repository1 = self.create_repository(name='repo 1')
         repository2 = self.create_repository(name='repo 2')
@@ -130,7 +130,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(default_reviewers[0]['name'], 'default1')
 
     @add_fixtures(['test_users'])
-    def test_get_default_reviewers_with_users(self):
+    def test_get_with_users(self):
         """Testing the GET default-reviewers/?users= API"""
         user1 = User.objects.get(username='doc')
         user2 = User.objects.get(username='dopey')
@@ -162,7 +162,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(default_reviewers), 1)
         self.assertEqual(default_reviewers[0]['name'], 'default1')
 
-    def test_get_default_reviewers_with_groups(self):
+    def test_get_with_groups(self):
         """Testing the GET default-reviewers/?groups= API"""
         group1 = Group.objects.create(name='group1')
         group2 = Group.objects.create(name='group2')
@@ -200,7 +200,7 @@ class ResourceListTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_users', 'test_scmtools'])
-    def test_post_default_reviewer(self, local_site=None):
+    def test_post(self, local_site=None):
         """Testing the POST default-reviewers/ API"""
         self._login_user(admin=True)
 
@@ -261,7 +261,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(repos[1], repo2)
 
     @add_fixtures(['test_users'])
-    def test_post_default_reviewer_with_defaults(self):
+    def test_post_with_defaults(self):
         """Testing the POST default-reviewers/ API with field defaults"""
         self._login_user(admin=True)
 
@@ -285,7 +285,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(default_reviewer.file_regex, file_regex)
 
     @add_fixtures(['test_users'])
-    def test_post_default_reviewer_with_permission_denied(self):
+    def test_post_with_permission_denied(self):
         """Testing the POST default-reviewers/ API
         with Permission Denied error
         """
@@ -300,7 +300,7 @@ class ResourceListTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_post_default_reviewer_with_invalid_regex(self):
+    def test_post_with_invalid_regex(self):
         """Testing the POST default-reviewers/ API with an invalid regex"""
         self._login_user(admin=True)
 
@@ -317,7 +317,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue('file_regex' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_post_default_reviewer_with_permission_denied_and_local_site(self):
+    def test_post_with_permission_denied_and_local_site(self):
         """Testing the POST default-reviewers/ API
         with a local site and Permission Denied error
         """
@@ -332,7 +332,7 @@ class ResourceListTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_users'])
-    def test_post_default_reviewer_with_invalid_username(self):
+    def test_post_with_invalid_username(self):
         """Testing the POST default-reviewers/ API with invalid username"""
         self._login_user(admin=True)
 
@@ -349,7 +349,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue('users' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_post_default_reviewer_with_user_invalid_site(self):
+    def test_post_with_user_invalid_site(self):
         """Testing the POST default-reviewers/ API
         with user and invalid site
         """
@@ -370,7 +370,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue('users' in rsp['fields'])
 
     @add_fixtures(['test_users'])
-    def test_post_default_reviewer_with_invalid_group(self):
+    def test_post_with_invalid_group(self):
         """Testing the POST default-reviewers/ API with invalid group"""
         self._login_user(admin=True)
 
@@ -387,7 +387,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue('groups' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_post_default_reviewer_with_group_invalid_site(self):
+    def test_post_with_group_invalid_site(self):
         """Testing the POST default-reviewers/ API
         with group and invalid site
         """
@@ -409,7 +409,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue('groups' in rsp['fields'])
 
     @add_fixtures(['test_users'])
-    def test_post_default_reviewer_with_invalid_repository(self):
+    def test_post_with_invalid_repository(self):
         """Testing the POST default-reviewers/ API with invalid repository"""
         self._login_user(admin=True)
 
@@ -426,7 +426,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue('repositories' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site', 'test_scmtools'])
-    def test_post_default_reviewer_with_repository_invalid_site(self):
+    def test_post_with_repository_invalid_site(self):
         """Testing the POST default-reviewers/ API
         with repository and invalid site
         """
@@ -447,10 +447,10 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue('repositories' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site', 'test_scmtools'])
-    def test_post_default_reviewer_with_site(self, local_site=None):
+    def test_post_with_site(self, local_site=None):
         """Testing the POST default-reviewers/ API with a local site"""
         local_site = LocalSite.objects.get(name=self.local_site_name)
-        self.test_post_default_reviewer(local_site)
+        self.test_post(local_site)
 
 
 class ResourceItemTests(BaseWebAPITestCase):
@@ -460,7 +460,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_users'])
-    def test_delete_default_reviewer(self):
+    def test_delete(self):
         """Testing the DELETE default-reviewers/<id>/ API"""
         self._login_user(admin=True)
         default_reviewer = DefaultReviewer.objects.create(
@@ -472,7 +472,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             DefaultReviewer.objects.filter(name='default1').exists())
 
     @add_fixtures(['test_users'])
-    def test_delete_default_reviewer_with_permission_denied_error(self):
+    def test_delete_with_permission_denied_error(self):
         """Testing the DELETE default-reviewers/<id>/ API
         with Permission Denied error
         """
@@ -485,7 +485,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             DefaultReviewer.objects.filter(name='default1').exists())
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_delete_default_reviewer_with_site(self):
+    def test_delete_with_site(self):
         """Testing the DELETE default-reviewers/<id>/ API with a local site"""
         self._login_user(local_site=True, admin=True)
 
@@ -500,7 +500,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             DefaultReviewer.objects.filter(name='default1').exists())
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_delete_default_reviewer_with_site_and_permission_denied_error(self):
+    def test_delete_with_site_and_permission_denied_error(self):
         """Testing the DELETE default-reviewers/<id>/ API
         with a local site and Permission Denied error
         """
@@ -519,7 +519,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_users', 'test_scmtools'])
-    def test_get_default_reviewer(self):
+    def test_get(self):
         """Testing the GET default-reviewers/<id>/ API"""
         user = User.objects.get(username='doc')
         group = Group.objects.create(name='group1')
@@ -550,7 +550,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(repos[0]['title'], repository.name)
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_default_reviewer_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET default-reviewers/<id>/ API with a local site"""
         self._login_user(local_site=True)
 
@@ -566,7 +566,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['default_reviewer']['file_regex'], '.*')
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_default_reviewer_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET default-reviewers/<id>/ API
         with a local site and Permission Denied error
         """
@@ -578,7 +578,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                                                   self.local_site_name),
                     expected_status=403)
 
-    def test_get_default_reviewer_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET default-reviewers/<id>/ API
         with Not Modified response
         """
@@ -594,7 +594,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_users', 'test_scmtools'])
-    def test_put_default_reviewer(self, local_site=None):
+    def test_put(self, local_site=None):
         """Testing the PUT default-reviewers/<id>/ API"""
         name = 'my-default-reviewer'
         file_regex = '/foo/'
@@ -667,13 +667,12 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(repos[1], repo2)
 
     @add_fixtures(['test_users', 'test_site', 'test_scmtools'])
-    def test_put_default_reviewer_with_site(self):
+    def test_put_with_site(self):
         """Testing the PUT default-reviewers/<id>/ API with a local site"""
-        self.test_put_default_reviewer(
-            LocalSite.objects.get(name=self.local_site_name))
+        self.test_put(LocalSite.objects.get(name=self.local_site_name))
 
     @add_fixtures(['test_users'])
-    def test_put_default_reviewer_with_permission_denied(self):
+    def test_put_with_permission_denied(self):
         """Testing the POST default-reviewers/ API with Permission Denied
         error
         """
@@ -688,7 +687,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_put_default_reviewer_with_permission_denied_and_local_site(self):
+    def test_put_with_permission_denied_and_local_site(self):
         """Testing the PUT default-reviewers/<id>/ API
         with a local site and Permission Denied error
         """
@@ -705,7 +704,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_users'])
-    def test_put_default_reviewer_with_invalid_username(self):
+    def test_put_with_invalid_username(self):
         """Testing the PUT default-reviewers/<id>/ API with invalid username"""
         self._login_user(admin=True)
 
@@ -721,7 +720,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertTrue('users' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_put_default_reviewer_with_user_invalid_site(self):
+    def test_put_with_user_invalid_site(self):
         """Testing the PUT default-reviewers/<id>/ API
         with user and invalid site
         """
@@ -741,7 +740,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertTrue('users' in rsp['fields'])
 
     @add_fixtures(['test_users'])
-    def test_put_default_reviewer_with_invalid_group(self):
+    def test_put_with_invalid_group(self):
         """Testing the PUT default-reviewers/<id>/ API with invalid group"""
         self._login_user(admin=True)
 
@@ -757,7 +756,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertTrue('groups' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_put_default_reviewer_with_group_invalid_site(self):
+    def test_put_with_group_invalid_site(self):
         """Testing the PUT default-reviewers/<id>/ API
         with group and invalid site
         """
@@ -777,7 +776,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertTrue('groups' in rsp['fields'])
 
     @add_fixtures(['test_users'])
-    def test_put_default_reviewer_with_invalid_repository(self):
+    def test_put_with_invalid_repository(self):
         """Testing the PUT default-reviewers/<id>/ API
         with invalid repository
         """
@@ -795,7 +794,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertTrue('repositories' in rsp['fields'])
 
     @add_fixtures(['test_users', 'test_site', 'test_scmtools'])
-    def test_put_default_reviewer_with_repository_invalid_site(self):
+    def test_put_with_repository_invalid_site(self):
         """Testing the PUT default-reviewers/<id>/ API
         with repository and invalid site
         """
diff --git a/reviewboard/webapi/tests/test_diff.py b/reviewboard/webapi/tests/test_diff.py
index e53d94ba2977c3e3cb76efba9894717640995aca..31a2a72b205fbccfc2dd6d281180cdb77eee4436 100644
--- a/reviewboard/webapi/tests/test_diff.py
+++ b/reviewboard/webapi/tests/test_diff.py
@@ -21,7 +21,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_diffs(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/diffs/ API"""
         review_request = self.create_review_request(create_repository=True,
                                                     publish=True)
@@ -35,7 +35,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['diffs'][0]['name'], diffset.name)
 
     @add_fixtures(['test_site'])
-    def test_get_diffs_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET review-requests/<id>/diffs API with a local site"""
         review_request = self.create_review_request(create_repository=True,
                                                     with_local_site=True,
@@ -52,7 +52,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['diffs'][0]['name'], diffset.name)
 
     @add_fixtures(['test_site'])
-    def test_get_diffs_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/<id>/diffs API
         with a local site and Permission Denied error
         """
@@ -68,7 +68,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_diffs(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/diffs/ API"""
         repository = self.create_repository(tool_name='Test')
         review_request = self.create_review_request(
@@ -96,7 +96,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(diffset.basedir, '/trunk')
         self.assertEqual(diffset.base_commit_id, '1234')
 
-    def test_post_diffs_with_missing_data(self):
+    def test_post_with_missing_data(self):
         """Testing the POST review-requests/<id>/diffs/ API
         with Invalid Form Data
         """
@@ -132,7 +132,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], INVALID_FORM_DATA.code)
         self.assertTrue('basedir' in rsp['fields'])
 
-    def test_post_diffs_too_big(self):
+    def test_post_too_big(self):
         """Testing the POST review-requests/<id>/diffs/ API
         with diff exceeding max size
         """
@@ -165,7 +165,7 @@ class ResourceListTests(BaseWebAPITestCase):
                          self.siteconfig.get('diffviewer_max_diff_size'))
 
     @add_fixtures(['test_site'])
-    def test_post_diffs_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requests/<id>/diffs/ API
         with a local site
         """
@@ -203,7 +203,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_diff(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/diffs/<revision>/ API"""
         review_request = self.create_review_request(create_repository=True,
                                                     publish=True)
@@ -217,7 +217,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['diff']['name'], diffset.name)
 
     @add_fixtures(['test_site'])
-    def test_get_diff_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET review-requests/<id>/diffs/<revision>/ API
         with a local site
         """
@@ -235,7 +235,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['diff']['id'], diffset.id)
         self.assertEqual(rsp['diff']['name'], diffset.name)
 
-    def test_get_diff_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET review-requests/<id>/diffs/<revision>/ API
         with Not Modified response
         """
@@ -248,7 +248,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             check_last_modified=True)
 
     @add_fixtures(['test_site'])
-    def test_get_diff_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/<id>/diffs/<revision>/ API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_draft_review_file_attachment_comment.py b/reviewboard/webapi/tests/test_draft_review_file_attachment_comment.py
index 7bbce12a4658a4f5a49c0eff3a6169c759228647..2c397500c777a2669153bedb3adaf2ec0f6986fc 100644
--- a/reviewboard/webapi/tests/test_draft_review_file_attachment_comment.py
+++ b/reviewboard/webapi/tests/test_draft_review_file_attachment_comment.py
@@ -15,7 +15,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_review_file_attachment_comments(self):
+    def test_get(self):
         """Testing the
         GET review-requests/<id>/reviews/draft/file-attachment-comments/ API
         """
@@ -34,7 +34,7 @@ class ResourceListTests(BaseWebAPITestCase):
                          comment.text)
 
     @add_fixtures(['test_site'])
-    def test_get_review_file_attachment_comments_with_site(self):
+    def test_get_with_site(self):
         """Testing the
         GET review-requests/<id>/reviews/draft/file-attachment-comments/ APIs
         with a local site
diff --git a/reviewboard/webapi/tests/test_draft_review_screenshot_comment.py b/reviewboard/webapi/tests/test_draft_review_screenshot_comment.py
index bfdbdfccb1f96a2bf4c50995459eb068dc87e574..7d1e0496e84478d97971c2f0dc9507ee1d9bb170 100644
--- a/reviewboard/webapi/tests/test_draft_review_screenshot_comment.py
+++ b/reviewboard/webapi/tests/test_draft_review_screenshot_comment.py
@@ -13,7 +13,7 @@ class DraftReviewScreenshotCommentResourceTests(BaseWebAPITestCase):
     # List tests
     #
 
-    def test_get_review_screenshot_comments(self):
+    def test_get(self):
         """Testing the
         GET review-requests/<id>/reviews/draft/screenshot-comments/ API
         """
@@ -30,7 +30,7 @@ class DraftReviewScreenshotCommentResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['screenshot_comments'][0]['text'], comment.text)
 
     @add_fixtures(['test_site'])
-    def test_get_review_screenshot_comments_with_site(self):
+    def test_get_with_site(self):
         """Testing the
         GET review-requests/<id>/reviews/draft/screenshot-comments/ APIs
         with a local site
diff --git a/reviewboard/webapi/tests/test_file_attachment.py b/reviewboard/webapi/tests/test_file_attachment.py
index 0307a416e89b00355d4bfb5d0de542810b0d21a5..30ada13df0c1bc217dd2e5b94ec86e6948e12883 100644
--- a/reviewboard/webapi/tests/test_file_attachment.py
+++ b/reviewboard/webapi/tests/test_file_attachment.py
@@ -17,7 +17,7 @@ class ResourceListTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_scmtools'])
-    def test_get_file_attachments(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/file-attachments/ API"""
         review_request = self.create_review_request(create_repository=True,
                                                     publish=True)
@@ -59,7 +59,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_file_attachments(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/file-attachments/ API"""
         review_request = self.create_review_request(submitter=self.user,
                                                     publish=True)
@@ -76,7 +76,7 @@ class ResourceListTests(BaseWebAPITestCase):
 
         review_request.publish(review_request.submitter)
 
-    def test_post_file_attachments_with_permission_denied_error(self):
+    def test_post_with_permission_denied_error(self):
         """Testing the POST review-requests/<id>/file-attachments/ API
         with Permission Denied error
         """
@@ -98,7 +98,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
     @add_fixtures(['test_site'])
-    def test_post_file_attachments_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requests/<id>/file-attachments/ API
         with a local site
         """
@@ -119,7 +119,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
 
     @add_fixtures(['test_site'])
-    def test_post_file_attachments_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/<id>/file-attachments/ API
         with a local site and Permission Denied error
         """
@@ -151,7 +151,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTP GET tests
     #
 
-    def test_get_file_attachment_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET review-requests/<id>/file-attachments/<id>/ API
         with Not Modified response
         """
diff --git a/reviewboard/webapi/tests/test_file_attachment_comment.py b/reviewboard/webapi/tests/test_file_attachment_comment.py
index 0fe1df9b92d47572672f025db4b00749a437996e..d7164d759a73f9da7ced902e9bda627fa68696c3 100644
--- a/reviewboard/webapi/tests/test_file_attachment_comment.py
+++ b/reviewboard/webapi/tests/test_file_attachment_comment.py
@@ -19,7 +19,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_file_attachment_comments(self):
+    def test_get(self):
         """Testing the
         GET review-requests/<id>/file-attachments/<id>/comments/ API
         """
@@ -50,7 +50,7 @@ class ResourceListTests(BaseWebAPITestCase):
             self.assertEqual(rsp_comments[i]['text'], comments[i].text)
 
     @add_fixtures(['test_site'])
-    def test_get_file_attachment_comments_with_site(self):
+    def test_get_with_site(self):
         """Testing the
         GET review-requests/<id>/file-attachments/<id>/comments/ API
         with a local site
@@ -78,7 +78,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp_comments[0]['text'], comment.text)
 
     @add_fixtures(['test_site'])
-    def test_get_file_attachment_comments_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the
         GET review-requests/<id>/file-attachments/<id>/comments/ API
         with a local site and Permission Denied error
@@ -109,7 +109,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_file_attachment_comments_with_extra_fields(self):
+    def test_post_with_extra_fields(self):
         """Testing the
         POST review-requests/<id>/file-attachments/<id>/comments/ API
         with extra fields
@@ -148,7 +148,7 @@ class ResourceListTests(BaseWebAPITestCase):
 
         return rsp
 
-    def test_post_file_attachment_comments_with_diff(self):
+    def test_post_with_diff(self):
         """Testing the
         POST review-requests/<id>/file-attachments/<id>/comments/ API
         with diffed file attachments
@@ -191,7 +191,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP PUT tests
     #
 
-    def test_put_file_attachment_comments_with_extra_fields(self):
+    def test_put_with_extra_fields(self):
         """Testing the
         PUT review-requests/<id>/file-attachments/<id>/comments/<id>/ API
         with extra fields
diff --git a/reviewboard/webapi/tests/test_file_attachment_draft.py b/reviewboard/webapi/tests/test_file_attachment_draft.py
index 3cc32a35c0a33ef06377813a3d927cd6a6967b7c..623e5a8ee2e1cfc828678f0f2a826ad38226b0ef 100644
--- a/reviewboard/webapi/tests/test_file_attachment_draft.py
+++ b/reviewboard/webapi/tests/test_file_attachment_draft.py
@@ -18,7 +18,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_file_attachments(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/draft/file-attachments/ API"""
         review_request = self.create_review_request(submitter=self.user)
 
@@ -32,7 +32,7 @@ class ResourceListTests(BaseWebAPITestCase):
 
         self.assertEqual(rsp['stat'], 'ok')
 
-    def test_post_file_attachments_with_permission_denied_error(self):
+    def test_post_with_permission_denied_error(self):
         """Testing the POST review-requests/<id>/draft/file-attachments/ API
         with Permission Denied error
         """
@@ -54,7 +54,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
     @add_fixtures(['test_site'])
-    def test_post_file_attachments_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requests/<id>/draft/file-attachments/ API
         with a local site
         """
@@ -87,7 +87,7 @@ class ResourceListTests(BaseWebAPITestCase):
         return review_request, rsp['draft_file_attachment']['id']
 
     @add_fixtures(['test_site'])
-    def test_post_file_attachments_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/<id>/draft/file-attachments/ API
         with a local site and Permission Denied error
         """
@@ -114,7 +114,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP PUT tests
     #
 
-    def test_put_file_attachment(self):
+    def test_put(self):
         """Testing the
         PUT review-requests/<id>/draft/file-attachments/<id>/ API
         """
@@ -140,7 +140,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(file_attachment.draft_caption, draft_caption)
 
     @add_fixtures(['test_site'])
-    def test_put_file_attachment_with_site(self):
+    def test_put_with_site(self):
         """Testing the
         PUT review-requests/<id>/draft/file-attachments/<id>/ API
         with a local site
@@ -168,7 +168,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(file_attachment.draft_caption, draft_caption)
 
     @add_fixtures(['test_site'])
-    def test_put_file_attachment_with_site_no_access(self):
+    def test_put_with_site_no_access(self):
         """Testing the
         PUT review-requests/<id>/draft/file-attachments/<id>/ API
         with a local site and Permission Denied error
diff --git a/reviewboard/webapi/tests/test_file_diff_comment.py b/reviewboard/webapi/tests/test_file_diff_comment.py
index 50cb18402b764540d1559bc6ed18c4a571230c61..a3cae154886079c78c1413c9e1ff2fe7f44a6c02 100644
--- a/reviewboard/webapi/tests/test_file_diff_comment.py
+++ b/reviewboard/webapi/tests/test_file_diff_comment.py
@@ -14,7 +14,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_comments(self):
+    def test_get(self):
         """Testing the
         GET review-requests/<id>/diffs/<revision>/files/<id>/diff-comments/ API
         """
@@ -35,7 +35,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['diff_comments']), 1)
         self.assertEqual(rsp['diff_comments'][0]['text'], comment.text)
 
-    def test_get_comments_as_anonymous(self):
+    def test_get_as_anonymous(self):
         """Testing the
         GET review-requests/<id>/diffs/<revision>/files/<id>/diff-comments/ API
         as an anonymous user
@@ -60,7 +60,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['diff_comments'][0]['text'], comment.text)
 
     @add_fixtures(['test_site'])
-    def test_get_comments_with_site(self):
+    def test_get_with_site(self):
         """Testing the
         GET review-requests/<id>/diffs/<revision>/files/<id>/diff-comments/ API
         with a local site
@@ -87,7 +87,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['diff_comments'][0]['text'], comment.text)
 
     @add_fixtures(['test_site'])
-    def test_get_comments_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the
         GET review-requests/<id>/diffs/<revision>/files/<id>/diff-comments/ API
         with a local site and Permission Denied error
@@ -113,7 +113,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_get_comments_with_line(self):
+    def test_get_with_line(self):
         """Testing the
         GET review-requests/<id>/diffs/<revision>/files/<id>/diff-comments/ API
         with ?line=
diff --git a/reviewboard/webapi/tests/test_repository.py b/reviewboard/webapi/tests/test_repository.py
index 8c93da3240327bc2a51f72f3566d17a9c3a2d032..4a5c549c35ac7c4704d9bd6da544a396f7df0729 100644
--- a/reviewboard/webapi/tests/test_repository.py
+++ b/reviewboard/webapi/tests/test_repository.py
@@ -75,7 +75,7 @@ class ResourceListTests(BaseRepositoryTests):
     # HTTP GET tests
     #
 
-    def test_get_repositories(self):
+    def test_get(self):
         """Testing the GET repositories/ API"""
         rsp = self.apiGet(get_repository_list_url(),
                           expected_mimetype=repository_list_mimetype)
@@ -84,7 +84,7 @@ class ResourceListTests(BaseRepositoryTests):
                          Repository.objects.accessible(self.user).count())
 
     @add_fixtures(['test_site'])
-    def test_get_repositories_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET repositories/ API with a local site"""
         self._login_user(local_site=True)
         rsp = self.apiGet(get_repository_list_url(self.local_site_name),
@@ -94,7 +94,7 @@ class ResourceListTests(BaseRepositoryTests):
                              local_site__name=self.local_site_name).count())
 
     @add_fixtures(['test_site'])
-    def test_get_repositories_with_show_visible(self):
+    def test_get_with_show_visible(self):
         """Testing the GET repositories/ API with show_invisible=True"""
         rsp = self.apiGet(get_repository_list_url(),
                           query={'show-invisible': True},
@@ -105,7 +105,7 @@ class ResourceListTests(BaseRepositoryTests):
                              self.user, visible_only=False).count())
 
     @add_fixtures(['test_site'])
-    def test_get_repositories_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET repositories/ API
         with a local site and Permission Denied error
         """
@@ -116,18 +116,18 @@ class ResourceListTests(BaseRepositoryTests):
     # HTTP POST tests
     #
 
-    def test_post_repository(self):
+    def test_post(self):
         """Testing the POST repositories/ API"""
         self._login_user(admin=True)
         self._post_repository(False)
 
-    def test_post_repository_with_visible_False(self):
+    def test_post_with_visible_False(self):
         """Testing the POST repositories/ API with visible=False"""
         self._login_user(admin=True)
         rsp = self._post_repository(False, data={'visible': False})
         self.assertEqual(rsp['repository']['visible'], False)
 
-    def test_post_repository_with_bad_host_key(self):
+    def test_post_with_bad_host_key(self):
         """Testing the POST repositories/ API with Bad Host Key error"""
         hostname = 'example.com'
         key = key1
@@ -150,7 +150,7 @@ class ResourceListTests(BaseRepositoryTests):
         self.assertEqual(rsp['expected_key'], expected_key.get_base64())
         self.assertEqual(rsp['key'], key.get_base64())
 
-    def test_post_repository_with_bad_host_key_and_trust_host(self):
+    def test_post_with_bad_host_key_and_trust_host(self):
         """Testing the POST repositories/ API
         with Bad Host Key error and trust_host=1
         """
@@ -180,7 +180,7 @@ class ResourceListTests(BaseRepositoryTests):
 
         self.assertTrue(saw['replace_host_key'])
 
-    def test_post_repository_with_unknown_host_key(self):
+    def test_post_with_unknown_host_key(self):
         """Testing the POST repositories/ API with Unknown Host Key error"""
         hostname = 'example.com'
         key = key1
@@ -200,7 +200,7 @@ class ResourceListTests(BaseRepositoryTests):
         self.assertEqual(rsp['hostname'], hostname)
         self.assertEqual(rsp['key'], key.get_base64())
 
-    def test_post_repository_with_unknown_host_key_and_trust_host(self):
+    def test_post_with_unknown_host_key_and_trust_host(self):
         """Testing the POST repositories/ API
         with Unknown Host Key error and trust_host=1
         """
@@ -228,7 +228,7 @@ class ResourceListTests(BaseRepositoryTests):
 
         self.assertTrue(saw['add_host_key'])
 
-    def test_post_repository_with_unknown_cert(self):
+    def test_post_with_unknown_cert(self):
         """Testing the POST repositories/ API with Unknown Certificate error"""
         class Certificate(object):
             failures = ['failures']
@@ -259,7 +259,7 @@ class ResourceListTests(BaseRepositoryTests):
         self.assertEqual(rsp['certificate']['valid']['until'],
                          cert.valid_until)
 
-    def test_post_repository_with_unknown_cert_and_trust_host(self):
+    def test_post_with_unknown_cert_and_trust_host(self):
         """Testing the POST repositories/ API
         with Unknown Certificate error and trust_host=1
         """
@@ -299,7 +299,7 @@ class ResourceListTests(BaseRepositoryTests):
         self.assertTrue('cert' in repository.extra_data)
         self.assertEqual(repository.extra_data['cert']['fingerprint'], '123')
 
-    def test_post_repository_with_missing_user_key(self):
+    def test_post_with_missing_user_key(self):
         """Testing the POST repositories/ API with Missing User Key error"""
         @classmethod
         def _check_repository(cls, *args, **kwargs):
@@ -313,7 +313,7 @@ class ResourceListTests(BaseRepositoryTests):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], MISSING_USER_KEY.code)
 
-    def test_post_repository_with_authentication_error(self):
+    def test_post_with_authentication_error(self):
         """Testing the POST repositories/ API with Authentication Error"""
         @classmethod
         def _check_repository(cls, *args, **kwargs):
@@ -328,12 +328,12 @@ class ResourceListTests(BaseRepositoryTests):
         self.assertTrue('reason' in rsp)
 
     @add_fixtures(['test_site'])
-    def test_post_repository_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST repositories/ API with a local site"""
         self._login_user(local_site=True, admin=True)
         self._post_repository(True)
 
-    def test_post_repository_full_info(self):
+    def test_post_full_info(self):
         """Testing the POST repositories/ API with all available info"""
         self._login_user(admin=True)
         self._post_repository(False, {
@@ -346,13 +346,13 @@ class ResourceListTests(BaseRepositoryTests):
             'raw_file_url': 'http://example.com/<filename>/<version>',
         })
 
-    def test_post_repository_with_no_access(self):
+    def test_post_with_no_access(self):
         """Testing the POST repositories/ API with no access"""
         self._login_user()
         self._post_repository(False, expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_post_repository_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST repositories/ API
         with a local site and no access
         """
@@ -405,7 +405,7 @@ class ResourceItemTests(BaseRepositoryTests):
     # HTTP DELETE tests
     #
 
-    def test_delete_repository(self):
+    def test_delete(self):
         """Testing the DELETE repositories/<id>/ API"""
         self._login_user(admin=True)
         repo_id = self._delete_repository(False, with_review_request=True)
@@ -422,7 +422,7 @@ class ResourceItemTests(BaseRepositoryTests):
                           pk=repo_id)
 
     @add_fixtures(['test_site'])
-    def test_delete_repository_with_site(self):
+    def test_delete_with_site(self):
         """Testing the DELETE repositories/<id>/ API with a local site"""
         self._login_user(local_site=True, admin=True)
         repo_id = self._delete_repository(True, with_review_request=True)
@@ -441,13 +441,13 @@ class ResourceItemTests(BaseRepositoryTests):
                           Repository.objects.get,
                           pk=repo_id)
 
-    def test_delete_repository_with_no_access(self):
+    def test_delete_with_no_access(self):
         """Testing the DELETE repositories/<id>/ API with no access"""
         self._login_user()
         self._delete_repository(False, expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_delete_repository_with_site_no_access(self):
+    def test_delete_with_site_no_access(self):
         """Testing the DELETE repositories/<id>/ API
         with a local site and no access
         """
@@ -458,7 +458,7 @@ class ResourceItemTests(BaseRepositoryTests):
     # HTTP PUT tests
     #
 
-    def test_put_repository(self):
+    def test_put(self):
         """Testing the PUT repositories/<id>/ API"""
         self._login_user(admin=True)
         self._put_repository(False, {
@@ -472,7 +472,7 @@ class ResourceItemTests(BaseRepositoryTests):
         })
 
     @add_fixtures(['test_site'])
-    def test_put_repository_with_site(self):
+    def test_put_with_site(self):
         """Testing the PUT repositories/<id>/ API with a local site"""
         self._login_user(local_site=True, admin=True)
         self._put_repository(True, {
@@ -485,20 +485,20 @@ class ResourceItemTests(BaseRepositoryTests):
             'raw_file_url': 'http://example.com/<filename>/<version>',
         })
 
-    def test_put_repository_with_no_access(self):
+    def test_put_with_no_access(self):
         """Testing the PUT repositories/<id>/ API with no access"""
         self._login_user()
         self._put_repository(False, expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_put_repository_with_site_no_access(self):
+    def test_put_with_site_no_access(self):
         """Testing the PUT repositories/<id>/ API
         with a local site and no access
         """
         self._login_user(local_site=True)
         self._put_repository(False, expected_status=403)
 
-    def test_put_repository_with_archive(self):
+    def test_put_with_archive(self):
         """Testing the PUT repositories/<id>/ API with archive_name=True"""
         self._login_user(admin=True)
         repo_id = self._put_repository(False, {'archive_name': True})
diff --git a/reviewboard/webapi/tests/test_repository_branches.py b/reviewboard/webapi/tests/test_repository_branches.py
index 230fff091f173a70b2acbb9258f82193d76df82a..d9a95b220ab0ca1603b4fd048fe488f4a267319e 100644
--- a/reviewboard/webapi/tests/test_repository_branches.py
+++ b/reviewboard/webapi/tests/test_repository_branches.py
@@ -15,7 +15,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_repository_branches(self):
+    def test_get(self):
         """Testing the GET repositories/<id>/branches/ API"""
         repository = self.create_repository(tool_name='Test')
         rsp = self.apiGet(get_repository_branches_url(repository),
@@ -29,7 +29,7 @@ class ResourceListTests(BaseWebAPITestCase):
             ])
 
     @add_fixtures(['test_site'])
-    def test_get_repository_branches_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET repositories/<id>/branches/ API with a local site"""
         self._login_user(local_site=True)
 
@@ -48,7 +48,7 @@ class ResourceListTests(BaseWebAPITestCase):
             ])
 
     @add_fixtures(['test_site'])
-    def test_get_repository_branches_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET repositories/<id>/branches/ API
         with a local site and Permission Denied error
         """
@@ -58,7 +58,7 @@ class ResourceListTests(BaseWebAPITestCase):
             get_repository_branches_url(repository, self.local_site_name),
             expected_status=403)
 
-    def test_get_repository_branches_with_no_support(self):
+    def test_get_with_no_support(self):
         """Testing the GET repositories/<id>/branches/ API
         with a repository that does not implement it
         """
diff --git a/reviewboard/webapi/tests/test_repository_commits.py b/reviewboard/webapi/tests/test_repository_commits.py
index f047d8619d1349b8b4369314c1a0ffe0a7f3a2ec..c0144f1b707ccd446c2542f829a951afc1cdedd3 100644
--- a/reviewboard/webapi/tests/test_repository_commits.py
+++ b/reviewboard/webapi/tests/test_repository_commits.py
@@ -19,7 +19,7 @@ class RepositoryCommitsResourceTests(BaseWebAPITestCase):
     # List tests
     #
 
-    def test_get_repository_commits(self):
+    def test_get(self):
         """Testing the GET repositories/<id>/commits/ API"""
         repository = self.create_repository(tool_name='Test')
 
@@ -31,7 +31,7 @@ class RepositoryCommitsResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['commits'][0]['message'], 'Commit 5')
         self.assertEqual(rsp['commits'][3]['author_name'], 'user2')
 
-    def test_get_repository_commits_without_start(self):
+    def test_get_without_start(self):
         """Testing the GET repositories/<id>/commits/ API
         without providing a start parameter
         """
@@ -43,7 +43,7 @@ class RepositoryCommitsResourceTests(BaseWebAPITestCase):
         self.assertTrue('start' in rsp['fields'])
 
     @add_fixtures(['test_site'])
-    def test_get_repository_commits_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET repositories/<id>/commits/ API with a local site"""
         self._login_user(local_site=True)
         repository = self.create_repository(with_local_site=True,
@@ -59,7 +59,7 @@ class RepositoryCommitsResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['commits'][1]['message'], 'Commit 6')
 
     @add_fixtures(['test_site'])
-    def test_get_repository_commits_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET repositories/<id>/commits/ API
         with a local site and Permission Denied error
         """
@@ -69,7 +69,7 @@ class RepositoryCommitsResourceTests(BaseWebAPITestCase):
             get_repository_commits_url(repository, self.local_site_name),
             expected_status=403)
 
-    def test_get_repository_commits_with_no_support(self):
+    def test_get_with_no_support(self):
         """Testing the GET repositories/<id>/commits/ API
         with a repository that does not implement it
         """
diff --git a/reviewboard/webapi/tests/test_repository_info.py b/reviewboard/webapi/tests/test_repository_info.py
index b51852047639e4c3b087ff0c8e99023d4949077d..28ba5d8002e049dbc7feb20474ad084dd09dfcb7 100644
--- a/reviewboard/webapi/tests/test_repository_info.py
+++ b/reviewboard/webapi/tests/test_repository_info.py
@@ -13,7 +13,7 @@ class ResourceTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_repository_info(self):
+    def test_get(self):
         """Testing the GET repositories/<id>/info API"""
         repository = self.create_repository(tool_name='Test')
         rsp = self.apiGet(get_repository_info_url(repository),
@@ -23,7 +23,7 @@ class ResourceTests(BaseWebAPITestCase):
                          repository.get_scmtool().get_repository_info())
 
     @add_fixtures(['test_site'])
-    def test_get_repository_info_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET repositories/<id>/info API with a local site"""
         self._login_user(local_site=True)
         repository = self.create_repository(with_local_site=True,
@@ -37,7 +37,7 @@ class ResourceTests(BaseWebAPITestCase):
                          repository.get_scmtool().get_repository_info())
 
     @add_fixtures(['test_site'])
-    def test_get_repository_info_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET repositories/<id>/info API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_review.py b/reviewboard/webapi/tests/test_review.py
index 4bc6260b624bf1354ec86c09497a686d3446a6b1..88750bac4f2f4219f1a02f2422562f6ecf7fbaac 100644
--- a/reviewboard/webapi/tests/test_review.py
+++ b/reviewboard/webapi/tests/test_review.py
@@ -20,7 +20,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_reviews(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/reviews/ API"""
         review_request = self.create_review_request(publish=True)
         self.create_review(review_request, publish=True)
@@ -31,11 +31,11 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['reviews']), 1)
 
     @add_fixtures(['test_site'])
-    def test_get_reviews_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET review-requests/<id>/reviews/ API
         with a local site
         """
-        self.test_post_reviews_with_site(public=True)
+        self.test_post_with_site(public=True)
 
         local_site = LocalSite.objects.get(name=self.local_site_name)
         review_request = ReviewRequest.objects.public(local_site=local_site)[0]
@@ -47,7 +47,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['reviews']), review_request.reviews.count())
 
     @add_fixtures(['test_site'])
-    def test_get_reviews_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/<id>/reviews/ API
         with a local site and Permission Denied error
         """
@@ -61,7 +61,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_get_reviews_with_counts_only(self):
+    def test_get_with_counts_only(self):
         """Testing the GET review-requests/<id>/reviews/?counts-only=1 API"""
         review_request = self.create_review_request(publish=True)
         self.create_review(review_request, publish=True)
@@ -73,7 +73,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['count'], 2)
 
-    def test_get_reviewrequest_reviews_with_invite_only_group_and_permission_denied_error(self):
+    def test_get_with_invite_only_group_and_permission_denied_error(self):
         """Testing the GET review-requests/<id>/reviews/ API
         with invite-only group and Permission Denied error
         """
@@ -95,7 +95,7 @@ class ResourceListTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_site'])
-    def test_post_reviews(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/reviews/ API"""
         body_top = ""
         body_bottom = "My Body Bottom"
@@ -133,7 +133,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(mail.outbox), 0)
 
     @add_fixtures(['test_site'])
-    def test_post_reviews_with_site(self, public=False):
+    def test_post_with_site(self, public=False):
         """Testing the POST review-requests/<id>/reviews/ API
         with a local site
         """
@@ -184,7 +184,7 @@ class ResourceListTests(BaseWebAPITestCase):
             self.assertEqual(len(mail.outbox), 0)
 
     @add_fixtures(['test_site'])
-    def test_post_reviews_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/<id>/reviews/ API
         with a local site and Permission Denied error
         """
@@ -207,22 +207,22 @@ class ResourceItemTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_site'])
-    def test_delete_review(self):
+    def test_delete(self):
         """Testing the DELETE review-requests/<id>/reviews/<id>/ API"""
         # Set up the draft to delete.
-        review = self.test_put_review()
+        review = self.test_put()
         review_request = review.review_request
 
         self.apiDelete(get_review_item_url(review_request, review.id))
         self.assertEqual(review_request.reviews.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_review_with_permission_denied(self):
+    def test_delete_with_permission_denied(self):
         """Testing the DELETE review-requests/<id>/reviews/<id>/ API
         with Permission Denied error
         """
         # Set up the draft to delete.
-        review = self.test_put_review()
+        review = self.test_put()
         review.user = User.objects.get(username='doc')
         review.save()
 
@@ -233,7 +233,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                        expected_status=403)
         self.assertEqual(review_request.reviews.count(), old_count)
 
-    def test_delete_review_with_published_review(self):
+    def test_delete_with_published_review(self):
         """Testing the DELETE review-requests/<id>/reviews/<id>/ API
         with pre-published review
         """
@@ -245,7 +245,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                        expected_status=403)
         self.assertEqual(review_request.reviews.count(), 1)
 
-    def test_delete_review_with_does_not_exist(self):
+    def test_delete_with_does_not_exist(self):
         """Testing the DELETE review-requests/<id>/reviews/<id>/ API
         with Does Not Exist error
         """
@@ -257,11 +257,11 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_delete_review_with_local_site(self):
+    def test_delete_with_local_site(self):
         """Testing the DELETE review-requests/<id>/reviews/<id>/ API
         with a local site
         """
-        review = self.test_put_review_with_site()
+        review = self.test_put_with_site()
 
         local_site = LocalSite.objects.get(name=self.local_site_name)
         review_request = ReviewRequest.objects.public(local_site=local_site)[0]
@@ -271,7 +271,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(review_request.reviews.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_review_with_local_site_no_access(self):
+    def test_delete_with_local_site_no_access(self):
         """Testing the DELETE review-requests/<id>/reviews/<id>/ API
         with a local site and Permission Denied error
         """
@@ -289,7 +289,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_review_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET review-requests/<id>/reviews/<id>/ API
         with Not Modified response
         """
@@ -305,7 +305,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_site'])
-    def test_put_review(self):
+    def test_put(self):
         """Testing the PUT review-requests/<id>/reviews/<id>/ API"""
         body_top = ""
         body_bottom = "My Body Bottom"
@@ -348,7 +348,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         return review
 
     @add_fixtures(['test_site'])
-    def test_put_review_with_site(self):
+    def test_put_with_site(self):
         """Testing the PUT review-requests/<id>/reviews/<id>/ API
         with a local site
         """
@@ -396,7 +396,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         return review
 
     @add_fixtures(['test_site'])
-    def test_put_review_with_site_no_access(self):
+    def test_put_with_site_no_access(self):
         """Testing the PUT review-requests/<id>/reviews/<id>/ API
         with a local site and Permission Denied error
         """
@@ -413,7 +413,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_put_review_with_published_review(self):
+    def test_put_with_published_review(self):
         """Testing the PUT review-requests/<id>/reviews/<id>/ API
         with pre-published review
         """
@@ -427,7 +427,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_put_review_publish(self):
+    def test_put_publish(self):
         """Testing the PUT review-requests/<id>/reviews/<id>/?public=1 API"""
         body_top = "My Body Top"
         body_bottom = ""
diff --git a/reviewboard/webapi/tests/test_review_comment.py b/reviewboard/webapi/tests/test_review_comment.py
index b1065558be5aae20d148d3cd72b229deeba37d30..ef8c8c5ba82a5d00b7423fa83cd8d4b419759957 100644
--- a/reviewboard/webapi/tests/test_review_comment.py
+++ b/reviewboard/webapi/tests/test_review_comment.py
@@ -75,7 +75,7 @@ class ResourceListTests(BaseResourceTestCase):
     # HTTP GET tests
     #
 
-    def test_get_diff_comments(self):
+    def test_get(self):
         """Testing the
         GET review-requests/<id>/reviews/<id>/diff-comments/ API
         """
@@ -86,7 +86,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(len(rsp['diff_comments']), review.comments.count())
 
-    def test_get_diff_comments_with_counts_only(self):
+    def test_get_with_counts_only(self):
         """Testing the
         GET review-requests/<id>/reviews/<id>/diff-comments/?counts-only=1 API
         """
@@ -98,7 +98,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['count'], review.comments.count())
 
-    def test_get_diff_comments_with_interdiff(self):
+    def test_get_with_interdiff(self):
         """Testing the GET review-requests/<id>/reviews/<id>/diff-comments/ API
         with interdiff
         """
@@ -116,11 +116,11 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(rsp['diff_comments'][0]['text'], comment_text)
 
     @add_fixtures(['test_site'])
-    def test_get_diff_comments_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET review-requests/<id>/reviews/<id>/diff-comments/ API
         with a local site
         """
-        review = self.test_post_diff_comments_with_site()
+        review = self.test_post_with_site()
 
         rsp = self.apiGet(
             get_review_diff_comment_list_url(review, self.local_site_name),
@@ -129,11 +129,11 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(len(rsp['diff_comments']), review.comments.count())
 
     @add_fixtures(['test_site'])
-    def test_get_diff_comments_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/<id>/reviews/<id>/diff-comments/ API
         with a local site and Permission Denied error
         """
-        review = self.test_post_diff_comments_with_site()
+        review = self.test_post_with_site()
 
         self._login_user()
 
@@ -147,7 +147,7 @@ class ResourceListTests(BaseResourceTestCase):
     # HTTP POST tests
     #
 
-    def test_post_diff_comments(self):
+    def test_post(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/diff-comments/ API
         """
@@ -165,7 +165,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(len(rsp['diff_comments']), 1)
         self.assertEqual(rsp['diff_comments'][0]['text'], comment.text)
 
-    def test_post_diff_comments_with_issue(self):
+    def test_post_with_issue(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/diff-comments/ API
         with an issue
@@ -183,7 +183,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertTrue(rsp['diff_comments'][0]['issue_opened'])
 
     @add_fixtures(['test_site'])
-    def test_post_diff_comments_with_site(self):
+    def test_post_with_site(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/diff-comments/ API
         with a local site
@@ -205,7 +205,7 @@ class ResourceListTests(BaseResourceTestCase):
         return review
 
     @add_fixtures(['test_site'])
-    def test_post_diff_comments_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/diff-comments/ API
         with a local site and Permission Denied error
@@ -220,7 +220,7 @@ class ResourceListTests(BaseResourceTestCase):
             expected_status=403)
         self.assertEqual(rsp['stat'], 'fail')
 
-    def test_post_diff_comments_with_interdiff(self):
+    def test_post_with_interdiff(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/diff-comments/ API
         with interdiff
@@ -246,7 +246,7 @@ class ResourceItemTests(BaseResourceTestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_diff_comment_with_interdiff(self):
+    def test_delete_with_interdiff(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         """
@@ -264,7 +264,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(len(rsp['diff_comments']), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_diff_comment_with_site(self):
+    def test_delete_with_site(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         with a local site
@@ -283,7 +283,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(review.comments.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_diff_comment_with_site_no_access(self):
+    def test_delete_with_site_no_access(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         with a local site and Permission Denied error
@@ -307,7 +307,7 @@ class ResourceItemTests(BaseResourceTestCase):
     # HTTP GET tests
     #
 
-    def test_get_diff_comment_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the
         GET review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         with Not Modified response
@@ -323,7 +323,7 @@ class ResourceItemTests(BaseResourceTestCase):
     # HTTP PUT tests
     #
 
-    def test_put_diff_comment_with_issue(self):
+    def test_put_with_issue(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/diff-comments/<id>/ API,
         removing issue_opened
@@ -337,7 +337,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertFalse(rsp['diff_comment']['issue_opened'])
 
-    def test_put_diff_comment_issue_status_before_publish(self):
+    def test_put_issue_status_before_publish(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         with an issue, before review is published
@@ -355,7 +355,7 @@ class ResourceItemTests(BaseResourceTestCase):
         # The issue_status should still be "open"
         self.assertEqual(rsp['diff_comment']['issue_status'], 'open')
 
-    def test_put_diff_comment_issue_status_after_publish(self):
+    def test_put_issue_status_after_publish(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         with an issue, after review is published
@@ -370,7 +370,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['diff_comment']['issue_status'], 'resolved')
 
-    def test_put_diff_comment_issue_status_by_issue_creator(self):
+    def test_put_issue_status_by_issue_creator(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         permissions for issue creator
@@ -392,7 +392,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['diff_comment']['issue_status'], 'dropped')
 
-    def test_put_diff_comment_issue_status_by_uninvolved_user(self):
+    def test_put_issue_status_by_uninvolved_user(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/diff-comments/<id>/ API
         permissions for an uninvolved user
diff --git a/reviewboard/webapi/tests/test_review_group.py b/reviewboard/webapi/tests/test_review_group.py
index 9852c79a300e08d531c2908ae9bf415c030f01fe..56dcbb93bf1741a96f9fc6cb1491cd61028aab50 100644
--- a/reviewboard/webapi/tests/test_review_group.py
+++ b/reviewboard/webapi/tests/test_review_group.py
@@ -20,7 +20,7 @@ class ResourceListTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_site'])
-    def test_get_groups(self):
+    def test_get(self):
         """Testing the GET groups/ API"""
         self.create_review_group(name='group1')
         self.create_review_group(name='group2', with_local_site=True)
@@ -33,7 +33,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['groups']), 1)
 
     @add_fixtures(['test_site'])
-    def test_get_groups_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET groups/ API with a local site"""
         self._login_user(local_site=True)
         local_site = LocalSite.objects.get(name=self.local_site_name)
@@ -49,14 +49,14 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['groups']), 1)
 
     @add_fixtures(['test_site'])
-    def test_get_groups_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET groups/ API
         with a local site and Permission Denied error
         """
         self.apiGet(get_review_group_list_url(self.local_site_name),
                     expected_status=403)
 
-    def test_get_groups_with_q(self):
+    def test_get_with_q(self):
         """Testing the GET groups/?q= API"""
         self.create_review_group(name='docgroup')
         self.create_review_group(name='devgroup')
@@ -70,7 +70,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_group(self, local_site=None):
+    def test_post(self, local_site=None):
         """Testing the POST groups/ API"""
         name = 'my-group'
         display_name = 'My Group'
@@ -102,12 +102,12 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(group.invite_only, invite_only)
 
     @add_fixtures(['test_site'])
-    def test_post_group_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST groups/ API with a local site"""
         local_site = LocalSite.objects.get(name=self.local_site_name)
-        self.test_post_group(local_site)
+        self.test_post(local_site)
 
-    def test_post_group_with_defaults(self):
+    def test_post_with_defaults(self):
         """Testing the POST groups/ API with field defaults"""
         name = 'my-group'
         display_name = 'My Group'
@@ -130,7 +130,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(group.invite_only, False)
 
     @add_fixtures(['test_site'])
-    def test_post_group_with_site_admin(self):
+    def test_post_with_site_admin(self):
         """Testing the POST groups/ API with a local site admin"""
         self._login_user(local_site=True, admin=True)
         local_site = LocalSite.objects.get(name=self.local_site_name)
@@ -146,7 +146,7 @@ class ResourceListTests(BaseWebAPITestCase):
 
         self.assertEqual(rsp['stat'], 'ok')
 
-    def test_post_group_with_no_access(self, local_site=None):
+    def test_post_with_no_access(self, local_site=None):
         """Testing the POST groups/ API with no access"""
         rsp = self.apiPost(
             get_review_group_list_url(local_site),
@@ -160,12 +160,12 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
 
     @add_fixtures(['test_site'])
-    def test_post_group_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST groups/ API with local site and no access"""
         local_site = LocalSite.objects.get(name=self.local_site_name)
-        self.test_post_group_with_no_access(local_site)
+        self.test_post_with_no_access(local_site)
 
-    def test_post_group_with_conflict(self):
+    def test_post_with_conflict(self):
         """Testing the POST groups/ API with Group Already Exists error"""
         self._login_user(admin=True)
         group = self.create_review_group()
@@ -190,7 +190,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_group(self):
+    def test_delete(self):
         """Testing the DELETE groups/<id>/ API"""
         self._login_user(admin=True)
         group = Group.objects.create(name='test-group', invite_only=True)
@@ -200,7 +200,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                        expected_status=204)
         self.assertFalse(Group.objects.filter(name='test-group').exists())
 
-    def test_delete_group_with_permission_denied_error(self):
+    def test_delete_with_permission_denied_error(self):
         """Testing the DELETE groups/<id>/ API with Permission Denied error"""
         group = Group.objects.create(name='test-group', invite_only=True)
         group.users.add(self.user)
@@ -209,7 +209,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                        expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_delete_group_with_local_site(self):
+    def test_delete_with_local_site(self):
         """Testing the DELETE groups/<id>/ API with a local site"""
         self.create_review_group(name='sitegroup', with_local_site=True)
 
@@ -219,7 +219,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=204)
 
     @add_fixtures(['test_site'])
-    def test_delete_group_with_local_site_and_permission_denied_error(self):
+    def test_delete_with_local_site_and_permission_denied_error(self):
         """Testing the DELETE groups/<id>/ API
         with a local site and Permission Denied error
         """
@@ -231,7 +231,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_scmtools'])
-    def test_delete_group_with_review_requests(self):
+    def test_delete_with_review_requests(self):
         """Testing the DELETE groups/<id>/ API with existing review requests"""
         self._login_user(admin=True)
 
@@ -252,7 +252,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_group_public(self):
+    def test_get_public(self):
         """Testing the GET groups/<id>/ API"""
         group = Group.objects.create(name='test-group')
 
@@ -263,14 +263,14 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['group']['display_name'], group.display_name)
         self.assertEqual(rsp['group']['invite_only'], False)
 
-    def test_get_group_public_not_modified(self):
+    def test_get_public_not_modified(self):
         """Testing the GET groups/<id>/ API with Not Modified response"""
         Group.objects.create(name='test-group')
 
         self._testHttpCaching(get_review_group_item_url('test-group'),
                               check_etags=True)
 
-    def test_get_group_invite_only(self):
+    def test_get_invite_only(self):
         """Testing the GET groups/<id>/ API with invite-only"""
         group = Group.objects.create(name='test-group', invite_only=True)
         group.users.add(self.user)
@@ -280,7 +280,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['group']['invite_only'], True)
 
-    def test_get_group_invite_only_with_permission_denied_error(self):
+    def test_get_invite_only_with_permission_denied_error(self):
         """Testing the GET groups/<id>/ API
         with invite-only and Permission Denied error
         """
@@ -292,7 +292,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
     @add_fixtures(['test_site'])
-    def test_get_group_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET groups/<id>/ API with a local site"""
         self._login_user(local_site=True)
         group = self.create_review_group(with_local_site=True)
@@ -305,7 +305,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['group']['display_name'], group.display_name)
 
     @add_fixtures(['test_site'])
-    def test_get_group_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET groups/<id>/ API
         with a local site and Permission Denied error
         """
@@ -318,7 +318,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_site'])
-    def test_put_group(self, local_site=None):
+    def test_put(self, local_site=None):
         """Testing the PUT groups/<name>/ API"""
         name = 'my-group'
         display_name = 'My Group'
@@ -346,11 +346,11 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(group.mailing_list, mailing_list)
 
     @add_fixtures(['test_site'])
-    def test_put_group_with_site(self):
+    def test_put_with_site(self):
         """Testing the PUT groups/<name>/ API with local site"""
-        self.test_put_group(LocalSite.objects.get(name=self.local_site_name))
+        self.test_put(LocalSite.objects.get(name=self.local_site_name))
 
-    def test_put_group_with_no_access(self, local_site=None):
+    def test_put_with_no_access(self, local_site=None):
         """Testing the PUT groups/<name>/ API with no access"""
         group = self.create_review_group(
             with_local_site=(local_site is not None))
@@ -367,12 +367,12 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
 
     @add_fixtures(['test_site'])
-    def test_put_group_with_site_no_access(self):
+    def test_put_with_site_no_access(self):
         """Testing the PUT groups/<name>/ API with local site and no access"""
-        self.test_put_group_with_no_access(
+        self.test_put_with_no_access(
             LocalSite.objects.get(name=self.local_site_name))
 
-    def test_put_group_with_conflict(self):
+    def test_put_with_conflict(self):
         """Testing the PUT groups/<name>/ API
         with Group Already Exists error
         """
diff --git a/reviewboard/webapi/tests/test_review_group_user.py b/reviewboard/webapi/tests/test_review_group_user.py
index cb3770857d578cb31d865a1a7be00dae77106436..9a92e0f286d9d4500d514d5f8c85ea9ea75eb5e7 100644
--- a/reviewboard/webapi/tests/test_review_group_user.py
+++ b/reviewboard/webapi/tests/test_review_group_user.py
@@ -18,7 +18,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_users(self, local_site=None):
+    def test_get(self, local_site=None):
         """Testing the GET groups/<name>/users/ API"""
         group = self.create_review_group(
             with_local_site=(local_site is not None))
@@ -32,16 +32,16 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['users']), 2)
 
     @add_fixtures(['test_site'])
-    def test_get_users_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET groups/<name>/users/ API with local site"""
         self._login_user(local_site=True)
-        self.test_get_users(LocalSite.objects.get(name=self.local_site_name))
+        self.test_get(LocalSite.objects.get(name=self.local_site_name))
 
     #
     # HTTP POST tests
     #
 
-    def test_post_user(self, local_site=None):
+    def test_post(self, local_site=None):
         """Testing the POST groups/<name>/users/ API"""
         self._login_user(admin=True, local_site=local_site)
 
@@ -59,11 +59,11 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(group.users.get().username, user.username)
 
     @add_fixtures(['test_site'])
-    def test_post_user_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST groups/<name>/users/ API with local site"""
-        self.test_post_user(LocalSite.objects.get(name=self.local_site_name))
+        self.test_post(LocalSite.objects.get(name=self.local_site_name))
 
-    def test_post_user_with_no_access(self, local_site=None):
+    def test_post_with_no_access(self, local_site=None):
         """Testing the POST groups/<name>/users/ API with Permission Denied"""
         group = self.create_review_group()
         user = User.objects.get(pk=1)
@@ -75,14 +75,14 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
 
     @add_fixtures(['test_site'])
-    def test_post_user_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST groups/<name>/users/ API
         with local site and Permission Denied
         """
-        self.test_post_user_with_no_access(
+        self.test_post_with_no_access(
             LocalSite.objects.get(name=self.local_site_name))
 
-    def test_post_user_with_invalid_user(self):
+    def test_post_with_invalid_user(self):
         """Testing the POST groups/<name>/users/ API with invalid user"""
         self._login_user(admin=True)
 
@@ -106,7 +106,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_user(self, local_site=None):
+    def test_delete(self, local_site=None):
         """Testing the DELETE groups/<name>/users/<username>/ API"""
         self._login_user(admin=True, local_site=local_site)
 
@@ -124,13 +124,13 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(group.users.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_user_with_site(self):
+    def test_delete_with_site(self):
         """Testing the DELETE groups/<name>/users/<username>/ API
         with local site
         """
-        self.test_delete_user(LocalSite.objects.get(name=self.local_site_name))
+        self.test_delete(LocalSite.objects.get(name=self.local_site_name))
 
-    def test_delete_user_with_no_access(self, local_site=None):
+    def test_delete_with_no_access(self, local_site=None):
         """Testing the DELETE groups/<name>/users/<username>/ API
         with Permission Denied
         """
@@ -145,9 +145,9 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_delete_user_with_site_no_access(self):
+    def test_delete_with_site_no_access(self):
         """Testing the DELETE groups/<name>/users/<username>/ API
         with local site and Permission Denied
         """
-        self.test_delete_user_with_no_access(
+        self.test_delete_with_no_access(
             LocalSite.objects.get(name=self.local_site_name))
diff --git a/reviewboard/webapi/tests/test_review_reply.py b/reviewboard/webapi/tests/test_review_reply.py
index 3aefb6c50312355188748cf0ea318f04d968fdeb..aa8d5fb49202a660b4473c0f346993c482824be7 100644
--- a/reviewboard/webapi/tests/test_review_reply.py
+++ b/reviewboard/webapi/tests/test_review_reply.py
@@ -32,7 +32,7 @@ class ResourceListTests(BaseResourceTestCase):
     # HTTP GET tests
     #
 
-    def test_get_replies(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/reviews/<id>/replies API"""
         review = self._create_test_review()
         reply = self.create_reply(review, user=self.user, publish=True)
@@ -47,7 +47,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(reply_rsp['body_top'], reply.body_top)
         self.assertEqual(reply_rsp['body_bottom'], reply.body_bottom)
 
-    def test_get_replies_with_counts_only(self):
+    def test_get_with_counts_only(self):
         """Testing the
         GET review-requests/<id>/reviews/<id>/replies/?counts-only=1 API
         """
@@ -61,7 +61,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(rsp['count'], 1)
 
     @add_fixtures(['test_site'])
-    def test_get_replies_with_site(self):
+    def test_get_with_site(self):
         """Testing the
         GET review-requests/<id>/reviews/<id>/replies/ API with a local site
         """
@@ -88,7 +88,7 @@ class ResourceListTests(BaseResourceTestCase):
                              reply.body_bottom)
 
     @add_fixtures(['test_site'])
-    def test_get_replies_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/<id>/reviews/<id>/replies/ API
         with a local site and Permission Denied error
         """
@@ -105,7 +105,7 @@ class ResourceListTests(BaseResourceTestCase):
     # HTTP POST tests
     #
 
-    def test_post_replies(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/reviews/<id>/replies/ API"""
         review_request = self.create_review_request(publish=True)
         review = self.create_review(review_request, publish=True)
@@ -122,7 +122,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(len(mail.outbox), 0)
 
     @add_fixtures(['test_site'])
-    def test_post_replies_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requsets/<id>/reviews/<id>/replies/ API
         with a local site
         """
@@ -141,7 +141,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(len(mail.outbox), 0)
 
     @add_fixtures(['test_site'])
-    def test_post_replies_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/<id>/reviews/<id>/replies/ API
         with a local site and Permission Denied error
         """
@@ -155,7 +155,7 @@ class ResourceListTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_post_replies_with_body_top(self):
+    def test_post_with_body_top(self):
         """Testing the POST review-requests/<id>/reviews/<id>/replies/ API
         with body_top
         """
@@ -174,7 +174,7 @@ class ResourceListTests(BaseResourceTestCase):
         reply = Review.objects.get(pk=rsp['reply']['id'])
         self.assertEqual(reply.body_top, body_top)
 
-    def test_post_replies_with_body_bottom(self):
+    def test_post_with_body_bottom(self):
         """Testing the POST review-requests/<id>/reviews/<id>/replies/ API
         with body_bottom
         """
@@ -202,7 +202,7 @@ class ResourceItemTests(BaseResourceTestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_reply(self):
+    def test_delete(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/replies/<id>/ API
         """
@@ -222,7 +222,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(Review.objects.filter(pk=reply_id).count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_reply_with_site(self):
+    def test_delete_with_site(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/replies/<id>/ API
         with a local site
@@ -238,7 +238,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(review.replies.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_reply_with_site_no_access(self):
+    def test_delete_with_site_no_access(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/replies/<id>/ API
         with a local site and Permission Denied error
@@ -258,7 +258,7 @@ class ResourceItemTests(BaseResourceTestCase):
     # HTTP GET tests
     #
 
-    def test_get_reply_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET review-requests/<id>/reviews/<id>/
         with Not Modified response
         """
@@ -274,7 +274,7 @@ class ResourceItemTests(BaseResourceTestCase):
     # HTTP PUT tests
     #
 
-    def test_put_reply(self):
+    def test_put(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/replies/<id>/ API
         """
@@ -297,7 +297,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'ok')
 
     @add_fixtures(['test_site'])
-    def test_put_reply_with_site(self):
+    def test_put_with_site(self):
         """Testing the PUT review-requests/<id>/reviews/<id>/replies/<id>/ API
         with a local site
         """
@@ -321,7 +321,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'ok')
 
     @add_fixtures(['test_site'])
-    def test_put_reply_with_site_no_access(self):
+    def test_put_with_site_no_access(self):
         """Testing the PUT review-requests/<id>/reviews/<id>/replies/<id>/ API
         with a local site and Permission Denied error
         """
@@ -335,7 +335,7 @@ class ResourceItemTests(BaseResourceTestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_put_reply_publish(self):
+    def test_put_with_publish(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/replies/<id>/?public=1 API
         """
diff --git a/reviewboard/webapi/tests/test_review_reply_diff_comment.py b/reviewboard/webapi/tests/test_review_reply_diff_comment.py
index a9cbd7ae46427976a28566a6af9cf58b21c75b2f..736e9e8e105a24bde63eb2c56debad04284dd4b9 100644
--- a/reviewboard/webapi/tests/test_review_reply_diff_comment.py
+++ b/reviewboard/webapi/tests/test_review_reply_diff_comment.py
@@ -140,7 +140,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_diff_comment(self):
+    def test_delete(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/diff-comments/<id>/ API
         """
@@ -162,7 +162,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(comments.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_diff_comment_with_local_site(self):
+    def test_delete_with_local_site(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/diff-comments/<id>/ API
         with a local site
@@ -186,7 +186,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         comments = Comment.objects.filter(review=reply, reply_to=comment)
         self.assertEqual(comments.count(), 0)
 
-    def test_delete_diff_comment_no_access(self):
+    def test_delete_no_access(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/diff-comments/<id>/ API
         and Permission Denied
@@ -207,7 +207,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_delete_diff_comment_with_local_site_no_access(self):
+    def test_delete_with_local_site_no_access(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/diff-comments/<id>/ API
         with a local site and Permission Denied
diff --git a/reviewboard/webapi/tests/test_review_reply_file_attachment_comment.py b/reviewboard/webapi/tests/test_review_reply_file_attachment_comment.py
index 8d2f1563736b0dffd202cc2ed87c71bee41ed98e..a66f90b73c15885d5f36a42ffc5575b2a3b2d515 100644
--- a/reviewboard/webapi/tests/test_review_reply_file_attachment_comment.py
+++ b/reviewboard/webapi/tests/test_review_reply_file_attachment_comment.py
@@ -17,7 +17,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_reply_with_file_attachment_comment(self):
+    def test_post_with_file_attachment_comment(self):
         """Testing the POST
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/
         API
@@ -47,7 +47,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(reply_comment.text, comment_text)
 
     @add_fixtures(['test_site'])
-    def test_post_reply_with_file_attachment_comment_and_local_site(self):
+    def test_post_with_file_attachment_comment_and_local_site(self):
         """Testing the POST
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/
         API with a local site
@@ -79,7 +79,7 @@ class ResourceListTests(BaseWebAPITestCase):
             pk=rsp['file_attachment_comment']['id'])
         self.assertEqual(reply_comment.text, comment_text)
 
-    def test_post_reply_with_inactive_file_attachment_comment(self):
+    def test_post_with_inactive_file_attachment_comment(self):
         """Testing the POST
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/
         API with inactive file attachment
@@ -117,7 +117,7 @@ class ResourceListTests(BaseWebAPITestCase):
             pk=rsp['file_attachment_comment']['id'])
         self.assertEqual(reply_comment.text, comment_text)
 
-    def test_post_reply_with_file_attachment_comment_http_303(self):
+    def test_post_with_file_attachment_comment_http_303(self):
         """Testing the POST
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/
         API and 303 See Other
@@ -159,7 +159,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_file_attachment_comment(self):
+    def test_delete(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/<id>/
         API
@@ -181,7 +181,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(comments.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_file_attachment_comment_with_local_site(self):
+    def test_delete_with_local_site(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/<id>/
         API with a local site
@@ -203,7 +203,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                                                         reply_to=comment)
         self.assertEqual(comments.count(), 0)
 
-    def test_delete_file_attachment_comment_no_access(self):
+    def test_delete_no_access(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/<id>/
         API and Permission Denied
@@ -225,7 +225,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_delete_file_attachment_comment_with_local_site_no_access(self):
+    def test_delete_with_local_site_no_access(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/<id>/
         API with a local site and Permission Denied
@@ -251,7 +251,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP PUT tests
     #
 
-    def test_put_reply_with_file_attachment_comment(self):
+    def test_put_with_file_attachment_comment(self):
         """Testing the PUT
         review-requests/<id>/reviews/<id>/replies/<id>/file-attachment-comments/
         API
diff --git a/reviewboard/webapi/tests/test_review_reply_screenshot_comment.py b/reviewboard/webapi/tests/test_review_reply_screenshot_comment.py
index 8c2a3ff92c1d6538fe2365af523d680b62a9bb90..9ed206a332e5b6abe9d60ebdaeeefa6e318fcd2e 100644
--- a/reviewboard/webapi/tests/test_review_reply_screenshot_comment.py
+++ b/reviewboard/webapi/tests/test_review_reply_screenshot_comment.py
@@ -17,7 +17,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_reply_with_screenshot_comment(self):
+    def test_post_with_screenshot_comment(self):
         """Testing the POST
         review-requests/<id>/reviews/<id>/replies/<id>/screenshot-comments/ API
         """
@@ -46,7 +46,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(reply_comment.reply_to, comment)
 
     @add_fixtures(['test_site'])
-    def test_post_reply_with_screenshot_comment_and_local_site(self):
+    def test_post_with_screenshot_comment_and_local_site(self):
         """Testing the POST
         review-requests/<id>/reviews/<id>/replies/<id>/screenshot-comments/ API
         with a local site
@@ -78,7 +78,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(reply_comment.text, comment_text)
         self.assertEqual(reply_comment.reply_to, comment)
 
-    def test_post_reply_with_screenshot_comment_http_303(self):
+    def test_post_with_screenshot_comment_http_303(self):
         """Testing the POST
         review-requests/<id>/reviews/<id>/replies/<id>/screenshot-comments/ API
         """
@@ -118,7 +118,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_screenshot_comment(self):
+    def test_delete(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/screenshot-comments/<id>/
         API
@@ -140,7 +140,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(replies.count(), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_screenshot_comment_with_local_site(self):
+    def test_delete_with_local_site(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/screenshot-comments/<id>/
         API with a local site
@@ -162,7 +162,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                                                    reply_to=comment)
         self.assertEqual(replies.count(), 0)
 
-    def test_delete_screenshot_comment_no_access(self):
+    def test_delete_no_access(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/screenshot-comments/<id>/
         API and Permission Denied
@@ -184,7 +184,7 @@ class ResourceItemTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_delete_screenshot_comment_with_local_site_no_access(self):
+    def test_delete_with_local_site_no_access(self):
         """Testing the DELETE
         review-requests/<id>/reviews/<id>/replies/<id>/screenshot-comments/<id>/
         API with a local site and Permission Denied
diff --git a/reviewboard/webapi/tests/test_review_request.py b/reviewboard/webapi/tests/test_review_request.py
index e7cd9035d8fa3d26e09b37321f0e1b431b649be5..832e99d5c082254458eb8a1a3905cca1bb145c21 100644
--- a/reviewboard/webapi/tests/test_review_request.py
+++ b/reviewboard/webapi/tests/test_review_request.py
@@ -23,7 +23,7 @@ class ResourceListTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests(self):
+    def test_get(self):
         """Testing the GET review-requests/ API"""
         self.create_review_request(publish=True)
         self.create_review_request(publish=True)
@@ -35,7 +35,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['review_requests']), 2)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET review-requests/ API with a local site"""
         self._login_user(local_site=True)
 
@@ -50,7 +50,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['review_requests']), 2)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/ API
         with a local site and Permission Denied error
         """
@@ -58,7 +58,7 @@ class ResourceListTests(BaseWebAPITestCase):
                     expected_status=403)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_status(self):
+    def test_get_with_status(self):
         """Testing the GET review-requests/?status= API"""
         self.create_review_request(publish=True, status='S')
         self.create_review_request(publish=True, status='S')
@@ -84,7 +84,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(len(rsp['review_requests']), 6)
 
-    def test_get_reviewrequests_with_counts_only(self):
+    def test_get_with_counts_only(self):
         """Testing the GET review-requests/?counts-only=1 API"""
         self.create_review_request(publish=True)
         self.create_review_request(publish=True)
@@ -95,7 +95,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['count'], 2)
 
-    def test_get_reviewrequests_with_to_groups(self):
+    def test_get_with_to_groups(self):
         """Testing the GET review-requests/?to-groups= API"""
         group = self.create_review_group(name='devgroup')
 
@@ -110,7 +110,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(len(rsp['review_requests']), 1)
 
-    def test_get_reviewrequests_with_to_groups_and_status(self):
+    def test_get_with_to_groups_and_status(self):
         """Testing the GET review-requests/?to-groups=&status= API"""
         group = self.create_review_group(name='devgroup')
 
@@ -142,7 +142,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(len(rsp['review_requests']), 2)
 
-    def test_get_reviewrequests_with_to_groups_and_counts_only(self):
+    def test_get_with_to_groups_and_counts_only(self):
         """Testing the GET review-requests/?to-groups=&counts-only=1 API"""
         group = self.create_review_group(name='devgroup')
 
@@ -159,7 +159,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['count'], 2)
 
-    def test_get_reviewrequests_with_to_users(self):
+    def test_get_with_to_users(self):
         """Testing the GET review-requests/?to-users= API"""
         grumpy = User.objects.get(username='grumpy')
 
@@ -177,7 +177,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(len(rsp['review_requests']), 2)
 
-    def test_get_reviewrequests_with_to_users_and_status(self):
+    def test_get_with_to_users_and_status(self):
         """Testing the GET review-requests/?to-users=&status= API"""
         grumpy = User.objects.get(username='grumpy')
 
@@ -209,7 +209,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(len(rsp['review_requests']), 2)
 
-    def test_get_reviewrequests_with_to_users_and_counts_only(self):
+    def test_get_with_to_users_and_counts_only(self):
         """Testing the GET review-requests/?to-users=&counts-only=1 API"""
         grumpy = User.objects.get(username='grumpy')
 
@@ -229,7 +229,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['count'], 2)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_to_users_directly(self):
+    def test_get_with_to_users_directly(self):
         """Testing the GET review-requests/?to-users-directly= API"""
         rsp = self.apiGet(get_review_request_list_url(), {
             'to-users-directly': 'doc',
@@ -238,7 +238,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['review_requests']),
                          ReviewRequest.objects.to_user_directly("doc").count())
 
-    def test_get_reviewrequests_with_to_users_directly_and_status(self):
+    def test_get_with_to_users_directly_and_status(self):
         """Testing the GET review-requests/?to-users-directly=&status= API"""
         url = get_review_request_list_url()
 
@@ -260,7 +260,7 @@ class ResourceListTests(BaseWebAPITestCase):
             len(rsp['review_requests']),
             ReviewRequest.objects.to_user_directly("doc", status='D').count())
 
-    def test_get_reviewrequests_with_to_users_directly_and_counts_only(self):
+    def test_get_with_to_users_directly_and_counts_only(self):
         """Testing the
         GET review-requests/?to-users-directly=&counts-only=1 API
         """
@@ -272,7 +272,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['count'],
                          ReviewRequest.objects.to_user_directly("doc").count())
 
-    def test_get_reviewrequests_with_from_user(self):
+    def test_get_with_from_user(self):
         """Testing the GET review-requests/?from-user= API"""
         rsp = self.apiGet(get_review_request_list_url(), {
             'from-user': 'grumpy',
@@ -281,7 +281,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['review_requests']),
                          ReviewRequest.objects.from_user("grumpy").count())
 
-    def test_get_reviewrequests_with_from_user_and_status(self):
+    def test_get_with_from_user_and_status(self):
         """Testing the GET review-requests/?from-user=&status= API"""
         url = get_review_request_list_url()
 
@@ -303,7 +303,7 @@ class ResourceListTests(BaseWebAPITestCase):
             len(rsp['review_requests']),
             ReviewRequest.objects.from_user("grumpy", status='D').count())
 
-    def test_get_reviewrequests_with_from_user_and_counts_only(self):
+    def test_get_with_from_user_and_counts_only(self):
         """Testing the GET review-requests/?from-user=&counts-only=1 API"""
         rsp = self.apiGet(get_review_request_list_url(), {
             'from-user': 'grumpy',
@@ -314,7 +314,7 @@ class ResourceListTests(BaseWebAPITestCase):
                          ReviewRequest.objects.from_user("grumpy").count())
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_ship_it_0(self):
+    def test_get_with_ship_it_0(self):
         """Testing the GET review-requests/?ship-it=0 API"""
         self.create_review_request(publish=True)
 
@@ -333,7 +333,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['review_requests']), q.count())
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_ship_it_1(self):
+    def test_get_with_ship_it_1(self):
         """Testing the GET review-requests/?ship-it=1 API"""
         self.create_review_request(publish=True)
 
@@ -352,7 +352,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['review_requests']), q.count())
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_time_added_from(self):
+    def test_get_with_time_added_from(self):
         """Testing the GET review-requests/?time-added-from= API"""
         start_index = 3
 
@@ -381,7 +381,7 @@ class ResourceListTests(BaseWebAPITestCase):
                 time_added__gte=r.time_added).count())
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_time_added_to(self):
+    def test_get_with_time_added_to(self):
         """Testing the GET review-requests/?time-added-to= API"""
         start_index = 3
 
@@ -409,7 +409,7 @@ class ResourceListTests(BaseWebAPITestCase):
                 public=True, status='P',
                 time_added__lt=r.time_added).count())
 
-    def test_get_reviewrequests_with_last_updated_from(self):
+    def test_get_with_last_updated_from(self):
         """Testing the GET review-requests/?last-updated-from= API"""
         start_index = 3
         public_review_requests = [
@@ -437,7 +437,7 @@ class ResourceListTests(BaseWebAPITestCase):
                 last_updated__gte=r.last_updated).count())
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequests_with_last_updated_to(self):
+    def test_get_with_last_updated_to(self):
         """Testing the GET review-requests/?last-updated-to= API"""
         start_index = 3
         public_review_requests = [
@@ -465,7 +465,7 @@ class ResourceListTests(BaseWebAPITestCase):
                 last_updated__lt=r.last_updated).count())
 
     @add_fixtures(['test_scmtools'])
-    def test_get_reviewrequest_with_repository_and_changenum(self):
+    def test_get_with_repository_and_changenum(self):
         """Testing the GET review-requests/?repository=&changenum= API"""
         review_request = self.create_review_request(create_repository=True,
                                                     publish=True)
@@ -488,7 +488,7 @@ class ResourceListTests(BaseWebAPITestCase):
                          review_request.commit)
 
     @add_fixtures(['test_scmtools'])
-    def test_get_reviewrequest_with_repository_and_commit_id(self):
+    def test_get_with_repository_and_commit_id(self):
         """Testing the GET review-requests/?repository=&commit_id= API
         with changenum backwards-compatibility
         """
@@ -521,7 +521,7 @@ class ResourceListTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_scmtools'])
-    def test_post_reviewrequests(self):
+    def test_post(self):
         """Testing the POST review-requests/ API"""
         repository = self.create_repository()
 
@@ -539,7 +539,7 @@ class ResourceListTests(BaseWebAPITestCase):
         return ReviewRequest.objects.get(pk=rsp['review_request']['id'])
 
     @add_fixtures(['test_scmtools'])
-    def test_post_reviewrequests_with_repository_name(self):
+    def test_post_with_repository_name(self):
         """Testing the POST review-requests/ API with a repository name"""
         repository = self.create_repository()
 
@@ -557,7 +557,7 @@ class ResourceListTests(BaseWebAPITestCase):
         return ReviewRequest.objects.get(pk=rsp['review_request']['id'])
 
     @add_fixtures(['test_scmtools'])
-    def test_post_reviewrequests_with_no_repository(self):
+    def test_post_with_no_repository(self):
         """Testing the POST review-requests/ API with no repository"""
         rsp = self.apiPost(
             get_review_request_list_url(),
@@ -573,7 +573,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(review_request.repository, None)
 
     @add_fixtures(['test_site', 'test_scmtools'])
-    def test_post_reviewrequests_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requests/ API with a local site"""
         self._login_user(local_site=True)
 
@@ -588,7 +588,7 @@ class ResourceListTests(BaseWebAPITestCase):
                          repository.name)
 
     @add_fixtures(['test_site', 'test_scmtools'])
-    def test_post_reviewrequests_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/ API
         with a local site and Permission Denied error
         """
@@ -600,7 +600,7 @@ class ResourceListTests(BaseWebAPITestCase):
             expected_status=403)
 
     @add_fixtures(['test_site', 'test_scmtools'])
-    def test_post_reviewrequests_with_site_invalid_repository_error(self):
+    def test_post_with_site_invalid_repository_error(self):
         """Testing the POST review-requests/ API
         with a local site and Invalid Repository error
         """
@@ -614,7 +614,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], INVALID_REPOSITORY.code)
 
-    def test_post_reviewrequests_with_invalid_repository_error(self):
+    def test_post_with_invalid_repository_error(self):
         """Testing the POST review-requests/ API
         with Invalid Repository error
         """
@@ -626,7 +626,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], INVALID_REPOSITORY.code)
 
     @add_fixtures(['test_site', 'test_scmtools'])
-    def test_post_reviewrequests_with_no_site_invalid_repository_error(self):
+    def test_post_with_no_site_invalid_repository_error(self):
         """Testing the POST review-requests/ API with
         Invalid Repository error from a site-local repository
         """
@@ -640,7 +640,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], INVALID_REPOSITORY.code)
 
     @add_fixtures(['test_scmtools'])
-    def test_post_reviewrequests_with_submit_as(self):
+    def test_post_with_submit_as(self):
         """Testing the POST review-requests/?submit_as= API"""
         self.user.is_superuser = True
         self.user.save()
@@ -665,7 +665,7 @@ class ResourceListTests(BaseWebAPITestCase):
         ReviewRequest.objects.get(pk=rsp['review_request']['id'])
 
     @add_fixtures(['test_scmtools'])
-    def test_post_reviewrequests_with_submit_as_and_permission_denied_error(self):
+    def test_post_with_submit_as_and_permission_denied_error(self):
         """Testing the POST review-requests/?submit_as= API
         with Permission Denied error
         """
@@ -690,7 +690,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_reviewrequest(self):
+    def test_delete(self):
         """Testing the DELETE review-requests/<id>/ API"""
         self.user.user_permissions.add(
             Permission.objects.get(codename='delete_reviewrequest'))
@@ -707,7 +707,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                           ReviewRequest.objects.get,
                           pk=review_request.pk)
 
-    def test_delete_reviewrequest_with_permission_denied_error(self):
+    def test_delete_with_permission_denied_error(self):
         """Testing the DELETE review-requests/<id>/ API
         with Permission Denied error
         """
@@ -720,7 +720,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_delete_reviewrequest_with_does_not_exist_error(self):
+    def test_delete_with_does_not_exist_error(self):
         """Testing the DELETE review-requests/<id>/ API
         with Does Not Exist error
         """
@@ -735,7 +735,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_delete_reviewrequest_with_site(self):
+    def test_delete_with_site(self):
         """Testing the DELETE review-requests/<id>/ API with a lotal site"""
         user = User.objects.get(username='doc')
         user.user_permissions.add(
@@ -758,7 +758,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequest(self):
+    def test_get(self):
         """Testing the GET review-requests/<id>/ API"""
         review_request = self.create_review_request(publish=True)
 
@@ -771,7 +771,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                          review_request.summary)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequest_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET review-requests/<id>/ API with a local site"""
         self._login_user(local_site=True)
         review_request = self.create_review_request(publish=True,
@@ -788,7 +788,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                          review_request.summary)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequest_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/<id>/ API
         with a local site and Permission Denied error
         """
@@ -801,7 +801,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                                                 self.local_site_name),
                     expected_status=403)
 
-    def test_get_reviewrequest_with_non_public_and_permission_denied_error(self):
+    def test_get_with_non_public_and_permission_denied_error(self):
         """Testing the GET review-requests/<id>/ API
         with non-public and Permission Denied error
         """
@@ -814,7 +814,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_get_reviewrequest_with_invite_only_group_and_permission_denied_error(self):
+    def test_get_with_invite_only_group_and_permission_denied_error(self):
         """Testing the GET review-requests/<id>/ API
         with invite-only group and Permission Denied error
         """
@@ -833,7 +833,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequest_with_invite_only_group_and_target_user(self):
+    def test_get_with_invite_only_group_and_target_user(self):
         """Testing the GET review-requests/<id>/ API
         with invite-only group and target user
         """
@@ -855,7 +855,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                          review_request.summary)
 
     @add_fixtures(['test_site'])
-    def test_get_reviewrequest_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET review-requests/<id>/ API
         with Not Modified response
         """
@@ -868,7 +868,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP PUT tests
     #
 
-    def test_put_reviewrequest_status_discarded(self):
+    def test_put_status_discarded(self):
         """Testing the PUT review-requests/<id>/?status=discarded API"""
         r = self.create_review_request(submitter=self.user, publish=True)
 
@@ -892,7 +892,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(fc_status['old'][0], 'P')
         self.assertEqual(fc_status['new'][0], 'D')
 
-    def test_put_reviewrequest_status_discarded_with_permission_denied(self):
+    def test_put_status_discarded_with_permission_denied(self):
         """Testing the PUT review-requests/<id>/?status=discarded API
         with Permission Denied
         """
@@ -907,7 +907,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_put_reviewrequest_status_pending(self):
+    def test_put_status_pending(self):
         """Testing the PUT review-requests/<id>/?status=pending API"""
         r = self.create_review_request(submitter=self.user, publish=True)
         r.close(ReviewRequest.SUBMITTED)
@@ -923,7 +923,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         r = ReviewRequest.objects.get(pk=r.id)
         self.assertEqual(r.status, 'P')
 
-    def test_put_reviewrequest_status_submitted(self):
+    def test_put_status_submitted(self):
         """Testing the PUT review-requests/<id>/?status=submitted API"""
         r = self.create_review_request(submitter=self.user, publish=True)
 
@@ -948,7 +948,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(fc_status['new'][0], 'S')
 
     @add_fixtures(['test_site'])
-    def test_put_reviewrequest_status_submitted_with_site(self):
+    def test_put_status_submitted_with_site(self):
         """Testing the PUT review-requests/<id>/?status=submitted API
         with a local site
         """
@@ -977,7 +977,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(fc_status['new'][0], 'S')
 
     @add_fixtures(['test_site'])
-    def test_put_reviewrequest_status_submitted_with_site_no_access(self):
+    def test_put_status_submitted_with_site_no_access(self):
         """Testing the PUT review-requests/<id>/?status=submitted API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_review_request_draft.py b/reviewboard/webapi/tests/test_review_request_draft.py
index eef608731a5e802681cb89686d86a9f6bbd215d3..b0c45a540e51fad571a717db52992a4e4cd4df39 100644
--- a/reviewboard/webapi/tests/test_review_request_draft.py
+++ b/reviewboard/webapi/tests/test_review_request_draft.py
@@ -14,82 +14,18 @@ class ResourceTests(BaseWebAPITestCase):
     """Testing the ReviewRequestDraftResource API tests."""
     fixtures = ['test_users']
 
-    def _create_update_review_request(self, apiFunc, expected_status,
-                                      review_request=None,
-                                      local_site_name=None):
-        summary = "My Summary"
-        description = "My Description"
-        testing_done = "My Testing Done"
-        branch = "My Branch"
-        bugs = "#123,456"
-
-        if review_request is None:
-            review_request = self.create_review_request(submitter=self.user,
-                                                        publish=True)
-            review_request.target_people.add(
-                User.objects.get(username='doc'))
-
-        func_kwargs = {
-            'summary': summary,
-            'description': description,
-            'testing_done': testing_done,
-            'branch': branch,
-            'bugs_closed': bugs,
-        }
-
-        if expected_status >= 400:
-            expected_mimetype = None
-        else:
-            expected_mimetype = review_request_draft_item_mimetype
-
-        rsp = apiFunc(
-            get_review_request_draft_url(review_request, local_site_name),
-            func_kwargs,
-            expected_status=expected_status,
-            expected_mimetype=expected_mimetype)
-
-        if expected_status >= 200 and expected_status < 300:
-            self.assertEqual(rsp['stat'], 'ok')
-            self.assertEqual(rsp['draft']['summary'], summary)
-            self.assertEqual(rsp['draft']['description'], description)
-            self.assertEqual(rsp['draft']['testing_done'], testing_done)
-            self.assertEqual(rsp['draft']['branch'], branch)
-            self.assertEqual(rsp['draft']['bugs_closed'], ['123', '456'])
-
-            draft = ReviewRequestDraft.objects.get(pk=rsp['draft']['id'])
-            self.assertEqual(draft.summary, summary)
-            self.assertEqual(draft.description, description)
-            self.assertEqual(draft.testing_done, testing_done)
-            self.assertEqual(draft.branch, branch)
-            self.assertEqual(draft.get_bug_list(), ['123', '456'])
-
-        return rsp
-
-    def _create_update_review_request_with_site(self, apiFunc, expected_status,
-                                                relogin=True,
-                                                review_request=None):
-        if relogin:
-            self._login_user(local_site=True)
-
-        if review_request is None:
-            review_request = self.create_review_request(submitter='doc',
-                                                        with_local_site=True)
-
-        return self._create_update_review_request(
-            apiFunc, expected_status, review_request, self.local_site_name)
-
     #
     # HTTP DELETE tests
     #
 
-    def test_delete_reviewrequestdraft(self):
+    def test_delete(self):
         """Testing the DELETE review-requests/<id>/draft/ API"""
         review_request = self.create_review_request(submitter=self.user)
         summary = review_request.summary
         description = review_request.description
 
         # Set some data.
-        self.test_put_reviewrequestdraft(review_request)
+        self.test_put(review_request)
 
         self.apiDelete(get_review_request_draft_url(review_request))
 
@@ -98,7 +34,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(review_request.description, description)
 
     @add_fixtures(['test_site'])
-    def test_delete_reviewrequestdraft_with_site(self):
+    def test_delete_with_site(self):
         """Testing the DELETE review-requests/<id>/draft/ API
         with a local site
         """
@@ -107,7 +43,7 @@ class ResourceTests(BaseWebAPITestCase):
         summary = review_request.summary
         description = review_request.description
 
-        self.test_put_reviewrequestdraft_with_site(review_request)
+        self.test_put_with_site(review_request)
 
         self.apiDelete(get_review_request_draft_url(review_request,
                                                     self.local_site_name))
@@ -117,7 +53,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(review_request.description, description)
 
     @add_fixtures(['test_site'])
-    def test_delete_reviewrequestdraft_with_site_no_access(self):
+    def test_delete_with_site_no_access(self):
         """Testing the DELETE review-requests/<id>/draft/ API
         with a local site and Permission Denied error
         """
@@ -134,19 +70,19 @@ class ResourceTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_reviewrequestdraft(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/draft/ API"""
         self._create_update_review_request(self.apiPost, 201)
 
     @add_fixtures(['test_site'])
-    def test_post_reviewrequestdraft_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requests/<id>/draft/ API
         with a local site
         """
         self._create_update_review_request_with_site(self.apiPost, 201)
 
     @add_fixtures(['test_site'])
-    def test_post_reviewrequestdraft_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/<id>/draft/ API
         with a local site and Permission Denied error
         """
@@ -159,18 +95,18 @@ class ResourceTests(BaseWebAPITestCase):
     # HTTP PUT tests
     #
 
-    def test_put_reviewrequestdraft(self, review_request=None):
+    def test_put(self, review_request=None):
         """Testing the PUT review-requests/<id>/draft/ API"""
         self._create_update_review_request(self.apiPut, 200, review_request)
 
     @add_fixtures(['test_site'])
-    def test_put_reviewrequestdraft_with_site(self, review_request=None):
+    def test_put_with_site(self, review_request=None):
         """Testing the PUT review-requests/<id>/draft/ API with a local site"""
         self._create_update_review_request_with_site(
             self.apiPut, 200, review_request=review_request)
 
     @add_fixtures(['test_site'])
-    def test_put_reviewrequestdraft_with_site_no_access(self):
+    def test_put_with_site_no_access(self):
         """Testing the PUT review-requests/<id>/draft/ API
         with a local site and Permission Denied error
         """
@@ -179,7 +115,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_put_reviewrequestdraft_with_changedesc(self):
+    def test_put_with_changedesc(self):
         """Testing the PUT review-requests/<id>/draft/ API
         with a change description
         """
@@ -199,7 +135,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertNotEqual(draft.changedesc, None)
         self.assertEqual(draft.changedesc.text, changedesc)
 
-    def test_put_reviewrequestdraft_with_depends_on(self):
+    def test_put_with_depends_on(self):
         """Testing the PUT review-requests/<id>/draft/ API
         with depends_on field
         """
@@ -233,7 +169,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(list(depends_2.draft_blocks.all()), [draft])
 
     @add_fixtures(['test_site'])
-    def test_put_reviewrequestdraft_with_depends_on_and_site(self):
+    def test_put_with_depends_on_and_site(self):
         """Testing the PUT review-requests/<id>/draft/ API
         with depends_on field and local site
         """
@@ -271,7 +207,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(list(depends_1.draft_blocks.all()), [draft])
         self.assertEqual(bad_depends.draft_blocks.count(), 0)
 
-    def test_put_reviewrequestdraft_with_depends_on_invalid_id(self):
+    def test_put_with_depends_on_invalid_id(self):
         """Testing the PUT review-requests/<id>/draft/ API
         with depends_on field and invalid ID
         """
@@ -288,7 +224,7 @@ class ResourceTests(BaseWebAPITestCase):
         draft = review_request.get_draft()
         self.assertEqual(draft.depends_on.count(), 0)
 
-    def test_put_reviewrequestdraft_with_invalid_field_name(self):
+    def test_put_with_invalid_field_name(self):
         """Testing the PUT review-requests/<id>/draft/ API
         with Invalid Form Data error
         """
@@ -303,7 +239,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], INVALID_FORM_DATA.code)
         self.assertTrue('foobar' in rsp['fields'])
 
-    def test_put_reviewrequestdraft_with_permission_denied_error(self):
+    def test_put_with_permission_denied_error(self):
         """Testing the PUT review-requests/<id>/draft/ API
         with Permission Denied error
         """
@@ -319,13 +255,13 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_put_reviewrequestdraft_publish(self):
+    def test_put_publish(self):
         """Testing the PUT review-requests/<id>/draft/?public=1 API"""
         self.siteconfig.set('mail_send_review_mail', True)
         self.siteconfig.save()
 
         # Set some data first.
-        self.test_put_reviewrequestdraft()
+        self.test_put()
 
         mail.outbox = []
 
@@ -351,7 +287,7 @@ class ResourceTests(BaseWebAPITestCase):
             "Re: Review Request %s: My Summary" % review_request.pk)
         self.assertValidRecipients(["doc", "grumpy"])
 
-    def test_put_reviewrequestdraft_publish_with_new_review_request(self):
+    def test_put_publish_with_new_review_request(self):
         """Testing the PUT review-requests/<id>/draft/?public=1 API
         with a new review request
         """
@@ -385,3 +321,67 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(mail.outbox[0].subject,
                          "Review Request %s: My Summary" % review_request.pk)
         self.assertValidRecipients(["doc", "grumpy"], [])
+
+    def _create_update_review_request(self, apiFunc, expected_status,
+                                      review_request=None,
+                                      local_site_name=None):
+        summary = "My Summary"
+        description = "My Description"
+        testing_done = "My Testing Done"
+        branch = "My Branch"
+        bugs = "#123,456"
+
+        if review_request is None:
+            review_request = self.create_review_request(submitter=self.user,
+                                                        publish=True)
+            review_request.target_people.add(
+                User.objects.get(username='doc'))
+
+        func_kwargs = {
+            'summary': summary,
+            'description': description,
+            'testing_done': testing_done,
+            'branch': branch,
+            'bugs_closed': bugs,
+        }
+
+        if expected_status >= 400:
+            expected_mimetype = None
+        else:
+            expected_mimetype = review_request_draft_item_mimetype
+
+        rsp = apiFunc(
+            get_review_request_draft_url(review_request, local_site_name),
+            func_kwargs,
+            expected_status=expected_status,
+            expected_mimetype=expected_mimetype)
+
+        if expected_status >= 200 and expected_status < 300:
+            self.assertEqual(rsp['stat'], 'ok')
+            self.assertEqual(rsp['draft']['summary'], summary)
+            self.assertEqual(rsp['draft']['description'], description)
+            self.assertEqual(rsp['draft']['testing_done'], testing_done)
+            self.assertEqual(rsp['draft']['branch'], branch)
+            self.assertEqual(rsp['draft']['bugs_closed'], ['123', '456'])
+
+            draft = ReviewRequestDraft.objects.get(pk=rsp['draft']['id'])
+            self.assertEqual(draft.summary, summary)
+            self.assertEqual(draft.description, description)
+            self.assertEqual(draft.testing_done, testing_done)
+            self.assertEqual(draft.branch, branch)
+            self.assertEqual(draft.get_bug_list(), ['123', '456'])
+
+        return rsp
+
+    def _create_update_review_request_with_site(self, apiFunc, expected_status,
+                                                relogin=True,
+                                                review_request=None):
+        if relogin:
+            self._login_user(local_site=True)
+
+        if review_request is None:
+            review_request = self.create_review_request(submitter='doc',
+                                                        with_local_site=True)
+
+        return self._create_update_review_request(
+            apiFunc, expected_status, review_request, self.local_site_name)
diff --git a/reviewboard/webapi/tests/test_review_screenshot_comment.py b/reviewboard/webapi/tests/test_review_screenshot_comment.py
index 9bcde4be45358910ba10679e6abf73a0466b1a48..d102712e9c96604d2c13d022849cd9b8567c4d39 100644
--- a/reviewboard/webapi/tests/test_review_screenshot_comment.py
+++ b/reviewboard/webapi/tests/test_review_screenshot_comment.py
@@ -46,7 +46,7 @@ class ResourceListTests(BaseTestCase):
     # HTTP POST tests
     #
 
-    def test_post_screenshot_comments(self):
+    def test_post(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/screenshot-comments/ API
         """
@@ -68,7 +68,7 @@ class ResourceListTests(BaseTestCase):
         self.assertEqual(rsp['screenshot_comment']['h'], h)
 
     @add_fixtures(['test_site'])
-    def test_post_screenshot_comments_with_site(self):
+    def test_post_with_site(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/screenshot-comments/ API
         with a local site
@@ -93,7 +93,7 @@ class ResourceListTests(BaseTestCase):
         self.assertEqual(rsp['screenshot_comment']['w'], w)
         self.assertEqual(rsp['screenshot_comment']['h'], h)
 
-    def test_post_screenshot_comment_with_issue(self):
+    def test_post_with_issue(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/screenshot-comments/ API
         with an issue
@@ -113,7 +113,7 @@ class ResourceListTests(BaseTestCase):
         self.assertTrue(rsp['screenshot_comments'][0]['issue_opened'])
 
     @add_fixtures(['test_site'])
-    def test_post_screenshot_comments_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the
         POST review-requests/<id>/reviews/<id>/screenshot-comments/ API
         with a local site and Permission Denied error
@@ -146,7 +146,7 @@ class ResourceItemTests(BaseTestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_screenshot_comment(self):
+    def test_delete(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/screenshot-comments/<id>/ API
         """
@@ -170,7 +170,7 @@ class ResourceItemTests(BaseTestCase):
         self.assertEqual(len(rsp['screenshot_comments']), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_screenshot_comment_with_local_site(self):
+    def test_delete_with_local_site(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/screenshot-comments/<id> API
         with a local site
@@ -200,7 +200,7 @@ class ResourceItemTests(BaseTestCase):
         self.assertEqual(len(rsp['screenshot_comments']), 0)
 
     @add_fixtures(['test_site'])
-    def test_delete_screenshot_comment_with_local_site_no_access(self):
+    def test_delete_with_local_site_no_access(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/screenshot-comments/<id> API
         with a local site and Permission Denied error
@@ -230,7 +230,7 @@ class ResourceItemTests(BaseTestCase):
         self.assertEqual(rsp['stat'], 'fail')
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
-    def test_delete_screenshot_comment_with_does_not_exist_error(self):
+    def test_delete_with_does_not_exist_error(self):
         """Testing the
         DELETE review-requests/<id>/reviews/<id>/screenshot-comments/<id>/ API
         with Does Not Exist error
@@ -248,7 +248,7 @@ class ResourceItemTests(BaseTestCase):
     # HTTP PUT tests
     #
 
-    def test_put_screenshot_comment_with_issue(self):
+    def test_put_with_issue(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/screenshot-comments/<id>/ API
         with an issue, removing issue_opened
@@ -263,7 +263,7 @@ class ResourceItemTests(BaseTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertFalse(rsp['screenshot_comment']['issue_opened'])
 
-    def test_put_screenshot_comment_issue_status_before_publish(self):
+    def test_put_issue_status_before_publish(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/screenshot-comments/<id> API
         with an issue, before review is published
@@ -283,7 +283,7 @@ class ResourceItemTests(BaseTestCase):
         # The issue_status should still be "open"
         self.assertEqual(rsp['screenshot_comment']['issue_status'], 'open')
 
-    def test_put_screenshot_comment_issue_status_after_publish(self):
+    def test_put_issue_status_after_publish(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/screenshot-comments/<id>/ API
         with an issue, after review is published
@@ -298,7 +298,7 @@ class ResourceItemTests(BaseTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['screenshot_comment']['issue_status'], 'resolved')
 
-    def test_put_screenshot_comment_issue_status_by_issue_creator(self):
+    def test_put_issue_status_by_issue_creator(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/screenshot-comments/<id>/ API
         permissions for issue creator
@@ -320,7 +320,7 @@ class ResourceItemTests(BaseTestCase):
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(rsp['screenshot_comment']['issue_status'], 'dropped')
 
-    def test_put_screenshot_comment_issue_status_by_uninvolved_user(self):
+    def test_put_issue_status_by_uninvolved_user(self):
         """Testing the
         PUT review-requests/<id>/reviews/<id>/screenshot-comments/<id>/ API
         permissions for an uninvolved user
diff --git a/reviewboard/webapi/tests/test_root.py b/reviewboard/webapi/tests/test_root.py
index 4f9dbb07217dac05244e73c6b8e0c8338440c436..03ab793358eb7934010e9172a1d1d8b176644f2d 100644
--- a/reviewboard/webapi/tests/test_root.py
+++ b/reviewboard/webapi/tests/test_root.py
@@ -9,7 +9,7 @@ class ResourceTests(BaseWebAPITestCase):
     """Testing the RootResource APIs."""
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_api_root_with_local_site(self):
+    def test_get_with_local_site(self):
         """Testing the GET / API with local sites"""
         self._login_user(local_site=True)
         rsp = self.apiGet(get_root_url('local-site-1'),
@@ -22,13 +22,13 @@ class ResourceTests(BaseWebAPITestCase):
                          'repositories/{repository_id}/')
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_api_root_with_local_site_and_cache(self):
+    def test_get_with_local_site_and_cache(self):
         """Testing the GET / API with multiple local sites"""
         # djblets had a bug where the uri_templates were cached without any
         # consideration of the local site (or, more generally, the base uri).
         # In this case, fetching /s/<local_site>/api/ might return uri
         # templates for someone else's site. This was breaking rbt post.
-        self.test_get_api_root_with_local_site()
+        self.test_get_with_local_site()
 
         rsp = self.apiGet(get_root_url('local-site-2'),
                           expected_mimetype=root_item_mimetype)
diff --git a/reviewboard/webapi/tests/test_screenshot.py b/reviewboard/webapi/tests/test_screenshot.py
index dfa27969dd16f337f280f827f21d7164170d92a6..a52bc6b93170d39e1d9980061f0e21afaa1bdfed 100644
--- a/reviewboard/webapi/tests/test_screenshot.py
+++ b/reviewboard/webapi/tests/test_screenshot.py
@@ -14,7 +14,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_screenshots_with_invalid_review_request_id(self):
+    def test_get_with_invalid_review_request_id(self):
         """Testing the GET review-requests/<id>/screenshots/ API
         with an invalid review request ID
         """
@@ -27,7 +27,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_screenshots(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/screenshots/ API"""
         review_request = self.create_review_request(publish=True,
                                                     submitter=self.user)
@@ -42,7 +42,7 @@ class ResourceListTests(BaseWebAPITestCase):
 
         self.assertEqual(rsp['stat'], 'ok')
 
-    def test_post_screenshots_with_permission_denied_error(self):
+    def test_post_with_permission_denied_error(self):
         """Testing the POST review-requests/<id>/screenshots/ API
         with Permission Denied error
         """
@@ -64,7 +64,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
     @add_fixtures(['test_site'])
-    def test_post_screenshots_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requests/<id>/screenshots/ API
         with a local site
         """
@@ -85,7 +85,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['stat'], 'ok')
 
     @add_fixtures(['test_site'])
-    def test_post_screenshots_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/<id>/screenshots/ API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_screenshot_comment.py b/reviewboard/webapi/tests/test_screenshot_comment.py
index dfd2ba40f7183e695594c44e4c7b6234d55c34d6..fceca86047231b5fca6e2b8ae815bcfdc071701a 100644
--- a/reviewboard/webapi/tests/test_screenshot_comment.py
+++ b/reviewboard/webapi/tests/test_screenshot_comment.py
@@ -15,7 +15,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_screenshot_comments(self):
+    def test_get(self):
         """Testing the
         GET review-requests/<id>/screenshots/<id>/comments/ API
         """
@@ -46,7 +46,7 @@ class ResourceListTests(BaseWebAPITestCase):
             self.assertEqual(rsp_comments[i]['h'], comments[i].h)
 
     @add_fixtures(['test_site'])
-    def test_get_screenshot_comments_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET review-requests/<id>/screenshots/<id>/comments/ API
         with a local site
         """
@@ -80,7 +80,7 @@ class ResourceListTests(BaseWebAPITestCase):
             self.assertEqual(rsp_comments[i]['h'], comments[i].h)
 
     @add_fixtures(['test_site'])
-    def test_get_screenshot_comments_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET review-requests/<id>/screenshots/<id>/comments/ API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_screenshot_draft.py b/reviewboard/webapi/tests/test_screenshot_draft.py
index bd0533440db1046be831a177bc00470e1a2e8d58..fa97098b3c561acdda1e8d213d5429eedcb7bda4 100644
--- a/reviewboard/webapi/tests/test_screenshot_draft.py
+++ b/reviewboard/webapi/tests/test_screenshot_draft.py
@@ -19,7 +19,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_screenshots(self):
+    def test_post(self):
         """Testing the POST review-requests/<id>/draft/screenshots/ API"""
         review_request = self.create_review_request(submitter=self.user,
                                                     publish=True)
@@ -33,7 +33,7 @@ class ResourceListTests(BaseWebAPITestCase):
 
         self.assertEqual(rsp['stat'], 'ok')
 
-    def test_post_screenshots_with_permission_denied_error(self):
+    def test_post_with_permission_denied_error(self):
         """Testing the POST review-requests/<id>/draft/screenshots/ API
         with Permission Denied error
         """
@@ -54,7 +54,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
     @add_fixtures(['test_site'])
-    def test_post_screenshots_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST review-requests/<id>/draft/screenshots/ API
         with a local site
         """
@@ -86,7 +86,7 @@ class ResourceListTests(BaseWebAPITestCase):
         return review_request, rsp['draft_screenshot']['id']
 
     @add_fixtures(['test_site'])
-    def test_post_screenshots_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST review-requests/<id>/draft/screenshots/ API
         with a local site and Permission Denied error
         """
@@ -112,7 +112,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP PUT tests
     #
 
-    def test_put_screenshot(self):
+    def test_put(self):
         """Testing the PUT review-requests/<id>/draft/screenshots/<id>/ API"""
         draft_caption = 'The new caption'
 
@@ -147,7 +147,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(screenshot.draft_caption, draft_caption)
 
     @add_fixtures(['test_site'])
-    def test_put_screenshot_with_site(self):
+    def test_put_with_site(self):
         """Testing the PUT review-requests/<id>/draft/screenshots/<id>/ API
         with a local site
         """
@@ -173,7 +173,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(screenshot.draft_caption, draft_caption)
 
     @add_fixtures(['test_site'])
-    def test_put_screenshot_with_site_no_access(self):
+    def test_put_with_site_no_access(self):
         """Testing the PUT review-requests/<id>/draft/screenshots/<id>/ API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_server_info.py b/reviewboard/webapi/tests/test_server_info.py
index c91048a7e760bd22ce65353d4add16ac6a520cf9..1ab4939ba141c873ccc0d22ce3d15df7327bdfc1 100644
--- a/reviewboard/webapi/tests/test_server_info.py
+++ b/reviewboard/webapi/tests/test_server_info.py
@@ -12,7 +12,7 @@ class ResourceTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_server_info(self):
+    def test_get(self):
         """Testing the GET info/ API"""
         rsp = self.apiGet(get_server_info_url(),
                           expected_mimetype=server_info_mimetype)
@@ -30,7 +30,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertTrue(diffs_caps.get('base_commit_ids', False))
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_server_info_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET info/ API with a local site"""
         self._login_user(local_site=True)
         rsp = self.apiGet(get_server_info_url(self.local_site_name),
@@ -41,7 +41,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertTrue('site' in rsp['info'])
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_server_info_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET info/ API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_session.py b/reviewboard/webapi/tests/test_session.py
index c1cf7e3d225fdfd4eb71c8bf71c7e32b84d54a05..ccd8037ec1ac3e1b0a3de9eda55f62eda34de182 100644
--- a/reviewboard/webapi/tests/test_session.py
+++ b/reviewboard/webapi/tests/test_session.py
@@ -13,7 +13,7 @@ class ResourceTests(BaseWebAPITestCase):
     #
 
     @add_fixtures(['test_users'])
-    def test_get_session_with_logged_in_user(self):
+    def test_get_with_logged_in_user(self):
         """Testing the GET session/ API with logged in user"""
         rsp = self.apiGet(get_session_url(),
                           expected_mimetype=session_mimetype)
@@ -23,7 +23,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['session']['links']['user']['title'],
                          self.user.username)
 
-    def test_get_session_with_anonymous_user(self):
+    def test_get_with_anonymous_user(self):
         """Testing the GET session/ API with anonymous user"""
         rsp = self.apiGet(get_session_url(),
                           expected_mimetype=session_mimetype)
@@ -32,7 +32,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertFalse(rsp['session']['authenticated'])
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_session_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET session/ API with a local site"""
         self._login_user(local_site=True)
         rsp = self.apiGet(get_session_url(self.local_site_name),
@@ -43,7 +43,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['session']['links']['user']['title'], 'doc')
 
     @add_fixtures(['test_users', 'test_site'])
-    def test_get_session_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET session/ API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_user.py b/reviewboard/webapi/tests/test_user.py
index f062ec0f7498013215b508739cebe14e9a68ae26..dd9de36d76be61d1f6c77e744706f2da165578d5 100644
--- a/reviewboard/webapi/tests/test_user.py
+++ b/reviewboard/webapi/tests/test_user.py
@@ -18,14 +18,14 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_users(self):
+    def test_get(self):
         """Testing the GET users/ API"""
         rsp = self.apiGet(get_user_list_url(),
                           expected_mimetype=user_list_mimetype)
         self.assertEqual(rsp['stat'], 'ok')
         self.assertEqual(len(rsp['users']), User.objects.count())
 
-    def test_get_users_with_q(self):
+    def test_get_with_q(self):
         """Testing the GET users/?q= API"""
         rsp = self.apiGet(get_user_list_url(), {'q': 'gru'},
                           expected_mimetype=user_list_mimetype)
@@ -33,7 +33,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['users']), 1)  # grumpy
 
     @add_fixtures(['test_site'])
-    def test_get_users_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET users/ API with a local site"""
         self._login_user(local_site=True)
         local_site = LocalSite.objects.get(name=self.local_site_name)
@@ -43,7 +43,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(len(rsp['users']), local_site.users.count())
 
     @add_fixtures(['test_site'])
-    def test_get_users_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET users/ API
         with a local site and Permission Denied error
         """
@@ -59,7 +59,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_user(self):
+    def test_get(self):
         """Testing the GET users/<username>/ API"""
         username = 'doc'
         user = User.objects.get(username=username)
@@ -75,13 +75,13 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['user']['id'], user.id)
         self.assertEqual(rsp['user']['email'], user.email)
 
-    def test_get_user_not_modified(self):
+    def test_get_not_modified(self):
         """Testing the GET users/<username>/ API with Not Modified response"""
         self._testHttpCaching(get_user_item_url('doc'),
                               check_etags=True)
 
     @add_fixtures(['test_site'])
-    def test_get_user_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET users/<username>/ API with a local site"""
         self._login_user(local_site=True)
 
@@ -100,7 +100,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['user']['email'], user.email)
 
     @add_fixtures(['test_site'])
-    def test_get_user_with_site_and_profile_private(self):
+    def test_get_with_site_and_profile_private(self):
         """Testing the GET users/<username>/ API
         with a local site and private profile
         """
@@ -129,10 +129,9 @@ class ResourceItemTests(BaseWebAPITestCase):
                     expected_status=404)
 
     @add_fixtures(['test_site'])
-    def test_get_user_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET users/<username>/ API
         with a local site and Permission Denied error
         """
-        print self.fixtures
         self.apiGet(get_user_item_url('doc', self.local_site_name),
                     expected_status=403)
diff --git a/reviewboard/webapi/tests/test_validate_diff.py b/reviewboard/webapi/tests/test_validate_diff.py
index 930c22509813c4672e8cb64f53c1900231e77573..a3bdc174e72302c5049d2133cb20828a9d18937f 100644
--- a/reviewboard/webapi/tests/test_validate_diff.py
+++ b/reviewboard/webapi/tests/test_validate_diff.py
@@ -17,7 +17,7 @@ class ResourceTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_diff(self):
+    def test_post(self):
         """Testing the POST validation/diffs/ API"""
         repository = self.create_repository(tool_name='Test')
 
@@ -37,7 +37,7 @@ class ResourceTests(BaseWebAPITestCase):
 
         f.close()
 
-    def test_post_diff_with_missing_basedir(self):
+    def test_post_with_missing_basedir(self):
         """Testing the POST validations/diffs/ API with a missing basedir"""
         repository = self.create_repository(tool_name='Test')
 
@@ -58,7 +58,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], INVALID_FORM_DATA.code)
         self.assertTrue('basedir' in rsp['fields'])
 
-    def test_post_diff_with_files_not_found(self):
+    def test_post_with_files_not_found(self):
         """Testing the POST validation/diffs/ API
         with source files not found
         """
@@ -83,7 +83,7 @@ class ResourceTests(BaseWebAPITestCase):
         self.assertEqual(rsp['file'], 'missing-file')
         self.assertEqual(rsp['revision'], 'd6613f0')
 
-    def test_post_diff_with_parse_error(self):
+    def test_post_with_parse_error(self):
         """Testing the POST validation/diffs/ API with a malformed diff file"""
         repository = self.create_repository(tool_name='Test')
 
diff --git a/reviewboard/webapi/tests/test_watched_review_group.py b/reviewboard/webapi/tests/test_watched_review_group.py
index 40b38e4be7b159dd9f6ca69492e80fdc8163acb2..a9033e0eaf64abc97b95acbce07fc4e6ed2856fe 100644
--- a/reviewboard/webapi/tests/test_watched_review_group.py
+++ b/reviewboard/webapi/tests/test_watched_review_group.py
@@ -19,7 +19,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_watched_review_groups(self):
+    def test_get(self):
         """Testing the GET users/<username>/watched/review-groups/ API"""
         group = self.create_review_group()
         profile = Profile.objects.get(user=self.user)
@@ -40,7 +40,7 @@ class ResourceListTests(BaseWebAPITestCase):
                              watched[id].name)
 
     @add_fixtures(['test_site'])
-    def test_get_watched_review_groups_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET users/<username>/watched/review-groups/ API
         with a local site
         """
@@ -65,7 +65,7 @@ class ResourceListTests(BaseWebAPITestCase):
                              watched[id].name)
 
     @add_fixtures(['test_site'])
-    def test_get_watched_review_groups_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET users/<username>/watched/review-groups/ API
         with a local site and Permission Denied error
         """
@@ -80,7 +80,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_watched_review_group(self):
+    def test_post(self):
         """Testing the POST users/<username>/watched/review-groups/ API"""
         group = self.create_review_group()
 
@@ -94,7 +94,7 @@ class ResourceListTests(BaseWebAPITestCase):
 
         return group
 
-    def test_post_watched_review_group_with_does_not_exist_error(self):
+    def test_post_with_does_not_exist_error(self):
         """Testing the POST users/<username>/watched/review-groups/ API
         with Does Not Exist error
         """
@@ -106,7 +106,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_post_watched_review_group_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST users/<username>/watched/review-groups/ API
         with a local site
         """
@@ -125,7 +125,7 @@ class ResourceListTests(BaseWebAPITestCase):
         return group
 
     @add_fixtures(['test_site'])
-    def test_post_watched_review_group_with_site_does_not_exist_error(self):
+    def test_post_with_site_does_not_exist_error(self):
         """Testing the POST users/<username>/watched/review-groups/ API
         with a local site and Does Not Exist error
         """
@@ -139,7 +139,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_post_watched_review_group_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST users/<username>/watched/review-groups/ API
         with a local site and Permission Denied error
         """
@@ -160,7 +160,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_watched_review_group(self):
+    def test_delete(self):
         """Testing the DELETE users/<username>/watched/review-groups/<id>/ API
         """
         # First, star it.
@@ -173,7 +173,7 @@ class ResourceItemTests(BaseWebAPITestCase):
 
         self.assertFalse(group in profile.starred_groups.all())
 
-    def test_delete_watched_review_group_with_does_not_exist_error(self):
+    def test_delete_with_does_not_exist_error(self):
         """Testing the DELETE users/<username>/watched/review-groups/<id>/ API
         with Does Not Exist error
         """
@@ -185,7 +185,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_delete_watched_review_group_with_site(self):
+    def test_delete_with_site(self):
         """Testing the DELETE users/<username>/watched/review-groups/<id>/ API
         with a local site
         """
@@ -200,7 +200,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertFalse(group in profile.starred_groups.all())
 
     @add_fixtures(['test_site'])
-    def test_delete_watched_review_group_with_site_no_access(self):
+    def test_delete_with_site_no_access(self):
         """Testing the DELETE users/<username>/watched/review-groups/<id>/ API
         with a local site and Permission Denied error
         """
diff --git a/reviewboard/webapi/tests/test_watched_review_request.py b/reviewboard/webapi/tests/test_watched_review_request.py
index b6c15b8ff175156b20b0c671a906a8ab122f6e54..9281ac0c8f569c3b294f9931c345f518ca5ef906 100644
--- a/reviewboard/webapi/tests/test_watched_review_request.py
+++ b/reviewboard/webapi/tests/test_watched_review_request.py
@@ -19,7 +19,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP GET tests
     #
 
-    def test_get_watched_review_requests(self):
+    def test_get(self):
         """Testing the GET users/<username>/watched/review_request/ API"""
         review_request = self.create_review_request(publish=True)
         profile = Profile.objects.get(user=self.user)
@@ -43,7 +43,7 @@ class ResourceListTests(BaseWebAPITestCase):
                 apiwatched[i]['watched_review_request']['summary'])
 
     @add_fixtures(['test_site'])
-    def test_get_watched_review_requests_with_site(self):
+    def test_get_with_site(self):
         """Testing the GET users/<username>/watched/review_request/ API
         with a local site
         """
@@ -72,7 +72,7 @@ class ResourceListTests(BaseWebAPITestCase):
                 apiwatched[i]['watched_review_request']['summary'])
 
     @add_fixtures(['test_site'])
-    def test_get_watched_review_requests_with_site_no_access(self):
+    def test_get_with_site_no_access(self):
         """Testing the GET users/<username>/watched/review_request/ API
         with a local site and Permission Denied error
         """
@@ -84,7 +84,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], PERMISSION_DENIED.code)
 
     @add_fixtures(['test_site'])
-    def test_get_watched_review_requests_with_site_does_not_exist(self):
+    def test_get_with_site_does_not_exist(self):
         """Testing the GET users/<username>/watched/review_request/ API
         with a local site and Does Not Exist error
         """
@@ -100,7 +100,7 @@ class ResourceListTests(BaseWebAPITestCase):
     # HTTP POST tests
     #
 
-    def test_post_watched_review_request(self):
+    def test_post(self):
         """Testing the POST users/<username>/watched/review-request/ API"""
         review_request = self.create_review_request(publish=True)
         rsp = self.apiPost(
@@ -112,7 +112,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertTrue(review_request in
                         profile.starred_review_requests.all())
 
-    def test_post_watched_review_request_with_does_not_exist_error(self):
+    def test_post_with_does_not_exist_error(self):
         """Testing the POST users/<username>/watched/review_request/
         with Does Not Exist error
         """
@@ -124,7 +124,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_post_watched_review_request_with_site(self):
+    def test_post_with_site(self):
         """Testing the POST users/<username>/watched/review_request/ API
         with a local site
         """
@@ -146,7 +146,7 @@ class ResourceListTests(BaseWebAPITestCase):
         return review_request
 
     @add_fixtures(['test_site'])
-    def test_post_watched_review_request_with_site_does_not_exist_error(self):
+    def test_post_with_site_does_not_exist_error(self):
         """Testing the POST users/<username>/watched/review_request/ API
         with a local site and Does Not Exist error
         """
@@ -161,7 +161,7 @@ class ResourceListTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_post_watched_review_request_with_site_no_access(self):
+    def test_post_with_site_no_access(self):
         """Testing the POST users/<username>/watched/review_request/ API
         with a local site and Permission Denied error
         """
@@ -182,7 +182,7 @@ class ResourceItemTests(BaseWebAPITestCase):
     # HTTP DELETE tests
     #
 
-    def test_delete_watched_review_request(self):
+    def test_delete(self):
         """Testing the DELETE users/<username>/watched/review_request/ API"""
         # First, star it.
         review_request = self.create_review_request(publish=True)
@@ -198,7 +198,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertTrue(review_request not in
                         profile.starred_review_requests.all())
 
-    def test_delete_watched_review_request_with_does_not_exist_error(self):
+    def test_delete_with_does_not_exist_error(self):
         """Testing the DELETE users/<username>/watched/review_request/ API
         with Does Not Exist error
         """
@@ -209,7 +209,7 @@ class ResourceItemTests(BaseWebAPITestCase):
         self.assertEqual(rsp['err']['code'], DOES_NOT_EXIST.code)
 
     @add_fixtures(['test_site'])
-    def test_delete_watched_review_request_with_site(self):
+    def test_delete_with_site(self):
         """Testing the DELETE users/<username>/watched/review_request/ API
         with a local site
         """
@@ -225,7 +225,7 @@ class ResourceItemTests(BaseWebAPITestCase):
                         profile.starred_review_requests.all())
 
     @add_fixtures(['test_site'])
-    def test_delete_watched_review_request_with_site_no_access(self):
+    def test_delete_with_site_no_access(self):
         """Testing the DELETE users/<username>/watched/review_request/ API
         with a local site and Permission Denied error
         """