diff --git a/jenkins/gerrit-bazel-build-its-plugin.sh b/jenkins/gerrit-bazel-build-its-plugin.sh
index aa77d93..d2bd185 100644
--- a/jenkins/gerrit-bazel-build-its-plugin.sh
+++ b/jenkins/gerrit-bazel-build-its-plugin.sh
@@ -10,7 +10,7 @@
 
 . set-java.sh 8
 
-bazel build --spawn_strategy=standalone --genrule_strategy=standalone -v 3 plugins/its-{name}
+bazel build --spawn_strategy=standalone --genrule_strategy=standalone plugins/its-{name}
 
 # Remove duplicate entries
 PLUGIN_JAR=$(ls $(pwd)/bazel-genfiles/plugins/its-{name}/its-{name}*.jar)
diff --git a/jenkins/gerrit-bazel-build-plugin-manual.sh b/jenkins/gerrit-bazel-build-plugin-manual.sh
index fded690..27b39c9 100644
--- a/jenkins/gerrit-bazel-build-plugin-manual.sh
+++ b/jenkins/gerrit-bazel-build-plugin-manual.sh
@@ -9,9 +9,9 @@
 
 . set-java.sh 8
 
-bazel build --spawn_strategy=standalone --genrule_strategy=standalone -v 3 $TARGETS
+bazel build --spawn_strategy=standalone --genrule_strategy=standalone $TARGETS
 
-for JAR in $(bazel targets --show_output $TARGETS | awk '{{print $2}}')
+for JAR in $(find bazel-genfiles/plugins/{name} -name {name}*.jar)
 do
     PLUGIN_VERSION=$(git describe  --always origin/{branch})
     echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh
index c8dbe4a..54b0cbe 100644
--- a/jenkins/gerrit-bazel-build-plugin.sh
+++ b/jenkins/gerrit-bazel-build-plugin.sh
@@ -8,9 +8,9 @@
 
 . set-java.sh 8
 
-bazel build --spawn_strategy=standalone --genrule_strategy=standalone -v 3 $TARGETS
+bazel build --spawn_strategy=standalone --genrule_strategy=standalone $TARGETS
 
-for JAR in $(bazel targets --show_output $TARGETS | awk '{{print $2}}')
+for JAR in $(find bazel-genfiles/plugins/{name} -name {name}*.jar)
 do
     PLUGIN_VERSION=$(git describe  --always origin/{branch})
     echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
diff --git a/jenkins/gerrit-bazel-build.sh b/jenkins/gerrit-bazel-build.sh
index cfb76eb..7c550b7 100644
--- a/jenkins/gerrit-bazel-build.sh
+++ b/jenkins/gerrit-bazel-build.sh
@@ -1,16 +1,13 @@
 #!/bin/bash -e
 
-if [ -f "gerrit/BUILD" ]
-then
-  cd gerrit
-  . set-java.sh 8
+cd gerrit
+. set-java.sh 8
 
-  export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone"
+export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone"
 
-  bazel build $BAZEL_OPTS \
-        gerrit-plugin-api:plugin-api_deploy.jar \
-        gerrit-extension-api:extension-api_deploy.jar
+bazel build $BAZEL_OPTS \
+      gerrit-plugin-api:plugin-api_deploy.jar \
+      gerrit-extension-api:extension-api_deploy.jar
 
-  bazel build $BAZEL_OPTS plugins:core
-  bazel build $BAZEL_OPTS release
-fi
+bazel build $BAZEL_OPTS plugins:core
+bazel build $BAZEL_OPTS release
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
index 23b37b0..5f2aebf 100644
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -1,36 +1,33 @@
 #!/bin/bash -e
 
-if [ -f "gerrit/BUILD" ]
+cd gerrit
+
+export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone \
+                   --test_output errors \
+                   --test_summary detailed --flaky_test_attempts 3 \
+                   --test_verbose_timeout_warnings --build_tests_only \
+                   --nocache_test_results \
+                   --test_tag_filters=-elastic,-flaky"
+
+echo 'Test in default DB mode'
+echo '----------------------------------------------'
+bazel test $BAZEL_OPTS //...
+
+echo 'Test in Note DB mode'
+echo '----------------------------------------------'
+GERRIT_ENABLE_NOTEDB=TRUE bazel test $BAZEL_OPTS //...
+
+echo 'Test PolyGerrit locally'
+echo '----------------------------------------------'
+sh ./polygerrit-ui/app/run_test.sh
+
+if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
 then
-  cd gerrit
-
-  export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone \
-                     --test_output errors \
-                     --test_summary detailed --flaky_test_attempts 3 \
-                     --test_verbose_timeout_warnings --build_tests_only \
-                     --nocache_test_results \
-                     --test_tag_filters=-elastic,-flaky"
-
-  echo 'Test in default DB mode'
+  echo 'Not running on Sauce Labs because env vars are not set.'
+else
+  echo 'Test PolyGerrit on Sauce Labs'
   echo '----------------------------------------------'
-  bazel test $BAZEL_OPTS //...
-
-  echo 'Test in Note DB mode'
-  echo '----------------------------------------------'
-  GERRIT_ENABLE_NOTEDB=TRUE bazel test $BAZEL_OPTS //...
-
-  echo 'Test PolyGerrit locally'
-  echo '----------------------------------------------'
-  sh ./polygerrit-ui/app/run_test.sh
-
-  if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
-  then
-    echo 'Not running on Sauce Labs because env vars are not set.'
-  else
-    echo 'Test PolyGerrit on Sauce Labs'
-    echo '----------------------------------------------'
-    WCT_ARGS='--plugin sauce' sh ./polygerrit-ui/app/run_test.sh
-  fi
+  WCT_ARGS='--plugin sauce' sh ./polygerrit-ui/app/run_test.sh
 fi
 
 exit 0
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 0b59bdd..01e7f86 100644
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -1,46 +1,43 @@
 #!/bin/bash -ex
 
-if [ -f "gerrit/BUILD" ]
+cd gerrit
+
+. set-java.sh 8
+
+echo "Test with mode=$MODE"
+echo '----------------------------------------------'
+
+if [ "$MODE" == "notedb" ]
 then
-  cd gerrit
+  GERRIT_NOTEDB="--test_env=GERRIT_NOTEDB=READ_WRITE"
+fi
 
-  . set-java.sh 8
+if [ "$MODE" == "default" ] || [ "$MODE" == "notedb" ]
+then
+  export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone \
+                   --test_output errors \
+                   --test_summary detailed --flaky_test_attempts 3 \
+                   --test_verbose_timeout_warnings --build_tests_only \
+                   --nocache_test_results \
+                   --test_tag_filters=-elastic,-flaky"
 
-  echo "Test with mode=$MODE"
-  echo '----------------------------------------------'
+  bazel test $GERRIT_NOTEDB $BAZEL_OPTS //...
+fi
 
-  if [ "$MODE" == "notedb" ]
+if [ "$MODE" == "polygerrit" ]
+then
+  if [ -z "$DISPLAY" ]
   then
-    GERRIT_NOTEDB="--test_env=GERRIT_NOTEDB=READ_WRITE"
+    echo 'Not running local tests because env var "DISPLAY" is not set.'
+  else
+    echo 'Running local tests...'
+    sh ./polygerrit-ui/app/run_test.sh
   fi
-
-  if [ "$MODE" == "default" ] || [ "$MODE" == "notedb" ]
+  if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
   then
-    export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone \
-                     --test_output errors \
-                     --test_summary detailed --flaky_test_attempts 3 \
-                     --test_verbose_timeout_warnings --build_tests_only \
-                     --nocache_test_results \
-                     --test_tag_filters=-elastic,-flaky"
-
-    bazel test $GERRIT_NOTEDB $BAZEL_OPTS //...
-  fi
-
-  if [ "$MODE" == "polygerrit" ]
-  then
-    if [ -z "$DISPLAY" ]
-    then
-      echo 'Not running local tests because env var "DISPLAY" is not set.'
-    else
-      echo 'Running local tests...'
-      sh ./polygerrit-ui/app/run_test.sh
-    fi
-    if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
-    then
-      echo 'Not running on Sauce Labs because env vars are not set.'
-    else
-      echo 'Running tests on Sauce Labs...'
-      WCT_ARGS='--plugin sauce' sh ./polygerrit-ui/app/run_test.sh
-    fi
+    echo 'Not running on Sauce Labs because env vars are not set.'
+  else
+    echo 'Running tests on Sauce Labs...'
+    WCT_ARGS='--plugin sauce' sh ./polygerrit-ui/app/run_test.sh
   fi
 fi