diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index c4a82a22f5ce0e48dd73f378f614891e97fa9c05..4ef7496c80c420a4a08b4323cc32799d2c1c720a 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -127,7 +127,7 @@ mock==1.0.1
 nose-exclude
 nose-ignore-docstring
 nosexcover==1.0.7
-pep8==1.4.5
+pep8==1.5.7
 pylint==0.28
 python-subunit==0.0.16
 rednose==0.3
diff --git a/setup.cfg b/setup.cfg
index f5a7de158e7c0ba4d81e045c82fd1f5504d372fe..3ef65d1ecefadc4de15036195fae60f71b8f138d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,5 +16,5 @@ no-path-adjustment=1
 #pdb=1
 
 [pep8]
-ignore=E501
+ignore=E501,E265
 exclude=migrations