diff --git a/zerver/tests/test_hooks.py b/zerver/tests/test_hooks.py
index c6ff423dd5..cd3cdb71b1 100644
--- a/zerver/tests/test_hooks.py
+++ b/zerver/tests/test_hooks.py
@@ -934,13 +934,12 @@ class PagerDutyHookTests(WebhookTestCase):
 
     def test_bad_message(self):
         # type: () -> None
-        expected_message = 'Unknown pagerduty message\n``` py\n{u\'type\': u\'incident.triggered\'}\n```'
+        expected_message = 'Unknown pagerduty message\n```\n{\n  "type":"incident.triggered"\n}\n```'
         self.send_and_test_stream_message('bad_message_type', u"pagerduty", expected_message)
 
-    @skip_py3
     def test_unknown_message_type(self):
         # type: () -> None
-        expected_message = 'Unknown pagerduty message\n``` py\n{u\'type\': u\'foo\'}\n```'
+        expected_message = 'Unknown pagerduty message\n```\n{\n  "type":"foo"\n}\n```'
         self.send_and_test_stream_message('unknown_message_type', u"pagerduty", expected_message)
 
 class TravisHookTests(WebhookTestCase):
diff --git a/zerver/views/webhooks/pagerduty.py b/zerver/views/webhooks/pagerduty.py
index 3c28efae00..b6f6afab05 100644
--- a/zerver/views/webhooks/pagerduty.py
+++ b/zerver/views/webhooks/pagerduty.py
@@ -75,9 +75,9 @@ def send_raw_pagerduty_json(user_profile, client, stream, message, topic):
     subject = topic or 'pagerduty'
     body = (
         u'Unknown pagerduty message\n'
-        u'``` py\n'
+        u'```\n'
         u'%s\n'
-        u'```') % (pprint.pformat(message),)
+        u'```') % (ujson.dumps(message, indent=2),)
     check_send_message(user_profile, client, 'stream',
                        [stream], subject, body)