diff --git a/nodepool/nodedb.py b/nodepool/nodedb.py
index 021ce3d3d..791f78f49 100644
--- a/nodepool/nodedb.py
+++ b/nodepool/nodedb.py
@@ -255,7 +255,7 @@ class NodeDatabaseSession(object):
             snapshot_image_table.c.provider_name == provider_name,
             snapshot_image_table.c.image_name == image_name,
             snapshot_image_table.c.state == READY).order_by(
-            snapshot_image_table.c.version.desc()).all()
+                snapshot_image_table.c.version.desc()).all()
         return images
 
     def getCurrentSnapshotImage(self, provider_name, image_name):
diff --git a/test-requirements.txt b/test-requirements.txt
index 62ec67012..d5dcfcb89 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,5 @@
-flake8==2.0
+# Nodepool uses hacking for its dependencies
+hacking>=0.8,<0.9
 coverage
 sphinx>=1.1.2,<1.2
 docutils==0.9.1