diff --git a/zerver/lib/test_helpers.py b/zerver/lib/test_helpers.py
index 7c4ceaff4a..5aeb90534f 100644
--- a/zerver/lib/test_helpers.py
+++ b/zerver/lib/test_helpers.py
@@ -423,7 +423,9 @@ class AuthedTestCase(TestCase):
         # Check the correct message was sent
         msg = self.get_last_message()
         self.assertEqual(msg.sender.email, email)
-        self.assertEqual(get_display_recipient(msg.recipient), stream_name)
+        if stream_name is not None:
+            self.assertEqual(get_display_recipient(msg.recipient), stream_name)
+        # TODO: should also validate recipient for private messages
 
         return msg
 
diff --git a/zerver/tests/test_hooks.py b/zerver/tests/test_hooks.py
index 028b8ca45c..769ec8c9bd 100644
--- a/zerver/tests/test_hooks.py
+++ b/zerver/tests/test_hooks.py
@@ -45,12 +45,12 @@ class WebhookTestCase(AuthedTestCase):
         if content_type is not None:
             kwargs['content_type'] = content_type
 
-        result = self.client.post(self.url, payload, content_type=content_type)
-        self.assert_json_success(result)
-
-        msg = self.get_last_message()
+        msg = self.send_json_payload(self.TEST_USER_EMAIL, self.url, payload,
+                                     stream_name=None, **kwargs)
         self.do_test_message(msg, expected_message)
 
+        return msg
+
     def build_webhook_url(self):
         # type: () -> text_type
         api_key = self.get_api_key(self.TEST_USER_EMAIL)