diff --git a/zerver/lib/test_helpers.py b/zerver/lib/test_helpers.py
index 579004039f..27171bdcb9 100644
--- a/zerver/lib/test_helpers.py
+++ b/zerver/lib/test_helpers.py
@@ -233,6 +233,9 @@ class AuthedTestCase(TestCase):
     def client_post(self, url, info={}, **kwargs):
         return self.client.post(url, info, **kwargs)
 
+    def client_get(self, url, info={}, **kwargs):
+        return self.client.get(url, info, **kwargs)
+
     def login_with_return(self, email, password=None):
         # type: (text_type, Optional[text_type]) -> HttpResponse
         if password is None:
@@ -315,7 +318,7 @@ class AuthedTestCase(TestCase):
         # type: (int, int, int) -> List[Dict[str, Any]]
         post_params = {"anchor": anchor, "num_before": num_before,
                        "num_after": num_after}
-        result = self.client.get("/json/messages", dict(post_params))
+        result = self.client_get("/json/messages", dict(post_params))
         data = ujson.loads(result.content)
         return data['messages']
 
diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py
index e74bc71e8b..17d37f2a21 100644
--- a/zerver/tests/test_auth_backends.py
+++ b/zerver/tests/test_auth_backends.py
@@ -235,7 +235,7 @@ class DevFetchAPIKeyTest(AuthedTestCase):
 class DevGetEmailsTest(AuthedTestCase):
     def test_success(self):
         # type: () -> None
-        result = self.client.get("/api/v1/dev_get_emails")
+        result = self.client_get("/api/v1/dev_get_emails")
         self.assert_json_success(result)
         self.assert_in_response("direct_admins", result)
         self.assert_in_response("direct_users", result)
@@ -243,13 +243,13 @@ class DevGetEmailsTest(AuthedTestCase):
     def test_dev_auth_disabled(self):
         # type: () -> None
         with mock.patch('zerver.views.dev_auth_enabled', return_value=False):
-            result = self.client.get("/api/v1/dev_get_emails")
+            result = self.client_get("/api/v1/dev_get_emails")
             self.assert_json_error_contains(result, "Dev environment not enabled.", 400)
 
 class FetchAuthBackends(AuthedTestCase):
     def test_fetch_auth_backend_format(self):
         # type: () -> None
-        result = self.client.get("/api/v1/get_auth_backends")
+        result = self.client_get("/api/v1/get_auth_backends")
         self.assert_json_success(result)
         data = ujson.loads(result.content)
         self.assertEqual(set(data.keys()),
@@ -261,7 +261,7 @@ class FetchAuthBackends(AuthedTestCase):
         # type: () -> None
         backends = [GoogleMobileOauth2Backend(), DevAuthBackend()]
         with mock.patch('django.contrib.auth.get_backends', return_value=backends):
-            result = self.client.get("/api/v1/get_auth_backends")
+            result = self.client_get("/api/v1/get_auth_backends")
             self.assert_json_success(result)
             data = ujson.loads(result.content)
             self.assertEqual(data, {
diff --git a/zerver/tests/test_decorators.py b/zerver/tests/test_decorators.py
index 4b5380d733..c0b10bd43a 100644
--- a/zerver/tests/test_decorators.py
+++ b/zerver/tests/test_decorators.py
@@ -487,30 +487,30 @@ class LoginRequiredTest(AuthedTestCase):
         user_profile = get_user_profile_by_email(email)
 
         # Verify fails if logged-out
-        result = self.client.get('/accounts/accept_terms/')
+        result = self.client_get('/accounts/accept_terms/')
         self.assertEqual(result.status_code, 302)
 
         # Verify succeeds once logged-in
         self.login(email)
-        result = self.client.get('/accounts/accept_terms/')
+        result = self.client_get('/accounts/accept_terms/')
         self.assert_in_response("I agree to the", result)
 
         # Verify fails if user deactivated (with session still valid)
         user_profile.is_active = False
         user_profile.save()
-        result = self.client.get('/accounts/accept_terms/')
+        result = self.client_get('/accounts/accept_terms/')
         self.assertEqual(result.status_code, 302)
 
         # Verify succeeds if user reactivated
         do_reactivate_user(user_profile)
         self.login(email)
-        result = self.client.get('/accounts/accept_terms/')
+        result = self.client_get('/accounts/accept_terms/')
         self.assert_in_response("I agree to the", result)
 
         # Verify fails if realm deactivated
         user_profile.realm.deactivated = True
         user_profile.realm.save()
-        result = self.client.get('/accounts/accept_terms/')
+        result = self.client_get('/accounts/accept_terms/')
         self.assertEqual(result.status_code, 302)
 
 class FetchAPIKeyTest(AuthedTestCase):
diff --git a/zerver/tests/test_i18n.py b/zerver/tests/test_i18n.py
index 0ed26365c3..204f9b6c90 100644
--- a/zerver/tests/test_i18n.py
+++ b/zerver/tests/test_i18n.py
@@ -88,7 +88,7 @@ class JsonTranslationTestCase(AuthedTestCase):
         mock_gettext.return_value = dummy_value
 
         self.login("hamlet@zulip.com")
-        result = self.client.get("/de/accounts/login/jwt/")
+        result = self.client_get("/de/accounts/login/jwt/")
 
         self.assert_json_error_contains(result,
                                         dummy_value,
diff --git a/zerver/tests/test_management_commands.py b/zerver/tests/test_management_commands.py
index 085fd83b71..8133549038 100644
--- a/zerver/tests/test_management_commands.py
+++ b/zerver/tests/test_management_commands.py
@@ -72,7 +72,7 @@ class TestGenerateRealmCreationLink(AuthedTestCase):
 
         with self.settings(OPEN_REALM_CREATION=False):
             # Check realm creation page is accessible
-            result = self.client.get(generated_link)
+            result = self.client_get(generated_link)
             self.assertEquals(result.status_code, 200)
             self.assert_in_response(u"Let's get started…", result)
 
@@ -82,11 +82,11 @@ class TestGenerateRealmCreationLink(AuthedTestCase):
             self.assertEquals(result.status_code, 302)
             self.assertTrue(result["Location"].endswith(
                     "/accounts/send_confirm/%s@%s" % (username, domain)))
-            result = self.client.get(result["Location"])
+            result = self.client_get(result["Location"])
             self.assert_in_response("Check your email so we can get started.", result)
 
             # Generated link used for creating realm
-            result = self.client.get(generated_link)
+            result = self.client_get(generated_link)
             self.assertEquals(result.status_code, 200)
             self.assert_in_response("The organization creation link has been expired or is not valid.", result)
 
@@ -94,7 +94,7 @@ class TestGenerateRealmCreationLink(AuthedTestCase):
         with self.settings(OPEN_REALM_CREATION=False):
             # Realm creation attempt with an invalid link should fail
             random_link = "/create_realm/5e89081eb13984e0f3b130bf7a4121d153f1614b"
-            result = self.client.get(random_link)
+            result = self.client_get(random_link)
             self.assertEquals(result.status_code, 200)
             self.assert_in_response("The organization creation link has been expired or is not valid.", result)
 
@@ -107,6 +107,6 @@ class TestGenerateRealmCreationLink(AuthedTestCase):
             obj.date_created = obj.date_created - timedelta(days=settings.REALM_CREATION_LINK_VALIDITY_DAYS + 1)
             obj.save()
 
-            result = self.client.get(generated_link)
+            result = self.client_get(generated_link)
             self.assertEquals(result.status_code, 200)
             self.assert_in_response("The organization creation link has been expired or is not valid.", result)
diff --git a/zerver/tests/test_narrow.py b/zerver/tests/test_narrow.py
index 9aeb014206..3fa41cc2ce 100644
--- a/zerver/tests/test_narrow.py
+++ b/zerver/tests/test_narrow.py
@@ -303,7 +303,7 @@ class GetOldMessagesTest(AuthedTestCase):
     def get_and_check_messages(self, modified_params):
         post_params = {"anchor": 1, "num_before": 1, "num_after": 1}
         post_params.update(modified_params)
-        payload = self.client.get("/json/messages", dict(post_params))
+        payload = self.client_get("/json/messages", dict(post_params))
         self.assert_json_success(payload)
         result = ujson.loads(payload.content)
 
@@ -579,7 +579,7 @@ class GetOldMessagesTest(AuthedTestCase):
 
         for i in range(len(required_args)):
             post_params = dict(required_args[:i] + required_args[i + 1:])
-            result = self.client.get("/json/messages", post_params)
+            result = self.client_get("/json/messages", post_params)
             self.assert_json_error(result,
                                    "Missing '%s' argument" % (required_args[i][0],))
 
@@ -602,7 +602,7 @@ class GetOldMessagesTest(AuthedTestCase):
                                        [(other_param, 0) for other_param in \
                                             int_params[:idx] + int_params[idx + 1:]]
                                    )
-                result = self.client.get("/json/messages", post_params)
+                result = self.client_get("/json/messages", post_params)
                 self.assert_json_error(result,
                                        "Bad value for '%s': %s" % (param, type))
 
@@ -618,7 +618,7 @@ class GetOldMessagesTest(AuthedTestCase):
             '{foo: 3}', '[1,2]', '[["x","y","z"]]')
         for type in bad_types:
             post_params = dict(other_params + [("narrow", type)])
-            result = self.client.get("/json/messages", post_params)
+            result = self.client_get("/json/messages", post_params)
             self.assert_json_error(result,
                                    "Bad value for 'narrow': %s" % (type,))
 
@@ -640,7 +640,7 @@ class GetOldMessagesTest(AuthedTestCase):
         for operator in ['', 'foo', 'stream:verona', '__init__']:
             narrow = [dict(operator=operator, operand='')]
             params = dict(anchor=0, num_before=0, num_after=0, narrow=ujson.dumps(narrow))
-            result = self.client.get("/json/messages", params)
+            result = self.client_get("/json/messages", params)
             self.assert_json_error_contains(result,
                 "Invalid narrow operator: unknown operator")
 
@@ -652,7 +652,7 @@ class GetOldMessagesTest(AuthedTestCase):
         not_a_string = 42
         narrow = [dict(operator='stream', operand=not_a_string)]
         params = dict(anchor=0, num_before=0, num_after=0, narrow=ujson.dumps(narrow))
-        result = self.client.get("/json/messages", params)
+        result = self.client_get("/json/messages", params)
         self.assert_json_error_contains(result, 'elem["operand"] is not a string')
 
     def exercise_bad_narrow_operand(self, operator, operands, error_msg):
@@ -660,7 +660,7 @@ class GetOldMessagesTest(AuthedTestCase):
         for operand in operands:
             post_params = dict(other_params + [
                 ("narrow", ujson.dumps([[operator, operand]]))])
-            result = self.client.get("/json/messages", post_params)
+            result = self.client_get("/json/messages", post_params)
             self.assert_json_error_contains(result, error_msg)
 
     def test_bad_narrow_stream_content(self):
diff --git a/zerver/tests/test_realm_emoji.py b/zerver/tests/test_realm_emoji.py
index 4957adaf4f..cee7565bc1 100644
--- a/zerver/tests/test_realm_emoji.py
+++ b/zerver/tests/test_realm_emoji.py
@@ -12,7 +12,7 @@ class RealmEmojiTest(AuthedTestCase):
         self.login("iago@zulip.com")
         realm = get_realm('zulip.com')
         check_add_realm_emoji(realm, "my_emoji", "https://example.com/my_emoji")
-        result = self.client.get("/json/realm/emoji")
+        result = self.client_get("/json/realm/emoji")
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
         content = ujson.loads(result.content)
@@ -26,7 +26,7 @@ class RealmEmojiTest(AuthedTestCase):
         self.assert_json_success(result)
         self.assertEqual(200, result.status_code)
 
-        result = self.client.get("/json/realm/emoji")
+        result = self.client_get("/json/realm/emoji")
         content = ujson.loads(result.content)
         self.assert_json_success(result)
         self.assertEqual(len(content["emoji"]), 1)
@@ -46,7 +46,7 @@ class RealmEmojiTest(AuthedTestCase):
         result = self.client_delete("/json/realm/emoji/my_emoji")
         self.assert_json_success(result)
 
-        result = self.client.get("/json/realm/emoji")
+        result = self.client_get("/json/realm/emoji")
         content = ujson.loads(result.content)
         self.assert_json_success(result)
         self.assertEqual(len(content["emoji"]), 0)
diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py
index cf59cfc09e..103908f58e 100644
--- a/zerver/tests/test_signup.py
+++ b/zerver/tests/test_signup.py
@@ -31,7 +31,7 @@ from six.moves import range
 import six
 from six import text_type
 
-class PublicURLTest(TestCase):
+class PublicURLTest(AuthedTestCase):
     """
     Account creation URLs are accessible even when not logged in. Authenticated
     URLs redirect to a page.
@@ -92,7 +92,7 @@ class PublicURLTest(TestCase):
     def test_get_gcid_when_not_configured(self):
         # type: () -> None
         with self.settings(GOOGLE_CLIENT_ID=None):
-            resp = self.client.get("/api/v1/fetch_google_client_id")
+            resp = self.client_get("/api/v1/fetch_google_client_id")
             self.assertEquals(400, resp.status_code,
                 msg="Expected 400, received %d for GET /api/v1/fetch_google_client_id" % resp.status_code,
             )
@@ -102,7 +102,7 @@ class PublicURLTest(TestCase):
     def test_get_gcid_when_configured(self):
         # type: () -> None
         with self.settings(GOOGLE_CLIENT_ID="ABCD"):
-            resp = self.client.get("/api/v1/fetch_google_client_id")
+            resp = self.client_get("/api/v1/fetch_google_client_id")
             self.assertEquals(200, resp.status_code,
                 msg="Expected 200, received %d for GET /api/v1/fetch_google_client_id" % resp.status_code,
             )
@@ -223,7 +223,7 @@ class LoginTest(AuthedTestCase):
         self.assertEquals(result.status_code, 302)
         self.assertTrue(result["Location"].endswith(
                 "/accounts/send_confirm/%s@%s" % (username, domain)))
-        result = self.client.get(result["Location"])
+        result = self.client_get(result["Location"])
         self.assert_in_response("Check your email so we can get started.", result)
 
         # Visit the confirmation link.
@@ -237,7 +237,7 @@ class LoginTest(AuthedTestCase):
         else:
             raise ValueError("Couldn't find a confirmation email.")
 
-        result = self.client.get(confirmation_url)
+        result = self.client_get(confirmation_url)
         self.assertEquals(result.status_code, 200)
 
         # Pick a password and agree to the ToS.
@@ -246,7 +246,7 @@ class LoginTest(AuthedTestCase):
         self.assertTrue(result["Location"].endswith("/invite/"))
 
         # Invite other users to join you.
-        result = self.client.get(result["Location"])
+        result = self.client_get(result["Location"])
         self.assert_in_response("You're the first one here!", result)
 
         # Reset the outbox for our invites.
@@ -500,7 +500,7 @@ class EmailUnsubscribeTests(AuthedTestCase):
 
         unsubscribe_link = one_click_unsubscribe_link(user_profile,
                                                       "missed_messages")
-        result = self.client.get(urllib.parse.urlparse(unsubscribe_link).path)
+        result = self.client_get(urllib.parse.urlparse(unsubscribe_link).path)
 
         self.assertEqual(result.status_code, 200)
         # Circumvent user_profile caching.
@@ -523,7 +523,7 @@ class EmailUnsubscribeTests(AuthedTestCase):
 
         # Simulate unsubscribing from the welcome e-mails.
         unsubscribe_link = one_click_unsubscribe_link(user_profile, "welcome")
-        result = self.client.get(urllib.parse.urlparse(unsubscribe_link).path)
+        result = self.client_get(urllib.parse.urlparse(unsubscribe_link).path)
 
         # The welcome email jobs are no longer scheduled.
         self.assertEqual(result.status_code, 200)
@@ -550,7 +550,7 @@ class EmailUnsubscribeTests(AuthedTestCase):
 
         # Simulate unsubscribing from digest e-mails.
         unsubscribe_link = one_click_unsubscribe_link(user_profile, "digest")
-        result = self.client.get(urllib.parse.urlparse(unsubscribe_link).path)
+        result = self.client_get(urllib.parse.urlparse(unsubscribe_link).path)
 
         # The setting is toggled off, and scheduled jobs have been removed.
         self.assertEqual(result.status_code, 200)
@@ -578,7 +578,7 @@ class RealmCreationTest(AuthedTestCase):
             self.assertEquals(result.status_code, 302)
             self.assertTrue(result["Location"].endswith(
                     "/accounts/send_confirm/%s@%s" % (username, domain)))
-            result = self.client.get(result["Location"])
+            result = self.client_get(result["Location"])
             self.assert_in_response("Check your email so we can get started.", result)
 
             # Visit the confirmation link.
@@ -592,7 +592,7 @@ class RealmCreationTest(AuthedTestCase):
             else:
                 raise ValueError("Couldn't find a confirmation email.")
 
-            result = self.client.get(confirmation_url)
+            result = self.client_get(confirmation_url)
             self.assertEquals(result.status_code, 200)
 
             result = self.submit_reg_form_for_user(username, password, domain)
@@ -607,5 +607,5 @@ class RealmCreationTest(AuthedTestCase):
 
             self.assertTrue(result["Location"].endswith("/invite/"))
 
-            result = self.client.get(result["Location"])
+            result = self.client_get(result["Location"])
             self.assert_in_response("You're the first one here!", result)
diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index 3b33f2b2d5..eb9764dbf5 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -282,7 +282,7 @@ class StreamAdminTest(AuthedTestCase):
         self.assertEqual(subscribers, [])
 
         # It doesn't show up in the list of public streams anymore.
-        result = self.client.get("/json/streams?include_subscribed=false")
+        result = self.client_get("/json/streams?include_subscribed=false")
         public_streams = [s["name"] for s in ujson.loads(result.content)["streams"]]
         self.assertNotIn(active_name, public_streams)
         self.assertNotIn(deactivated_stream_name, public_streams)
@@ -599,7 +599,7 @@ class SubscriptionPropertiesTest(AuthedTestCase):
         self.login(test_email)
         subs = gather_subscriptions(get_user_profile_by_email(test_email))[0]
 
-        result = self.client.get(
+        result = self.client_get(
             "/json/subscriptions/property",
             {"subscription_data": ujson.dumps([{"property": "in_home_view",
                                                 "stream": subs[0]["name"],
@@ -898,7 +898,7 @@ class SubscriptionAPITest(AuthedTestCase):
         Calling /api/v1/users/me/subscriptions should successfully return your subscriptions.
         """
         email = self.test_email
-        result = self.client.get("/api/v1/users/me/subscriptions", **self.api_auth(email))
+        result = self.client_get("/api/v1/users/me/subscriptions", **self.api_auth(email))
         self.assert_json_success(result)
         json = ujson.loads(result.content)
         self.assertIn("subscriptions", json)
@@ -1559,7 +1559,7 @@ class GetPublicStreamsTest(AuthedTestCase):
         email = 'hamlet@zulip.com'
         self.login(email)
 
-        result = self.client.get("/json/streams?include_subscribed=false")
+        result = self.client_get("/json/streams?include_subscribed=false")
 
         self.assert_json_success(result)
         json = ujson.loads(result.content)
@@ -1577,8 +1577,8 @@ class GetPublicStreamsTest(AuthedTestCase):
         self.login(email)
 
         # Check it correctly lists the user's subs with include_public=false
-        result = self.client.get("/api/v1/streams?include_public=false", **self.api_auth(email))
-        result2 = self.client.get("/api/v1/users/me/subscriptions", **self.api_auth(email))
+        result = self.client_get("/api/v1/streams?include_public=false", **self.api_auth(email))
+        result2 = self.client_get("/api/v1/users/me/subscriptions", **self.api_auth(email))
 
         self.assert_json_success(result)
         json = ujson.loads(result.content)
@@ -1594,7 +1594,7 @@ class GetPublicStreamsTest(AuthedTestCase):
                          sorted([s["name"] for s in json2["subscriptions"]]))
 
         # Check it correctly lists all public streams with include_subscribed=false
-        result = self.client.get("/api/v1/streams?include_public=true&include_subscribed=false",
+        result = self.client_get("/api/v1/streams?include_public=true&include_subscribed=false",
                                  **self.api_auth(email))
         self.assert_json_success(result)
 
@@ -1605,7 +1605,7 @@ class GetPublicStreamsTest(AuthedTestCase):
                          sorted(all_streams))
 
         # Check non-superuser can't use include_all_active
-        result = self.client.get("/api/v1/streams?include_all_active=true",
+        result = self.client_get("/api/v1/streams?include_all_active=true",
                                  **self.api_auth(email))
         self.assertEqual(result.status_code, 400)
 
@@ -1639,7 +1639,7 @@ class InviteOnlyStreamTest(AuthedTestCase):
         self.assert_json_success(result1)
         result2 = self.common_subscribe_to_streams(email, ["Normandy"], invite_only=False)
         self.assert_json_success(result2)
-        result = self.client.get("/api/v1/users/me/subscriptions", **self.api_auth(email))
+        result = self.client_get("/api/v1/users/me/subscriptions", **self.api_auth(email))
         self.assert_json_success(result)
         json = ujson.loads(result.content)
         self.assertIn("subscriptions", json)
@@ -1692,7 +1692,7 @@ class InviteOnlyStreamTest(AuthedTestCase):
         self.assertEqual(json["already_subscribed"], {})
 
         # Make sure both users are subscribed to this stream
-        result = self.client.get("/api/v1/streams/%s/members" % (stream_name,),
+        result = self.client_get("/api/v1/streams/%s/members" % (stream_name,),
                                  **self.api_auth(email))
         self.assert_json_success(result)
         json = ujson.loads(result.content)
@@ -1728,7 +1728,7 @@ class GetSubscribersTest(AuthedTestCase):
         # type: (text_type, Optional[str]) -> HttpResponse
         if email is None:
             email = self.email
-        return self.client.get("/api/v1/streams/%s/members" % (stream_name,),
+        return self.client_get("/api/v1/streams/%s/members" % (stream_name,),
                                **self.api_auth(email))
 
     def make_successful_subscriber_request(self, stream_name):
diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py
index e44221d9af..b042c0e71b 100644
--- a/zerver/tests/test_upload.py
+++ b/zerver/tests/test_upload.py
@@ -61,13 +61,13 @@ class FileUploadTest(AuthedTestCase):
 
         # Download file via API
         self.client_post('/accounts/logout/')
-        response = self.client.get(uri, **auth_headers)
+        response = self.client_get(uri, **auth_headers)
         data = b"".join(response.streaming_content)
         self.assertEquals(b"zulip!", data)
 
         # Files uploaded through the API should be accesible via the web client
         self.login("hamlet@zulip.com")
-        response = self.client.get(uri)
+        response = self.client_get(uri)
         data = b"".join(response.streaming_content)
         self.assertEquals(b"zulip!", data)
 
@@ -118,7 +118,7 @@ class FileUploadTest(AuthedTestCase):
 
         # In the future, local file requests will follow the same style as S3
         # requests; they will be first authenthicated and redirected
-        response = self.client.get(uri)
+        response = self.client_get(uri)
         data = b"".join(response.streaming_content)
         self.assertEquals(b"zulip!", data)
 
@@ -296,12 +296,12 @@ class AvatarTest(AuthedTestCase):
         cordelia.avatar_source = UserProfile.AVATAR_FROM_GRAVATAR
         cordelia.save()
         with self.settings(ENABLE_GRAVATAR=True):
-            response = self.client.get("/avatar/cordelia@zulip.com?foo=bar")
+            response = self.client_get("/avatar/cordelia@zulip.com?foo=bar")
             redirect_url = response['Location']
             self.assertEqual(redirect_url, avatar_url(cordelia) + '&foo=bar')
 
         with self.settings(ENABLE_GRAVATAR=False):
-            response = self.client.get("/avatar/cordelia@zulip.com?foo=bar")
+            response = self.client_get("/avatar/cordelia@zulip.com?foo=bar")
             redirect_url = response['Location']
             self.assertTrue(redirect_url.endswith(avatar_url(cordelia) + '&foo=bar'))
 
@@ -312,7 +312,7 @@ class AvatarTest(AuthedTestCase):
 
         cordelia.avatar_source = UserProfile.AVATAR_FROM_USER
         cordelia.save()
-        response = self.client.get("/avatar/cordelia@zulip.com?foo=bar")
+        response = self.client_get("/avatar/cordelia@zulip.com?foo=bar")
         redirect_url = response['Location']
         self.assertTrue(redirect_url.endswith(avatar_url(cordelia) + '&foo=bar'))
 
@@ -323,7 +323,7 @@ class AvatarTest(AuthedTestCase):
 
         cordelia.avatar_source = UserProfile.AVATAR_FROM_SYSTEM
         cordelia.save()
-        response = self.client.get("/avatar/cordelia@zulip.com?foo=bar")
+        response = self.client_get("/avatar/cordelia@zulip.com?foo=bar")
         redirect_url = response['Location']
         self.assertTrue(redirect_url.endswith(avatar_url(cordelia) + '&foo=bar'))
 
@@ -334,7 +334,7 @@ class AvatarTest(AuthedTestCase):
         # but this test just validates the current code's behavior.
         self.login("hamlet@zulip.com")
 
-        response = self.client.get("/avatar/nonexistent_user@zulip.com?foo=bar")
+        response = self.client_get("/avatar/nonexistent_user@zulip.com?foo=bar")
         redirect_url = response['Location']
         actual_url = 'https://secure.gravatar.com/avatar/444258b521f152129eb0c162996e572d?d=identicon&foo=bar'
         self.assertEqual(redirect_url, actual_url)
@@ -360,7 +360,7 @@ class AvatarTest(AuthedTestCase):
 
             if rfname is not None:
                 rfp = open(os.path.join(TEST_AVATAR_DIR, rfname), 'rb')
-                response = self.client.get(url)
+                response = self.client_get(url)
                 data = b"".join(response.streaming_content)
                 self.assertEquals(rfp.read(), data)
 
@@ -478,7 +478,7 @@ class S3Test(AuthedTestCase):
         base = '/user_uploads/'
         self.assertEquals(base, uri[:len(base)])
 
-        response = self.client.get(uri)
+        response = self.client_get(uri)
         redirect_url = response['Location']
 
         self.assertEquals(b"zulip!", urllib.request.urlopen(redirect_url).read().strip())
diff --git a/zerver/tests/tests.py b/zerver/tests/tests.py
index 157fbd0ff3..1da5bd6ef9 100644
--- a/zerver/tests/tests.py
+++ b/zerver/tests/tests.py
@@ -195,7 +195,7 @@ class PermissionTest(AuthedTestCase):
         do_change_is_admin(admin, True)
 
         # Make sure we see is_admin flag in /json/users
-        result = self.client.get('/json/users')
+        result = self.client_get('/json/users')
         self.assert_json_success(result)
         members = ujson.loads(result.content)['members']
         hamlet = find_dict(members, 'email', 'hamlet@zulip.com')
@@ -445,7 +445,7 @@ class ActivityTest(AuthedTestCase):
                 last_visit=last_visit
             )
         with queries_captured() as queries:
-            self.client.get('/activity')
+            self.client_get('/activity')
 
         self.assert_length(queries, 12)
 
@@ -535,7 +535,7 @@ class ActivateTest(AuthedTestCase):
 class BotTest(AuthedTestCase):
     def assert_num_bots_equal(self, count):
         # type: (int) -> None
-        result = self.client.get("/json/bots")
+        result = self.client_get("/json/bots")
         self.assert_json_success(result)
         json = ujson.loads(result.content)
         self.assertEqual(count, len(json['bots']))
@@ -595,7 +595,7 @@ class BotTest(AuthedTestCase):
             event['event']
         )
 
-        users_result = self.client.get('/json/users')
+        users_result = self.client_get('/json/users')
         members = ujson.loads(users_result.content)['members']
         bots = [m for m in members if m['email'] == 'hambot-bot@zulip.com']
         self.assertEqual(len(bots), 1)
@@ -866,7 +866,7 @@ class BotTest(AuthedTestCase):
 
     def get_bot(self):
         # type: () -> Dict[str, Any]
-        result = self.client.get("/json/bots")
+        result = self.client_get("/json/bots")
         bots = ujson.loads(result.content)['bots']
         return bots[0]
 
@@ -1382,7 +1382,7 @@ class GetProfileTest(AuthedTestCase):
         user_profile = get_user_profile_by_email(email)
         self.send_message(email, "Verona", Recipient.STREAM, "hello")
 
-        result = self.client.get("/api/v1/users/me", **self.api_auth(email))
+        result = self.client_get("/api/v1/users/me", **self.api_auth(email))
 
         max_id = most_recent_message(user_profile).id
 
@@ -1439,7 +1439,7 @@ class GetProfileTest(AuthedTestCase):
     def test_get_all_profiles_avatar_urls(self):
         # type: () -> None
         user_profile = get_user_profile_by_email('hamlet@zulip.com')
-        result = self.client.get("/api/v1/users", **self.api_auth('hamlet@zulip.com'))
+        result = self.client_get("/api/v1/users", **self.api_auth('hamlet@zulip.com'))
         self.assert_json_success(result)
         json = ujson.loads(result.content)
 
@@ -1639,7 +1639,7 @@ class AlertWordTests(AuthedTestCase):
         # type: () -> None
         self.login("hamlet@zulip.com")
 
-        result = self.client.get('/json/users/me/alert_words')
+        result = self.client_get('/json/users/me/alert_words')
         self.assert_json_success(result)
 
         data = ujson.loads(result.content)
@@ -1653,7 +1653,7 @@ class AlertWordTests(AuthedTestCase):
         self.assert_json_success(result)
 
 
-        result = self.client.get('/json/users/me/alert_words')
+        result = self.client_get('/json/users/me/alert_words')
         self.assert_json_success(result)
         data = ujson.loads(result.content)
         self.assertEqual(data['alert_words'], ['one', 'two', 'three'])
@@ -1668,7 +1668,7 @@ class AlertWordTests(AuthedTestCase):
         result = self.client_delete('/json/users/me/alert_words', {'alert_words': ujson.dumps(['one'])})
         self.assert_json_success(result)
 
-        result = self.client.get('/json/users/me/alert_words')
+        result = self.client_get('/json/users/me/alert_words')
         self.assert_json_success(result)
         data = ujson.loads(result.content)
         self.assertEqual(data['alert_words'], ['two', 'three'])
@@ -1683,7 +1683,7 @@ class AlertWordTests(AuthedTestCase):
         result = self.client_post('/json/users/me/alert_words', {'alert_words': ujson.dumps(['a', 'b', 'c'])})
         self.assert_json_success(result)
 
-        result = self.client.get('/json/users/me/alert_words')
+        result = self.client_get('/json/users/me/alert_words')
         self.assert_json_success(result)
         data = ujson.loads(result.content)
         self.assertEqual(data['alert_words'], ['a', 'b', 'c'])
@@ -1703,7 +1703,7 @@ class AlertWordTests(AuthedTestCase):
         result = self.client_put('/json/users/me/alert_words', {'alert_words': ujson.dumps(['one', 'two', 'three'])})
         self.assert_json_success(result)
 
-        result = self.client.get('/json/users/me/alert_words')
+        result = self.client_get('/json/users/me/alert_words')
         self.assert_json_success(result)
         data = ujson.loads(result.content)
         self.assertEqual(data['alert_words'], ['one', 'two', 'three'])
@@ -1828,7 +1828,7 @@ class HomeTest(AuthedTestCase):
         email = "hamlet@zulip.com"
 
         # Verify fails if logged-out
-        result = self.client.get('/')
+        result = self.client_get('/')
         self.assertEqual(result.status_code, 302)
 
         # Verify succeeds once logged-in
@@ -1836,7 +1836,7 @@ class HomeTest(AuthedTestCase):
         with \
                 patch('zerver.lib.actions.request_event_queue', return_value=42), \
                 patch('zerver.lib.actions.get_user_events', return_value=[]):
-            result = self.client.get('/', dict(stream='Denmark'))
+            result = self.client_get('/', dict(stream='Denmark'))
         html = result.content.decode('utf-8')
 
         for html_bit in html_bits: