diff --git a/.pylintrc b/.pylintrc
index ef7fa06..cecfeab 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -44,8 +44,7 @@ symbols=no
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=W,C,R,no-member
-
+disable=W,C,R,no-member,assignment-from-no-return,assignment-from-none
 
 [REPORTS]
 
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 1ab2d7a..b5424ad 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,5 +1,5 @@
 alabaster==0.7.10
-astroid==1.3.8
+astroid==1.6.5
 Babel==2.3.4
 cliff==2.8.0
 cmd2==0.8.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e40a77f..ccec41c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,10 @@ flake8<2.6.0,>=2.5.4 # MIT
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 mock>=2.0.0 # BSD
-pylint==1.9.2 # GPLv2
+#pylint==1.9.2 # GPLv2
 stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
+astroid==1.6.5;python_version<"3.0" # LGPLv2.1
+astroid==2.1.0;python_version>="3.0" # LGPLv2.1
+pylint==1.9.2;python_version<"3.0" # GPLv2
+pylint==2.2.0;python_version>="3.0" # GPLv2