diff --git a/.ci/lint b/.ci/lint
index 8065ed25e0ff..2920022b2cbc 100644
--- a/.ci/lint
+++ b/.ci/lint
@@ -29,13 +29,13 @@ pipeline {
             parallel {
                 stage('salt linting') {
                     steps {
-                        sh 'eval "$(pyenv init -)"; tox -e pylint-salt | tee pylint-report.xml'
+                        sh 'eval "$(pyenv init -)"; tox -e pylint-salt $(find salt/ -name "*.py" -exec git diff --name-only "origin/$CHANGE_TARGET" "origin/$BRANCH_NAME" setup.py {} +) | tee pylint-report.xml'
                         archiveArtifacts artifacts: 'pylint-report.xml'
                     }
                 }
                 stage('test linting') {
                     steps {
-                        sh 'eval "$(pyenv init -)"; tox -e pylint-tests | tee pylint-report-tests.xml'
+                        sh 'eval "$(pyenv init -)"; tox -e pylint-tests $(find tests/ -name "*.py" -exec git diff --name-only "origin/$CHANGE_TARGET" "origin/$BRANCH_NAME" {} +) | tee pylint-report-tests.xml'
                         archiveArtifacts artifacts: 'pylint-report-tests.xml'
                     }
                 }
@@ -49,7 +49,9 @@ pipeline {
                     parserName: 'PyLint',
                     pattern: 'pylint-report*.xml'
                 ]],
-                failedTotalAll: '1',
+                failedTotalAll: '0',
+                useDeltaValues: false,
+                canRunOnFailed: true,
                 usePreviousBuildAsReference: true
             ])
             cleanWs()
diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py
index afd46e651a29..7529b241e812 100644
--- a/tests/integration/utils/testprogram.py
+++ b/tests/integration/utils/testprogram.py
@@ -598,7 +598,7 @@ class TestSaltProgram(six.with_metaclass(TestSaltProgramMeta, TestProgram)):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             connect = sock.bind(('localhost', port))
-        except:
+        except OSError:
             # these ports are already in use, use different ones
             pub_port = 4606
             ret_port = 4607