diff --git a/Makefile b/Makefile
index 39a0f31..b850ae8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ test: tests  # Alias test -> tests
 
 .PHONY: format
 format:
-	black --exclude "/migrations/" graphene_django examples
+	black --exclude "/migrations/" graphene_django examples setup.py
 
 .PHONY: lint
 lint:
diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
index 4d8d597..b9bc599 100644
--- a/graphene_django/filter/tests/test_fields.py
+++ b/graphene_django/filter/tests/test_fields.py
@@ -321,12 +321,14 @@ def test_filter_filterset_related_results():
         pub_date=datetime.now(),
         pub_date_time=datetime.now(),
         reporter=r1,
+        editor=r1,
     )
     Article.objects.create(
         headline="a2",
         pub_date=datetime.now(),
         pub_date_time=datetime.now(),
         reporter=r2,
+        editor=r2,
     )
 
     query = """
@@ -450,7 +452,7 @@ def test_global_id_multiple_field_explicit_reverse():
     assert multiple_filter.field_class == GlobalIDMultipleChoiceField
 
 
-def test_filter_filterset_related_results():
+def test_filter_filterset_related_results_with_filter():
     class ReporterFilterNode(DjangoObjectType):
         class Meta:
             model = Reporter
diff --git a/graphene_django/rest_framework/mutation.py b/graphene_django/rest_framework/mutation.py
index 0fe9a02..b5e7160 100644
--- a/graphene_django/rest_framework/mutation.py
+++ b/graphene_django/rest_framework/mutation.py
@@ -52,7 +52,7 @@ class SerializerMutation(ClientIDMutation):
         lookup_field=None,
         serializer_class=None,
         model_class=None,
-        model_operations=["create", "update"],
+        model_operations=("create", "update"),
         only_fields=(),
         exclude_fields=(),
         **options
diff --git a/setup.cfg b/setup.cfg
index 546ad67..7d93d3e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,8 +5,33 @@ test=pytest
 universal=1
 
 [flake8]
-exclude = setup.py,docs/*,examples/*,tests,graphene_django/debug/sql/*
+exclude = docs,graphene_django/debug/sql/*,migrations
 max-line-length = 120
+select =
+	# Dictionary key repeated
+	F601,
+	# Ensure use of ==/!= to compare with str, bytes and int literals
+	F632,
+	# Redefinition of unused name
+	F811,
+	# Using an undefined variable
+	F821,
+	# Defining an undefined variable in __all__
+	F822,
+	# Using a variable before it is assigned
+	F823,
+	# Duplicate argument in function declaration
+	F831,
+	# Black would format this line
+	BLK,
+	# Do not use bare except
+	B001,
+	# Don't allow ++n. You probably meant n += 1
+	B002,
+	# Do not use mutable structures for argument defaults
+	B006,
+	# Do not perform calls in argument defaults
+	B008
 
 [coverage:run]
 omit = */tests/*
diff --git a/setup.py b/setup.py
index e622a71..bc7dcd3 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,8 @@ tests_require = [
 dev_requires = [
     "black==19.3b0",
     "flake8==3.7.7",
+    "flake8-black==0.1.0",
+    "flake8-bugbear==19.3.0",
 ] + tests_require
 
 setup(
@@ -64,7 +66,11 @@ setup(
     setup_requires=["pytest-runner"],
     tests_require=tests_require,
     rest_framework_require=rest_framework_require,
-    extras_require={"test": tests_require, "rest_framework": rest_framework_require, "dev": dev_requires},
+    extras_require={
+        "test": tests_require,
+        "rest_framework": rest_framework_require,
+        "dev": dev_requires,
+    },
     include_package_data=True,
     zip_safe=False,
     platforms="any",
diff --git a/tox.ini b/tox.ini
index 58f283a..a1b599a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,12 +28,12 @@ commands = {posargs:py.test --cov=graphene_django graphene_django examples}
 
 [testenv:black]
 basepython = python3.7
-deps = black
+deps = -e.[dev]
 commands  =
-    black --exclude "/migrations/" graphene_django examples --check
+    black --exclude "/migrations/" graphene_django examples setup.py --check
 
 [testenv:flake8]
 basepython = python3.7
-deps = flake8
+deps = -e.[dev]
 commands =
     flake8 graphene_django examples