diff --git a/.pylintrc b/.pylintrc
index 028e4ae73e7..2a3b18226b5 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -32,32 +32,3 @@ output-format=parseable
 
 # Just the errors please, no full report
 reports=no
-
-
-[TYPECHECK]
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
- http.client,
- httplib,
- pkg_resources,
- # cloud_tests requirements.
- boto3,
- botocore,
- paramiko,
- pylxd,
- simplestreams
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-# argparse.Namespace from https://github.com/PyCQA/pylint/issues/2413
-ignored-classes=argparse.Namespace,optparse.Values,thread._local,ImageManager,ContainerManager
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=types,http.client,command_handlers,m_.*,enter_context
diff --git a/tox.ini b/tox.ini
index 58e1207caf8..a1e1e16972e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -304,9 +304,8 @@ setenv =
     ON_JENKINS="1"
 
 [pytest]
-# TODO: s/--strict/--strict-markers/ once pytest version is high enough
 testpaths = tools tests/unittests
-addopts = --strict
+addopts = --strict --strict-markers
 log_format = %(asctime)s %(levelname)-9s %(name)s:%(filename)s:%(lineno)d %(message)s
 log_date_format = %Y-%m-%d %H:%M:%S
 markers =