diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 5107718809..9f48c64444 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -915,6 +915,13 @@ function git_checkout
   fi
 
   add_jira_footer "git revision" "${PATCH_BRANCH} / ${GIT_REVISION}"
+
+  if [[ ! -f ${BASEDIR}/pom.xml ]]; then
+    hadoop_error "ERROR: This verison of test-patch.sh only supports Maven-based builds. Aborting."
+    add_jira_table -1 pre-patch "Unsupported build system."
+    output_to_jira 1
+    cleanup_and_exit 1
+  fi
   return 0
 }
 
@@ -1331,7 +1338,6 @@ function apply_patch_file
 ## @return       none; otherwise relaunches
 function check_reexec
 {
-  set +x
   local commentfile=${PATCH_DIR}/tp.${RANDOM}
 
   if [[ ${REEXECED} == true ]]; then
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 49106ae562..5b2654a92e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -604,6 +604,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11916. TestStringUtils#testLowerAndUpperStrings failed on MAC
     due to a JVM bug. (Ming Ma via ozawa)
 
+    HADOOP-11904. test-patch.sh goes into an infinite loop on non-maven
+    builds (aw)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES