diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 4c7a651..6bfad54 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -36,12 +36,6 @@
 then
   if [[ "$MODE" == *"polygerrit"* ]]
   then
-    if [[ "$TARGET_BRANCH" == "master" ]]
-    then
-      echo 'Running lint tests...'
-      bazel test //polygerrit-ui/app:lint_test --test_output errors
-    fi
-
     if [ -z "$DISPLAY" ]
     then
       echo 'Not running local tests because env var "DISPLAY" is not set.'
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index d7f7d49..3c5e34a 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -162,6 +162,15 @@
          cd gerrit
          echo 'Running google-java-format check...'
          git show --diff-filter=AM --name-only HEAD | grep java$ | xargs -r ~/format/google-java-format --dry-run
+      - shell: |
+         #!/bin/bash -xe
+         cd gerrit
+         if [ "$TARGET_BRANCH" == "master" ] && git show --diff-filter=AM --name-only HEAD | grep polygerrit-ui
+         then
+           echo 'Running PolyGerrit lint check...'
+           bazel test //polygerrit-ui/app:lint_test --test_output errors
+           bazel test //polygerrit-ui/app:polylint_test --test_output errors
+         fi
 
 - job:
     name: 'Gerrit-verifier-change'