diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index 4d08f3ebeec..0188ecd9e53 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -153,6 +153,7 @@ pipeline {
                         YETUS_ARGS+=("--whitespace-tabs-ignore-list=.*/generated/.*")
                         YETUS_ARGS+=("--personality=${SOURCEDIR}/dev-support/hbase-personality.sh")
                         YETUS_ARGS+=("--quick-hadoopcheck")
+                        YETUS_ARGS+=("--skip-errorprone")
                         # effectively treat dev-support as a custom maven module
                         YETUS_ARGS+=("--skip-dir=dev-support")
                         # help keep the ASF boxes clean
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index e5ccea0761f..9cab756e653 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -94,6 +94,9 @@ function personality_parse_args
       --hadoop-profile=*)
         HADOOP_PROFILE=${i#*=}
       ;;
+      --skip-errorprone)
+        SKIP_ERRORPRONE=true
+      ;;
     esac
   done
 }
@@ -165,7 +168,7 @@ function personality_modules
     return
   fi
 
-  if [[ ${testtype} == compile ]]; then
+  if [[ ${testtype} == compile ]] && [[ "${SKIP_ERRORPRONE}" != "true" ]]; then
     extra="${extra} -PerrorProne"
   fi