diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 469359c8cb4..069ffc46232 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -53,8 +53,11 @@ function personality_globals
 
   # TODO use PATCH_BRANCH to select hadoop versions to use.
   # All supported Hadoop versions that we want to test the compilation with
-  HBASE_HADOOP2_VERSIONS="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 2.6.1 2.6.2 2.6.3 2.7.1"
-  HBASE_HADOOP3_VERSIONS="3.0.0-alpha1"
+  HBASE_MASTER_HADOOP2_VERSIONS="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3"
+  HBASE_MASTER_HADOOP3_VERSIONS="3.0.0-alpha1"
+
+  HBASE_HADOOP2_VERSIONS="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3"
+  HBASE_HADOOP3_VERSIONS=""
 
   # TODO use PATCH_BRANCH to select jdk versions to use.
 
@@ -181,6 +184,8 @@ function hadoopcheck_rebuild
   local logfile
   local count
   local result=0
+  local hbase_hadoop2_versions
+  local hbase_hadoop3_versions
 
   if [[ "${repostatus}" = branch ]]; then
     return 0
@@ -188,8 +193,16 @@ function hadoopcheck_rebuild
 
   big_console_header "Compiling against various Hadoop versions"
 
+  if [[ "${PATCH_BRANCH}" = "master" ]]; then
+    hbase_hadoop2_versions=${HBASE_MASTER_HADOOP2_VERSIONS}
+    hbase_hadoop3_versions=${HBASE_MASTER_HADOOP3_VERSIONS}
+  else
+    hbase_hadoop2_versions=${HBASE_HADOOP2_VERSIONS}
+    hbase_hadoop3_versions=${HBASE_HADOOP3_VERSIONS}
+  fi
+
   export MAVEN_OPTS="${MAVEN_OPTS}"
-  for hadoopver in ${HBASE_HADOOP2_VERSIONS}; do
+  for hadoopver in ${hbase_hadoop2_versions}; do
     logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
     echo_and_redirect "${logfile}" \
       "${MAVEN}" clean install \
@@ -202,7 +215,7 @@ function hadoopcheck_rebuild
     fi
   done
 
-  for hadoopver in ${HBASE_HADOOP3_VERSIONS}; do
+  for hadoopver in ${hbase_hadoop3_versions}; do
     logfile="${PATCH_DIR}/patch-javac-${hadoopver}.txt"
     echo_and_redirect "${logfile}" \
       "${MAVEN}" clean install \
@@ -220,7 +233,11 @@ function hadoopcheck_rebuild
     return 1
   fi
 
-  add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${HBASE_HADOOP2_VERSIONS} or ${HBASE_HADOOP3_VERSIONS}."
+  if [[ -n "${hbase_hadoop3_versions}" ]]; then
+    add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions} or ${hbase_hadoop3_versions}."
+  else
+    add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions}."
+  fi
   return 0
 }