diff --git a/lower-constraints.txt b/lower-constraints.txt
index 798cbe34a..a6f8c7389 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -54,8 +54,6 @@ linecache2==1.0.0
 logutils==0.3.5
 Mako==1.0.7
 MarkupSafe==1.0
-mccabe==0.2.1
-mock==2.0.0
 monotonic==1.4
 mox3==0.25.0
 msgpack==0.5.6
diff --git a/test-requirements.txt b/test-requirements.txt
index 5f845e04f..f27760e18 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,12 +2,13 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+# Hacking already pins down pep8, pyflakes and flake8
+hacking>=3.0.1,<3.1.0 # Apache-2.0
 
 bandit>=1.1.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-hacking>=3.0.1,<3.1.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 osprofiler>=1.4.0 # Apache-2.0
 os-testr>=1.0.0 # Apache-2.0
diff --git a/zun/container/docker/driver.py b/zun/container/docker/driver.py
index 561d9e128..ed117783d 100644
--- a/zun/container/docker/driver.py
+++ b/zun/container/docker/driver.py
@@ -1062,8 +1062,8 @@ class DockerDriver(driver.BaseDriver, driver.ContainerDriver,
             labels = {}
             slabels = info['Labels']
             if slabels:
-                for l in slabels:
-                    kv = l.split("=")
+                for slabel in slabels:
+                    kv = slabel.split("=")
                     label = {kv[0]: kv[1]}
                     labels.update(label)
             runtimes = []