diff --git a/_pytest/_code/source.py b/_pytest/_code/source.py
index fb00db1a6..2ee1c317e 100644
--- a/_pytest/_code/source.py
+++ b/_pytest/_code/source.py
@@ -2,7 +2,8 @@ from __future__ import absolute_import, division, generators, print_function
 
 from bisect import bisect_right
 import sys
-import inspect, tokenize
+import inspect
+import tokenize
 import py
 cpy_compile = compile
 
diff --git a/_pytest/helpconfig.py b/_pytest/helpconfig.py
index 5be1caa1d..e744637f8 100644
--- a/_pytest/helpconfig.py
+++ b/_pytest/helpconfig.py
@@ -4,7 +4,8 @@ from __future__ import absolute_import, division, print_function
 import py
 import pytest
 from _pytest.config import PrintHelp
-import os, sys
+import os
+import sys
 from argparse import Action
 
 
diff --git a/testing/test_argcomplete.py b/testing/test_argcomplete.py
index 1023e183a..b07f6e83b 100644
--- a/testing/test_argcomplete.py
+++ b/testing/test_argcomplete.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import py, pytest
+import py
+import pytest
 
 # test for _argcomplete but not specific for any application
 
diff --git a/testing/test_collection.py b/testing/test_collection.py
index 05d9244a0..a0b481628 100644
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import pytest, py
+import pytest
+import py
 
 from _pytest.main import Session, EXIT_NOTESTSCOLLECTED
 
diff --git a/testing/test_config.py b/testing/test_config.py
index 495821cd5..2ea4d0c10 100644
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, print_function
-import py, pytest
+import py
+import pytest
 
 import _pytest._code
 from _pytest.config import getcfg, get_common_ancestor, determine_setup
diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py
index de386f4e9..86e76cc0a 100644
--- a/testing/test_parseopt.py
+++ b/testing/test_parseopt.py
@@ -1,7 +1,8 @@
 from __future__ import absolute_import, division, print_function
 import sys
 import os
-import py, pytest
+import py
+import pytest
 from _pytest import config as parseopt
 
 
diff --git a/tox.ini b/tox.ini
index 3c3f89055..9312432b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -196,6 +196,6 @@ filterwarnings =
     ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
 
 [flake8]
-ignore = E401,E402,E501,E701,E702,E704,E712,E731
+ignore = E402,E501,E701,E702,E704,E712,E731
 max-line-length = 120
 exclude = _pytest/vendored_packages/pluggy.py