diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 214710e8..7e2d2787 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -71,22 +71,22 @@ pipeline {
         stage("Linux") {
             failFast true
             parallel {
-                stage('Linux - py35') {
+                stage('Linux - py36') {
                     agent {
                         label 'Linux'
                     }
                     stages {
-                        stage('Linux - py35 - Generate environment') {
+                        stage('Linux - py36 - Generate environment') {
                             environment {
-                                PYVER = 'py35'
+                                PYVER = 'py36'
                             }
                             steps {
                                 sh '.ci/generate_env_linux.sh'
                             }
                         }
-                        stage('Linux - py35 - conandev') {
+                        stage('Linux - py36 - conandev') {
                             environment {
-                                TOXENV = 'py35-conandev'
+                                TOXENV = 'py36-conandev'
                             }
                             steps {
                                 sh '''
@@ -96,9 +96,9 @@ pipeline {
                                 '''
                             }
                         }
-                        stage('Linux - py35 - conancurrent') {
+                        stage('Linux - py36 - conancurrent') {
                             environment {
-                                TOXENV = 'py35-conancurrent'
+                                TOXENV = 'py36-conancurrent'
                             }
                             steps {
                                 sh '''
diff --git a/tests/requirements_test.txt b/tests/requirements_test.txt
index db2a012d..2a69b3b4 100644
--- a/tests/requirements_test.txt
+++ b/tests/requirements_test.txt
@@ -2,6 +2,7 @@ pytest>=3.6
 parameterized
 responses
 pluggy==0.11.0
-pylint
+pylint==2.10.2; python_version >= '3.0'
+pylint==1.9.5; python_version == '2.7'
 astroid
 spdx_lookup
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 5c2d4a4e..09afbd79 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 skipsdist=True
 envlist =
-    py{27,35,37,38}-conan{dev,current,prev,prevprev}
+    py{27,36,37,38}-conan{dev,current,prev,prevprev}
 
 [testenv]
 deps =
@@ -11,6 +11,7 @@ deps =
     conanprevprev: conan-unknown
     coverage: coverage-enable-subprocess
     -r {toxinidir}/tests/requirements_test.txt
+    
 
 setenv =
     PYTHONDONTWRITEBYTECODE=1
@@ -25,6 +26,8 @@ setenv =
 passenv = PYTEST_ADDOPTS USE_UNSUPPORTED_CONAN_WITH_PYTHON_2
 
 commands =
+    python --version
+    conan --version
     coverage: coverage erase
     {env:PYTEST_TEST_RUNNER:pytest} {posargs:tests}
     coverage: coverage combine