diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py
index 03b3c3994..77baa3247 100644
--- a/_pytest/_code/code.py
+++ b/_pytest/_code/code.py
@@ -339,8 +339,8 @@ class Traceback(list):
                 loc = f.f_locals
                 for otherloc in l:
                     if f.is_true(f.eval(co_equal,
-                        __recursioncache_locals_1=loc,
-                        __recursioncache_locals_2=otherloc)):
+                            __recursioncache_locals_1=loc,
+                            __recursioncache_locals_2=otherloc)):
                         return i
             l.append(entry.frame.f_locals)
         return None
diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py
index 593e80b90..61069664e 100644
--- a/_pytest/fixtures.py
+++ b/_pytest/fixtures.py
@@ -205,7 +205,7 @@ def slice_items(items, ignore, scoped_argkeys_cache):
                     for item in it:
                         argkeys = scoped_argkeys_cache.get(item)
                         if argkeys and slicing_argkey in argkeys and \
-                            slicing_argkey not in ignore:
+                                slicing_argkey not in ignore:
                             items_same.append(item)
                         else:
                             items_other.append(item)
diff --git a/_pytest/pytester.py b/_pytest/pytester.py
index 768d922cf..9b124f57e 100644
--- a/_pytest/pytester.py
+++ b/_pytest/pytester.py
@@ -264,7 +264,7 @@ class HookRecorder:
         return [x.report for x in self.getcalls(names)]
 
     def matchreport(self, inamepart="",
-        names="pytest_runtest_logreport pytest_collectreport", when=None):
+            names="pytest_runtest_logreport pytest_collectreport", when=None):
         """ return a testreport whose dotted import path matches """
         l = []
         for rep in self.getreports(names=names):
@@ -298,7 +298,7 @@ class HookRecorder:
         skipped = []
         failed = []
         for rep in self.getreports(
-            "pytest_collectreport pytest_runtest_logreport"):
+                "pytest_collectreport pytest_runtest_logreport"):
             if rep.passed:
                 if getattr(rep, "when", None) == "call":
                     passed.append(rep)
diff --git a/_pytest/python.py b/_pytest/python.py
index 222f5d915..27b81247e 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -737,7 +737,7 @@ class Metafunc(fixtures.FuncargnamesCompatAttr):
         self._arg2fixturedefs = fixtureinfo.name2fixturedefs
 
     def parametrize(self, argnames, argvalues, indirect=False, ids=None,
-        scope=None):
+            scope=None):
         """ Add new invocations to the underlying test function using the list
         of argvalues for the given argnames.  Parametrization is performed
         during the collection phase.  If you need to setup expensive resources
diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index 2229beb07..6bf62292d 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -243,7 +243,7 @@ def pytest_runtest_makereport(item, call):
         rep.wasxfail = "reason: " + call.excinfo.value.msg
         rep.outcome = "skipped"
     elif evalxfail and not rep.skipped and evalxfail.wasvalid() and \
-        evalxfail.istrue():
+            evalxfail.istrue():
         if call.excinfo:
             if evalxfail.invalidraise(call.excinfo.value):
                 rep.outcome = "failed"
diff --git a/_pytest/unittest.py b/_pytest/unittest.py
index 0cf0f1726..2000c4d00 100644
--- a/_pytest/unittest.py
+++ b/_pytest/unittest.py
@@ -210,7 +210,7 @@ def pytest_runtest_protocol(item):
         check_testcase_implements_trial_reporter()
 
         def excstore(self, exc_value=None, exc_type=None, exc_tb=None,
-            captureVars=None):
+                captureVars=None):
             if exc_value is None:
                 self._rawexcinfo = sys.exc_info()
             else:
diff --git a/tox.ini b/tox.ini
index b347c3116..31957cfb1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -196,6 +196,6 @@ filterwarnings =
     ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
 
 [flake8]
-ignore = E125,E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731
+ignore = E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731
 max-line-length = 120
 exclude = _pytest/vendored_packages/pluggy.py