diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py
index 50c2b95f8..5505fb4e1 100644
--- a/_pytest/fixtures.py
+++ b/_pytest/fixtures.py
@@ -872,7 +872,7 @@ def fixture(scope="function", params=None, autouse=False, ids=None, name=None):
     instead of ``return``. In this case, the code block after the ``yield`` statement is executed
     as teardown code regardless of the test outcome. A fixture function must yield exactly once.
     """
-    if callable(scope) and params is None and autouse == False:
+    if callable(scope) and params is None and autouse is False:
         # direct decoration
         return FixtureFunctionMarker(
             "function", params, autouse, name=name)(scope)
diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py
index 86e76cc0a..02fdf0ada 100644
--- a/testing/test_parseopt.py
+++ b/testing/test_parseopt.py
@@ -164,12 +164,12 @@ class TestParser(object):
         assert getattr(args, parseopt.FILE_OR_DIR) == ['4', '2']
         args = parser.parse(['-R', '-S', '4', '2', '-R'])
         assert getattr(args, parseopt.FILE_OR_DIR) == ['4', '2']
-        assert args.R == True
-        assert args.S == False
+        assert args.R is True
+        assert args.S is False
         args = parser.parse(['-R', '4', '-S', '2'])
         assert getattr(args, parseopt.FILE_OR_DIR) == ['4', '2']
-        assert args.R == True
-        assert args.S == False
+        assert args.R is True
+        assert args.S is False
 
     def test_parse_defaultgetter(self):
         def defaultget(option):
diff --git a/tox.ini b/tox.ini
index 43be981c4..144fe623d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -196,6 +196,6 @@ filterwarnings =
     ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning
 
 [flake8]
-ignore = E712,E731
+ignore = E731
 max-line-length = 120
 exclude = _pytest/vendored_packages/pluggy.py