diff --git a/.pylintrc b/.pylintrc
index 2ac0c2876a..c31bb4ce31 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -12,6 +12,7 @@ disable=
 # "E" Error for important programming issues (likely bugs)
  method-hidden,
  no-member,
+ no-value-for-parameter,  # TODO
  not-callable,
 # "W" Warnings for stylistic problems or minor programming issues
  arguments-differ,
@@ -23,6 +24,7 @@ disable=
  keyword-arg-before-vararg,  # TODO
  pointless-string-statement,
  protected-access,
+ raise-missing-from,  # TODO
  redefined-builtin,
  redefined-outer-name,
  signature-differs,
@@ -31,6 +33,7 @@ disable=
  unused-argument,
  unused-wildcard-import,
  useless-else-on-loop,
+ using-constant-test,  # TODO
  wildcard-import,
 # "C" Coding convention violations
  abstract-method,
@@ -39,6 +42,7 @@ disable=
  bad-continuation,
  deprecated-lambda,
  global-statement,
+ import-outside-toplevel,  # TODO
  invalid-name,
  missing-docstring,
  superfluous-parens,
@@ -49,8 +53,11 @@ disable=
  duplicate-code,
  inconsistent-return-statements,  # TODO
  interface-not-implemented,
+ no-else-continue,  # TODO
+ no-else-raise,  # TODO
  no-else-return,
  no-self-use,
+ super-with-arguments,  # TODO
  too-many-ancestors,
  too-many-arguments,
  too-many-branches,
@@ -59,6 +66,7 @@ disable=
  too-many-locals,
  too-many-return-statements,
  too-many-statements,
+ unnecessary-comprehension,  # TODO
  useless-object-inheritance
 
 [Basic]
diff --git a/test-requirements.txt b/test-requirements.txt
index d96b9b8571..85762109a0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,17 +9,15 @@
 # Hacking should appear first in case something else depends on pep8
 hacking>=3.0.1,<3.1.0 # Apache-2.0
 #
-astroid==2.1.0 # LGPLv2.1
 bandit!=1.6.0,>=1.4.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.12 # LGPLv3
-isort<5 # MIT
 nodeenv>=0.9.4 # BSD
 pytest>=5.3.5 # MIT
 pytest-django>=3.8.0 # BSD (3 clause)
 pytest-html>=2.0.1 #MPL-2.0
 python-memcached>=1.59 # PSF
-pylint==2.2.2 # GPLv2
+pylint==2.6.0 # GPLv2
 selenium>=2.50.1 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT