diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index dd358536f1..2c1bcf66fd 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -219,7 +219,9 @@ class MatrixFederationHttpClient(object):
             Deferred[Dict]: Parsed JSON response body.
         """
         try:
-            response = yield self._send_request(request, backoff_on_404=backoff_on_404, **send_request_args)
+            response = yield self._send_request(
+                request, backoff_on_404=backoff_on_404, **send_request_args,
+            )
         except HttpResponseException as e:
             # Received an HTTP error > 300. Check if it meets the requirements
             # to retry with a trailing slash
@@ -234,7 +236,9 @@ class MatrixFederationHttpClient(object):
             # trailing slash on Synapse <= v0.99.3.
             request.path += "/"
 
-            response = yield self._send_request(request, backoff_on_404=backoff_on_404, **send_request_args)
+            response = yield self._send_request(
+                request, backoff_on_404=backoff_on_404, **send_request_args,
+            )
 
         defer.returnValue(response)
 
diff --git a/tests/http/test_fedclient.py b/tests/http/test_fedclient.py
index fbe87d4d0b..cd8e086f86 100644
--- a/tests/http/test_fedclient.py
+++ b/tests/http/test_fedclient.py
@@ -365,7 +365,7 @@ class FederationClientTests(HomeserverTestCase):
         self.assertEqual(conn.value(), b"")
 
         # We should get a 404 failure response
-        r = self.failureResultOf(d)
+        self.failureResultOf(d)
 
     def test_client_sends_body(self):
         self.cl.post_json(