diff --git a/src/_zkapauthorizer/_storage_server.py b/src/_zkapauthorizer/_storage_server.py
index aebccdcf3acb339977a2575505d46c9af6d3842a..5d94598ff08f6fbd0d17db9db524a5bd2144e7ae 100644
--- a/src/_zkapauthorizer/_storage_server.py
+++ b/src/_zkapauthorizer/_storage_server.py
@@ -26,7 +26,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -48,7 +48,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import timedelta
 from errno import ENOENT
diff --git a/src/_zkapauthorizer/controller.py b/src/_zkapauthorizer/controller.py
index b30ed608a37be5b19e408dce3c1b53f2e0b95d12..f9536b26b812cb423fa299c92e9195188c78a09d 100644
--- a/src/_zkapauthorizer/controller.py
+++ b/src/_zkapauthorizer/controller.py
@@ -22,7 +22,29 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
+    from future.builtins import (
+        filter,
+        map,
+        zip,
+        ascii,
+        chr,
+        hex,
+        input,
+        next,
+        oct,
+        open,
+        pow,
+        round,
+        super,
+        bytes,
+        dict,
+        list,
+        object,
+        range,
+        str,
+        max,
+        min,
+    )  # noqa: F401
 
 from base64 import b64decode, b64encode
 from datetime import timedelta
diff --git a/src/_zkapauthorizer/eliot.py b/src/_zkapauthorizer/eliot.py
index 8daabaa712386c1b705cece6491d8b27fb9440e4..82676056076227173976cfa56f502935e02565f0 100644
--- a/src/_zkapauthorizer/eliot.py
+++ b/src/_zkapauthorizer/eliot.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from eliot import ActionType, Field, MessageType
 
diff --git a/src/_zkapauthorizer/model.py b/src/_zkapauthorizer/model.py
index e6834f11f37445bd6e90bfdf6bf491acfd731fdc..7caa8efa5b11357dc1cec9475f20cd3e8ba63957 100644
--- a/src/_zkapauthorizer/model.py
+++ b/src/_zkapauthorizer/model.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -44,7 +44,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import datetime
 from functools import wraps
diff --git a/src/_zkapauthorizer/resource.py b/src/_zkapauthorizer/resource.py
index 556983ed8563b7bb940c2876054cb56192d81106..9dbb51e2fe57385510b5cfe19d74605a9a5c2b7f 100644
--- a/src/_zkapauthorizer/resource.py
+++ b/src/_zkapauthorizer/resource.py
@@ -26,7 +26,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -48,7 +48,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from itertools import islice
 from json import dumps, load, loads
diff --git a/src/_zkapauthorizer/storage_common.py b/src/_zkapauthorizer/storage_common.py
index 2ddd2a8438552206e2bd0df462f891ba85b3ff26..b847073a5cc7a1c857ff2d9874b087ceae2397c0 100644
--- a/src/_zkapauthorizer/storage_common.py
+++ b/src/_zkapauthorizer/storage_common.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from base64 import b64encode
 
diff --git a/src/_zkapauthorizer/tests/strategies.py b/src/_zkapauthorizer/tests/strategies.py
index eef58788c61c4688902f1e8798d9d7d69e9c70de..7f29860e6046ce6e4bdab528e844210bc1193329 100644
--- a/src/_zkapauthorizer/tests/strategies.py
+++ b/src/_zkapauthorizer/tests/strategies.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from base64 import b64encode, urlsafe_b64encode
 from datetime import datetime, timedelta
diff --git a/src/_zkapauthorizer/tests/test_client_resource.py b/src/_zkapauthorizer/tests/test_client_resource.py
index c9ef7675bef5e62fc66f99bc1f37390c404feda8..f559b3e135bb34db7289ce8186bd88dac9fa84ff 100644
--- a/src/_zkapauthorizer/tests/test_client_resource.py
+++ b/src/_zkapauthorizer/tests/test_client_resource.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -44,7 +44,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import datetime
 from io import BytesIO
diff --git a/src/_zkapauthorizer/tests/test_plugin.py b/src/_zkapauthorizer/tests/test_plugin.py
index e3d1f71c433807f54790ceae428f5243b5044583..831f4236734cbce2c2300c612881137bd111709b 100644
--- a/src/_zkapauthorizer/tests/test_plugin.py
+++ b/src/_zkapauthorizer/tests/test_plugin.py
@@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -43,7 +43,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from datetime import timedelta
 from functools import partial
diff --git a/src/_zkapauthorizer/tests/test_pricecalculator.py b/src/_zkapauthorizer/tests/test_pricecalculator.py
index ab8990ffa9281909239e4f6f6588b8ea459e9631..b69135bfd988c5b43d9a8640ed829e559c8c9171 100644
--- a/src/_zkapauthorizer/tests/test_pricecalculator.py
+++ b/src/_zkapauthorizer/tests/test_pricecalculator.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from future.utils import PY2
 
 if PY2:
-    from future.builtins import (
+    from future.builtins import (  # noqa: F401
         filter,
         map,
         zip,
@@ -44,7 +44,7 @@ if PY2:
         str,
         max,
         min,
-    )  # noqa: F401
+    )
 
 from functools import partial