diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 843506eae2f..aa3ca363b15 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -139,7 +139,7 @@ pipeline {
         }
         stage ('hadoop 3 cache') {
           environment {
-            HADOOP3_VERSION="3.0.0"
+            HADOOP3_VERSION="3.0.3"
           }
           steps {
             // directory must be unique for each parallel stage, because jenkins runs them in the same workspace :(
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 4631a0a496b..9c54d6d9779 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -532,9 +532,16 @@ function hadoopcheck_rebuild
       hbase_hadoop2_versions="2.8.2 2.8.3 2.8.4 2.8.5 2.9.1 2.9.2"
     fi
   fi
-  hbase_hadoop3_versions="3.0.0"
   if [[ "${PATCH_BRANCH}" = branch-1* ]]; then
+    yetus_info "Setting Hadoop 3 versions to test based on branch-1.x rules."
     hbase_hadoop3_versions=""
+  else
+    yetus_info "Setting Hadoop 3 versions to test based on branch-2.x/master/feature branch rules"
+    if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
+      hbase_hadoop3_versions="3.0.3 3.1.2"
+    else
+      hbase_hadoop2_versions="3.0.3 3.1.1 3.1.2"
+    fi
   fi
 
   export MAVEN_OPTS="${MAVEN_OPTS}"