diff --git a/.mailmap b/.mailmap
index ac9e6535..173333be 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,3 +17,4 @@
 <jeblair@hp.com> <james.blair@rackspace.com>
 <chris@pistoncloud.com> <chris@slicehost.com>
 <ken.pepple@gmail.com> <ken.pepple@rabbityard.com>
+Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
diff --git a/glance/common/utils.py b/glance/common/utils.py
index 919c1b98..68ddd1d7 100644
--- a/glance/common/utils.py
+++ b/glance/common/utils.py
@@ -386,7 +386,7 @@ def get_terminal_size():
 
     height_width = func.get(platform.os.name, _get_terminal_size_unknownOS)()
 
-    if height_width == None:
+    if height_width is None:
         raise exception.Invalid()
 
     for i in height_width:
diff --git a/glance/registry/client.py b/glance/registry/client.py
index e39c125e..d3390af1 100644
--- a/glance/registry/client.py
+++ b/glance/registry/client.py
@@ -89,8 +89,8 @@ class RegistryClient(BaseClient):
                   action, **kwargs)
             status = res.status
             request_id = res.getheader('x-openstack-request-id')
-            msg = _("Registry request %(method)s %(action)s HTTP %(status)s"\
-                  " request id %(request_id)s")
+            msg = _("Registry request %(method)s %(action)s HTTP %(status)s"
+                    " request id %(request_id)s")
             LOG.debug(msg % locals())
 
         except:
diff --git a/tools/test-requires b/tools/test-requires
index 5783b28e..0a891138 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -11,7 +11,7 @@ nose
 nose-exclude
 openstack.nose_plugin>=0.7
 nosehtmloutput>=0.0.3
-pep8==1.1
+pep8==1.3.3
 sphinx>=1.1.2
 requests
 
diff --git a/tox.ini b/tox.ini
index 918ea876..c3368a9e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,8 @@ commands = nosetests {posargs}
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack .
+deps = pep8==1.3.3
+commands = pep8 --ignore=E121,E122,E123,E124,E125,E126,E127,E128,E711 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack .
 
 [testenv:cover]
 setenv = NOSE_WITH_COVERAGE=1