diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 67aa2d1d168f..c7131c45e2f1 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -602,13 +602,20 @@ function hadoopcheck_rebuild
     else
       hbase_hadoop3_versions="3.1.1 3.1.2 3.1.3 3.1.4 3.2.0 3.2.1 3.2.2 3.2.3 3.2.4 3.3.0 3.3.1 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6"
     fi
-  else
-    yetus_info "Setting Hadoop 3 versions to test based on branch-2.5+/master/feature branch rules"
+  elif [[ "${PATCH_BRANCH}" = branch-2.5 ]]; then
+    yetus_info "Setting Hadoop 3 versions to test based on branch-2.5 rules"
     if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
       hbase_hadoop3_versions="3.2.4 3.3.6"
     else
       hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6"
     fi
+  else
+    yetus_info "Setting Hadoop 3 versions to test based on branch-2.6+/master/feature branch rules"
+    if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
+      hbase_hadoop3_versions="3.3.6"
+    else
+      hbase_hadoop3_versions="3.3.5 3.3.6"
+    fi
   fi
 
   export MAVEN_OPTS="${MAVEN_OPTS}"
diff --git a/pom.xml b/pom.xml
index ae6a75fbae92..7d013de887a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -803,7 +803,7 @@
     <maven.min.version>3.5.0</maven.min.version>
     <java.min.version>${compileSource}</java.min.version>
     <!-- Dependencies -->
-    <hadoop-three.version>3.2.4</hadoop-three.version>
+    <hadoop-three.version>3.3.5</hadoop-three.version>
     <!-- These must be defined here for downstream build tools that don't look at profiles.
     -->
     <hadoop.version>${hadoop-three.version}</hadoop.version>