diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index 5deae1c4d..1c128e81f 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -1,5 +1,4 @@
 import json
-import six
 
 from mock import Mock
 
diff --git a/tests/test_terms_auth.py b/tests/test_terms_auth.py
index b1b0f2a8c..06b68f0a7 100644
--- a/tests/test_terms_auth.py
+++ b/tests/test_terms_auth.py
@@ -19,13 +19,11 @@ from mock import Mock
 
 from twisted.test.proto_helpers import MemoryReactorClock
 
-from synapse.api.errors import InteractiveAuthIncompleteError
-from synapse.http.server import JsonResource
 from synapse.rest.client.v2_alpha.register import register_servlets
 from synapse.util import Clock
 
 from tests import unittest
-from tests.server import make_request, render, setup_test_homeserver
+from tests.server import make_request
 
 
 class TermsTestCase(unittest.HomeserverTestCase):
@@ -114,8 +112,8 @@ class TermsTestCase(unittest.HomeserverTestCase):
         request, channel = make_request(b"POST", self.url, request_data)
         self.render(request)
 
-        # We're interested in getting a response that looks like a successful registration,
-        # not so much that the details are exactly what we want.
+        # We're interested in getting a response that looks like a successful
+        # registration, not so much that the details are exactly what we want.
 
         self.assertEquals(channel.result["code"], b"200", channel.result)