diff --git a/.travis.yml b/.travis.yml
index 7292060ab31259d12d708b3b364d9636f00f8da5..b45f05ec05ff5a754b6f0033c98db5623c0314d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,5 +14,4 @@ before_script:
   - pip install -r test_requirements.txt --use-mirrors
 
 script: 
-  #- py.test --pep8 mwclient -v --doctest-modules tests/client-test.py
-  - py.test -v --doctest-modules tests/client-test.py
+  - py.test --pep8 mwclient -v --doctest-modules tests/client-test.py
diff --git a/mwclient/listing.py b/mwclient/listing.py
index 0f5a4bb8560b9bbf7a3583ae42616ce039bbc829..9fc9e298c35f7701c0a773f2d2adc0ff71316a36 100644
--- a/mwclient/listing.py
+++ b/mwclient/listing.py
@@ -83,7 +83,7 @@ class List(object):
     def generate_kwargs(_prefix, *args, **kwargs):
         kwargs.update(args)
         for key, value in kwargs.iteritems():
-            if value != None:
+            if value is not None:
                 yield _prefix + key, value
 
     @staticmethod
diff --git a/mwclient/page.py b/mwclient/page.py
index 66e77dad8eea68cdf4392df7f6ae0f2aac76337c..bbeeaeec0d65f3c62e437c9204445695f2c8868f 100644
--- a/mwclient/page.py
+++ b/mwclient/page.py
@@ -67,7 +67,7 @@ class Page(object):
     def resolve_redirect(self):
         """ Returns the redirect target page, or the current page if it's not a redirect page."""
         target_page = self.redirects_to()
-        if target_page == None:
+        if target_page is None:
             return self
         else:
             return target_page
@@ -205,7 +205,7 @@ class Page(object):
             self.last_rev_time = client.parse_timestamp(result['newtimestamp'])
         return result['edit']
 
-    def handle_edit_error(self, e,  summary):
+    def handle_edit_error(self, e, summary):
         if e.code == 'editconflict':
             raise errors.EditError(self, summary, e.info)
         elif e.code in ('protectedtitle', 'cantcreate', 'cantcreate-anon', 'noimageredirect-anon',
diff --git a/mwclient/page_nowriteapi.py b/mwclient/page_nowriteapi.py
index cfca4030be51e3260c66bba9a8941c7f8b7eef6c..d6f68cdb7a0cc7c896bd399e3ac526b1fb9a75ef 100644
--- a/mwclient/page_nowriteapi.py
+++ b/mwclient/page_nowriteapi.py
@@ -37,7 +37,7 @@ class OldPage(object):
         if page.data:
             if page.readonly:
                 raise errors.ProtectedPageError(self)
-            self.get_token('edit',  True)
+            self.get_token('edit', True)
             raise errors.EditError(page.title, data)
 
     @staticmethod
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000000000000000000000000000000000000..7ad3f7d55bce5863baf11824f92864a05f0b5a39
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+pep8ignore = E501 W602